gam7 7.22.4__tar.gz → 7.22.6__tar.gz

{gam7-7.22.4 → gam7-7.22.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.22.4
+Version: 7.22.6
 Summary: CLI tool to manage Google Workspace
 Project-URL: Homepage, https://github.com/GAM-team/GAM
 Project-URL: Issues, https://github.com/GAM-team/GAM/issues

{gam7-7.22.4 → gam7-7.22.6}/src/GamCommands.txt

@@ -729,6 +729,7 @@ If an item contains spaces, it should be surrounded by ".
 <DomainNameList> ::= "<DomainName>(,<DomainName>)*"
 <DriveFileACLRoleList> ::= "<DriveFileACLRole>(,<DriveFileACLRole>)*"
 <DriveFileACLTypeList> ::= "<DriveFileACLType>(,<DriveFileACLType>)*"
+<DriveFileIDList> ::= "<DriveFileID>(,<DriveFileID>)*"
 <DriveFileList> ::= "<DriveFileItem>(,<DriveFileItem>)*"
 <DriveFilePermissionList> ::= "<DriveFilePermission>(,<DriveFilePermission>)*"
 <DriveFilePermissionIDList> ::= "<DriveFilePermissionID>(,<DriveFilePermissionID>)*"
@@ -5411,18 +5412,28 @@ gam show vaultmatters|matters [matterstate <MatterStateList>]
         [formatjson]
 
 gam print vaultcounts [todrive <ToDriveAttributes>*]
-        matter <MatterItem> corpus mail|groups
-        [(accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone]
-        [(shareddrives|teamdrives (<SharedDriveIDList>|(select <FileSelector>|<CSVFileSelector>))) |
-            (rooms (<ChatSpaceList>|(select <FileSelector>|<CSVFileSelector>))) |
-            (sitesurl (<URLList>||(select <FileSelector>|<CSVFileSelector>)))]
+        matter <MatterItem> <QueryItem>
+        [wait <Integer>]
+gam print vaultcounts [todrive <ToDriveAttributes>*]
+        matter <MatterItem>
+	corpus mail|groups
         [scope [all_data|held_data|unprocessed_data]]
+        [(accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone]
         [terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
         [excludedrafts <Boolean>]
         [wait <Integer>]
 gam print vaultcounts [todrive <ToDriveAttributes>*]
         matter <MatterItem> operation <String> [wait <Integer>]
 
+gam create vaultexport|export matter <MatterItem> [name <String>]
+        vaultquery <QueryItem>
+        [driveclientsideencryption any|encrypted|unencrypted]
+        [includeaccessinfo <Boolean>]
+        [excludedrafts <Boolean>] [mailclientsideencryption any|encrypted|unencrypted]
+        [showconfidentialmodecontent <Boolean>] [usenewexport <Boolean>] [exportlinkeddrivefiles <Boolean>]
+        [format ics|mbox|pst|xml]
+        [region any|europe|us] [showdetails|returnidonly]
+
 gam create vaultexport|export matter <MatterItem> [name <String>] corpus calendar|drive|gemini|groups|hangouts_chat|mail|voice
         (accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone
         (shareddrives|teamdrives (<SharedDriveIDList>|(select <FileSelector>|<CSVFileSelector>))) |
@@ -5433,12 +5444,13 @@ gam create vaultexport|export matter <MatterItem> [name <String>] corpus calenda
         [locationquery <StringList>] [peoplequery <StringList>] [minuswords <StringList>]
         [responsestatuses <AttendeeStatus>(,<AttendeeStatus>)*] [calendarversiondate <Date>|<Time>]
         [(includeshareddrives <Boolean>)|(shareddrivesoption included|included_if_account_is_not_a_member|not_included)]
-        [driveversiondate <Date>|<Time>] [includeaccessinfo <Boolean>]
-        [driveclientsideencryption any|encrypted|unencrypted]
+        [driveversiondate <Date>|<Time>]
         [includerooms <Boolean>]
+        (covereddata calllogs|textmessages|voicemails)*
+        [driveclientsideencryption any|encrypted|unencrypted]
+        [includeaccessinfo <Boolean>]
         [excludedrafts <Boolean>] [mailclientsideencryption any|encrypted|unencrypted]
         [showconfidentialmodecontent <Boolean>] [usenewexport <Boolean>] [exportlinkeddrivefiles <Boolean>]
-        [covereddata calllogs|textmessages|voicemails]
         [format ics|mbox|pst|xml]
         [region any|europe|us] [showdetails|returnidonly]
 gam delete vaultexport|export <ExportItem> matter <MatterItem>
@@ -5501,14 +5513,14 @@ gam create vaulthold|hold matter <MatterItem> [name <String>] corpus calendar|dr
         [(accounts|groups|users <EmailItemList>) | (orgunit|org|ou <OrgUnit>)]
         [query <QueryVaultCorpus>]
         [terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
-        [includerooms <Boolean>] [covereddata calllogs|textmessages|voicemails]
+        [includerooms <Boolean>] (covereddata calllogs|textmessages|voicemails)*
         [includeshareddrives <Boolean>]
         [showdetails|returnidonly]
 gam update vaulthold|hold <HoldItem> matter <MatterItem>
         [([addaccounts|addgroups|addusers <EmailItemList>] [removeaccounts|removegroups|removeusers <EmailItemList>]) | (orgunit|org|ou <OrgUnit>)]
         [query <QueryVaultCorpus>]
         [terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
-        [includerooms <Boolean>] [covereddata calllogs|textmessages|voicemails]
+        [includerooms <Boolean>] (covereddata calllogs|textmessages|voicemails)*
         [includeshareddrives <Boolean>]
         [showdetails]
 gam delete vaulthold|hold <HoldItem> matter <MatterItem>
@@ -5548,6 +5560,29 @@ gam show vaultholds|holds [matters <MatterItemList>]
 gam <UserTypeEntity> print vaultholds|holds [todrive <ToDriveAttribute>*]
 gam <UserTypeEntity> show vaultholds|holds
 
+gam create vaultquery <MatterItem> [name <String>]
+        corpus calendar|drive|gemini|groups|hangouts_chat|mail|voice
+        [scope all_data|held_data|unprocessed_data]
+        (accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone
+        (documentids  (<DriveFileIDList>|(select <FileSelector>|<CSVFileSelector>))) |
+        (shareddrives|teamdrives (<SharedDriveIDList>|(select <FileSelector>|<CSVFileSelector>))) |
+        [(includeshareddrives <Boolean>)|(shareddrivesoption included|included_if_account_is_not_a_member|not_included)]
+        (sitesurl (<URLList>||(select <FileSelector>|<CSVFileSelector>)))
+        [driveversiondate <Date>|<Time>]
+        [includerooms <Boolean>]
+        (rooms (<ChatSpaceList>|(select <FileSelector>|<CSVFileSelector>))) |
+        [terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
+        [locationquery <StringList>] [peoplequery <StringList>] [minuswords <StringList>]
+        [responsestatuses <AttendeeStatus>(,<AttendeeStatus>)*] [calendarversiondate <Date>|<Time>]
+        (covereddata calllogs|textmessages|voicemails)*
+        [shownames] [formatjson]
+
+gam copy vaultquery <MatterItem> <QueryItem> [targetmatter <MatterItem"] [name <String>]
+        [shownames] [formatjson]
+
+gam delete vaultquery <QueryItem> matter <MatterItem>
+gam delete vaultquery <MatterItem> <QueryItem>
+
 <VaultQueryFieldName> ::=
         createtime |
         displayname |

{gam7-7.22.4 → gam7-7.22.6}/src/GamUpdate.txt

@@ -1,3 +1,53 @@
+7.22.06
+
+Added commands to create, copy and delete Vault saved queries.
+```
+gam create vaultquery <MatterItem> [name <String>]
+        corpus calendar|drive|gemini|groups|hangouts_chat|mail|voice
+        [scope all_data|held_data|unprocessed_data]
+        (accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone
+        (documentids  (<DriveFileIDList>|(select <FileSelector>|<CSVFileSelector>))) |
+        (shareddrives|teamdrives (<SharedDriveIDList>|(select <FileSelector>|<CSVFileSelector>))) |
+        [(includeshareddrives <Boolean>)|(shareddrivesoption included|included_if_account_is_not_a_member|not_included)]
+        (sitesurl (<URLList>||(select <FileSelector>|<CSVFileSelector>)))
+        [driveversiondate <Date>|<Time>]
+        [includerooms <Boolean>]
+        (rooms (<ChatSpaceList>|(select <FileSelector>|<CSVFileSelector>))) |
+        [terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
+        [locationquery <StringList>] [peoplequery <StringList>] [minuswords <StringList>]
+        [responsestatuses <AttendeeStatus>(,<AttendeeStatus>)*] [calendarversiondate <Date>|<Time>]
+        (covereddata calllogs|textmessages|voicemails)*
+        [shownames] [formatjson]
+
+gam copy vaultquery <MatterItem> <QueryItem> [targetmatter <MatterItem"] [name <String>]
+        [shownames] [formatjson]
+
+gam delete vaultquery <QueryItem> matter <MatterItem>
+gam delete vaultquery <MatterItem> <QueryItem>
+```
+
+Added a variant of `gam print vaultcounts` that gets its query parameters from a saved Vault query.
+```
+gam print vaultcounts [todrive <ToDriveAttributes>*]
+        matter <MatterItem> <QueryItem>
+        [wait <Integer>]
+```
+
+7.22.05
+
+Added a variant of `gam create vaultexport` that gets its query parameters from a saved Vault query.
+
+```
+gam create vaultexport|export matter <MatterItem> [name <String>]
+        vaultquery <QueryItem>
+        [driveclientsideencryption any|encrypted|unencrypted]
+        [includeaccessinfo <Boolean>]
+        [excludedrafts <Boolean>] [mailclientsideencryption any|encrypted|unencrypted]
+        [showconfidentialmodecontent <Boolean>] [usenewexport <Boolean>] [exportlinkeddrivefiles <Boolean>]
+        [format ics|mbox|pst|xml]
+        [region any|europe|us] [showdetails|returnidonly]
+```
+
 7.22.04
 
 Added a variant of `gam create vaulthold` that gets its parameters from a saved Vault query.

{gam7-7.22.4 → gam7-7.22.6}/src/gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.22.04'
+__version__ = '7.22.06'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -41716,6 +41716,7 @@ VAULT_SEARCH_METHODS_MAP = {
   'accounts': 'ACCOUNT',
   'chatspace': 'ROOM',
   'chatspaces': 'ROOM',
+  'documentids': 'DRIVE_DOCUMENT',
   'entireorg': 'ENTIRE_ORG',
   'everyone': 'ENTIRE_ORG',
   'org': 'ORG_UNIT',
@@ -41831,6 +41832,8 @@ def _buildVaultQuery(myarg, query, corpusArgumentMap):
     query['dataScope'] = 'ALL_DATA'
   if myarg == 'corpus':
     query['corpus'] = getChoice(corpusArgumentMap, mapChoice=True)
+  elif myarg == 'scope':
+    query['dataScope'] = getChoice(VAULT_EXPORT_DATASCOPE_MAP, mapChoice=True)
   elif myarg in VAULT_SEARCH_METHODS_MAP:
     if query.get('searchMethod'):
       Cmd.Backup()
@@ -41851,8 +41854,8 @@ def _buildVaultQuery(myarg, query, corpusArgumentMap):
       query['hangoutsChatInfo'] = {'roomId': roomIds}
     elif searchMethod == 'SITES_URL':
       query['sitesUrlInfo'] = {'urls': _getQueryList(Cmd.OB_URL_LIST)}
-  elif myarg == 'scope':
-    query['dataScope'] = getChoice(VAULT_EXPORT_DATASCOPE_MAP, mapChoice=True)
+    elif searchMethod == 'DRIVE_DOCUMENT':
+      query['driveDocumentInfo'] = {'documentIds': {'ids': _getQueryList(Cmd.OB_DRIVE_FILE_ID_LIST)}}
   elif myarg == 'terms':
     query['terms'] = getString(Cmd.OB_STRING)
   elif myarg in {'start', 'starttime'}:
@@ -41891,7 +41894,7 @@ def _buildVaultQuery(myarg, query, corpusArgumentMap):
     query['hangoutsChatOptions'] = {'includeRooms': getBoolean()}
 # mail
   elif myarg == 'excludedrafts':
-    query['mailOptions'] = {'excludeDrafts': getBoolean()}
+    query.setdefault('mailOptions', {})['excludeDrafts'] =  getBoolean()
   elif myarg == 'mailclientsideencryption':
     query.setdefault('mailOptions', {})['clientSideEncryptedOption'] = getChoice(VAULT_CSE_OPTION_MAP, mapChoice=True)
 # voice
@@ -41909,33 +41912,46 @@ def _validateVaultQuery(body, corpusArgumentMap):
       if body['query']['corpus'] != corpus:
         body['exportOptions'].pop(options, None)
 
-# gam create vaultexport|export matter <MatterItem> [name <String>] corpus calendar|drive|gemini|groups|hangouts_chat|mail|voice
-#	(accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone
+# gam create vaultexport|export matter <MatterItem> [name <String>]
+#	vaultquery <QueryItem>
+#	[driveclientsideencryption any|encrypted|unencrypted]
+#	[includeaccessinfo <Boolean>]
+#	[excludedrafts <Boolean>] [mailclientsideencryption any|encrypted|unencrypted]
+#	[showconfidentialmodecontent <Boolean>] [usenewexport <Boolean>] [exportlinkeddrivefiles <Boolean>]
+#	[format ics|mbox|pst|xml]
+#	[region any|europe|us] [showdetails|returnidonly]
+# gam create vaultexport|export matter <MatterItem> [name <String>]
+#	corpus calendar|drive|gemini|groups|hangouts_chat|mail|voice
+#	[scope all_data|held_data|unprocessed_data]
+#	(accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone|entireorg
+#	(documentids  (<DriveFileIDList>|(select <FileSelector>|<CSVFileSelector>))) |
 #	(shareddrives|teamdrives (<SharedDriveIDList>|(select <FileSelector>|<CSVFileSelector>))) |
-#	    (rooms (<ChatSpaceList>|(select <FileSelector>|<CSVFileSelector>))) |
-#	    (sitesurl (<URLList>||(select <FileSelector>|<CSVFileSelector>)))
-#	[scope <all_data|held_data|unprocessed_data>]
+#	[(includeshareddrives <Boolean>)|(shareddrivesoption included|included_if_account_is_not_a_member|not_included)]
+#	(sitesurl (<URLList>||(select <FileSelector>|<CSVFileSelector>)))
+#	[driveversiondate <Date>|<Time>]
+#	[includerooms <Boolean>]
+#	(rooms (<ChatSpaceList>|(select <FileSelector>|<CSVFileSelector>))) |
 #	[terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
 #	[locationquery <StringList>] [peoplequery <StringList>] [minuswords <StringList>]
 #	[responsestatuses <AttendeeStatus>(,<AttendeeStatus>)*] [calendarversiondate <Date>|<Time>]
-#	[(includeshareddrives <Boolean>)|(shareddrivesoption included|included_if_account_is_not_a_member|not_included)]
-#	[driveversiondate <Date>|<Time>] [includeaccessinfo <Boolean>]
+#	(covereddata calllogs|textmessages|voicemails)*
 #	[driveclientsideencryption any|encrypted|unencrypted]
-#	[includerooms <Boolean>]
+#	[includeaccessinfo <Boolean>]
 #	[excludedrafts <Boolean>] [mailclientsideencryption any|encrypted|unencrypted]
 #	[showconfidentialmodecontent <Boolean>] [usenewexport <Boolean>] [exportlinkeddrivefiles <Boolean>]
-#	[covereddata calllogs|textmessages|voicemails]
 #	[format ics|mbox|pst|xml]
 #	[region any|europe|us] [showdetails|returnidonly]
 def doCreateVaultExport():
   v = buildGAPIObject(API.VAULT)
   matterId = None
   body = {'query': {'dataScope': 'ALL_DATA'}, 'exportOptions': {}}
+  includeAccessInfo = None
   exportFormat = None
+  formatLocation = None
+  useNewExport = None
   showConfidentialModeContent = None
   exportLinkedDriveFiles = None
   returnIdOnly = showDetails = False
-  useNewExport = None
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if myarg == 'matter':
@@ -41943,23 +41959,23 @@ def doCreateVaultExport():
       body['matterId'] = matterId
     elif myarg == 'name':
       body['name'] = getString(Cmd.OB_STRING)
+    elif matterId is not None and myarg == 'vaultquery':
+      _, _, _, body['query'] = convertQueryNameToID(v, getString(Cmd.OB_QUERY_ITEM), matterId, matterNameId)
     elif myarg in VAULT_QUERY_ARGS:
       _buildVaultQuery(myarg, body['query'], VAULT_CORPUS_ARGUMENT_MAP)
-    elif myarg == 'usenewexport':
-      useNewExport = getBoolean()
+    elif myarg == 'includeaccessinfo':
+      includeAccessInfo = getBoolean()
     elif myarg == 'format':
+      formatLocation = Cmd.Location()
       exportFormat = getChoice(VAULT_EXPORT_FORMAT_MAP, mapChoice=True)
+    elif myarg == 'usenewexport':
+      useNewExport = getBoolean()
     elif myarg == 'showconfidentialmodecontent':
       showConfidentialModeContent = getBoolean()
     elif myarg == 'exportlinkeddrivefiles':
       exportLinkedDriveFiles = getBoolean()
     elif myarg == 'region':
       body['exportOptions']['region'] = getChoice(VAULT_EXPORT_REGION_MAP, mapChoice=True)
-    elif myarg == 'includeaccessinfo':
-      body['exportOptions'].setdefault('driveOptions', {})['includeAccessInfo'] = getBoolean()
-    elif myarg == 'covereddata':
-      body['exportOptions'].setdefault('voiceOptions', {'coveredData': []})
-      body['exportOptions']['voiceOptions']['coveredData'].append(getChoice(VAULT_VOICE_COVERED_DATA_MAP, mapChoice=True))
     elif myarg == 'showdetails':
       showDetails = True
       returnIdOnly = False
@@ -41971,15 +41987,19 @@ def doCreateVaultExport():
   if not matterId:
     missingArgumentExit('matter')
   _validateVaultQuery(body, VAULT_CORPUS_ARGUMENT_MAP)
-  if exportFormat is not None:
-    if not exportFormat in VAULT_CORPUS_EXPORT_FORMATS[body['query']['corpus']]:
-      invalidChoiceExit(exportFormat, VAULT_CORPUS_EXPORT_FORMATS[body['query']['corpus']], False)
-  elif body['query']['corpus'] != 'DRIVE':
-    exportFormat = VAULT_CORPUS_EXPORT_FORMATS[body['query']['corpus']][0]
   if 'name' not in body:
     body['name'] = f'GAM {body["query"]["corpus"]} Export - {ISOformatTimeStamp(todaysTime())}'
   optionsField = VAULT_CORPUS_OPTIONS_MAP[body['query']['corpus']]
-  if body['query']['corpus'] != 'DRIVE':
+  if body['query']['corpus'] == 'DRIVE':
+    if includeAccessInfo is not None:
+      body['exportOptions'][optionsField] = {'includeAccessInfo': includeAccessInfo}
+  else:
+    if exportFormat is not None:
+      if not exportFormat in VAULT_CORPUS_EXPORT_FORMATS[body['query']['corpus']]:
+        Cmd.SetLocation(formatLocation)
+        invalidChoiceExit(exportFormat, VAULT_CORPUS_EXPORT_FORMATS[body['query']['corpus']], False)
+    else:
+      exportFormat = VAULT_CORPUS_EXPORT_FORMATS[body['query']['corpus']][0]
     body['exportOptions'][optionsField] = {'exportFormat': exportFormat}
     if body['query']['corpus'] == 'MAIL':
       if showConfidentialModeContent is not None:
@@ -42461,7 +42481,7 @@ def _showVaultHold(matterNameId, hold, cd, FJQC, k=0, kcount=0):
   showJSON(None, hold, timeObjects=VAULT_HOLD_TIME_OBJECTS)
   Ind.Decrement()
 
-def _useVaultQuery(v, matterId, matterNameId, body):
+def _useVaultQueryForHold(v, matterId, matterNameId, body):
   _, _, _, query = convertQueryNameToID(v, getString(Cmd.OB_QUERY_ITEM), matterId, matterNameId)
   body['corpus'] = query['corpus']
   method = query.get('method')
@@ -42566,7 +42586,7 @@ def doCreateVaultHold():
     elif myarg == 'name':
       body['name'] = getString(Cmd.OB_STRING)
     elif matterId is not None and myarg == 'vaultquery':
-      _useVaultQuery(v, matterId, matterNameId, body)
+      _useVaultQueryForHold(v, matterId, matterNameId, body)
       usedVaultQuery = True
     elif myarg == 'corpus':
       body['corpus'] = getChoice(VAULT_CORPUS_ARGUMENT_MAP, mapChoice=True)
@@ -43025,6 +43045,99 @@ def _showVaultQuery(matterNameId, query, cd, drive, FJQC, k=0, kcount=0):
   showJSON(None, query, timeObjects=VAULT_QUERY_TIME_OBJECTS)
   Ind.Decrement()
 
+def doCreateCopyVaultQuery(copyCmd):
+  v = buildGAPIObject(API.VAULT)
+  body = {'query': {'dataScope': 'ALL_DATA'}, 'displayName': ''}
+  matterId, matterNameId = getMatterItem(v)
+  if copyCmd:
+    _, queryName, _, body['query'] = convertQueryNameToID(v, getString(Cmd.OB_QUERY_ITEM), matterId, matterNameId)
+  targetId = None
+  cd = drive = None
+  FJQC = FormatJSONQuoteChar()
+  while Cmd.ArgumentsRemaining():
+    myarg = getArgument()
+    if myarg == 'name':
+      body['displayName'] = getString(Cmd.OB_STRING)
+    elif copyCmd and myarg == 'targetmatter':
+      targetId, targetNameId = getMatterItem(v)
+    elif not copyCmd and myarg in VAULT_QUERY_ARGS:
+      _buildVaultQuery(myarg, body['query'], VAULT_CORPUS_ARGUMENT_MAP)
+    elif myarg == 'shownames':
+      cd = buildGAPIObject(API.DIRECTORY)
+      _, drive = buildGAPIServiceObject(API.DRIVE3, _getAdminEmail())
+      if drive is None:
+        return
+    else:
+      FJQC.GetFormatJSON(myarg)
+  if copyCmd:
+    if targetId is None:
+      targetId = matterId
+      targetNameId = matterNameId
+    if not body['displayName']:
+      body['displayName'] = f'Copy of {queryName}' if matterId == targetId else queryName
+    resultId = targetId
+    resultNameId = targetNameId
+  else:
+    if not body['displayName']:
+      body['displayName'] = 'GAM {body["query"]["corpus"]} Query - {ISOformatTimeStamp(todaysTime())}'
+    resultId = matterId
+    resultNameId = matterNameId
+  try:
+    result = callGAPI(v.matters().savedQueries(), 'create',
+                      throwReasons=[GAPI.NOT_FOUND, GAPI.BAD_REQUEST, GAPI.FORBIDDEN, GAPI.INVALID_ARGUMENT, GAPI.ALREADY_EXISTS],
+                      matterId=resultId, body=body)
+    _showVaultQuery(resultNameId, result, cd, drive, FJQC)
+  except (GAPI.notFound, GAPI.badRequest, GAPI.forbidden, GAPI.invalidArgument, GAPI.alreadyExists) as e:
+    entityActionFailedWarning([Ent.VAULT_MATTER, resultNameId, Ent.VAULT_QUERY, body['displayName']], str(e))
+
+# gam create vaultquery <MatterItem> [name <String>]
+#	corpus calendar|drive|gemini|groups|hangouts_chat|mail|voice
+#	[scope all_data|held_data|unprocessed_data]
+#	(accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone|entireorg
+#	(documentids  (<DriveFileIDList>|(select <FileSelector>|<CSVFileSelector>))) |
+#	(shareddrives|teamdrives (<SharedDriveIDList>|(select <FileSelector>|<CSVFileSelector>))) |
+#	[(includeshareddrives <Boolean>)|(shareddrivesoption included|included_if_account_is_not_a_member|not_included)]
+#	(sitesurl (<URLList>||(select <FileSelector>|<CSVFileSelector>)))
+#	[driveversiondate <Date>|<Time>]
+#	[includerooms <Boolean>]
+#	(rooms (<ChatSpaceList>|(select <FileSelector>|<CSVFileSelector>))) |
+#	[terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
+#	[locationquery <StringList>] [peoplequery <StringList>] [minuswords <StringList>]
+#	[responsestatuses <AttendeeStatus>(,<AttendeeStatus>)*] [calendarversiondate <Date>|<Time>]
+#	(covereddata calllogs|textmessages|voicemails)*
+#	[shownames] [formatjson]
+def doCreateVaultQuery():
+  doCreateCopyVaultQuery(False)
+
+# gam copy vaultquery <MatterItem> <QueryItem> [targetmatter <MatterItem"] [name <String>]
+#	[shownames] [formatjson]
+def doCopyVaultQuery():
+  doCreateCopyVaultQuery(True)
+
+# gam delete vaultquery <QueryItem> matter <MatterItem>
+# gam delete vaultquery <MatterItem> <QueryItem>
+def doDeleteVaultQuery():
+  v = buildGAPIObject(API.VAULT)
+  if not Cmd.ArgumentIsAhead('matter'):
+    matterId, matterNameId = getMatterItem(v)
+    queryId, queryName, queryNameId, _ = convertQueryNameToID(v, getString(Cmd.OB_QUERY_ITEM), matterId, matterNameId)
+  else:
+    queryName = getString(Cmd.OB_QUERY_ITEM)
+  while Cmd.ArgumentsRemaining():
+    myarg = getArgument()
+    if myarg == 'matter':
+      matterId, matterNameId = getMatterItem(v)
+      queryId, queryName, queryNameId, _ = convertQueryNameToID(v, queryName, matterId, matterNameId)
+    else:
+      unknownArgumentExit()
+  try:
+    callGAPI(v.matters().savedQueries(), 'delete',
+             throwReasons=[GAPI.NOT_FOUND, GAPI.BAD_REQUEST, GAPI.FORBIDDEN, GAPI.INVALID_ARGUMENT],
+             matterId=matterId, savedQueryId=queryId)
+    entityActionPerformed([Ent.VAULT_MATTER, matterNameId, Ent.VAULT_QUERY, queryNameId])
+  except (GAPI.notFound, GAPI.badRequest, GAPI.forbidden, GAPI.invalidArgument) as e:
+    entityActionFailedWarning([Ent.VAULT_MATTER, matterNameId, Ent.VAULT_QUERY, queryNameId], str(e))
+
 VAULT_QUERY_FIELDS_CHOICE_MAP = {
   'createtime': 'createTime',
   'displayname': 'displayName',
@@ -43510,12 +43623,13 @@ def doPrintShowVaultMatters():
 PRINT_VAULT_COUNTS_TITLES = ['account', 'count', 'error']
 
 # gam print vaultcounts [todrive <ToDriveAttributes>*]
-#	matter <MatterItem> corpus mail|groups
-#	(accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone
-#	(shareddrives|teamdrives (<SharedDriveIDList>|(select <FileSelector>|<CSVFileSelector>))) |
-#	    (rooms (<ChatSpaceList>|(select <FileSelector>|<CSVFileSelector>))) |
-#	    (sitesurl (<URLList>||(select <FileSelector>|<CSVFileSelector>)))
-#	[scope <all_data|held_data|unprocessed_data>]
+#	matter <MatterItem> <QueryItem>
+#	[wait <Integer>]
+# gam print vaultcounts [todrive <ToDriveAttributes>*]
+#	matter <MatterItem>
+#	corpus mail|groups
+#	[scope all_data|held_data|unprocessed_data]
+#	(accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone|entireorg
 #	[terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
 #	[excludedrafts <Boolean>]
 #	[wait <Integer>]
@@ -43526,18 +43640,19 @@ def doPrintVaultCounts():
   csvPF = CSVPrintFile(PRINT_VAULT_COUNTS_TITLES, 'sortall')
   matterId = name = None
   operationWait = 15
-  body = {'view': 'ALL'}
-  query = {}
+  body = {'view': 'ALL', 'query': {}}
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if csvPF and myarg == 'todrive':
       csvPF.GetTodriveParameters()
     elif myarg == 'matter':
-      matterId, _ = getMatterItem(v)
+      matterId, matterNameId = getMatterItem(v)
+    elif matterId is not None and myarg == 'vaultquery':
+      _, _, _, body['query'] = convertQueryNameToID(v, getString(Cmd.OB_QUERY_ITEM), matterId, matterNameId)
     elif myarg == 'operation':
       name = getString(Cmd.OB_STRING)
     elif myarg in VAULT_QUERY_ARGS:
-      _buildVaultQuery(myarg, query, VAULT_COUNTS_CORPUS_ARGUMENT_MAP)
+      _buildVaultQuery(myarg, body['query'], VAULT_COUNTS_CORPUS_ARGUMENT_MAP)
     elif myarg == 'wait':
       operationWait = getInteger(minVal=1)
     else:
@@ -43548,7 +43663,6 @@ def doPrintVaultCounts():
     operation = {'name': name}
     doWait = False
   else:
-    body['query'] = query
     _validateVaultQuery(body, VAULT_COUNTS_CORPUS_ARGUMENT_MAP)
     try:
       operation = callGAPI(v.matters(), 'count',
@@ -77963,6 +78077,7 @@ MAIN_ADD_CREATE_FUNCTIONS = {
   Cmd.ARG_VAULTEXPORT:		doCreateVaultExport,
   Cmd.ARG_VAULTHOLD:		doCreateVaultHold,
   Cmd.ARG_VAULTMATTER:		doCreateVaultMatter,
+  Cmd.ARG_VAULTQUERY:		doCreateVaultQuery,
   Cmd.ARG_VERIFY:		doCreateSiteVerification,
   }
 
@@ -78020,6 +78135,7 @@ MAIN_COMMANDS_WITH_OBJECTS = {
      {Cmd.ARG_SHAREDDRIVEACLS:	doCopySyncSharedDriveACLs,
       Cmd.ARG_STORAGEBUCKET:	doCopyCloudStorageBucket,
       Cmd.ARG_VAULTEXPORT:	doCopyVaultExport,
+      Cmd.ARG_VAULTQUERY:	doCopyVaultQuery,
      }
     ),
   'create':
@@ -78084,6 +78200,7 @@ MAIN_COMMANDS_WITH_OBJECTS = {
       Cmd.ARG_VAULTEXPORT:	doDeleteVaultExport,
       Cmd.ARG_VAULTHOLD:	doDeleteVaultHold,
       Cmd.ARG_VAULTMATTER:	doDeleteVaultMatter,
+      Cmd.ARG_VAULTQUERY:	doDeleteVaultQuery,
      }
     ),
   'download':

{gam7-7.22.4 → gam7-7.22.6}/src/gam/gamlib/glclargs.py

@@ -1216,6 +1216,7 @@ class GamCLArgs():
   OB_DOMAIN_NAME_LIST = 'DomainNameList'
   OB_DRIVE_FILE_ENTITY = 'DriveFileEntity'
   OB_DRIVE_FILE_ID = 'DriveFileID'
+  OB_DRIVE_FILE_ID_LIST = 'DriveFileIDList'
   OB_DRIVE_FILE_NAME = 'DriveFileName'
   OB_DRIVE_FILE_PERMISSION_ENTITY = 'DriveFilePermissionEntity'
   OB_DRIVE_FILE_PERMISSION_ID = 'DriveFilePermissionID'

{gam7-7.22.4 → gam7-7.22.6}/wiki/Basic-Items.md

@@ -462,6 +462,7 @@
         See: https://support.google.com/mail/answer/7190
 <QueryGroup> ::= <String>
         See: https://developers.google.com/admin-sdk/directory/v1/guides/search-groups
+<QueryItem> ::= <UniqueID>|<String>
 <QueryMemberRestrictions> ::= <String>
         See: https://cloud.google.com/identity/docs/reference/rest/v1beta1/SecuritySettings#MemberRestriction
 <QueryMobile> ::= <String>

{gam7-7.22.4 → gam7-7.22.6}/wiki/GamUpdates.md

@@ -10,6 +10,30 @@ Add the `-s` option to the end of the above commands to suppress creating the `g
 
 See [Downloads-Installs-GAM7](https://github.com/GAM-team/GAM/wiki/Downloads-Installs) for Windows or other options, including manual installation
 
+### 7.22.05
+
+Added a variant of `gam create vaultexport` that gets its query parameters from a saved Vault query.
+
+```
+gam create vaultexport|export matter <MatterItem> [name <String>]
+        vaultquery <QueryItem>
+        [driveclientsideencryption any|encrypted|unencrypted]
+        [includeaccessinfo <Boolean>]
+        [excludedrafts <Boolean>] [mailclientsideencryption any|encrypted|unencrypted]
+        [showconfidentialmodecontent <Boolean>] [usenewexport <Boolean>] [exportlinkeddrivefiles <Boolean>]
+        [format ics|mbox|pst|xml]
+        [region any|europe|us] [showdetails|returnidonly]
+```
+
+### 7.22.04
+
+Added a variant of `gam create vaulthold` that gets its parameters from a saved Vault query.
+```
+gam create vaulthold matter <MatterItem> [name <String>]
+        vaultquery <QueryItem>
+        [showdetails|returnidonly]
+```
+
 ### 7.22.03
 
 Fix backwards compatability bug introduced in 7.22.00 for `gam print users` that changed `suspended`

{gam7-7.22.4 → gam7-7.22.6}/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md

@@ -252,7 +252,7 @@ writes the credentials into the file oauth2.txt.
 admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt
 admin@server:/Users/admin$ gam version
 WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
-GAM 7.22.03 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.22.05 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.7 64-bit final
 MacOS Sequoia 15.6.1 x86_64

{gam7-7.22.4 → gam7-7.22.6}/wiki/Users-Drive-Permissions.md

@@ -29,6 +29,7 @@
 ```
 <DomainName> ::= <String>(.<String>)+
 <EmailAddress> ::= <String>@<DomainName>
+<JSONData> ::= (json [charset <Charset>] <String>) | (json file <FileName> [charset <Charset>]) |
 <UniqueID> ::= id:<String>
 <UserItem> ::= <EmailAddress>|<UniqueID>|<String>