diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index d6d8ce55..9f7aa1f7 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,14 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation +### 6.72.02 + +Updated `gam delete admin ` to handle the following error that +occurs when `` references a user that has been deleted. +``` +ERROR: 404: resourceNotFound - Does not exist +``` + ### 6.72.01 Improved commands to display drive file comments. diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 229553a1..3a410227 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -334,7 +334,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin/bin/gamadv-xtd3$ ./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.72.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.72.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -1006,7 +1006,7 @@ writes the credentials into the file oauth2.txt. C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt C:\GAMADV-XTD3>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.72.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.72.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Users-Gmail-Messages-Threads.md b/docs/Users-Gmail-Messages-Threads.md index 5a911012..6ed95a39 100644 --- a/docs/Users-Gmail-Messages-Threads.md +++ b/docs/Users-Gmail-Messages-Threads.md @@ -1,5 +1,5 @@ # Users - Gmail - Messages/Threads -_ [Notes](#notes) +- [Notes](#notes) - [API documentation](#api-documentation) - [Query documentation](#query-documentation) - [Definitions](#definitions) diff --git a/docs/Users-Shared-Drives.md b/docs/Users-Shared-Drives.md index 58c8ce9a..c7b0aa57 100644 --- a/docs/Users-Shared-Drives.md +++ b/docs/Users-Shared-Drives.md @@ -293,7 +293,7 @@ gam show teamdrives ``` By default, Gam displays all Teams Drives accessible by the user. * `matchname ` - Display Shared Drives with names that match a pattern. -* `(role|roles )* - Display Shared Drives where the user has one of the specified roles. +* `(role|roles )*` - Display Shared Drives where the user has one of the specified roles. By default, Gam displays the information as an indented list of keys and values. * `formatjson` - Display the fields in JSON format. diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index d1492ce9..f155929c 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.72.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.72.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 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.72.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.72.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 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.72.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.72.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 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.72.01 + Latest: 6.72.02 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.72.01 +6.72.02 ``` 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.72.01 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.72.02 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index e4835b14..e98a4f37 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,14 @@ Merged GAM-Team version +6.72.02 + +Updated `gam delete admin ` to handle the following error that +occurs when `` references a user that has been deleted. +``` +ERROR: 404: resourceNotFound - Does not exist +``` + 6.72.01 Improved commands to display drive file comments. diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 18790fd4..4afe6681 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -16264,13 +16264,13 @@ def doDeleteAdmin(): try: callGAPI(cd.roleAssignments(), 'delete', throwReasons=[GAPI.NOT_FOUND, GAPI.OPERATION_NOT_SUPPORTED, GAPI.FORBIDDEN, - GAPI.INVALID_INPUT, GAPI.SERVICE_NOT_AVAILABLE, + GAPI.INVALID_INPUT, GAPI.SERVICE_NOT_AVAILABLE, GAPI.RESOURCE_NOT_FOUND, GAPI.BAD_REQUEST, GAPI.CUSTOMER_NOT_FOUND], retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS, customer=GC.Values[GC.CUSTOMER_ID], roleAssignmentId=roleAssignmentId) entityActionPerformed([Ent.ADMIN_ROLE_ASSIGNMENT, roleAssignmentId]) except (GAPI.notFound, GAPI.operationNotSupported, GAPI.forbidden, - GAPI.invalidInput, GAPI.serviceNotAvailable) as e: + GAPI.invalidInput, GAPI.serviceNotAvailable, GAPI.resourceNotFound) as e: entityActionFailedWarning([Ent.ADMIN_ROLE_ASSIGNMENT, roleAssignmentId], str(e)) except (GAPI.badRequest, GAPI.customerNotFound): accessErrorExit(cd)