gam7 7.6.14__tar.gz → 7.7.1__tar.gz

{gam7-7.6.14 → gam7-7.7.1}/PKG-INFO

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

@@ -3545,19 +3545,6 @@ gam print contacts [todrive <ToDriveAttribute>*] <ContactSelection>
         [fields <ContactFieldNameList>]
         [formatjson [quotechar <Character>]]
 
-vgam info gal <ContactEntity>
-        [basic|full]
-        [fields <ContactFieldNameList>]
-        [formatjson]
-gam show gal <ContactSelection>
-        [basic|full] [orderby <ContactOrderByFieldName> [ascending|descending]]
-        [fields <ContactFieldNameList>]
-        [formatjson]
-gam print gal [todrive <ToDriveAttribute>*] <ContactSelection>
-        [basic|full] [orderby <ContactOrderByFieldName> [ascending|descending]]
-        [fields <ContactFieldNameList>]
-        [formatjson [quotechar <Character>]]
-
 # Domain - People Contacts and Profiles
 
 <PeopleSourceName> ::=

{gam7-7.6.14 → gam7-7.7.1}/src/GamUpdate.txt

@@ -1,9 +1,31 @@
+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.
+```
+gam info gal
+gam print gal
+gam show gal
+```
+
+These commands are a work-around for `gam print gal`.
+```
+gam config csv_output_row_filter "includeInGlobalAddressList:boolean:true" redirect csv ./UserGAL.csv print users fields name,gal
+gam config csv_output_row_filter "includeInGlobalAddressList:boolean:true" batch_size 25 redirect csv ./GroupGAL.csv print groups fields name,gal
+```
+
 7.06.14
 
 Updated `gam create|update adminrole` to allow specifying a collection of privileges
 with `privileges select <FileSelector>|<CSVFileSelector>` which makes copying roles much simpler.
 
-Updated option `role <RoleItem>` to `gam print|show adminroles` to allow display of information
+Added option `role <RoleItem>` to `gam print|show adminroles` to allow display of information
 for a specific role.
 
 7.06.13

{gam7-7.6.14 → gam7-7.7.1}/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.06.14'
+__version__ = '7.07.01'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -5655,8 +5655,8 @@ def getGDataUserCredentials(api, user, i, count):
     handleOAuthTokenError(e, True, True, i, count)
     return (userEmail, None)
 
-def getContactsObject(contactFeed):
-  contactsObject = initGDataObject(gdata.apps.contacts.service.ContactsService(contactFeed=contactFeed),
+def getContactsObject():
+  contactsObject = initGDataObject(gdata.apps.contacts.service.ContactsService(contactFeed=True),
                                    API.CONTACTS)
   return (GC.Values[GC.DOMAIN], contactsObject)
 
@@ -19996,7 +19996,9 @@ def dedupEmailAddressMatches(contactsManager, emailMatchType, fields):
     fields[CONTACT_EMAILS] = savedAddresses
   return updateRequired
 
-def _createContact():
+# gam create contact <ContactAttribute>+
+#	[(csv [todrive <ToDriveAttribute>*] (addcsvdata <FieldName> <String>)*))| returnidonly]
+def doCreateDomainContact():
   entityType = Ent.DOMAIN
   contactsManager = ContactsManager()
   parameters = {'csvPF': None, 'titles': ['Domain', CONTACT_ID], 'addCSVData': {}, 'returnIdOnly': False}
@@ -20007,7 +20009,7 @@ def _createContact():
     csvPF.AddTitles(sorted(addCSVData.keys()))
   returnIdOnly = parameters['returnIdOnly']
   contactEntry = contactsManager.FieldsToContact(fields)
-  user, contactsObject = getContactsObject(True)
+  user, contactsObject = getContactsObject()
   try:
     contact = callGData(contactsObject, 'CreateContact',
                         throwErrors=[GDATA.BAD_REQUEST, GDATA.SERVICE_NOT_APPLICABLE, GDATA.FORBIDDEN],
@@ -20032,11 +20034,6 @@ def _createContact():
   if csvPF:
     csvPF.writeCSVfile('Contacts')
 
-# gam create contact <ContactAttribute>+
-#	[(csv [todrive <ToDriveAttribute>*] (addcsvdata <FieldName> <String>)*))| returnidonly]
-def doCreateDomainContact():
-  _createContact()
-
 def _clearUpdateContacts(updateContacts):
   entityType = Ent.DOMAIN
   contactsManager = ContactsManager()
@@ -20058,7 +20055,7 @@ def _clearUpdateContacts(updateContacts):
         unknownArgumentExit()
     if not contactClear['emailClearPattern']:
       missingArgumentExit('emailclearpattern')
-  user, contactsObject = getContactsObject(True)
+  user, contactsObject = getContactsObject()
   if queriedContacts:
     entityList = queryContacts(contactsObject, contactQuery)
     if entityList is None:
@@ -20129,7 +20126,8 @@ def doClearDomainContacts():
 def doUpdateDomainContacts():
   _clearUpdateContacts(True)
 
-def _dedupContacts():
+# gam dedup contacts <ContactEntity>|<ContactSelection> [matchType [<Boolean>]]
+def doDedupDomainContacts():
   entityType = Ent.DOMAIN
   contactsManager = ContactsManager()
   contactQuery = _initContactQueryAttributes()
@@ -20140,7 +20138,7 @@ def _dedupContacts():
       emailMatchType = getBoolean()
     else:
       _getContactQueryAttributes(contactQuery, myarg, -1, False)
-  user, contactsObject = getContactsObject(True)
+  user, contactsObject = getContactsObject()
   contacts = queryContacts(contactsObject, contactQuery)
   if contacts is None:
     return
@@ -20180,15 +20178,12 @@ def _dedupContacts():
       break
   Ind.Decrement()
 
-# gam dedup contacts <ContactEntity>|<ContactSelection> [matchType [<Boolean>]]
-def doDedupDomainContacts():
-  _dedupContacts()
-
-def _deleteContacts():
+# gam delete contacts <ContactEntity>|<ContactSelection>
+def doDeleteDomainContacts():
   entityType = Ent.DOMAIN
   contactsManager = ContactsManager()
   entityList, contactQuery, queriedContacts = _getContactEntityList(-1, False)
-  user, contactsObject = getContactsObject(True)
+  user, contactsObject = getContactsObject()
   if queriedContacts:
     entityList = queryContacts(contactsObject, contactQuery)
     if entityList is None:
@@ -20228,10 +20223,6 @@ def _deleteContacts():
       break
   Ind.Decrement()
 
-# gam delete contacts <ContactEntity>|<ContactSelection>
-def doDeleteDomainContacts():
-  _deleteContacts()
-
 CONTACT_TIME_OBJECTS = {CONTACT_UPDATED}
 CONTACT_FIELDS_WITH_CRS_NLS = {CONTACT_NOTES, CONTACT_BILLING_INFORMATION}
 
@@ -20299,7 +20290,10 @@ def _getContactFieldsList(contactsManager, displayFieldsList):
     else:
       invalidChoiceExit(field, contactsManager.CONTACT_ARGUMENT_TO_PROPERTY_MAP, True)
 
-def _infoContacts(contactFeed):
+# gam info contacts <ContactEntity>
+#	[basic|full]
+#	[fields <ContactFieldNameList>] [formatjson]
+def doInfoDomainContacts():
   entityType = Ent.DOMAIN
   contactsManager = ContactsManager()
   entityList = getEntityList(Cmd.OB_CONTACT_ENTITY)
@@ -20314,7 +20308,7 @@ def _infoContacts(contactFeed):
       _getContactFieldsList(contactsManager, displayFieldsList)
     else:
       FJQC.GetFormatJSON(myarg)
-  user, contactsObject = getContactsObject(contactFeed)
+  user, contactsObject = getContactsObject()
   j = 0
   jcount = len(entityList)
   if not FJQC.formatJSON:
@@ -20342,19 +20336,13 @@ def _infoContacts(contactFeed):
       break
   Ind.Decrement()
 
-# gam info contacts <ContactEntity>
-#	[basic|full]
-#	[fields <ContactFieldNameList>] [formatjson]
-def doInfoDomainContacts():
-  _infoContacts(True)
-
-# gam info gal <ContactEntity>
-#	[basic|full]
+# gam print contacts [todrive <ToDriveAttribute>*] <ContactSelection>
+#	[basic|full|countsonly] [showdeleted] [orderby <ContactOrderByFieldName> [ascending|descending]]
+#	[fields <ContactFieldNameList>] [formatjson [quotechar <Character>]]
+# gam show contacts <ContactSelection>
+#	[basic|full|countsonly] [showdeleted] [orderby <ContactOrderByFieldName> [ascending|descending]]
 #	[fields <ContactFieldNameList>] [formatjson]
-def doInfoGAL():
-  _infoContacts(False)
-
-def _printShowContacts(contactFeed):
+def doPrintShowDomainContacts():
   entityType = Ent.DOMAIN
   entityTypeName = Ent.Singular(entityType)
   contactsManager = ContactsManager()
@@ -20380,7 +20368,7 @@ def _printShowContacts(contactFeed):
       pass
     else:
       FJQC.GetFormatJSONQuoteChar(myarg, True)
-  user, contactsObject = getContactsObject(contactFeed)
+  user, contactsObject = getContactsObject()
   contacts = queryContacts(contactsObject, contactQuery)
   if countsOnly:
     jcount = countLocalContactSelects(contactsManager, contacts, contactQuery)
@@ -20466,24 +20454,6 @@ def _printShowContacts(contactFeed):
   if csvPF:
     csvPF.writeCSVfile(CSVTitle)
 
-# gam print contacts [todrive <ToDriveAttribute>*] <ContactSelection>
-#	[basic|full|countsonly] [showdeleted] [orderby <ContactOrderByFieldName> [ascending|descending]]
-#	[fields <ContactFieldNameList>] [formatjson [quotechar <Character>]]
-# gam show contacts <ContactSelection>
-#	[basic|full|countsonly] [showdeleted] [orderby <ContactOrderByFieldName> [ascending|descending]]
-#	[fields <ContactFieldNameList>] [formatjson]
-def doPrintShowDomainContacts():
-  _printShowContacts(True)
-
-# gam print gal [todrive <ToDriveAttribute>*] <ContactSelection>
-#	[basic|full] [orderby <ContactOrderByFieldName> [ascending|descending]]
-#	[fields <ContactFieldNameList>] [formatjson [quotechar <Character>]]
-# gam show gal <ContactSelection>
-#	[basic|full|countsonly] [orderby <ContactOrderByFieldName> [ascending|descending]]
-#	[fields <ContactFieldNameList>] [formatjson]
-def doPrintShowGAL():
-  _printShowContacts(False)
-
 # Prople commands utilities
 #
 def normalizePeopleResourceName(resourceName):
@@ -28213,75 +28183,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'}},
@@ -28296,9 +28362,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
@@ -28356,8 +28420,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},'
@@ -28393,8 +28457,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']
@@ -28402,9 +28466,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)
@@ -28537,20 +28601,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)
@@ -75645,7 +75703,6 @@ MAIN_COMMANDS_WITH_OBJECTS = {
       Cmd.ARG_DRIVEFILEACL:	doInfoDriveFileACLs,
       Cmd.ARG_DRIVELABEL:	doInfoDriveLabels,
       Cmd.ARG_INSTANCE:		doInfoInstance,
-      Cmd.ARG_GAL:		doInfoGAL,
       Cmd.ARG_GROUP:		doInfoGroups,
       Cmd.ARG_GROUPMEMBERS:	doInfoGroupMembers,
       Cmd.ARG_INBOUNDSSOASSIGNMENT:	doInfoInboundSSOAssignment,
@@ -75740,7 +75797,6 @@ MAIN_COMMANDS_WITH_OBJECTS = {
       Cmd.ARG_DRIVELABEL:	doPrintShowDriveLabels,
       Cmd.ARG_DRIVELABELPERMISSION:	doPrintShowDriveLabelPermissions,
       Cmd.ARG_FEATURE:		doPrintShowFeatures,
-      Cmd.ARG_GAL:		doPrintShowGAL,
       Cmd.ARG_GROUP:		doPrintGroups,
       Cmd.ARG_GROUPMEMBERS:	doPrintGroupMembers,
       Cmd.ARG_GROUPTREE:	doPrintShowGroupTree,
@@ -75858,7 +75914,6 @@ MAIN_COMMANDS_WITH_OBJECTS = {
       Cmd.ARG_DRIVELABEL:	doPrintShowDriveLabels,
       Cmd.ARG_DRIVELABELPERMISSION:	doPrintShowDriveLabelPermissions,
       Cmd.ARG_FEATURE:		doPrintShowFeatures,
-      Cmd.ARG_GAL:		doPrintShowGAL,
       Cmd.ARG_GROUPMEMBERS:	doShowGroupMembers,
       Cmd.ARG_GROUPTREE:	doPrintShowGroupTree,
       Cmd.ARG_GUARDIAN:		doPrintShowGuardians,

{gam7-7.6.14 → gam7-7.7.1}/src/gam/gamlib/glclargs.py

@@ -616,7 +616,6 @@ class GamCLArgs():
   ARG_FORWARDS = 'forwards'
   ARG_FORWARDINGADDRESS = 'forwardingaddress'
   ARG_FORWARDINGADDRESSES = 'forwardingaddresses'
-  ARG_GAL = 'gal'
   ARG_GCPFOLDER = 'gcpfolder'
   ARG_GCPSERVICEACCOUNT = 'gcpserviceaccount'
   ARG_GMAIL = 'gmail'

{gam7-7.6.14 → gam7-7.7.1}/wiki/Administrators.md

@@ -7,13 +7,14 @@
 - [Create an administrator](#create-an-administrator)
 - [Delete an administrator](#delete-an-administrator)
 - [Display administrators](#display-administrators)
+- [Copy privileges from one role to a new role](#copy-privileges-from-one-role-to-a-new-role)
 - [Copy roles from one administrator to another](#copy-roles-from-one-administrator-to-another)
 
 ## API documentation
 * [About Administrator roles](https://support.google.com/a/answer/33325?ref_topic=4514341)
 * [Directory API - Privileges](https://developers.google.com/admin-sdk/directory/reference/rest/v1/privileges)
 * [Directory API - Roles](https://developers.google.com/admin-sdk/directory/reference/rest/v1/roles)
-* [Directory API - Role SAssignments](https://developers.google.com/admin-sdk/directory/reference/rest/v1/roleAssignments)
+* [Directory API - Role Assignments](https://developers.google.com/admin-sdk/directory/reference/rest/v1/roleAssignments)
 
 ## Definitions
 ```
@@ -36,7 +37,7 @@ gam print privileges [todrive <ToDriveAttribute>*]
 gam show privileges
 ```
 
-Here is the output from `gam show privileges`; use this to find `<Privilege>`.
+Here is the output from `gam show privileges`; use this to find a specific `<Privilege>`.
 ```
 Show 111 Privileges
   Privilege: REPORTS_ACCESS (1/111)
@@ -1381,24 +1382,33 @@ Show 111 Privileges
 
 ## Manage administrative roles
 ```
-gam create adminrole <String> privileges all|all_ou|<PrivilegeList> [description <String>]
-gam update adminrole <RoleItem> [name <String>] [privileges all|all_ou|<PrivilegeList>] [description <String>]
+gam create adminrole <String> [description <String>]
+        privileges all|all_ou|<PrivilegeList>|(select <FileSelector>|<CSVFileSelector>>)
+gam update adminrole <RoleItem> [name <String>] [description <String>]
+        [privileges all|all_ou|<PrivilegeList>|(select <FileSelector>|<CSVFileSelector>>)] 
 gam delete adminrole <RoleItem>
 ```
 * `privileges all` - All defined privileges
 * `privileges all_ou` - All defined privileges than can be scoped to an OU
 * `privileges <PrivilegeList>` - A specific list of privileges
+* `privileges select <FileSelector>|<CSVFileSelector>>` - A collection of privileges from a flat or CSV file
 
 ## Display administrative roles
 ```
 gam info adminrole <RoleItem> [privileges]
+```
+* `privileges` - Display privileges associated with role
+```
 gam print adminroles|roles [todrive <ToDriveAttribute>*]
-        [privileges] [oneitemperrow]
-gam show adminroles|roles [todrive <ToDriveAttribute>*] [privileges]
+        [role <RoleItem>] [privileges] [oneitemperrow]
+gam show adminroles|roles
+        [role <RoleItem>] [privileges]
 ```
+By default, all roles are displayed, use `role <RoleItem>` to display a specific role.
+
 * `privileges` - Display privileges associated with each role
 
-By default, all privileges for a role are shown on one row as a repeating item.
+By default, with `print`, all privileges for a role are shown on one row as a repeating item.
 When `oneitemperrow` is specified, each privilege is output on a separate row/line with the other role fields.
 
 ## Create an administrator
@@ -1438,6 +1448,16 @@ options to limit the display:
 By default, all role privileges for an admin are shown on one row as a repeating item.
 When `oneitemperrow` is specified, each role privilege is output on a separate row/line with the other admin fields.
 
+## Copy privileges from one role to a new role
+Get privileges for existing role; replace Role Name with actual role name
+```
+gam redirect csv ./RolePrivileges.csv print adminrole role 'Role Name' privileges oneitemperrow
+```
+Create a new role with those privileges
+```
+gam create adminrole "New Role Name" privileges select csvfile RolePrivileges.csv:privilegeName
+```
+
 ## Copy roles from one administrator to another
 Get roles for current admin.
 ```

gam7-7.6.14/wiki/Domain-SharedContacts-GAL.md → gam7-7.7.1/wiki/Domain-SharedContacts.md

@@ -1,4 +1,4 @@
-# Domain Shared Contacts - Global Address List
+# Domain Shared Contacts
 - [API documentation](#api-documentation)
 - [Python Regular Expressions](Python-Regular-Expressions) Match function
 - [Definitions](#definitions)