diff --git a/docs/Authorization.md b/docs/Authorization.md index 8944fe02..9d60e6d5 100644 --- a/docs/Authorization.md +++ b/docs/Authorization.md @@ -225,7 +225,7 @@ perform these steps and then you should be able to authorize and use your projec * Click on Grant Access * Enter the new admin address in Principals * Click in the Select a role box -* Type orgpolicy.policies.update in the Filter box +* Type organization policy administrator in the Filter box * Click Organization Policy Administrator * Click Save * In the upper left click the three lines to the left of Google Cloud and select IAM & Admin diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 0bd138ee..5ed6e1cd 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,10 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads-Installs](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads-Installs) for Windows or other options, including manual installation +### 6.79.08 + +Clarified action to perform messages when creating/deleting/updating licenses. + ### 6.79.07 Added option `totalonly` to `gam print|show groups` that displays diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index a59384f4..d3ea9b68 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -251,7 +251,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 -GAMADV-XTD3 6.79.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 @@ -923,7 +923,7 @@ writes the credentials into the file oauth2.txt. C:\>del C:\GAMConfig\oauth2.txt C:\>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.79.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Shared-Drives.md b/docs/Shared-Drives.md index 4e766dea..7e804fce 100644 --- a/docs/Shared-Drives.md +++ b/docs/Shared-Drives.md @@ -13,6 +13,8 @@ - [Change Shared Drive visibility](#change-shared-drive-visibility) - [Display Shared Drives](#display-shared-drives) - [Display List of Shared Drives in an Organizational Unit](#display-list-of-shared-drives-in-an-organizational-unit) +- [Display all Shared Drives with a specific organizer](#display-all-shared-drives-with-a-specific-organizer) +- [Display all Shared Drives without a specific organizer](#display-all-shared-drives-without-a-specific-organizer) - [Manage Shared Drive access](#manage-shared-drive-access) - [Transfer Shared Drive access](#transfer-shared-drive-access) - [Display Shared Drive access](#display-shared-drive-access) @@ -396,6 +398,18 @@ Print information about Shared Drives that have admin@domain.com as a member. ``` gam user admin@domain.com print teamdrives ``` +## Display all Shared Drives with a specific organizer +Substitute actual email address for `organizer@domain.com`. +``` +gam config csv_output_header_filter "id,name" print teamdriveacls pm emailaddress organizer@domain.com role organizer em pma process pmselect +``` + +## Display all Shared Drives without a specific organizer +Substitute actual email address for `organizer@domain.com`. +``` +gam config csv_output_header_filter "id,name" print teamdriveacls pm emailaddress organizer@domain.com role organizer em pma skip pmselect +``` + ## Display List of Shared Drives in an Organizational Unit To use this command you must add the `Cloud Identity API` to your project and authorize the appropriate scope: `Cloud Identity OrgUnits API`. @@ -596,10 +610,12 @@ Print ACLs for all Shared Drives in the organization created after November 1, 2 ``` gam print teamdriveacls teamdriveadminquery "createdTime > '2017-11-01T00:00:00'" ``` + Print ACLs for all Shared Drives in the organization with foo@bar.com as an organizer. ``` gam print teamdriveacls user foo@bar.com role organizer ``` + Print ACLs for all Shared Drives in the organization with foo@bar.com or groups that contain foo@bar.com as a reader. ``` gam print teamdriveacls user foo@bar.com role reader checkgroups diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 011c4bd6..0f8dfac1 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.79.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 @@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAMADV-XTD3 6.79.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAMADV-XTD3 6.79.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.79.07 + Latest: 6.79.08 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.79.07 +6.79.08 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.79.07 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.79.08 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index e786f7b0..1b0dc70d 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,10 @@ Merged GAM-Team version +6.79.08 + +Clarified action to perform messages when creating/deleting/updating licenses. + 6.79.07 Added option `totalonly` to `gam print|show groups` that displays diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 03a70a31..16ee2353 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -3619,6 +3619,8 @@ def SetGlobalVariables(): def _getCfgString(sectionName, itemName): value = _stripStringQuotes(GM.Globals[GM.PARSER].get(sectionName, itemName)) + if itemName == GC.DOMAIN: + value = value.strip() minLen, maxLen = GC.VAR_INFO[itemName].get(GC.VAR_LIMITS, (None, None)) if ((minLen is None) or (len(value) >= minLen)) and ((maxLen is None) or (len(value) <= maxLen)): if itemName == GC.LICENSE_SKUS and value: @@ -65663,9 +65665,9 @@ def _createLicenses(lic, productId, skuId, parameters, jcount, users, i, count, noAvailableLicenses = False doneSet = set() if not returnDoneSet: - entityPerformActionNumItems([Ent.LICENSE, SKU.skuIdToDisplayName(skuId)], jcount, Ent.USER, i, count) + entityPerformActionModifierNumItems([Ent.LICENSE, SKU.skuIdToDisplayName(skuId)], Msg.TO_LC, jcount, Ent.USER, i, count) else: - entityPerformActionModifierNumItems([Ent.LICENSE, SKU.skuIdToDisplayName(skuId)], Msg.MAXIMUM_OF, jcount, Ent.USER, i, count) + entityPerformActionModifierNumItems([Ent.LICENSE, SKU.skuIdToDisplayName(skuId)], Msg.TO_MAXIMUM_OF, jcount, Ent.USER, i, count) Ind.Increment() j = 0 for user in users: @@ -65730,7 +65732,7 @@ def updateLicense(users): message = Act.PREVIEW productId, skuId, oldSkuId = parameters[LICENSE_PRODUCT_SKUIDS][0] body = {'skuId': skuId} - entityPerformActionNumItems([Ent.LICENSE, SKU.skuIdToDisplayName(skuId)], jcount, Ent.USER) + entityPerformActionModifierNumItems([Ent.LICENSE, SKU.skuIdToDisplayName(skuId)], Msg.FOR, jcount, Ent.USER) Ind.Increment() for user in users: j += 1 @@ -65763,7 +65765,7 @@ def _deleteLicenses(lic, productId, skuId, parameters, jcount, users, i, count): Act.Set([Act.DELETE, Act.DELETE_PREVIEW][parameters['preview']]) if parameters['preview']: message = Act.PREVIEW - entityPerformActionNumItems([Ent.LICENSE, SKU.skuIdToDisplayName(skuId)], jcount, Ent.USER, i, count) + entityPerformActionModifierNumItems([Ent.LICENSE, SKU.skuIdToDisplayName(skuId)], Msg.FROM_LC, jcount, Ent.USER, i, count) Ind.Increment() j = 0 for user in users: diff --git a/src/gam/gamlib/glmsgs.py b/src/gam/gamlib/glmsgs.py index ffa092d2..18d55f4a 100644 --- a/src/gam/gamlib/glmsgs.py +++ b/src/gam/gamlib/glmsgs.py @@ -257,6 +257,7 @@ FORBIDDEN = 'Forbidden' FORMAT_NOT_AVAILABLE = 'Format ({0}) not available' FORMAT_NOT_DOWNLOADABLE = 'Format not downloadable' FROM = 'From' +FROM_LC = 'from' FULL_PATH_MUST_START_WITH_DRIVE = 'fullpath must start with {0} or {1}' GAM_BATCH_FILE_WRITTEN = 'GAM batch file {0} written\n' GAM_LATEST_VERSION_NOT_AVAILABLE = 'GAM Latest Version information not available' @@ -468,6 +469,8 @@ TASKLIST_TITLE_NOT_FOUND = 'Task list title not found' THREAD = 'thread' THREADS = 'threads' TO = 'To' +TO_LC = 'to' +TO_MAXIMUM_OF = 'to maximum of' TO_SET_UP_GOOGLE_CHAT = """ To set up Google Chat for your API project, please go to: