From 16b3d2b0065be5a1803b508ee2477b148a286d59 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Mon, 22 Jul 2024 20:47:05 -0700 Subject: [PATCH] Allow `` in any case --- docs/GamUpdates.md | 5 +++++ docs/How-to-Upgrade-from-Standard-GAM.md | 4 ++-- docs/Version-and-Help.md | 12 ++++++------ src/GamUpdate.txt | 13 +++++++++---- src/gam/__init__.py | 6 +++--- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 455d59a0..1c70e412 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,11 @@ 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.01 + +Updated commands that take `` as an argument to take the value in any case, +e.g., _SEED_ADMIN_ROLE or _seed_admin_role. + ### 6.79.00 Updated code to work around a Cryptography library change that caused service account private key creation to fail. diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 55b30e89..653a52a4 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.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.01 - 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.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.01 - 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/Version-and-Help.md b/docs/Version-and-Help.md index d7b7d821..7d7898dc 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.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.01 - 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.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.01 - 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.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.01 - 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.00 + Latest: 6.79.01 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.79.00 +6.79.01 ``` 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.00 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.79.01 - 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 6280f949..dcdf8766 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,11 +1,16 @@ -6.79.00 - -Updated code to work around a Cryptography library change that caused service account private key creation to fail. - 7.00.00 Merged GAM-Team version +6.79.01 + +Updated commands that take `` as an argument to take the value in any case, +e.g., _SEED_ADMIN_ROLE or _seed_admin_role. + +6.79.00 + +Updated code to work around a Cryptography library change that caused service account private key creation to fail. + 6.78.00 Added command to check if an OU contains items; this is useful when tryng to delete an OU diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 4ee8bd8a..82b6c91e 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -16210,7 +16210,7 @@ def makeRoleIdNameMap(): accessErrorExit(cd) for role in result: GM.Globals[GM.MAP_ROLE_ID_TO_NAME][role['roleId']] = role['roleName'] - GM.Globals[GM.MAP_ROLE_NAME_TO_ID][role['roleName']] = role['roleId'] + GM.Globals[GM.MAP_ROLE_NAME_TO_ID][role['roleName'].lower()] = role['roleId'] def role_from_roleid(roleid): if GM.Globals[GM.MAKE_ROLE_ID_NAME_MAP]: @@ -16220,7 +16220,7 @@ def role_from_roleid(roleid): def roleid_from_role(role): if GM.Globals[GM.MAKE_ROLE_ID_NAME_MAP]: makeRoleIdNameMap() - return GM.Globals[GM.MAP_ROLE_NAME_TO_ID].get(role, None) + return GM.Globals[GM.MAP_ROLE_NAME_TO_ID].get(role.lower(), None) def getRoleId(): role = getString(Cmd.OB_ROLE_ITEM) @@ -16344,7 +16344,7 @@ def _showAdminRole(role, i=0, count=0): def doInfoAdminRole(): cd = buildGAPIObject(API.DIRECTORY) fieldsList = PRINT_ADMIN_ROLES_FIELDS[:] - role, roleId = getRoleId() + _, roleId = getRoleId() while Cmd.ArgumentsRemaining(): myarg = getArgument() if myarg == 'privileges':