diff --git a/docs/Drive-File-Selection.md b/docs/Drive-File-Selection.md index 4e6d0b99..72807356 100644 --- a/docs/Drive-File-Selection.md +++ b/docs/Drive-File-Selection.md @@ -75,6 +75,7 @@ others_3p_shortcuts | others_items | writable_files + ::= ::= ::= (teamdriveid ) | (teamdriveid:) diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 1a70ff38..0ca4d7ea 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,15 @@ 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.65.04 + +Fixed bug where license SKU `1010020031` (Google Workspace Frontline Standard) was improperly entered making it unusable; +its alias `wsflwstan` was usable. + +Added support for Google Workspace Additional Storage. +* ProductID - 101043 +* SKUID - 1010430001 | gwas | plusstorage + ### 6.65.03 Fixed bug in commands that display calendar events where event start and end times were not properly displayed diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index e25426e6..fca92d94 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.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.65.04 - 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.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.65.04 - 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/Licenses.md b/docs/Licenses.md index ab3861a4..93bafa0f 100644 --- a/docs/Licenses.md +++ b/docs/Licenses.md @@ -30,6 +30,7 @@ | Google Meet Global Dialing | 101036 | | Google Vault |Google-Vault | | Google Voice | 101033 | +| Google Workspace Additional Storage | 101043 | | Google Workspace Archived User | 101034 | | Google Workspace for Education | 101031 | | Google Workspace for Education | 101037 | @@ -67,6 +68,7 @@ | Google Voice Premier | 1010330002 | voicepremier | | Google Voice Standard | 1010330004 | voicestandard | | Google Voice Starter | 1010330003 | voicestarter | +| Google Workspace Additional Storage | 1010430001 | gwas | | Google Workspace Business - Archived User | 1010340002 | gsuitebusinessarchived | | Google Workspace Business Plus | 1010020025 | wsbizplus | | Google Workspace Business Plus - Archived User | 1010340003 | wsbizplusarchived | @@ -111,6 +113,7 @@ 101038 | 101039 | 101040 | + 101043 | 101047 | Google-Apps | Google-Chrome-Device-Management | @@ -163,6 +166,7 @@ voicepremier | gvpremier | googlevoicepremier | 1010330002 | voicestandard | gvstandard | googlevoicestandard | 1010330004 | voicestarter | gvstarter | googlevoicestarter | 1010330003 | + wsas | plusstorage | 1010430001 | wsbizplus | workspacebusinessplus | 1010020025 | wsbizplusarchived | workspacebusinessplusarchived | 1010340003 | wsbizstan | workspacebusinessstandard | 1010020028 | diff --git a/docs/Users-Drive-Files-Display.md b/docs/Users-Drive-Files-Display.md index e354aaf5..47dfef6e 100644 --- a/docs/Users-Drive-Files-Display.md +++ b/docs/Users-Drive-Files-Display.md @@ -483,6 +483,7 @@ See: [Drive File Selection](Drive-File-Selection) for details of ` ::= all_files | all_folders | + all_forms | all_google_files | all_non_google_files | all_shortcuts | @@ -490,13 +491,16 @@ See: [Drive File Selection](Drive-File-Selection) for details of ` 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.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.65.04 - 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.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.65.04 - 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.03 + Latest: 6.65.04 echo $? 1 ``` @@ -73,7 +73,7 @@ echo $? Print the current version number without details ``` gam version simple -6.65.03 +6.65.04 ``` 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.03 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.65.04 - 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/GamCommands.txt b/src/GamCommands.txt index b41b11f1..4eaa8779 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -241,6 +241,7 @@ If an item contains spaces, it should be surrounded by ". 101038 | 101039 | 101040 | + 101043 | 101047 | Google-Apps | Google-Chrome-Device-Management | @@ -291,6 +292,7 @@ If an item contains spaces, it should be surrounded by ". voicepremier | gvpremier | googlevoicepremier | 1010330002 | voicestandard | gvstandard | googlevoicestandard | 1010330004 | voicestarter | gvstarter | googlevoicestarter | 1010330003 | + wsas | plusstorage | 1010430001 | wsbizplus | workspacebusinessplus | 1010020025 | wsbizplusarchived | workspacebusinessplusarchived | 1010340003 | wsbizstan | workspacebusinessstandard | 1010020028 | diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index a42c626f..29ad2973 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,12 @@ +6.65.04 + +Fixed bug where license SKU `1010020031` (Google Workspace Frontline Standard) was improperly entered making it unusable; +its alias `wsflwstan` was usable. + +Added support for Google Workspace Additional Storage. +* ProductID - 101043 +* SKUID - 1010430001 | gwas | plusstorage + 7.00.00 Merged GAM-Team version diff --git a/src/gam/gamlib/glskus.py b/src/gam/gamlib/glskus.py index 48667f62..3005df97 100644 --- a/src/gam/gamlib/glskus.py +++ b/src/gam/gamlib/glskus.py @@ -33,6 +33,7 @@ _PRODUCTS = { '101038': 'AppSheet', '101039': 'Assured Controls', '101040': 'Beyond Corp Enterprise', + '101043': 'Google Workspace Additional Storage', '101047': 'Duet AI', 'Google-Apps': 'Google Workspace', 'Google-Chrome-Device-Management': 'Google Chrome Device Management', @@ -82,6 +83,8 @@ _SKUS = { 'product': '101039', 'aliases': ['assuredcontrols'], 'displayName': 'Assured Controls'}, '1010400001': { 'product': '101040', 'aliases': ['beyondcorp', 'beyondcorpenterprise', 'bce'], 'displayName': 'Beyond Corp Enterprise'}, + '1010430001': { + 'product': '101043', 'aliases': ['gwas', 'plusstorage'], 'displayName': 'Google Workspace Additional Storage'}, '1010470001': { 'product': '101047', 'aliases': ['duetai'], 'displayName': 'Duet AI for Enterprise'}, '1010470002': { @@ -113,7 +116,7 @@ _SKUS = { 'product': 'Google-Apps', 'aliases': ['wes', 'wsentstarter', 'workspaceenterprisestarter'], 'displayName': 'Workspace Enterprise Starter'}, '1010020030': { 'product': 'Google-Apps', 'aliases': ['wsflw', 'workspacefrontline', 'workspacefrontlineworker'], 'displayName': 'Google Workspace Frontline Starter'}, - '1010020031`': { + '1010020031': { 'product': 'Google-Apps', 'aliases': ['wsflwstan', 'workspacefrontlinestan', 'workspacefrontlineworkerstan'], 'displayName': 'Google Workspace Frontline Standard'}, '1010340001': { 'product': '101034', 'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'], 'displayName': 'Google Workspace Enterprise Plus - Archived User'},