gam7 7.7.0__tar.gz → 7.7.3__tar.gz

{gam7-7.7.0 → gam7-7.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.7.0
+Version: 7.7.3
 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.7.0 → gam7-7.7.3}/src/GamCommands.txt

@@ -5240,7 +5240,10 @@ gam show vaultmatters|matters [matterstate <MatterStateList>]
 
 gam print vaultcounts [todrive <ToDriveAttributes>*]
         matter <MatterItem> corpus mail|groups
-        (accounts <EmailAddressEntity>) | (orgunit|org|ou <OrgUnitPath>) | everyone
+        [(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]]
         [terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
         [excludedrafts <Boolean>]
@@ -5250,7 +5253,9 @@ gam print vaultcounts [todrive <ToDriveAttributes>*]
 
 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>) | (rooms <RoomList>) | (sitesurl <URLList>)
+        (shareddrives|teamdrives (<SharedDriveIDList>|(select <FileSelector>|<CSVFileSelector>))) |
+            (rooms (<ChatSpaceList>|(select <FileSelector>|<CSVFileSelector>))) |
+            (sitesurl (<URLList>||(select <FileSelector>|<CSVFileSelector>)))
         [scope all_data|held_data|unprocessed_data]
         [terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
         [locationquery <StringList>] [peoplequery <StringList>] [minuswords <StringList>]

{gam7-7.7.0 → gam7-7.7.3}/src/GamUpdate.txt

@@ -1,4 +1,19 @@
+7.07.03
+
+Updated `gam create vaultexport` to allow allow specifying a list of items in a search method
+with `shareddrives|rooms|sitesurl select <FileSelector>|<CSVFileSelector>`.
+
+7.07.02
+
+Fixed bug in `redirect csv ... transpose` where a CSV file with multiple rows was not properly transposed.
+
+7.07.01
+
+Fixed bug in `gam print|show chromepolicies` that caused a trap. Made additional
+updates to handle changes in the Chrome Policy API.
+
 7.07.00
+
 As of mid-October 2024, Google deprecated the API that retrieved the Global Address List.
 
 The following commands have been eliminated.

{gam7-7.7.0 → gam7-7.7.3}/src/cacerts.pem

@@ -1,33 +1,3 @@
-# Operating CA: DigiCert
-# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
-# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
-# Label: "Baltimore CyberTrust Root"
-# Serial: 33554617
-# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4
-# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74
-# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
 # Operating CA: DigiCert
 # Issuer: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
 # Subject: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com

{gam7-7.7.0 → gam7-7.7.3}/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.07.00'
+__version__ = '7.07.03'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -8585,13 +8585,16 @@ class CSVPrintFile():
 
     def writeCSVData(writer):
       try:
-        if GM.Globals[GM.CSVFILE][GM.REDIRECT_WRITE_HEADER]:
-          writer.writerow(dict((item, item) for item in writer.fieldnames))
-        if not self.sortHeaders:
-          writer.writerows(self.rows)
+        if not self.outputTranspose:
+          if GM.Globals[GM.CSVFILE][GM.REDIRECT_WRITE_HEADER]:
+            writer.writerow(dict((item, item) for item in writer.fieldnames))
+          if not self.sortHeaders:
+            writer.writerows(self.rows)
+          else:
+            for row in sorted(self.rows, key=itemgetter(*self.sortHeaders)):
+              writer.writerow(row)
         else:
-          for row in sorted(self.rows, key=itemgetter(*self.sortHeaders)):
-            writer.writerow(row)
+          writer.writerows(self.rows)
         return True
       except IOError as e:
         stderrErrorMsg(e)
@@ -9008,17 +9011,13 @@ class CSVPrintFile():
     normalizeSortHeaders()
     if self.outputTranspose:
       newRows = []
-      pivotKey = titlesList[0]
-      newTitlesList = [pivotKey]
-      newTitlesSet = set(newTitlesList)
-      for title in titlesList[1:]:
-        newRow = {pivotKey: title}
+      newTitlesList = [i for i in range(len(self.rows)+1)]
+      for title in titlesList:
+        i = 0
+        newRow = {i: title}
         for row in self.rows:
-          pivotValue = row[pivotKey]
-          if pivotValue not in newTitlesSet:
-            newTitlesSet.add(pivotValue)
-            newTitlesList.append(pivotValue)
-          newRow[pivotValue] = row.get(title)
+          i += 1
+          newRow[i] = row.get(title)
         newRows.append(newRow)
       titlesList = newTitlesList
       self.rows = newRows
@@ -28183,75 +28182,171 @@ def doDeleteChromePolicy():
   except (GAPI.notFound, GAPI.permissionDenied, GAPI.invalidArgument, GAPI.serviceNotAvailable, GAPI.quotaExceeded) as e:
     entityActionFailedWarning(kvList, str(e))
 
-CHROME_SCHEMA_TYPE_MESSAGE = {
-  'chrome.users.AutoUpdateCheckPeriodNew':
-    {'autoupdatecheckperiodminutesnew':
-       {'casedField': 'autoUpdateCheckPeriodMinutesNew',
-        'type': 'duration', 'minVal': 1, 'maxVal': 720, 'scale': 60}},
+CHROME_SCHEMA_SPECIAL_CASES = {
   'chrome.users.AutoUpdateCheckPeriodNewV2':
     {'autoupdatecheckperiodminutesnew':
        {'casedField': 'autoUpdateCheckPeriodMinutesNew',
-        'type': 'duration', 'minVal': 1, 'maxVal': 720, 'scale': 60}},
-  'chrome.users.BrowserSwitcherDelayDuration':
+        'type': 'duration', 'minVal': 1, 'maxVal': 720}},
+  'chrome.users.Avatar':
+    {'useravatarimage':
+       {'casedField': 'userAvatarImage',
+        'type': 'downloadUri'}},
+  'chrome.users.BrowserSwitcherDelayDurationV2':
     {'browserswitcherdelayduration':
        {'casedField': 'browserSwitcherDelayDuration',
-        'type': 'duration', 'minVal': 0, 'maxVal': 30, 'scale': 1}},
+        'type': 'duration', 'minVal': 0, 'maxVal': 30}},
+  'chrome.users.BrowsingDataLifetimeV2':
+    {'browsinghistoryttl':
+       {'casedField': 'browsingHistoryTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'downloadhistoryttl':
+       {'casedField': 'downloadHistoryTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'cookiesandothersitedatattl':
+       {'casedField': 'cookiesAndOtherSiteDataTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'cachedimagesandfilesttl':
+       {'casedField': 'cachedImagesAndFilesTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'passwordsigninttl':
+       {'casedField': 'passwordSigninTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'autofillttl':
+       {'casedField': 'autofillTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'sitesettingsttl':
+       {'casedField': 'siteSettingsTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'hostedappdatattl':
+       {'casedField': 'hostedAppDataTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None}},
   'chrome.users.CloudReportingUploadFrequencyV2':
     {'cloudreportinguploadfrequency':
        {'casedField': 'cloudReportingUploadFrequency',
-        'type': 'count', 'minVal': 3, 'maxVal': 24, 'scale': 1}},
-  'chrome.users.FetchKeepaliveDurationSecondsOnShutdown':
+        'type': 'duration', 'minVal': 3, 'maxVal': 24}},
+  'chrome.users.FetchKeepaliveDurationSecondsOnShutdownV2':
     {'fetchkeepalivedurationsecondsonshutdown':
        {'casedField': 'fetchKeepaliveDurationSecondsOnShutdown',
-        'type': 'duration', 'minVal': 0, 'maxVal': 5, 'scale': 1}},
-  'chrome.users.MaxInvalidationFetchDelay':
+        'type': 'duration', 'minVal': 0, 'maxVal': 5}},
+  'chrome.users.MaxInvalidationFetchDelayV2':
     {'maxinvalidationfetchdelay':
        {'casedField': 'maxInvalidationFetchDelay',
-        'type': 'duration', 'minVal': 1, 'maxVal': 30, 'scale': 1, 'default': 10}},
+        'type': 'duration', 'minVal': 1, 'maxVal': 30, 'default': 10}},
   'chrome.users.PrintingMaxSheetsAllowed':
     {'printingmaxsheetsallowednullable':
        {'casedField': 'printingMaxSheetsAllowedNullable',
-        'type': 'value', 'minVal': 1, 'maxVal': None, 'scale': 1}},
-  'chrome.users.PrintJobHistoryExpirationPeriodNew':
+        'type': 'value', 'minVal': 1, 'maxVal': None}},
+  'chrome.users.PrintJobHistoryExpirationPeriodNewV2':
     {'printjobhistoryexpirationperioddaysnew':
        {'casedField': 'printJobHistoryExpirationPeriodDaysNew',
-        'type': 'duration', 'minVal': -1, 'maxVal': None, 'scale': 86400}},
+        'type': 'duration', 'minVal': -1, 'maxVal': None}},
   'chrome.users.RelaunchNotificationWithDurationV2':
     {'relaunchnotificationperiodduration':
        {'casedField': 'relaunchNotificationPeriodDuration',
-        'type': 'duration', 'minVal': -1, 'maxVal': None, 'scale': 3600}},
-  'chrome.users.SecurityTokenSessionSettings':
+        'type': 'duration', 'minVal': -1, 'maxVal': None}},
+  'chrome.users.SecurityTokenSessionSettingsV2':
     {'securitytokensessionnotificationseconds':
        {'casedField': 'securityTokenSessionNotificationSeconds',
-        'type': 'duration', 'minVal': 0, 'maxVal': 9999, 'scale': 1}},
-  'chrome.users.SessionLength':
+        'type': 'duration', 'minVal': 0, 'maxVal': 9999}},
+  'chrome.users.SessionLengthV2':
     {'sessiondurationlimit':
        {'casedField': 'sessionDurationLimit',
-        'type': 'duration', 'minVal': 1, 'maxVal': 1440, 'scale': 60}},
+        'type': 'duration', 'minVal': 1, 'maxVal': 1440}},
   'chrome.users.UpdatesSuppressed':
     {'updatessuppresseddurationmin':
        {'casedField': 'updatesSuppressedDurationMin',
-        'type': 'count', 'minVal': 1, 'maxVal': 1440, 'scale': 1},
+        'type': 'count', 'minVal': 1, 'maxVal': 1440},
      'updatessuppressedstarttime':
        {'casedField': 'updatesSuppressedStartTime',
         'type': 'timeOfDay'}},
-  'chrome.devices.managedguest.Avatar':
-    {'useravatarimage':
-       {'casedField': 'userAvatarImage',
-        'type': 'downloadUri'}},
-  'chrome.devices.managedguest.Wallpaper':
+  'chrome.users.Wallpaper':
     {'wallpaperimage':
        {'casedField': 'wallpaperImage',
         'type': 'downloadUri'}},
+  'chrome.devices.EnableReportUploadFrequencyV2':
+    {'reportdeviceuploadfrequency':
+       {'casedField': 'reportDeviceUploadFrequency',
+        'type': 'duration', 'minVal': 60, 'maxVal': 25379}},
+  'chrome.devices.ScheduledRebootDurationV2':
+    {'uptimelimitduration':
+       {'casedField': 'uptimeLimitDuration',
+        'type': 'duration', 'minVal': 1, 'maxVal': 365}},
   'chrome.devices.SignInWallpaperImage':
     {'devicewallpaperimage':
        {'casedField': 'deviceWallpaperImage',
         'type': 'downloadUri'}},
-  'chrome.users.Avatar':
+  'chrome.devices.kiosk.AcPowerSettingsV2':
+    {'acidletimeout':
+       {'casedField': 'acIdleTimeout',
+        'type': 'duration', 'minVal': 1, 'maxVal': 35000},
+     'acwarningtimeout':
+       {'casedField': 'acWarningTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000},
+     'acdimtimeout':
+       {'casedField': 'acDimTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000},
+     'acscreenofftimeout':
+       {'casedField': 'acScreenOffTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000}},
+  'chrome.devices.kiosk.BatteryPowerSettingsV2':
+    {'batteryidletimeout':
+       {'casedField': 'batteryIdleTimeout',
+        'type': 'duration', 'minVal': 1, 'maxVal': 35000},
+     'batterywarningtimeout':
+       {'casedField': 'batteryWarningTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000},
+     'batterydimtimeout':
+       {'casedField': 'batteryDimTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000},
+     'batteryscreenofftimeout':
+       {'casedField': 'batteryScreenOffTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000}},
+  'chrome.devices.managedguest.Avatar':
     {'useravatarimage':
        {'casedField': 'userAvatarImage',
         'type': 'downloadUri'}},
-  'chrome.users.Wallpaper':
+  'chrome.devices.managedguest.BrowsingDataLifetimeV2':
+    {'browsinghistoryttl':
+       {'casedField': 'browsingHistoryTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'downloadhistoryttl':
+       {'casedField': 'downloadHistoryTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'cookiesandothersitedatattl':
+       {'casedField': 'cookiesAndOtherSiteDataTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'cachedimagesandfilesttl':
+       {'casedField': 'cachedImagesAndFilesTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'passwordsigninttl':
+       {'casedField': 'passwordSigninTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'autofillttl':
+       {'casedField': 'autofillTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'sitesettingsttl':
+       {'casedField': 'siteSettingsTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'hostedappdatattl':
+       {'casedField': 'hostedAppDataTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None}},
+  'chrome.devices.managedguest.MaxInvalidationFetchDelayV2':
+    {'maxinvalidationfetchdelay':
+       {'casedField': 'maxInvalidationFetchDelay',
+        'type': 'duration', 'minVal': 1, 'maxVal': 30, 'default': 10}},
+  'chrome.devices.managedguest.PrintJobHistoryExpirationPeriodNewV2':
+    {'printjobhistoryexpirationperioddaysnew':
+       {'casedField': 'printJobHistoryExpirationPeriodDaysNew',
+        'type': 'duration', 'minVal': -1, 'maxVal': None}},
+  'chrome.devices.managedguest.SecurityTokenSessionSettingsV2':
+    {'securitytokensessionnotificationseconds':
+       {'casedField': 'securityTokenSessionNotificationSeconds',
+        'type': 'duration', 'minVal': 0, 'maxVal': 9999}},
+  'chrome.devices.managedguest.SessionLengthV2':
+    {'sessiondurationlimit':
+       {'casedField': 'sessionDurationLimit',
+        'type': 'duration', 'minVal': 1, 'maxVal': 1440}},
+  'chrome.devices.managedguest.Wallpaper':
     {'wallpaperimage':
        {'casedField': 'wallpaperImage',
         'type': 'downloadUri'}},
@@ -28266,9 +28361,7 @@ CHROME_TARGET_VERSION_PATTERN = re.compile(r'^(\d{1,4}\.){1,4}$')
 #	[(printerid <PrinterID>)|(appid <AppID>)]
 def doUpdateChromePolicy():
   def getSpecialVtypeValue(vtype, value):
-    if vtype == 'duration':
-      return {vtype: f'{value}s'}
-    if vtype in {'value', 'downloadUri'}:
+    if vtype in {'duration', 'value', 'downloadUri'}:
       return {vtype: value}
     if vtype == 'count':
       return value
@@ -28326,8 +28419,8 @@ def doUpdateChromePolicy():
           for field in jsonData.get('fields', []):
             casedField = field['name']
             lowerField = casedField.lower()
-            # Handle TYPE_MESSAGE fields with durations, values, counts and timeOfDay as special cases
-            tmschema = CHROME_SCHEMA_TYPE_MESSAGE.get(schemaName, {}).get(lowerField)
+            # Handle fields with durations, values, counts and timeOfDay as special cases
+            tmschema = CHROME_SCHEMA_SPECIAL_CASES.get(schemaName, {}).get(lowerField)
             if tmschema:
               body['requests'][-1]['policyValue']['value'][casedField] = getSpecialVtypeValue(tmschema['type'], field['value'])
               body['requests'][-1]['updateMask'] += f'{casedField},'
@@ -28363,8 +28456,8 @@ def doUpdateChromePolicy():
             body['requests'][-1]['policyValue']['value'][casedField] = value
             body['requests'][-1]['updateMask'] += f'{casedField},'
           break
-        # Handle TYPE_MESSAGE fields with durations, values, counts and timeOfDay as special cases
-        tmschema = CHROME_SCHEMA_TYPE_MESSAGE.get(schemaName, {}).get(field)
+        # Handle fields with durations, values, counts and timeOfDay as special cases
+        tmschema = CHROME_SCHEMA_SPECIAL_CASES.get(schemaName, {}).get(field)
         if tmschema:
           casedField = tmschema['casedField']
           vtype = tmschema['type']
@@ -28372,9 +28465,9 @@ def doUpdateChromePolicy():
             value = getString(Cmd.OB_STRING)
           elif vtype != 'timeOfDay':
             if 'default' not in tmschema:
-              value = getInteger(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'])*tmschema['scale']
+              value = getInteger(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'])
             else:
-              value = getIntegerEmptyAllowed(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'], default=tmschema['default'])*tmschema['scale']
+              value = getIntegerEmptyAllowed(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'], default=tmschema['default'])
           else:
             value = getHHMM()
           body['requests'][-1]['policyValue']['value'][casedField] = getSpecialVtypeValue(vtype, value)
@@ -28507,20 +28600,14 @@ def doPrintShowChromePolicies():
                 'chrome.users.apps.ManagedConfiguration'} and 'managedConfiguration' in values:
       values['managedConfiguration'] = json.dumps(values['managedConfiguration'], ensure_ascii=False).replace('\\n', '').replace('\\"', '"')[1:-1]
     for setting, value in values.items():
-      # Handle TYPE_MESSAGE fields with durations, values, counts and timeOfDay as special cases
-      schema = CHROME_SCHEMA_TYPE_MESSAGE.get(name, {}).get(setting.lower())
+      # Handle fields with durations, values, counts and timeOfDay as special cases
+      schema = CHROME_SCHEMA_SPECIAL_CASES.get(name, {}).get(setting.lower())
       if schema and setting == schema['casedField']:
         vtype = schema['type']
-        if vtype in {'duration', 'value'}:
+        if vtype in {'duration', 'value', 'downloadUri'}:
           value = value.get(vtype, '')
-          if value:
-            if value.endswith('s'):
-              value = value[:-1]
-            value = int(value) // schema['scale']
         elif vtype == 'count':
           pass
-        elif vtype == 'downloadUri':
-          value = value.get(vtype, '')
         else: #timeOfDay
           hours = value.get(vtype, {}).get('hours', 0)
           minutes = value.get(vtype, {}).get('minutes', 0)
@@ -40758,6 +40845,12 @@ VAULT_QUERY_ARGS = [
   ] + list(VAULT_SEARCH_METHODS_MAP.keys())
 
 def _buildVaultQuery(myarg, query, corpusArgumentMap):
+  def _getQueryList(obNameList):
+    itemList = getString(obNameList)
+    if itemList != 'select':
+      return itemList.replace(',', ' ').split()
+    return getEntityList(obNameList)
+
   if not query:
     query['dataScope'] = 'ALL_DATA'
   if myarg == 'corpus':
@@ -40773,11 +40866,11 @@ def _buildVaultQuery(myarg, query, corpusArgumentMap):
     elif searchMethod == 'ORG_UNIT':
       query['orgUnitInfo'] = {'orgUnitId': getOrgUnitId()[1]}
     elif searchMethod == 'SHARED_DRIVE':
-      query['sharedDriveInfo'] = {'sharedDriveIds': getString(Cmd.OB_SHAREDDRIVE_ID_LIST).replace(',', ' ').split()}
+      query['sharedDriveInfo'] = {'sharedDriveIds': _getQueryList(Cmd.OB_SHAREDDRIVE_ID_LIST)}
     elif searchMethod == 'ROOM':
-      query['hangoutsChatInfo'] = {'roomId': getString(Cmd.OB_ROOM_LIST).replace(',', ' ').split()}
+      query['hangoutsChatInfo'] = {'roomId': _getQueryList(Cmd.OB_CHAT_SPACE_LIST)}
     elif searchMethod == 'SITES_URL':
-      query['sitesUrlInfo'] = {'urls': getString(Cmd.OB_URL_LIST).replace(',', ' ').split()}
+      query['sitesUrlInfo'] = {'urls': _getQueryList(Cmd.OB_URL_LIST)}
   elif myarg == 'scope':
     query['dataScope'] = getChoice(VAULT_EXPORT_DATASCOPE_MAP, mapChoice=True)
   elif myarg == 'terms':
@@ -40835,7 +40928,9 @@ def _validateVaultQuery(body, corpusArgumentMap):
 
 # 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 <TeamDriveIDList>) | (rooms <RoomList>) | (sitesurl <URLList>)
+#	(shareddrives|teamdrives (<SharedDriveIDList>|(select <FileSelector>|<CSVFileSelector>))) |
+#	    (rooms (<ChatSpaceList>|(select <FileSelector>|<CSVFileSelector>))) |
+#	    (sitesurl (<URLList>||(select <FileSelector>|<CSVFileSelector>)))
 #	[scope <all_data|held_data|unprocessed_data>]
 #	[terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
 #	[locationquery <StringList>] [peoplequery <StringList>] [minuswords <StringList>]
@@ -42393,6 +42488,9 @@ 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>]
 #	[terms <String>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
 #	[excludedrafts <Boolean>]