From 893b63c5d54e406bcb34926f8b41e10dbd90b858 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 24 Jul 2023 10:16:30 -0400
Subject: [PATCH 01/14] actions: capture Vault matterId output

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 27ce149b..f1f7908a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -727,7 +727,7 @@ jobs:
              $gam calendar $gam_user addevent summary "GHA test event" start "${starttime}" end "${endtime}" attendee $newgroup hangoutsmeet guestscanmodify true sendupdates all
              $gam calendar $gam_user printevents after -0d
              $gam config enable_dasa false save
-             matterid=uid:$($gam create vaultmatter name "GHA matter $newbase" description "test matter" collaborators $newuser | head -1 | cut -d ' ' -f 3)
+             matterid=uid:$($gam create vaultmatter name "GHA matter $newbase" description "test matter" collaborators $newuser | head -1 | awk -F'[()]' '{print $2}')
              $gam create vaulthold matter $matterid name "GHA hold $newbase" corpus mail accounts $newuser
              $gam print vaultmatters matterstate open
              $gam print vaultholds matter $matterid

From ff6364c77be871f549af5c02a01d248934750d2b Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 24 Jul 2023 10:33:49 -0400
Subject: [PATCH 02/14] actions: noinfo on whatis command to avoid DASA license
 errors

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f1f7908a..f7688a33 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -746,7 +746,7 @@ jobs:
              $gam user $newuser delete license workspaceenterpriseplus
              echo finish
              $gam config enable_dasa true save
-             $gam whatis $newuser
+             $gam whatis $newuser noinfo
              $gam user $gam_user show tokens
              $gam config enable_dasa false save
              $gam print exports matter $matterid | $gam csv - gam download export $matterid id:~~id~~

From 3eea0cea083e0590ac9beaa4811cf88d276ac811 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Mon, 24 Jul 2023 08:14:35 -0700
Subject: [PATCH 03/14] Added option `returnidonly` to `gam create
 vaultexport|vaulthold|vaultmatter`

---
 src/GamCommands.txt |  6 ++---
 src/GamUpdate.txt   |  9 ++++++++
 src/gam/__init__.py | 53 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 887a210d..784d2322 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -4785,7 +4785,7 @@ gam <UserTypeEntity> show teamdriveacls
 
 gam create|add vaultmatter|matter [name <String>] [description <string>]
         [collaborator|collaborators <EmailItemList>] [sendemails <Boolean>] [ccme <Boolean>]
-        [showdetails]
+        [showdetails|returnidonly]
 gam update vaultmatter|matter <MatterItem> [name <String>] [description <string>]
         [addcollaborator|addcollaborators <EmailItemList>] [removecollaborator|removecollaborators <EmailItemList>]
 gam update vaultmatter|matter <MatterItem> action close|reopen|delete|undelete
@@ -4834,7 +4834,7 @@ gam create vaultexport|export matter <MatterItem> [name <String>] corpus drive|m
         [showconfidentialmodecontent <Boolean>] [usenewexport <Boolean>]
         [includerooms <Boolean>] [covereddata calllogs|textmessages|voicemails]
         [includeshareddrives|includeteamdrives <Boolean>] [driveversiondate <Date>|<Time>] [includeaccessinfo <Boolean>]
-        [region any|europe|us] [showdetails]
+        [region any|europe|us] [showdetails|returnidonly]
 gam delete vaultexport|export <ExportItem> matter <MatterItem>
 gam delete vaultexport|export <MatterItem> <ExportItem>
 gam download vaultexport|export <ExportItem> matter <MatterItem>
@@ -4894,7 +4894,7 @@ gam create vaulthold|hold matter <MatterItem> [name <String>] corpus drive|mail|
         [terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
         [includerooms <Boolean>] [covereddata calllogs|textmessages|voicemails]
         [includeshareddrives|includeteamdrives <Boolean>]
-        [showdetails]
+        [showdetails|returnidonly]
 gam update vaulthold|hold <HoldItem> matter <MatterItem>
         [([addaccounts|addgroups|addusers <EmailItemList>] [removeaccounts|removegroups|removeusers <EmailItemList>]) | (orgunit|org|ou <OrgUnit>)]
         [query <QueryVaultCorpus>]
diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index bc2835b8..2f237c6f 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -2,6 +2,15 @@
 
 Merged GAM-Team version
 
+6.61.11
+
+Added option `returnidonly` to `gam create vaultexport|vaulthold|vaultmatter`
+that causes GAM to return just the ID of the item created as output.
+
+6.61.10
+
+Fixed bug in `gam oauth create admin <EmailAddress>` which caused no scopes to be selected.
+
 6.61.09
 
 Updated `gam oauth create` to handle case where Google takes a very long time to respond
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 3dca8fa3..fd74a13d 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -36895,14 +36895,14 @@ def _validateVaultQuery(query):
 #	[includerooms <Boolean>]
 #	[covereddata calllogs|textmessages|voicemails]
 #	[includeshareddrives|includeteamdrives <Boolean>] [driveversiondate <Date>|<Time>] [includeaccessinfo <Boolean>]
-#	[region any|europe|us] [showdetails]
+#	[region any|europe|us] [showdetails|returnidonly]
 def doCreateVaultExport():
   v = buildGAPIObject(API.VAULT)
   matterId = None
   body = {'query': {'dataScope': 'ALL_DATA'}, 'exportOptions': {}}
   exportFormat = 'MBOX'
   showConfidentialModeContent = None
-  showDetails = False
+  returnIdOnly = showDetails = False
   useNewExport = None
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
@@ -36927,6 +36927,10 @@ def doCreateVaultExport():
       body['exportOptions'].setdefault('voiceOptions', {})['coveredData'] = getChoice(VAULT_VOICE_COVERED_DATA_MAP, mapChoice=True)
     elif myarg == 'showdetails':
       showDetails = True
+      returnIdOnly = False
+    elif myarg == 'returnidonly':
+      returnIdOnly = True
+      showDetails = False
     else:
       unknownArgumentExit()
   if not matterId:
@@ -36950,9 +36954,12 @@ def doCreateVaultExport():
                       throwReasons=[GAPI.ALREADY_EXISTS, GAPI.BAD_REQUEST, GAPI.BACKEND_ERROR, GAPI.INVALID_ARGUMENT,
                                     GAPI.FAILED_PRECONDITION, GAPI.FORBIDDEN, GAPI.QUOTA_EXCEEDED],
                       matterId=matterId, body=body)
-    entityActionPerformed([Ent.VAULT_MATTER, matterNameId, Ent.VAULT_EXPORT, formatVaultNameId(export['name'], export['id'])])
-    if showDetails:
-      _showVaultExport(None, export, None, None)
+    if not returnIdOnly:
+      entityActionPerformed([Ent.VAULT_MATTER, matterNameId, Ent.VAULT_EXPORT, formatVaultNameId(export['name'], export['id'])])
+      if showDetails:
+        _showVaultExport(None, export, None, None)
+    else:
+      writeStdout(f'{export["id"]}\n')
   except (GAPI.alreadyExists, GAPI.badRequest, GAPI.backendError, GAPI.invalidArgument,
           GAPI.failedPrecondition, GAPI.forbidden, GAPI.quotaExceeded) as e:
     entityActionFailedWarning([Ent.VAULT_MATTER, matterNameId, Ent.VAULT_EXPORT, body.get('name')], str(e))
@@ -37467,14 +37474,14 @@ def _setHoldQuery(body, queryParameters):
 #	[includerooms <Boolean>]
 #	[covereddata calllogs|textmessages|voicemails]
 #	[includeshareddrives|includeteamdrives <Boolean>]
-#	[showdetails]
+#	[showdetails|returnidonly]
 def doCreateVaultHold():
   v = buildGAPIObject(API.VAULT)
   body = {}
   matterId = None
   accounts = []
   queryParameters = {}
-  showDetails = False
+  returnIdOnly = showDetails = False
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if myarg == 'matter':
@@ -37492,6 +37499,10 @@ def doCreateVaultHold():
       pass
     elif myarg == 'showdetails':
       showDetails = True
+      returnIdOnly = False
+    elif myarg == 'returnidonly':
+      returnIdOnly = True
+      showDetails = False
     else:
       unknownArgumentExit()
   if matterId is None:
@@ -37511,9 +37522,12 @@ def doCreateVaultHold():
     hold = callGAPI(v.matters().holds(), 'create',
                     throwReasons=[GAPI.ALREADY_EXISTS, GAPI.BAD_REQUEST, GAPI.BACKEND_ERROR, GAPI.FAILED_PRECONDITION, GAPI.FORBIDDEN],
                     matterId=matterId, body=body)
-    entityActionPerformed([Ent.VAULT_MATTER, matterNameId, Ent.VAULT_HOLD, formatVaultNameId(hold['name'], hold['holdId'])])
-    if showDetails:
-      _showVaultHold(None, hold, None, None)
+    if not returnIdOnly:
+      entityActionPerformed([Ent.VAULT_MATTER, matterNameId, Ent.VAULT_HOLD, formatVaultNameId(hold['name'], hold['holdId'])])
+      if showDetails:
+        _showVaultHold(None, hold, None, None)
+    else:
+      writeStdout(f'{hold["holdId"]}\n')
   except (GAPI.alreadyExists, GAPI.badRequest, GAPI.backendError, GAPI.failedPrecondition, GAPI.forbidden) as e:
     entityActionFailedWarning([Ent.VAULT_MATTER, matterNameId, Ent.VAULT_HOLD, body.get('name')], str(e))
 
@@ -38092,14 +38106,14 @@ def _showVaultMatter(matter, cd, FJQC, j=0, jcount=0):
 
 # gam create vaultmatter|matter [name <String>] [description <string>]
 #	[collaborator|collaborators <CollaboratorItemList>] [sendemails <Boolean>] [ccme <Boolean>]
-#	[showdetails]
+#	[showdetails|returnidonly]
 def doCreateVaultMatter():
   v = buildGAPIObject(API.VAULT)
   body = {}
   cbody = {'matterPermission': {'role': 'COLLABORATOR', 'accountId': ''}, 'sendEmails': False, 'ccMe': False}
   collaborators = []
   cd = None
-  showDetails = False
+  returnIdOnly = showDetails = False
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if myarg == 'name':
@@ -38116,6 +38130,10 @@ def doCreateVaultMatter():
       cbody['ccMe'] = getBoolean()
     elif myarg == 'showdetails':
       showDetails = True
+      returnIdOnly = False
+    elif myarg == 'returnidonly':
+      returnIdOnly = True
+      showDetails = False
     else:
       unknownArgumentExit()
   if 'name' not in body:
@@ -38126,14 +38144,18 @@ def doCreateVaultMatter():
                       body=body)
     matterId = matter['matterId']
     matterNameId = formatVaultNameId(matter['name'], matterId)
-    entityActionPerformed([Ent.VAULT_MATTER, matterNameId])
+    if not returnIdOnly:
+      entityActionPerformed([Ent.VAULT_MATTER, matterNameId])
+    else:
+      writeStdout(f'{matterId}\n')
   except (GAPI.alreadyExists, GAPI.forbidden) as e:
     entityActionFailedWarning([Ent.VAULT_MATTER, body['name']], str(e))
     return
   jcount = len(collaborators)
   if jcount > 0:
     Act.Set(Act.ADD)
-    entityPerformActionNumItems([Ent.VAULT_MATTER, matterNameId], jcount, Ent.COLLABORATOR)
+    if not returnIdOnly:
+      entityPerformActionNumItems([Ent.VAULT_MATTER, matterNameId], jcount, Ent.COLLABORATOR)
     Ind.Increment()
     j = 0
     for collaborator in collaborators:
@@ -38143,7 +38165,8 @@ def doCreateVaultMatter():
         callGAPI(v.matters(), 'addPermissions',
                  throwReasons=[GAPI.FAILED_PRECONDITION, GAPI.FORBIDDEN],
                  matterId=matterId, body=cbody)
-        entityActionPerformed([Ent.VAULT_MATTER, matterNameId, Ent.COLLABORATOR, collaborator['email']], j, jcount)
+        if not returnIdOnly:
+          entityActionPerformed([Ent.VAULT_MATTER, matterNameId, Ent.COLLABORATOR, collaborator['email']], j, jcount)
       except (GAPI.failedPrecondition, GAPI.forbidden) as e:
         entityActionFailedWarning([Ent.VAULT_MATTER, matterNameId], str(e))
         break

From 31fa445733b97bd040e34135b584b643de3e88a0 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 24 Jul 2023 13:59:12 -0400
Subject: [PATCH 04/14] actions: handle 20 return code from whatis

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f7688a33..668c8339 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -746,7 +746,7 @@ jobs:
              $gam user $newuser delete license workspaceenterpriseplus
              echo finish
              $gam config enable_dasa true save
-             $gam whatis $newuser noinfo
+             $gam whatis $newuser || || if [ $? != 20 ]; then exit $?; fi # expect a 20 return code (is a user)
              $gam user $gam_user show tokens
              $gam config enable_dasa false save
              $gam print exports matter $matterid | $gam csv - gam download export $matterid id:~~id~~

From f48f486f64859e43429bdd25d3eb0ecb1eedd2b6 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 24 Jul 2023 14:26:25 -0400
Subject: [PATCH 05/14] actions: catch 60 return codes on message deletes

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 668c8339..1e6258de 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -704,9 +704,9 @@ jobs:
              $gam user $gam_user draftemail subject "GHA draft $newbase" message "Draft message test"
              $gam csvfile sample.csv:email waitformailbox
              $gam user $newuser delegate to "${newbase}-bulkuser-1"
-             $gam users "$gam_user $newbase-bulkuser-1 $newbase-bulkuser-2 $newbase-bulkuser-3" delete messages query in:anywhere maxtodelete 99999 doit
-             $gam users "$newbase-bulkuser-4 $newbase-bulkuser-5 $newbase-bulkuser-6" trash messages query in:anywhere maxtotrash 99999 doit
-             $gam users "$newbase-bulkuser-7 $newbase-bulkuser-8 $newbase-bulkuser-9" modify messages query in:anywhere maxtomodify 99999 addlabel IMPORTANT addlabel STARRED doit
+             $gam users "$gam_user $newbase-bulkuser-1 $newbase-bulkuser-2 $newbase-bulkuser-3" delete messages query in:anywhere maxtodelete 99999 doit || if [ $? != 60 ]; then exit $?; fi # expect a 60 return code (no messages)
+             $gam users "$newbase-bulkuser-4 $newbase-bulkuser-5 $newbase-bulkuser-6" trash messages query in:anywhere maxtotrash 99999 doit || if [ $? != 60 ]; then exit $?; fi # expect a 60 return code (no messages)
+             $gam users "$newbase-bulkuser-7 $newbase-bulkuser-8 $newbase-bulkuser-9" modify messages query in:anywhere maxtomodify 99999 addlabel IMPORTANT addlabel STARRED doit || if [ $? != 60 ]; then exit $?; fi # expect a 60 return code (no messages)
              $gam user $newuser delete label --ALL_LABELS--
              $gam config csv_output_row_filter "name:regex:gha-test-${JID}" print features | $gam csv - gam delete feature ~name
              $gam create feature name VC-$newbase
@@ -746,7 +746,7 @@ jobs:
              $gam user $newuser delete license workspaceenterpriseplus
              echo finish
              $gam config enable_dasa true save
-             $gam whatis $newuser || || if [ $? != 20 ]; then exit $?; fi # expect a 20 return code (is a user)
+             $gam whatis $newuser || if [ $? != 20 ]; then exit $?; fi # expect a 20 return code (is a user)
              $gam user $gam_user show tokens
              $gam config enable_dasa false save
              $gam print exports matter $matterid | $gam csv - gam download export $matterid id:~~id~~

From f01f050ffda6cbcd8a24b6a171597bbe2a69c895 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 24 Jul 2023 15:11:52 -0400
Subject: [PATCH 06/14] actions: report users with fields seems to never find
 an old date that works.

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e6258de..03d16110 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -769,7 +769,8 @@ jobs:
              $gam report usageparameters customer
              $gam report usage customer parameters gmail:num_emails_sent,accounts:num_1day_logins
              $gam report customer todrive
-             $gam report users fields accounts:is_less_secure_apps_access_allowed,gmail:last_imap_time,gmail:last_pop_time filters "accounts:last_login_time>2019-01-01T00:00:00.000Z" todrive
+             #$gam report users fields accounts:is_less_secure_apps_access_allowed,gmail:last_imap_time,gmail:last_pop_time filters "accounts:last_login_time>2019-01-01T00:00:00.000Z" todrive
+             $gam report users todrive
              $gam report admin start -3d todrive
              $gam print devices nopersonaldevices nodeviceusers filter "serial:$JID$JID$JID$JID-" | $gam csv - gam delete device id ~name
              $gam config enable_dasa false save

From 9535d05584a2a3a86f805cacce1d985dd03d421d Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 24 Jul 2023 16:00:13 -0400
Subject: [PATCH 07/14] actions: returnidonly on shared drive creation

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 03d16110..8d35968d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -780,7 +780,7 @@ jobs:
              $gam create caalevel "zzz_${newbase}" basic condition ipsubnetworks 1.1.1.1/32,2.2.2.2/32 endcondition
              $gam print caalevels
              $gam delete caalevel "zzz_${newbase}"
-             driveid=$($gam user $gam_user add shareddrive "${newbase}" | awk '{print $NF}')
+             driveid=$($gam user $gam_user add shareddrive "${newbase} returnidonly")
              echo "Created shared drive ${driveid}"
              $gam user $gam_user add drivefile localfile gam.py parentid "${driveid}"
              $gam user $gam_user update shareddrive "${driveid}" ou "${newou}"

From 223e017b9e53e7266d679e00b8b64c522243275b Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 24 Jul 2023 16:16:52 -0400
Subject: [PATCH 08/14] actions: returnidonly belongs outside the quotes, duh

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d35968d..7fca16a8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -780,7 +780,7 @@ jobs:
              $gam create caalevel "zzz_${newbase}" basic condition ipsubnetworks 1.1.1.1/32,2.2.2.2/32 endcondition
              $gam print caalevels
              $gam delete caalevel "zzz_${newbase}"
-             driveid=$($gam user $gam_user add shareddrive "${newbase} returnidonly")
+             driveid=$($gam user $gam_user add shareddrive "${newbase}" returnidonly)
              echo "Created shared drive ${driveid}"
              $gam user $gam_user add drivefile localfile gam.py parentid "${driveid}"
              $gam user $gam_user update shareddrive "${driveid}" ou "${newou}"

From e5bd3e6bc01828ecf14164cc49a006d3b10ce0aa Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 24 Jul 2023 16:52:52 -0400
Subject: [PATCH 09/14] actions: force dasa off to start, parse created printer
 id

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7fca16a8..da9a9c66 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -619,6 +619,7 @@ jobs:
              $gam config customer_id "C03uzfv2s" save
              $gam config domain "pdl.jaylee.us" save
              $gam config admin_email "${gam_user}" save
+             $gam config enable_dasa false save
              $gam oauth info
              $gam oauth refresh
              $gam config enable_dasa true save 
@@ -795,7 +796,7 @@ jobs:
              $gam delete inboundssoprofile "id:${ssoprofile}"
              $gam print printermodels | wc -l
              $gam print printers
-             printerid=$($gam create printer displayname "${newbase}" uri ipp://localhost:631 driverless description "made by $(gam_user)" ou "${newou}" | grep 'id: [a-z,0-9]*$' | cut -d' ' -f3)
+             printerid=$($gam create printer displayname "${newbase}" uri ipp://localhost:631 driverless description "made by $(gam_user)" ou "${newou}" nodetails | awk '{print substr($2, 1, length($2)-1)}')
              $gam info printer "$printerid"
              $gam delete printer "$printerid"
              $gam delete ou "${newou}"

From cb2228b8233a122a2a0bd1f4878359cbd439ac0e Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Mon, 24 Jul 2023 13:56:22 -0700
Subject: [PATCH 10/14] Handle matters with unknown state

---
 src/gam/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index fd74a13d..1263314d 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -36754,7 +36754,8 @@ def getMatterItem(v, state=None):
 
 def warnMatterNotOpen(matter, matterNameId, j, jcount):
   printWarningMessage(DATA_NOT_AVALIABLE_RC, formatKeyValueList('',
-                                                                Ent.FormatEntityValueList([Ent.VAULT_MATTER, matterNameId])+[Msg.MATTER_NOT_OPEN.format(matter['state'])],
+                                                                Ent.FormatEntityValueList([Ent.VAULT_MATTER, matterNameId])+
+                                                                [Msg.MATTER_NOT_OPEN.format(matter.get('state', 'Unknown'))],
                                                                 currentCount(j, jcount)))
 
 def _cleanVaultExport(export, cd):

From 90cff02b26fe5c81625fc5bede35ea93352b7de0 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Mon, 24 Jul 2023 15:44:27 -0700
Subject: [PATCH 11/14] Updated `gam print|show
 vaultexports|vaultholds|vaultqueries` to handle the case

where a vault matter changes state from `OPEN` to `CLOSED|DELETED` while the command is being processed.
---
 src/GamUpdate.txt   |  5 +++++
 src/gam/__init__.py | 27 +++++++++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index 2f237c6f..e5924129 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -2,6 +2,11 @@
 
 Merged GAM-Team version
 
+6.61.12
+
+Updated `gam print|show vaultexports|vaultholds|vaultqueries` to handle the case
+where a vault matter changes state from `OPEN` to `CLOSED|DELETED` while the command is being processed.
+
 6.61.11
 
 Added option `returnidonly` to `gam create vaultexport|vaulthold|vaultmatter`
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 1263314d..4711212c 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -36752,10 +36752,17 @@ def getMatterItem(v, state=None):
   matterId, _, matterNameId, _ = convertMatterNameToID(v, getString(Cmd.OB_MATTER_ITEM), state=state)
   return (matterId, matterNameId)
 
-def warnMatterNotOpen(matter, matterNameId, j, jcount):
+def warnMatterNotOpen(v, matter, matterNameId, j, jcount):
+  if v is not None:
+    try:
+      matter['state'] = callGAPI(v.matters(), 'get',
+                                 throwReasons=[GAPI.NOT_FOUND, GAPI.FORBIDDEN],
+                                 matterId=matter['matterId'], view='BASIC', fields='state')['state']
+    except (GAPI.notFound, GAPI.forbidden):
+      matter['state'] = 'Unknown'
   printWarningMessage(DATA_NOT_AVALIABLE_RC, formatKeyValueList('',
                                                                 Ent.FormatEntityValueList([Ent.VAULT_MATTER, matterNameId])+
-                                                                [Msg.MATTER_NOT_OPEN.format(matter.get('state', 'Unknown'))],
+                                                                [Msg.MATTER_NOT_OPEN.format(matter['state'])],
                                                                 currentCount(j, jcount)))
 
 def _cleanVaultExport(export, cd):
@@ -37136,13 +37143,13 @@ def doPrintShowVaultExports():
                                 throwReasons=[GAPI.FAILED_PRECONDITION, GAPI.FORBIDDEN],
                                 matterId=matterId, fields=fields)
       except GAPI.failedPrecondition:
-        warnMatterNotOpen(matter, matterNameId, j, jcount)
+        warnMatterNotOpen(v, matter, matterNameId, j, jcount)
         continue
       except GAPI.forbidden as e:
         entityActionFailedWarning([Ent.VAULT_EXPORT, None], str(e))
         break
     else:
-      warnMatterNotOpen(matter, matterNameId, j, jcount)
+      warnMatterNotOpen(None, matter, matterNameId, j, jcount)
       continue
     kcount = len(exports)
     if not csvPF:
@@ -37795,13 +37802,13 @@ def doPrintShowVaultHolds():
                               throwReasons=[GAPI.FAILED_PRECONDITION, GAPI.FORBIDDEN],
                               matterId=matterId, fields=fields)
       except GAPI.failedPrecondition:
-        warnMatterNotOpen(matter, matterNameId, j, jcount)
+        warnMatterNotOpen(v, matter, matterNameId, j, jcount)
         continue
       except GAPI.forbidden as e:
         entityActionFailedWarning([Ent.VAULT_HOLD, None], str(e))
         break
     else:
-      warnMatterNotOpen(matter, matterNameId, j, jcount)
+      warnMatterNotOpen(None, matter, matterNameId, j, jcount)
       continue
     kcount = len(holds)
     if not csvPF:
@@ -37845,7 +37852,7 @@ def printShowUserVaultHolds(entityList):
     matters = callGAPIpages(v.matters(), 'list', 'matters',
                             pageMessage=getPageMessage(),
                             throwReasons=[GAPI.FORBIDDEN],
-                            view='BASIC', state='OPEN', fields='matters(matterId,name),nextPageToken')
+                            view='BASIC', state='OPEN', fields='matters(matterId,name,state),nextPageToken')
   except GAPI.forbidden as e:
     entityActionFailedWarning([Ent.VAULT_HOLD, None], str(e))
     return
@@ -37863,7 +37870,7 @@ def printShowUserVaultHolds(entityList):
                                       throwReasons=[GAPI.FAILED_PRECONDITION, GAPI.FORBIDDEN],
                                       matterId=matterId, fields='holds(holdId,name,accounts(accountId,email),orgUnit(orgUnitId)),nextPageToken')
     except GAPI.failedPrecondition:
-      warnMatterNotOpen(matter, matterNameId, j, jcount)
+      warnMatterNotOpen(v, matter, matterNameId, j, jcount)
     except GAPI.forbidden as e:
       entityActionFailedWarning([Ent.VAULT_HOLD, None], str(e), j, jcount)
   totalHolds = 0
@@ -38052,13 +38059,13 @@ def doPrintShowVaultQueries():
                                 throwReasons=[GAPI.FAILED_PRECONDITION, GAPI.FORBIDDEN],
                                 matterId=matterId, fields=fields)
       except GAPI.failedPrecondition:
-        warnMatterNotOpen(matter, matterNameId, j, jcount)
+        warnMatterNotOpen(v, matter, matterNameId, j, jcount)
         continue
       except GAPI.forbidden as e:
         entityActionFailedWarning([Ent.VAULT_QUERY, None], str(e))
         break
     else:
-      warnMatterNotOpen(matter, matterNameId, j, jcount)
+      warnMatterNotOpen(None, matter, matterNameId, j, jcount)
       continue
     kcount = len(queries)
     if not csvPF:

From f09441ac28aa6c8af99858d634691461fe4000a8 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Mon, 24 Jul 2023 16:52:15 -0700
Subject: [PATCH 12/14] Simplify three gam test commands

---
 .github/workflows/build.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index da9a9c66..843540ca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -717,18 +717,16 @@ jobs:
              $gam info resource $newresource
              $gam user $newuser add drivefile drivefilename "TPS Reports" mimetype gfolder
              $gam user $newuser show filelist
-             $gam calendar $gam_user printacl | $gam csv - gam calendar $gam_user delete id ~id # clear ACLs
+             $gam calendar $gam_user printacl | $gam csv - gam calendar $gam_user delete ~id # clear ACLs
              $gam calendar $gam_user add read domain
              $gam calendar $gam_user add freebusy default
              $gam calendar $gam_user add editor $newuser
              $gam calendar $gam_user showacl
              $gam calendar $gam_user printacl | $gam csv - gam calendar $gam_user delete ~id
-             starttime=$($PYTHON -c "import datetime; print((datetime.datetime.now() + datetime.timedelta(hours=1)).strftime('%Y-%m-%dT%H:%M:%S.%f+00:00'))")
-             endtime=$($PYTHON -c "import datetime; print((datetime.datetime.now() + datetime.timedelta(hours=2)).strftime('%Y-%m-%dT%H:%M:%S.%f+00:00'))")
-             $gam calendar $gam_user addevent summary "GHA test event" start "${starttime}" end "${endtime}" attendee $newgroup hangoutsmeet guestscanmodify true sendupdates all
+             $gam calendar $gam_user addevent summary "GHA test event" start +1h end +2h attendee $newgroup hangoutsmeet guestscanmodify true sendupdates all
              $gam calendar $gam_user printevents after -0d
              $gam config enable_dasa false save
-             matterid=uid:$($gam create vaultmatter name "GHA matter $newbase" description "test matter" collaborators $newuser | head -1 | awk -F'[()]' '{print $2}')
+             matterid=uid:$($gam create vaultmatter name "GHA matter $newbase" description "test matter" collaborators $newuser returnidonly)
              $gam create vaulthold matter $matterid name "GHA hold $newbase" corpus mail accounts $newuser
              $gam print vaultmatters matterstate open
              $gam print vaultholds matter $matterid

From 14835592541fdb52e6ad77c02bea5fa33fba00c6 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 25 Jul 2023 11:24:02 -0400
Subject: [PATCH 13/14] actions: google-auth ToT to solve Python 3.12 issues
 with deprecated six library

---
 .github/workflows/build.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 843540ca..ba6546cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -426,6 +426,13 @@ jobs:
           "${PYTHON}" -m pip install --upgrade wheel
           "${PYTHON}" -m pip install --upgrade setuptools
 
+      - name: ToT Google Auth for Python 3.12
+        if: matrix.python == '3.12'
+        run: |
+            # This can be removed once google-auth 2.23+ is out
+            # and removes six deps
+            "${PYTHON}" -m pip install --upgrade --force git+https://github.com/googleapis/google-auth-library-python@main
+
       - name: Install pip requirements
         run: |
              echo "before anything..."

From 3955f0d7ae2aa99b1d19cf78a4510498c8e0ef6a Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Tue, 25 Jul 2023 08:40:06 -0700
Subject: [PATCH 14/14] Added commands to display Analytic UA properties.

---
 src/GamCommands.txt | 11 +++++++++++
 src/GamUpdate.txt   | 14 ++++++++++++++
 src/gam/__init__.py |  6 +++---
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 784d2322..cb85312a 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -1460,6 +1460,17 @@ gam print alias|aliases [todrive <ToDriveAttribute>*]
 
 gam whatis <EmailItem> [noinfo] [noinivitablecheck]
 
+# Analytics UA
+
+gam <UserTypeEntity> print analyticuaproperties [todrive <ToDriveAttribute>*]
+        accountid [accounts/]<String>
+        [maxresults <Integer>]
+        [formatjson [quotechar <Character>]]
+gam <UserTypeEntity> show analyticuaproperties
+        accountid [accounts/]<String>
+        [maxresults <Integer>]
+        [formatjson]
+
 # Analytics Admin
 
 gam <UserTypeEntity> print analyticaccounts [todrive <ToDriveAttribute>*]
diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index e5924129..9a12bce2 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -2,6 +2,20 @@
 
 Merged GAM-Team version
 
+6.61.13
+
+Added commands to display Analytic UA properties.
+```
+gam <UserTypeEntity> print analyticuaproperties [todrive <ToDriveAttribute>*]
+        accountid [accounts/]<String>
+        [maxresults <Integer>]
+        [formatjson [quotechar <Character>]]
+gam <UserTypeEntity> show analyticuaproperties
+        accountid [accounts/]<String>
+        [maxresults <Integer>]
+        [formatjson]
+```
+
 6.61.12
 
 Updated `gam print|show vaultexports|vaultholds|vaultqueries` to handle the case
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 4711212c..16c14a3a 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -14823,7 +14823,7 @@ def printShowAnalyticItems(users, entityType):
     elif entityType == Ent.ANALYTIC_PROPERTY and myarg == 'filter':
       kwargs['filter'] = getString(Cmd.OB_STRING)
     elif entityType == Ent.ANALYTIC_UA_PROPERTY and myarg == 'accountid':
-      kwargs['accountId'] = getString(Cmd.OB_STRING)
+      kwargs['accountId'] = getString(Cmd.OB_STRING).replace('accounts/', '')
     elif entityType == Ent.ANALYTIC_DATASTREAM and myarg == 'parent':
       kwargs['parent'] = getString(Cmd.OB_STRING)
     else:
@@ -14935,11 +14935,11 @@ def printShowAnalyticProperties(users):
   printShowAnalyticItems(users, Ent.ANALYTIC_PROPERTY)
 
 # gam <UserTypeEntity> print analyticuaproperties [todrive <ToDriveAttribute>*]
-#	accountid <String>
+#	accountid [accounts/]<String>
 #	[maxresults <Integer>]
 #	[formatjson [quotechar <Character>]]
 # gam <UserTypeEntity> show analyticuaproperties
-#	accountid <String>
+#	accountid [accounts/]<String>
 #	[maxresults <Integer>]
 #	[formatjson]
 def printShowAnalyticUAProperties(users):