deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-05-12 20:27:20 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

GAM 7.01.04

Browse Source
This commit is contained in:
Jay Lee 2024-12-04 03:16:04 +00:00
parent 0b303ffc30
commit ff3f31cf9e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gam/__init__.py
View File

@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
""" """
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>' __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
__version__ = '7.01.03' __version__ = '7.01.04'
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
#pylint: disable=wrong-import-position #pylint: disable=wrong-import-position
@ -11433,8 +11433,8 @@ def convertGCPFolderNameToID(parent, crm):
systemErrorExit(MULTIPLE_PROJECT_FOLDERS_FOUND_RC, None) systemErrorExit(MULTIPLE_PROJECT_FOLDERS_FOUND_RC, None)
return folders[0]['name'] return folders[0]['name']
PROJECTID_PATTERN = re.compile(r'^[a-z][a-z0-9-]{4,28}[a-z0-9]$') PROJECTID_PATTERN = re.compile(r'^[a-z][a-z0-9-]{4,99}[a-z0-9]$')
PROJECTID_FORMAT_REQUIRED = '[a-z][a-z0-9-]{4,28}[a-z0-9]' PROJECTID_FORMAT_REQUIRED = '[a-z][a-z0-9-]{4,99}[a-z0-9]'
def _checkProjectId(projectId): def _checkProjectId(projectId):
if not PROJECTID_PATTERN.match(projectId): if not PROJECTID_PATTERN.match(projectId):
Cmd.Backup() Cmd.Backup()
@ -11472,6 +11472,7 @@ def _generateProjectSvcAcctId(prefix):
return f'{prefix}-{"".join(random.choice(LOWERNUMERIC_CHARS) for _ in range(5))}' return f'{prefix}-{"".join(random.choice(LOWERNUMERIC_CHARS) for _ in range(5))}'
def _getLoginHintProjectInfo(createCmd): def _getLoginHintProjectInfo(createCmd):
print('a')
login_hint = None login_hint = None
create_key = True create_key = True
appInfo = {'applicationTitle': '', 'supportEmail': ''} appInfo = {'applicationTitle': '', 'supportEmail': ''}
@ -11484,7 +11485,9 @@ def _getLoginHintProjectInfo(createCmd):
if login_hint and login_hint.find('@') == -1: if login_hint and login_hint.find('@') == -1:
Cmd.Backup() Cmd.Backup()
login_hint = None login_hint = None
projectInfo['projectId'] = getString(Cmd.OB_STRING, optional=True, minLen=6, maxLen=30).strip() print(1)
projectInfo['projectId'] = getString(Cmd.OB_STRING, optional=True, minLen=6, maxLen=999999).strip()
print(2)
if projectInfo['projectId']: if projectInfo['projectId']:
_checkProjectId(projectInfo['projectId']) _checkProjectId(projectInfo['projectId'])
checkForExtraneousArguments() checkForExtraneousArguments()
@ -11496,7 +11499,7 @@ def _getLoginHintProjectInfo(createCmd):
elif myarg == 'nokey': elif myarg == 'nokey':
create_key = False create_key = False
elif myarg == 'project': elif myarg == 'project':
projectInfo['projectId'] = getString(Cmd.OB_STRING, minLen=6, maxLen=30) projectInfo['projectId'] = getString(Cmd.OB_STRING, minLen=6, maxLen=9999)
_checkProjectId(projectInfo['projectId']) _checkProjectId(projectInfo['projectId'])
elif createCmd and myarg == 'parent': elif createCmd and myarg == 'parent':
projectInfo['parent'] = getString(Cmd.OB_STRING) projectInfo['parent'] = getString(Cmd.OB_STRING)
@ -11512,6 +11515,7 @@ def _getLoginHintProjectInfo(createCmd):
break break
else: else:
unknownArgumentExit() unknownArgumentExit()
print(4)
if not projectInfo['projectId']: if not projectInfo['projectId']:
if createCmd: if createCmd:
projectInfo['projectId'] = _generateProjectSvcAcctId('gam-project') projectInfo['projectId'] = _generateProjectSvcAcctId('gam-project')