From ab65890455e5fa65915262178b8bf8a8cebda064 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Wed, 26 Jun 2024 07:07:11 -0700 Subject: [PATCH] sa email address cleanup --- docs/Bulk-Processing.md | 16 +++++ docs/GamUpdates.md | 11 +++ docs/How-to-Upgrade-from-Standard-GAM.md | 4 +- docs/Licenses.md | 6 ++ docs/Reseller.md | 2 + docs/Users-Chat.md | 2 + docs/Users-Drive-Files-Manage.md | 1 + docs/Version-and-Help.md | 12 ++-- src/GamCommands.txt | 3 + src/GamUpdate.txt | 11 +++ src/gam/__init__.py | 90 ++++++++++-------------- src/gam/gamlib/glapi.py | 6 ++ src/gam/gamlib/glcfg.py | 2 +- 13 files changed, 104 insertions(+), 62 deletions(-) diff --git a/docs/Bulk-Processing.md b/docs/Bulk-Processing.md index cf9f8b35..9de9185e 100644 --- a/docs/Bulk-Processing.md +++ b/docs/Bulk-Processing.md @@ -8,6 +8,7 @@ - [CSV files](#csv-files) - [CSV files with redirection and select](#csv-files-with-redirection-and-select) - [Automatic batch processing](#automatic-batch-processing) +- [Process Google Sheet commands and save results](#process-google-sheet-commands-and-save-results) ## Introduction Batch and CSV file processing can improve performance by executing Gam commands in parallel. @@ -156,3 +157,18 @@ If you want to select a `gam.cfg` section for the command, you must select and s ``` gam select
save config auto_batch_min 1 redirect csv ./filelistperms.csv multiprocess group sales@domain.com print filelist fields id,name,mimetype,basicpermissions ``` + +## Process Google Sheet commands and save results +You want to process data from a Google Sheet tab and save the results to another tab in the same sheet. +Make a Google sheet with two tabs: Commands, Results; get the File ID and the two tab IDs. +Put your command data in the Commands tab. + +Run your command, write the results to Results.txt +``` +gam redirect stdout ./Results.txt multiprocess redirect stderr stdout csv gsheet user@domain.com id: gam ... Command +``` + +Upload Results.txt to the Results tab of the sheet. +``` +gam user user@domain.com update drivefile localfile Results.txt retainname gsheet id: +``` diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 09f941ee..8b315b73 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,17 @@ 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.77.03 + +Thanks to jay, added the following Colab License SKUs: +``` +1010500001 - Colab Pro +1010500002 - Colab Pro+ +``` + +Thanks to Jay, updated `gam print|show admins` to properly display addresses +of service accounts with admin role assignments. + ### 6.77.02 Cleaned up problems with some of the new Chat API asadmin commands. diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index a99af82a..9e84675d 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.77.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.77.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 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.77.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.77.03 - 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/Licenses.md b/docs/Licenses.md index 803e3e77..81a6fa65 100644 --- a/docs/Licenses.md +++ b/docs/Licenses.md @@ -24,6 +24,7 @@ | Cloud Identity Free | 101001 | | Cloud Identity Premium | 101005 | | Cloud Search | 101035 | +| Colab | 101050 | | Education Endpoint Management | 101049 | | Gemini | 101047 | | Google Chrome Device Management | Google-Chrome-Device-Management | @@ -49,6 +50,8 @@ | Cloud Identity Free | 1010010001 | cloudidentity | | Cloud Identity Premium | 1010050001 | cloudidentitypremium | | Cloud Search | 1010350001 | cloudsearch | +| Colab Pro | 1010500001 | colabpro | +| Colab Pro+ | 1010500002 | colabpro+ | colabproplus | | Endpoint Education Upgrade | 1010490001 | eeu | | G Suite Basic | Google-Apps-For-Business | gsuitebasic | | G Suite Business | Google-Apps-Unlimited | gsuitebusiness | @@ -123,6 +126,7 @@ 101043 | 101047 | 101049 | + 101050 | Google-Apps | Google-Chrome-Device-Management | Google-Drive-storage | @@ -151,6 +155,8 @@ cloudidentity | identity | 1010010001 | Cloud Identity | cloudidentitypremium | identitypremium | 1010050001 | Cloud Identity Premium | cloudsearch | 1010350001 | Cloud Search | + colabpro | 1010500001 | Colab Pro | + colabpro+ | colabproplus | 1010500002 | Colab Pro+ | eeu | 1010490001 | SKU Endpoint Education Upgrade | geminibiz | 1010470003 | Gemini Business | geminiedu | 1010470004 | Gemini Education | diff --git a/docs/Reseller.md b/docs/Reseller.md index 214e4d57..feb86851 100644 --- a/docs/Reseller.md +++ b/docs/Reseller.md @@ -70,6 +70,8 @@ Thanks to Duncan Isaksen-Loxton for a script to help manage multiple domains. cloudidentity | identity | 1010010001 | Cloud Identity | cloudidentitypremium | identitypremium | 1010050001 | Cloud Identity Premium | cloudsearch | 1010350001 | Cloud Search | + colabpro | 1010500001 | Colab Pro | + colabpro+ | colabproplus | 1010500002 | Colab Pro+ | eeu | 1010490001 | SKU Endpoint Education Upgrade | geminibiz | 1010470003 | Gemini Business | geminiedu | 1010470004 | Gemini Education | diff --git a/docs/Users-Chat.md b/docs/Users-Chat.md index 4d54fd34..3d90e3db 100644 --- a/docs/Users-Chat.md +++ b/docs/Users-Chat.md @@ -360,6 +360,8 @@ By default, Gam displays the information as an indented list of keys and values. ### Display information about all chat spaces, asadmin For query and orderby information, see: https://developers.google.com/workspace/chat/api/reference/rest/v1/spaces/search + +Only spaces of `` `space` are displayed; spaces of `` `groupchat` and `directmessage` are not displayed. ``` gam show chatspaces asadmin [query ] [querytime