From 6b19ba1933d276351d8129967dc16cd21e66f1d9 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Fri, 20 Oct 2023 19:32:36 -0700 Subject: [PATCH] Updated `gam print|show browsers` to handle the following error: ERROR: 503: serviceNotAvailable - The service is currently unavailable. --- docs/GamUpdates.md | 9 ++++++++- docs/How-to-Upgrade-from-Standard-GAM.md | 4 ++-- docs/Version-and-Help.md | 12 ++++++------ src/GamUpdate.txt | 7 +++++++ src/gam/__init__.py | 3 +++ 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 53b3815d..1f97b3ba 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -8,7 +8,14 @@ Automatic update to the latest version on Linux/Mac OS/Google Cloud Shell/Raspbe By default, a folder, `gamadv-xtd3`, is created in the default or specified path and the files are downloaded into that folder. Add the `-s` option to the end of the above commands to suppress creating the `gamadv-xtd3` folder; the files are downloaded directly into the default or specified path. -See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation. +See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation + +### 6.65.02 + +Updated `gam print|show browsers` to handle the following error: +``` +ERROR: 503: serviceNotAvailable - The service is currently unavailable. +``` ### 6.65.01 diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 63f657b7..ba3ece6f 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.65.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.65.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.10.8 64-bit final MacOS High Sierra 10.13.6 x86_64 @@ -1002,7 +1002,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.65.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.65.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.0 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 27346030..3b9e0588 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -4,7 +4,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.65.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.65.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.0 64-bit final MacOS Monterey 12.7 x86_64 @@ -16,7 +16,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.65.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.65.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.0 64-bit final MacOS Monterey 12.7 x86_64 @@ -28,7 +28,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.65.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.65.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.0 64-bit final MacOS Monterey 12.7 x86_64 @@ -65,7 +65,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.65.01 + Latest: 6.65.02 echo $? 1 ``` @@ -73,7 +73,7 @@ echo $? Print the current version number without details ``` gam version simple -6.65.01 +6.65.02 ``` In Linux/MacOS you can do: ``` @@ -83,7 +83,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.65.01 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.65.02 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.0 64-bit final MacOS Monterey 12.7 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 263b7888..7fc22bc7 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,13 @@ Merged GAM-Team version +6.65.02 + +Updated `gam print|show browsers` to handle the following error: +``` +ERROR: 503: serviceNotAvailable - The service is currently unavailable. +``` + 6.65.01 Added option `showmimetypesize` to `gam print|show filecounts` and diff --git a/src/gam/__init__.py b/src/gam/__init__.py index b60c5df6..3787afe4 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -6467,6 +6467,7 @@ def getItemsToModify(entityType, entity, memberRoles=None, isSuspended=None, isA result = callGAPIpages(cbcm.chromebrowsers(), 'list', 'browsers', pageMessage=getPageMessageForWhom(), throwReasons=[GAPI.BAD_REQUEST, GAPI.INVALID_ORGUNIT, GAPI.FORBIDDEN], + retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS, customer=customerId, orgUnitPath=ou, projection='BASIC', orderBy='id', sortOrder='ASCENDING', fields='nextPageToken,browsers(deviceId)') except (GAPI.badRequest, GAPI.invalidOrgunit, GAPI.forbidden): @@ -6489,6 +6490,7 @@ def getItemsToModify(entityType, entity, memberRoles=None, isSuspended=None, isA result = callGAPIpages(cbcm.chromebrowsers(), 'list', 'browsers', pageMessage=getPageMessage(), throwReasons=[GAPI.INVALID_INPUT, GAPI.BAD_REQUEST, GAPI.RESOURCE_NOT_FOUND, GAPI.FORBIDDEN], + retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS, customer=customerId, query=query, projection='BASIC', orderBy='id', sortOrder='ASCENDING', fields='nextPageToken,browsers(deviceId)') except GAPI.invalidInput: @@ -24425,6 +24427,7 @@ def doPrintShowBrowsers(): feed = yieldGAPIpages(cbcm.chromebrowsers(), 'list', 'browsers', pageMessage=pageMessage, messageAttribute='deviceId', throwReasons=[GAPI.INVALID_INPUT, GAPI.BAD_REQUEST, GAPI.INVALID_ORGUNIT, GAPI.FORBIDDEN], + retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS, customer=customerId, orgUnitPath=orgUnitPath, query=query, projection=projection, orderBy=orderBy, sortOrder=sortOrder, fields=fields) for browsers in feed: