diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index d9d83b60..54378abb 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.76.14 + +Added the following Gemini License SKUs: +``` +1010470004 - Gemini Education +1010470005 - Gemini Education Premium +``` + ### 6.76.13 Updated `gam show fileinfo ... showlabels` and `gam print filelist ... showlabels` @@ -19,6 +27,8 @@ ERROR: 500: unknownError - Unknown Error. ERROR: 503: serviceNotAvailable - The service is currently unavailable. ``` +Upgraded to OpenSSL 3.3.1 where possible. + ### 6.76.12 Fixed bug in `gam print|show chatspaces` that caused the following error: diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index f11a0387..ca6b58bb 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -335,7 +335,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.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.14 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.1 x86_64 @@ -1009,7 +1009,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.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.14 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Licenses.md b/docs/Licenses.md index 89cb40f0..803e3e77 100644 --- a/docs/Licenses.md +++ b/docs/Licenses.md @@ -55,6 +55,8 @@ | G Suite Legacy | Google-Apps | standard | | G Suite Lite | Google-Apps-Lite | gsuitelite | | Gemini Business | 1010470003 | geminibiz +| Gemini Education | 1010470004 | geminiedu | +| Gemini Education Premium | 1010470005 | geminiedupremium | | Gemini Enterprise | 1010470001 | geminient | duetai | | Google Apps Message Security | Google-Apps-For-Postini | postini | | Google Chrome Device Management | Google-Chrome-Device-Management | cdm | @@ -151,6 +153,8 @@ cloudsearch | 1010350001 | Cloud Search | eeu | 1010490001 | SKU Endpoint Education Upgrade | geminibiz | 1010470003 | Gemini Business | + geminiedu | 1010470004 | Gemini Education | + geminiedupremium| 1010470005 | Gemini Education Premium | geminient| duetai | 1010470001 | Gemini Enterprise | gsuitebasic | gafb | gafw | basic | Google-Apps-For-Business | gsuitebusiness | gau | gsb | unlimited | Google-Apps-Unlimited | diff --git a/docs/Reseller.md b/docs/Reseller.md index 8022c4fb..214e4d57 100644 --- a/docs/Reseller.md +++ b/docs/Reseller.md @@ -72,6 +72,8 @@ Thanks to Duncan Isaksen-Loxton for a script to help manage multiple domains. cloudsearch | 1010350001 | Cloud Search | eeu | 1010490001 | SKU Endpoint Education Upgrade | geminibiz | 1010470003 | Gemini Business | + geminiedu | 1010470004 | Gemini Education | + geminiedupremium| 1010470005 | Gemini Education Premium | geminient| duetai | 1010470001 | Gemini Enterprise | gsuitebasic | gafb | gafw | basic | Google-Apps-For-Business | gsuitebusiness | gau | gsb | unlimited | Google-Apps-Unlimited | diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index aa137f66..3ae7a539 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.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.14 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.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.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.14 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.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.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.14 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.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.76.13 + Latest: 6.76.14 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.76.13 +6.76.14 ``` 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.76.13 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.76.14 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.1 x86_64 diff --git a/src/GamCommands.txt b/src/GamCommands.txt index 4cf66fce..d87a4728 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -272,6 +272,8 @@ If an item contains spaces, it should be surrounded by ". cloudsearch | 1010350001 | Cloud Search | eeu | 1010490001 | SKU Endpoint Education Upgrade | geminibiz | 1010470003 | Gemini Business | + geminiedu | 1010470004 | Gemini Education | + geminiedupremium| 1010470005 | Gemini Education Premium | geminient| duetai | 1010470001 | Gemini Enterprise | gsuitebasic | gafb | gafw | basic | Google-Apps-For-Business | gsuitebusiness | gau | gsb | unlimited | Google-Apps-Unlimited | diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index d04a16fd..7abdcdbf 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -15,6 +15,14 @@ gam delete|remove chatmember asadmin gam print|show chatmembers|asadmin ``` +6.76.14 + +Added the following Gemini License SKUs: +``` +1010470004 - Gemini Education +1010470005 - Gemini Education Premium +``` + 6.76.13 Updated `gam show fileinfo ... showlabels` and `gam print filelist ... showlabels` @@ -37,7 +45,7 @@ ERROR: Got an unexpected keyword argument orderBy Thanks to Jay, added `gam report vault`. -Thanks to Jay, added the following Gemini SKUs: +Thanks to Jay, added the following Gemini License SKUs: ``` 1010470006 - AI Security 1010470007 - AI Meetings and Messaging diff --git a/src/gam/gamlib/glskus.py b/src/gam/gamlib/glskus.py index bec4ca84..8e2ed00a 100644 --- a/src/gam/gamlib/glskus.py +++ b/src/gam/gamlib/glskus.py @@ -92,6 +92,10 @@ _SKUS = { 'product': '101047', 'aliases': ['gwlabs', 'workspacelabs'], 'displayName': 'Google Workspace Labs'}, '1010470003': { 'product': '101047', 'aliases': ['geminibiz'], 'displayName': 'Gemini Business'}, + '1010470004': { + 'product': '101047', 'aliases': ['geminiedu'], 'displayName': 'Gemini Education'}, + '1010470005': { + 'product': '101047', 'aliases': ['geminiedupremium'], 'displayName': 'Gemini Education Premium'}, '1010470006': { 'product': '101047', 'aliases': ['aisecurity'], 'displayName': 'AI Security'}, '1010470007': {