From 9d17ea2d68bf3083fab4bb1b0672052ec17c0335 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Wed, 23 Apr 2025 15:17:26 -0700 Subject: [PATCH] Added the following license SKU: 1010020034 --- pyproject.toml | 22 +++++++++--------- src/GamCommands.txt | 10 ++++---- src/GamUpdate.txt | 7 ++++++ src/gam/__init__.py | 2 +- src/gam/gamlib/glskus.py | 2 ++ src/gam/gamlib/glverlibs.py | 27 +++++++++++++--------- src/license.rtf | Bin 1006 -> 1107 bytes src/requirements.txt | 16 ++++++------- src/setup.cfg | 22 +++++++++--------- wiki/GamUpdates.md | 7 ++++++ wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md | 4 ++-- wiki/Licenses.md | 1 + wiki/Reports.md | 3 +-- wiki/Version-and-Help.md | 12 +++++----- 14 files changed, 78 insertions(+), 57 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dc08430c..240bad90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,18 +8,18 @@ authors = [ { name="Ross Scroggs", email="Ross.Scroggs@gmail.com" }, ] dependencies = [ - "chardet", - "cryptography", + "chardet>=5.2.0", + "cryptography>=44.0.2", "distro; sys_platform=='linux'", - "filelock", - "google-api-python-client>=2.1", - "google-auth-httplib2", - "google-auth-oauthlib>=0.4.1", - "google-auth>=2.3.2", - "httplib2>=0.17.0", + "filelock>=3.18.0", + "google-api-python-client>=2.167.0", + "google-auth-httplib2>=0.2.0", + "google-auth-oauthlib>=1.2.2", + "google-auth>=2.39.0", + "httplib2>=0.22.0", "lxml", - "passlib>=1.7.2", - "pathvalidate", + "passlib>=1.7.4", + "pathvalidate>=3.2.3", "pyscard==2.2.1", "python-dateutil", ] @@ -40,7 +40,7 @@ license = {text = "Apache License (2.0)"} license-files = ["LICEN[CS]E*"] [project.optional-dependencies] -yubikey = ["yubikey-manager>=5.0"] +yubikey = ["yubikey-manager>=5.6.1"] [project.scripts] gam = "gam.__main__:main" diff --git a/src/GamCommands.txt b/src/GamCommands.txt index 519d660b..e47893ee 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -322,7 +322,8 @@ If an item contains spaces, it should be surrounded by ". wsess | workspaceesentials | gsuiteessentials | essentials | d4e | driveenterprise | drive4enterprise | 1010060001 | Google Workspace Essentials | wsessplus | workspaceessentialsplus | 1010060005 | Google Workspace Essentials Plus | wsflw | workspacefrontline | workspacefrontlineworker | 1010020030 | Google Workspace Frontline Starter | - wsflwstan | workspacefrontlinestan | workspacefrontlineworkerstan | 1010020031 | Google Workspace Frontline Standard + wsflwstan | workspacefrontlinestan | workspacefrontlineworkerstan | 1010020031 | Google Workspace Frontline Standard | + wsflwplus | workspacefrontlineplus | workspacefrontlineworkerplus | 1010020034 | Google Workspace Frontline Plus ## Items built from primitives @@ -782,7 +783,7 @@ Items, separated by spaces, with spaces, commas or single quotes in the items th ## Collections of ChromeOS Devices -Specify a collection of ChromeOS devices by directly specifying them or by specifiying items that will yield a list of ChromeOS devices. +Specify a collection of ChromeOS devices by directly specifying them or by specifying items that will yield a list of ChromeOS devices. ::= (all cros)| @@ -865,7 +866,7 @@ Specify a collection of ChromeOS devices by directly specifying them or by speci ## Collections of Users -Specify a collection of Users by directly specifying them or by specifiying items that will yield a list of users. +Specify a collection of Users by directly specifying them or by specifying items that will yield a list of users. ::= (all users|users_ns|users_susp|users_ns_susp)| @@ -4458,8 +4459,7 @@ gam report usage customer [todrive *] domain| drive|doc|docs| gcp| - gemini| - geminiforworkspace| + gemini|geminiforworkspace| groups|group| groupsenterprise|enterprisegroups| jamboard| diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 259b2b24..18554aa4 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,10 @@ +7.06.10 + +Added the following license SKU. +``` +1010020034 - Google Workspace Frontline Plus +``` + 7.06.09 Added `gemini` and `geminiforworkspace` to `` for use in diff --git a/src/gam/__init__.py b/src/gam/__init__.py index bf4d2a54..ed9ed11b 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki """ __author__ = 'GAM Team ' -__version__ = '7.06.09' +__version__ = '7.06.10' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' #pylint: disable=wrong-import-position diff --git a/src/gam/gamlib/glskus.py b/src/gam/gamlib/glskus.py index 4a1df4fd..349acae1 100644 --- a/src/gam/gamlib/glskus.py +++ b/src/gam/gamlib/glskus.py @@ -144,6 +144,8 @@ _SKUS = { 'product': 'Google-Apps', 'aliases': ['wsflw', 'workspacefrontline', 'workspacefrontlineworker'], 'displayName': 'Google Workspace Frontline Starter'}, '1010020031': { 'product': 'Google-Apps', 'aliases': ['wsflwstan', 'workspacefrontlinestan', 'workspacefrontlineworkerstan'], 'displayName': 'Google Workspace Frontline Standard'}, + '1010020034': { + 'product': 'Google-Apps', 'aliases': ['wsflwplus', 'workspacefrontlineplus', 'workspacefrontlineworkerplus'], 'displayName': 'Google Workspace Frontline Plus'}, '1010340001': { 'product': '101034', 'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'], 'displayName': 'Google Workspace Enterprise Plus - Archived User'}, '1010340002': { diff --git a/src/gam/gamlib/glverlibs.py b/src/gam/gamlib/glverlibs.py index f2620a98..abd8eef4 100644 --- a/src/gam/gamlib/glverlibs.py +++ b/src/gam/gamlib/glverlibs.py @@ -20,14 +20,19 @@ """ -GAM_VER_LIBS = ['cryptography', - 'filelock', - 'google-api-python-client', - 'google-auth-httplib2', - 'google-auth-oauthlib', - 'google-auth', - 'httplib2', - 'passlib', - 'python-dateutil', - 'yubikey-manager', - ] +GAM_VER_LIBS = [ + 'chardet', + 'cryptography', + 'filelock', + 'google-api-python-client', + 'google-auth-httplib2', + 'google-auth-oauthlib', + 'google-auth', + 'lxml', + 'httplib2', + 'passlib', + 'pathvalidate', + 'pyscard', + 'python-dateutil', + 'yubikey-manager', +] diff --git a/src/license.rtf b/src/license.rtf index 86e852c91f221109f0bc6cd7e87ae70c4da0bef9..a560233fcb8ddd40be13c0af50afabfc76889826 100644 GIT binary patch delta 545 zcma)3O-chX7-goEO7H-JREF-XD4F2cLRVS}rFevIlgT9QU^*Ey=^r{2Zy;pvZ3Ooo z!kuR@Go`yy%;Njr_ww@cLVjD{C+}xlrkJAI2+}76K|LA1HU*_ zt3WIl-1S=41-{N{mhgn_^^S*S%2%t9V2o=x3#0z+4nCz>f)ONK7#jD8gE`enUG@|d zlJxGjuFV(Hgiugt1kbDznRGfcJQI`|r7=Rg*Afx{6F3;Ee4{HxKro4d3Ec#boWsF8 zj+%xLH)~6K?%j_Mp06_gJ7SD0H~Z!d?U#4iLVyCdtmn7Aj=k`^r=7BNKPVGjNMqan cRkJKzZ2RGl?2kXRH;svXZH(+^Bk)oA2ikeN@&Et; delta 472 zcmZvY&q~8U5XLpFsD<3ciwokxDrJ+j73oPzL2D7|O&E|(vYRe$H+8d7N(g-gAvce{ zl5e5nGq_3pgXkQFVfLHfH#^T8@9Pg+i;yygLB=T$;^~ZNFbzRu| zlUx7`CPXDvW7H>t`-=DS+-_tL#3EKkiF%-Dh#^vxN({b8soUxFDoqn2DybqmR%pzF z2@PGmKn`x}I8-GCU5?6uNN|IkZuAc1uFa7Q57rR!!UMdS_?H^Vn zOAllsGk4-tgc&q}iIB@gXQx+}gYoF>;=FjV4s4X?Mk7L%2%QzLR&xhZfgxZxH}U=5.2.0 +cryptography>=44.0.2 distro; sys_platform=='linux' -filelock -google-api-python-client>=2.166.0 +filelock>=3.18.0 +google-api-python-client>=2.167.0 google-auth-httplib2>=0.2.0 -google-auth-oauthlib>=1.2.1 -google-auth>=2.38.0 +google-auth-oauthlib>=1.2.2 +google-auth>=2.39.0 httplib2>=0.22.0 lxml passlib>=1.7.4 -pathvalidate +pathvalidate>=3.2.3 pyscard==2.2.1 python-dateutil -yubikey-manager[yubikey]>=5.6.1 +yubikey-manager>=5.6.1 diff --git a/src/setup.cfg b/src/setup.cfg index 4755fd10..253daf3c 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -23,21 +23,21 @@ classifiers = packages = find: python_requires = >= 3.8 install_requires = - chardet - cryptography + chardet >= 5.2.0 + cryptography >= 44.0.2 distro; sys_platform == 'linux' - filelock - google-api-python-client >= 2.36 - google-auth-httplib2 - google-auth-oauthlib >= 0.4.6 - google-auth >= 2.3.3 - httplib2 >= 0.20.2 + filelock >= 3.18.0 + google-api-python-client >= 2.167.0 + google-auth-httplib2 >= 0.2.0 + google-auth-oauthlib >= 1.2.2 + google-auth >= 2.39.0 + httplib2 >= 0.22.0 lxml passlib >= 1.7.4 - pathvalidate - pyscard==2.2.1 + pathvalidate >= 3.2.3 + pyscard == 2.2.1 python-dateutil - yubikey-manager >= 5.0 + yubikey-manager >= 5.6.1 [options.package_data] * = *.pem diff --git a/wiki/GamUpdates.md b/wiki/GamUpdates.md index 5d369d01..b0c9cd00 100644 --- a/wiki/GamUpdates.md +++ b/wiki/GamUpdates.md @@ -10,6 +10,13 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads-Installs-GAM7](https://github.com/GAM-team/GAM/wiki/Downloads-Installs) for Windows or other options, including manual installation +### 7.06.10 + +Added the following license SKU. +``` +1010020034 - Google Workspace Frontline Plus +``` + ### 7.06.09 Added `gemini` and `geminiforworkspace` to `` for use in diff --git a/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md b/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md index 099ffd5b..49d02187 100644 --- a/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md +++ b/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.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 -GAM 7.06.09 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.06.10 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.13.3 64-bit final MacOS Sequoia 15.4.1 x86_64 @@ -989,7 +989,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 -GAM 7.06.09 - https://github.com/GAM-team/GAM - pythonsource +GAM 7.06.10 - https://github.com/GAM-team/GAM - pythonsource GAM Team Python 3.13.3 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/wiki/Licenses.md b/wiki/Licenses.md index 22122fcf..c951800c 100644 --- a/wiki/Licenses.md +++ b/wiki/Licenses.md @@ -110,6 +110,7 @@ | Google Workspace for Education: Teaching and Learning Upgrade | 1010370001 | gwetlu | | Google Workspace Frontline Starter | 1010020030 | wsflw | | Google Workspace Frontline Standard | 1010020031 | wsflwstan | +| Google Workspace Frontline Plus | 1010020034 | wsflwplus | | Google Workspace Government | Google-Apps-For-Government | gsuitegov | | Google Workspace Labs | 1010470002 | gwlabs | workspacelabs | diff --git a/wiki/Reports.md b/wiki/Reports.md index 1a7a95da..1a4f9f10 100644 --- a/wiki/Reports.md +++ b/wiki/Reports.md @@ -51,8 +51,7 @@ config csv_output_row_filter "'\"accounts:used_quota_in_mb\":count>15000'" domain| drive|doc|docs| gcp| - gemini| - geminiforworkspace| + gemini|geminiforworkspace| groups|group| groupsenterprise|enterprisegroups| jamboard| diff --git a/wiki/Version-and-Help.md b/wiki/Version-and-Help.md index b1ed95e2..0dd4d41d 100644 --- a/wiki/Version-and-Help.md +++ b/wiki/Version-and-Help.md @@ -4,7 +4,7 @@ k Print the current version of Gam with details ``` gam version -GAM 7.06.09 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.06.10 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.13.3 64-bit final MacOS Sequoia 15.4.1 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 -GAM 7.06.09 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.06.10 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.13.3 64-bit final MacOS Sequoia 15.4.1 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 -GAM 7.06.09 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.06.10 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.13.3 64-bit final MacOS Sequoia 15.4.1 x86_64 @@ -65,7 +65,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gam7 Version Check: Current: 5.35.08 - Latest: 7.06.09 + Latest: 7.06.10 echo $? 1 ``` @@ -73,7 +73,7 @@ echo $? Print the current version number without details ``` gam version simple -7.06.09 +7.06.10 ``` 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 7.06.09 - https://github.com/GAM-team/GAM +GAM 7.06.10 - https://github.com/GAM-team/GAM GAM Team Python 3.13.3 64-bit final MacOS Sequoia 15.4.1 x86_64