diff --git a/docs/Authorization.md b/docs/Authorization.md index ce412d70..bf794524 100644 --- a/docs/Authorization.md +++ b/docs/Authorization.md @@ -231,6 +231,13 @@ gam create gcpfolder [admin Create a new project to create and download two files: `client_secrets.json` for the Client and `oauth2service.json` for the Service Account. On-screen instructions lead you through the process. +An existing project, `GAM Project Creation`, is used to create your GAM project. The initial instructions tell you how to +enable this project as a trusted app as your workspace may not allow untrusted third-party apps. You can skip these steps +if you know that untrusted third-party apps are allowed. + +The final instructions tell you how to enable your new GAM project as a trusted app as your workspace may not allow untrusted third-party apps. +You can skip these steps if you know that untrusted third-party apps are allowed. + ### Default values * `` - "GAM" * `` - "gam-project-abc-def-jki" where "abc-def-ghi" are randomly generated diff --git a/docs/Calendars-Events.md b/docs/Calendars-Events.md index a4888a9a..26292f25 100644 --- a/docs/Calendars-Events.md +++ b/docs/Calendars-Events.md @@ -466,7 +466,7 @@ No events are deleted unless you specify the `doit` option; omit `doit` to verif When events are deleted from a calendar, they are moved to the calendar's trash and are only permanently deleted (purged) after 30 days. Following a suggestion here (https://stackoverflow.com/questions/41043053/how-to-empty-calendar-trash-via-google-services) you can permanently delete -calendar events. This is achieved by creating a temporary calendar, deleting the events, moving the deleted events to the temporary calendar +calendar events with `purge events`. This is achieved by creating a temporary calendar, deleting the events, moving the deleted events to the temporary calendar and then deleting the temporary calendar. ## Delete all calendar events diff --git a/docs/ChromeOS-Devices.md b/docs/ChromeOS-Devices.md index abe630eb..cb1c8381 100644 --- a/docs/ChromeOS-Devices.md +++ b/docs/ChromeOS-Devices.md @@ -23,6 +23,7 @@ - [Print a header row and fields for selected CrOS devices](#print-a-header-row-and-fields-for-selected-cros-devices) - [Print a header row and fields for specified CrOS devices](#print-a-header-row-and-fields-for-specified-cros-devices) - [Display Examples](#display-examples) + - [Display CrOS device count](#display-cros-device-count) - [Print ChromeOS device activity](#print-chromeos-device-activity) - [Print a header row and activity for selected CrOS devices](#print-a-header-row-and-activity-for-selected-cros-devices) - [Print a header row and activity for specified CrOS devices](#print-a-header-row-and-activity-for-specified-cros-devices) @@ -672,6 +673,12 @@ Print information about CrOS devices synced between 45 days ago and 30 days ago: gam print cros query "sync:#querytime1#..#querytime2#" querytime1 -45d querytime2 -30d ``` +## Display CrOS device count +Display the number of CrOS devices in an entity. +``` +gam show count +``` + ## Print ChromeOS device activity ### Print a header row and activity for selected CrOS devices diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 37b8e638..f52dd1b6 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,16 @@ 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.63.10 + +Added commands to show the number of CrOS devices or Users in an entity. +``` +gam show count +gam show count +``` + +Updated `gam create project` to prompt user to mark `GAM Project Creation` as a trusted app. + ### 6.63.09 Updated `gam create teamdrive` to handle the following error: diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index ebacb76f..d0f1f7f7 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -330,7 +330,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.63.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.63.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.10.8 64-bit final MacOS High Sierra 10.13.6 x86_64 @@ -972,7 +972,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.63.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.63.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.11.5 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Users-Calendars-Events.md b/docs/Users-Calendars-Events.md index e72e0fb6..f1004f2b 100644 --- a/docs/Users-Calendars-Events.md +++ b/docs/Users-Calendars-Events.md @@ -548,8 +548,8 @@ No events are deleted unless you specify the `doit` option; omit `doit` to verif When events are deleted from a calendar, they are moved to the calendar's trash and are only permanently deleted (purged) after 30 days. Following a suggestion here (https://stackoverflow.com/questions/41043053/how-to-empty-calendar-trash-via-google-services) you can permanently delete -calendar events. This is achieved by creating a temporary calendar, deleting the events, moving the deleted events to the temporary calendar -and then deleting the temporary calendar. +calendar events with `purge events`. This is achieved by creating a temporary calendar, deleting the events, moving the deleted events to the temporary calendar +and then deleting the temporary calendar. ## Delete all calendar events For a user's primary calendar: diff --git a/docs/Users.md b/docs/Users.md index 237b98a4..e22c5bbf 100644 --- a/docs/Users.md +++ b/docs/Users.md @@ -38,6 +38,7 @@ - [Print domain counts for users in a specific domain and/or selected by a query](#print-domain-counts-for-users-in-a-specific-domain-and-or-selected-by-a-query) - [Print domain counts for users specified by ``](#print-domain-counts-for-users-specified-by-usertypeentity) - [Print user list](#print-user-list) +- [Display user count](#display-user-count) ## API documentation * https://developers.google.com/admin-sdk/directory/reference/rest/v1/users @@ -1087,7 +1088,7 @@ When using the `formatjson` option, double quotes are used extensively in the da The `quotechar ` option allows you to choose an alternate quote character, single quote for instance, that makes for readable/processable output. `quotechar` defaults to `gam.cfg/csv_output_quote_char`. When uploading CSV files to Google, double quote `"` should be used. -### Print user list +## Print user list Print a CSV file with headers `title,count,users` that displays the list of users in `` in a single row. ``` gam print userlist [todrive *] @@ -1177,4 +1178,11 @@ Got 12 Users in the Organizational Unit for /Test... Got 4 Users directly in the Organizational Unit for /Test $ more UsersList.csv ["testuser1@domain.org", "testuser2@domain.org", "testuser3@domain.org", "testuser4@domain.org"] -``` \ No newline at end of file +``` + +## Display user count +Display the number of users in an entity. +``` +gam show count +``` + diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 39bbafcb..68fe0438 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.63.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.63.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.11.5 64-bit final MacOS Monterey 12.6.6 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.63.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.63.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.11.5 64-bit final MacOS Monterey 12.6.6 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.63.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.63.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.11.5 64-bit final MacOS Monterey 12.6.6 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.63.09 + Latest: 6.63.10 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.63.09 +6.63.10 ``` 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.63.09 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.63.10 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.11.5 64-bit final MacOS Monterey 12.6.6 x86_64 diff --git a/src/GamCommands.txt b/src/GamCommands.txt index c067de61..bb14c476 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -2295,6 +2295,10 @@ Print no header row and deviceId for specified CrOS devices. gam print gam print cros +Show count of CrOS devices + +gam show count + Print activity for selected CrOS devices; use these options to select CrOS devices: [(query )|(queries ) [querytime.*