From 9dc87a060d01343790241d5e2cf65fe639ec7f76 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Thu, 26 Sep 2024 20:04:06 -0700 Subject: [PATCH] Fixed bug in `gam delete groups` --- docs/GamUpdates.md | 4 ++++ docs/How-to-Upgrade-from-Legacy-GAM.md | 4 ++-- docs/Version-and-Help.md | 12 ++++++------ src/GamUpdate.txt | 4 ++++ src/gam/__init__.py | 3 ++- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 87ec3f318..86b33c3c7 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 +### 7.00.08 + +Fixed bug in `gam delete groups` that caused the command to fail when `enable_dasa = true` in `gam.cfg`. + ### 7.00.07 Updated `` fields `address,email,phone,url` to allow an empty type field. diff --git a/docs/How-to-Upgrade-from-Legacy-GAM.md b/docs/How-to-Upgrade-from-Legacy-GAM.md index bc60dbcb3..107048f7a 100644 --- a/docs/How-to-Upgrade-from-Legacy-GAM.md +++ b/docs/How-to-Upgrade-from-Legacy-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 7.00.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 7.00.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.6 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 7.00.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 7.00.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.6 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 3b216a81b..cd6035edb 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 7.00.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 7.00.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.5 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 7.00.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 7.00.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.5 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 7.00.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 7.00.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.5 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: 7.00.07 + Latest: 7.00.08 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -7.00.07 +7.00.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 7.00.07 - https://github.com/taers232c/GAMADV-XTD3 +GAM 7.00.08 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.5 64-bit final MacOS Sonoma 14.5 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index d39277451..50d9e365e 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,7 @@ +7.00.08 + +Fixed bug in `gam delete groups` that caused the command to fail when `enable_dasa = true` in `gam.cfg`. + 7.00.07 Updated `` fields `address,email,phone,url` to allow an empty type field. diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 12fc552f2..5563b1f0c 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -25,7 +25,7 @@ """ __author__ = 'GAM Team ' -__version__ = '7.00.07' +__version__ = '7.00.08' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' #pylint: disable=wrong-import-position @@ -65740,6 +65740,7 @@ def deleteUserFromGroups(users): matchPattern = {} kwargs = _getUserGroupOptionalDomainCustomerId() if not kwargs: + kwargs = {'customer': GC.Values[GC.CUSTOMER_ID]} deleteGroups = {} if Cmd.ArgumentsRemaining(): if not checkArgumentPresent('emailmatchpattern'):