Further cleanup of gam create|update alias.

Author: taers232c

src/GamCommands.txt

@@ -1138,9 +1138,9 @@ gam print alertfeedback [todrive <ToDriveAttribute>*] [alert <AlertID>] [filter
 # Aliases
 
 gam create|add alias|aliases <EmailAddressEntity> user|group|target <UniqueID>|<EmailAddress>
-        [verifynotinvitable] [notargetverify]
+        [verifynotinvitable]
 gam update alias|aliases <EmailAddressEntity> user|group|target <UniqueID>|<EmailAddress>
-        [verifynotinvitable] [notargetverify]
+        [notargetverify]
 gam delete alias|aliases [user|group|target] <EmailAddressEntity>
 gam remove aliases|nicknames <EmailAddress> user|group <EmailAddressEntity>
 gam <UserTypeEntity> delete alias|aliases

src/GamUpdate.txt

@@ -1,3 +1,8 @@
+6.15.19
+
+Further cleanup of `gam create|update alias`.
+* See: https://github.com/taers232c/GAMADV-XTD3/wiki/Aliases
+
 6.15.18
 
 After discussions with Jay, the default for creating/updating aliases is to verify that

src/gam/__init__.py

@@ -25,7 +25,7 @@
 """
 
 __author__ = 'Ross Scroggs <[email protected]>'
-__version__ = '6.15.18'
+__version__ = '6.15.19'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -9613,9 +9613,9 @@ def doCreateProject():
     sys.stdout.write(Msg.CREATING_PROJECT.format(body['displayName']))
     try:
       create_operation = callGAPI(crm.projects(), 'create',
-                                  throwReasons=[GAPI.BAD_REQUEST, GAPI.ALREADY_EXISTS],
+                                  throwReasons=[GAPI.BAD_REQUEST, GAPI.ALREADY_EXISTS, GAPI.FAILED_PRECONDITION],
                                   body=body)
-    except (GAPI.badRequest, GAPI.alreadyExists) as e:
+    except (GAPI.badRequest, GAPI.alreadyExists, GAPI.failedPrecondition) as e:
       entityActionFailedExit([Ent.USER, login_hint, Ent.PROJECT, projectInfo['projectId']], str(e))
     operation_name = create_operation['name']
     time.sleep(5) # Google recommends always waiting at least 5 seconds
@@ -14306,8 +14306,10 @@ def printOrgUnit(parentOrgUnit, tree):
 
 ALIAS_TARGET_TYPES = ['user', 'group', 'target']
 
-# gam create|update aliases|nicknames <EmailAddressEntity> user|group|target <UniqueID>|<EmailAddress>
-#	[verifynotinvitable] [notargetverify]
+# gam create aliases|nicknames <EmailAddressEntity> user|group|target <UniqueID>|<EmailAddress>
+#	[verifynotinvitable]
+# gam update aliases|nicknames <EmailAddressEntity> user|group|target <UniqueID>|<EmailAddress>
+#	[notargetverify]
 def doCreateUpdateAliases():
   def verifyAliasTargetExists():
     if targetType != 'group':
@@ -14337,12 +14339,12 @@ def verifyAliasTargetExists():
   targetEmails = getEntityList(Cmd.OB_GROUP_ENTITY)
   entityLists = targetEmails if isinstance(targetEmails, dict) else None
   verifyNotInvitable = False
-  verifyTarget = True
+  verifyTarget = updateCmd
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
-    if myarg == 'verifynotinvitable':
+    if (not updateCmd) and myarg == 'verifynotinvitable':
       verifyNotInvitable = True
-    elif myarg == 'notargetverify':
+    elif updateCmd and myarg == 'notargetverify':
       verifyTarget = False
     else:
       unknownArgumentExit()

src/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Advanced GAM for Google Workspace
-version = 6.15.18
+version = 6.15.19
 description = Command line management for Google Workspaces
 long_description = file: readme.md
 long_description_content_type = text/markdown