deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-05-12 12:17:20 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Added the following license SKU: 1010020034

Browse Source
This commit is contained in:
Ross Scroggs 2025-04-23 15:17:26 -07:00
parent ac31042576
commit 9d17ea2d68
No known key found for this signature in database
GPG Key ID: 54585EA0887857D5
14 changed files with 78 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pyproject.toml
View File

@ -8,18 +8,18 @@ authors = [
{ name="Ross Scroggs", email="Ross.Scroggs@gmail.com" }, { name="Ross Scroggs", email="Ross.Scroggs@gmail.com" },
] ]
dependencies = [ dependencies = [
"chardet", "chardet>=5.2.0",
"cryptography", "cryptography>=44.0.2",
"distro; sys_platform=='linux'", "distro; sys_platform=='linux'",
"filelock", "filelock>=3.18.0",
"google-api-python-client>=2.1", "google-api-python-client>=2.167.0",
"google-auth-httplib2", "google-auth-httplib2>=0.2.0",
"google-auth-oauthlib>=0.4.1", "google-auth-oauthlib>=1.2.2",
"google-auth>=2.3.2", "google-auth>=2.39.0",
"httplib2>=0.17.0", "httplib2>=0.22.0",
"lxml", "lxml",
"passlib>=1.7.2", "passlib>=1.7.4",
"pathvalidate", "pathvalidate>=3.2.3",
"pyscard==2.2.1", "pyscard==2.2.1",
"python-dateutil", "python-dateutil",
] ]
@ -40,7 +40,7 @@ license = {text = "Apache License (2.0)"}
license-files = ["LICEN[CS]E*"] license-files = ["LICEN[CS]E*"]
[project.optional-dependencies] [project.optional-dependencies]
yubikey = ["yubikey-manager>=5.0"] yubikey = ["yubikey-manager>=5.6.1"]
[project.scripts] [project.scripts]
gam = "gam.__main__:main" gam = "gam.__main__:main"

10
src/GamCommands.txt
View File

@ -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 | wsess | workspaceesentials | gsuiteessentials | essentials | d4e | driveenterprise | drive4enterprise | 1010060001 | Google Workspace Essentials |
wsessplus | workspaceessentialsplus | 1010060005 | Google Workspace Essentials Plus | wsessplus | workspaceessentialsplus | 1010060005 | Google Workspace Essentials Plus |
wsflw | workspacefrontline | workspacefrontlineworker | 1010020030 | Google Workspace Frontline Starter | 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 ## 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 ## 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.
<CrOSTypeEntity> ::= <CrOSTypeEntity> ::=
(all cros)| (all cros)|
@ -865,7 +866,7 @@ Specify a collection of ChromeOS devices by directly specifying them or by speci
## Collections of Users ## 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.
<UserTypeEntity> ::= <UserTypeEntity> ::=
(all users|users_ns|users_susp|users_ns_susp)| (all users|users_ns|users_susp|users_ns_susp)|
@ -4458,8 +4459,7 @@ gam report usage customer [todrive <ToDriveAttribute>*]
domain| domain|
drive|doc|docs| drive|doc|docs|
gcp| gcp|
gemini| gemini|geminiforworkspace|
geminiforworkspace|
groups|group| groups|group|
groupsenterprise|enterprisegroups| groupsenterprise|enterprisegroups|
jamboard| jamboard|

7
src/GamUpdate.txt
View File

@ -1,3 +1,10 @@
7.06.10
Added the following license SKU.
```
1010020034 - Google Workspace Frontline Plus
```
7.06.09 7.06.09
Added `gemini` and `geminiforworkspace` to `<ActivityApplicationName>` for use in Added `gemini` and `geminiforworkspace` to `<ActivityApplicationName>` for use in

2
src/gam/__init__.py
View File

@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
""" """
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>' __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
__version__ = '7.06.09' __version__ = '7.06.10'
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
#pylint: disable=wrong-import-position #pylint: disable=wrong-import-position

2
src/gam/gamlib/glskus.py
View File

@ -144,6 +144,8 @@ _SKUS = {
'product': 'Google-Apps', 'aliases': ['wsflw', 'workspacefrontline', 'workspacefrontlineworker'], 'displayName': 'Google Workspace Frontline Starter'}, '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'}, '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': { '1010340001': {
'product': '101034', 'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'], 'displayName': 'Google Workspace Enterprise Plus - Archived User'}, 'product': '101034', 'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'], 'displayName': 'Google Workspace Enterprise Plus - Archived User'},
'1010340002': { '1010340002': {

27
src/gam/gamlib/glverlibs.py
View File

@ -20,14 +20,19 @@
""" """
GAM_VER_LIBS = ['cryptography', GAM_VER_LIBS = [
'filelock', 'chardet',
'google-api-python-client', 'cryptography',
'google-auth-httplib2', 'filelock',
'google-auth-oauthlib', 'google-api-python-client',
'google-auth', 'google-auth-httplib2',
'httplib2', 'google-auth-oauthlib',
'passlib', 'google-auth',
'python-dateutil', 'lxml',
'yubikey-manager', 'httplib2',
] 'passlib',
'pathvalidate',
'pyscard',
'python-dateutil',
'yubikey-manager',
]

BIN
src/license.rtf
View File

Binary file not shown.

16
src/requirements.txt
View File

@ -1,15 +1,15 @@
chardet chardet>=5.2.0
cryptography cryptography>=44.0.2
distro; sys_platform=='linux' distro; sys_platform=='linux'
filelock filelock>=3.18.0
google-api-python-client>=2.166.0 google-api-python-client>=2.167.0
google-auth-httplib2>=0.2.0 google-auth-httplib2>=0.2.0
google-auth-oauthlib>=1.2.1 google-auth-oauthlib>=1.2.2
google-auth>=2.38.0 google-auth>=2.39.0
httplib2>=0.22.0 httplib2>=0.22.0
lxml lxml
passlib>=1.7.4 passlib>=1.7.4
pathvalidate pathvalidate>=3.2.3
pyscard==2.2.1 pyscard==2.2.1
python-dateutil python-dateutil
yubikey-manager[yubikey]>=5.6.1 yubikey-manager>=5.6.1

22
src/setup.cfg
View File

@ -23,21 +23,21 @@ classifiers =
packages = find: packages = find:
python_requires = >= 3.8 python_requires = >= 3.8
install_requires = install_requires =
chardet chardet >= 5.2.0
cryptography cryptography >= 44.0.2
distro; sys_platform == 'linux' distro; sys_platform == 'linux'
filelock filelock >= 3.18.0
google-api-python-client >= 2.36 google-api-python-client >= 2.167.0
google-auth-httplib2 google-auth-httplib2 >= 0.2.0
google-auth-oauthlib >= 0.4.6 google-auth-oauthlib >= 1.2.2
google-auth >= 2.3.3 google-auth >= 2.39.0
httplib2 >= 0.20.2 httplib2 >= 0.22.0
lxml lxml
passlib >= 1.7.4 passlib >= 1.7.4
pathvalidate pathvalidate >= 3.2.3
pyscard==2.2.1 pyscard == 2.2.1
python-dateutil python-dateutil
yubikey-manager >= 5.0 yubikey-manager >= 5.6.1
[options.package_data] [options.package_data]
* = *.pem * = *.pem

7
wiki/GamUpdates.md
View File

@ -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 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 ### 7.06.09
Added `gemini` and `geminiforworkspace` to `<ActivityApplicationName>` for use in Added `gemini` and `geminiforworkspace` to `<ActivityApplicationName>` for use in

4
wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md
View File

@ -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$ rm -f /Users/admin/GAMConfig/oauth2.txt
admin@server:/Users/admin$ gam version 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 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 <google-apps-manager@googlegroups.com> GAM Team <google-apps-manager@googlegroups.com>
Python 3.13.3 64-bit final Python 3.13.3 64-bit final
MacOS Sequoia 15.4.1 x86_64 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:\>del C:\GAMConfig\oauth2.txt
C:\>gam version C:\>gam version
WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found 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 <google-apps-manager@googlegroups.com> GAM Team <google-apps-manager@googlegroups.com>
Python 3.13.3 64-bit final Python 3.13.3 64-bit final
Windows-10-10.0.17134 AMD64 Windows-10-10.0.17134 AMD64

1
wiki/Licenses.md
View File

@ -110,6 +110,7 @@
| Google Workspace for Education: Teaching and Learning Upgrade | 1010370001 | gwetlu | | Google Workspace for Education: Teaching and Learning Upgrade | 1010370001 | gwetlu |
| Google Workspace Frontline Starter | 1010020030 | wsflw | | Google Workspace Frontline Starter | 1010020030 | wsflw |
| Google Workspace Frontline Standard | 1010020031 | wsflwstan | | Google Workspace Frontline Standard | 1010020031 | wsflwstan |
| Google Workspace Frontline Plus | 1010020034 | wsflwplus |
| Google Workspace Government | Google-Apps-For-Government | gsuitegov | | Google Workspace Government | Google-Apps-For-Government | gsuitegov |
| Google Workspace Labs | 1010470002 | gwlabs | workspacelabs | | Google Workspace Labs | 1010470002 | gwlabs | workspacelabs |

3
wiki/Reports.md
View File

@ -51,8 +51,7 @@ config csv_output_row_filter "'\"accounts:used_quota_in_mb\":count>15000'"
domain| domain|
drive|doc|docs| drive|doc|docs|
gcp| gcp|
gemini| gemini|geminiforworkspace|
geminiforworkspace|
groups|group| groups|group|
groupsenterprise|enterprisegroups| groupsenterprise|enterprisegroups|
jamboard| jamboard|

12
wiki/Version-and-Help.md
View File

@ -4,7 +4,7 @@ k
Print the current version of Gam with details Print the current version of Gam with details
``` ```
gam version 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 <google-apps-manager@googlegroups.com> GAM Team <google-apps-manager@googlegroups.com>
Python 3.13.3 64-bit final Python 3.13.3 64-bit final
MacOS Sequoia 15.4.1 x86_64 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 Print the current version of Gam with details and time offset information
``` ```
gam version timeoffset 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 <google-apps-manager@googlegroups.com> GAM Team <google-apps-manager@googlegroups.com>
Python 3.13.3 64-bit final Python 3.13.3 64-bit final
MacOS Sequoia 15.4.1 x86_64 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 Print the current version of Gam with extended details and SSL information
``` ```
gam version extended 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 <google-apps-manager@googlegroups.com> GAM Team <google-apps-manager@googlegroups.com>
Python 3.13.3 64-bit final Python 3.13.3 64-bit final
MacOS Sequoia 15.4.1 x86_64 MacOS Sequoia 15.4.1 x86_64
@ -65,7 +65,7 @@ MacOS High Sierra 10.13.6 x86_64
Path: /Users/Admin/bin/gam7 Path: /Users/Admin/bin/gam7
Version Check: Version Check:
Current: 5.35.08 Current: 5.35.08
Latest: 7.06.09 Latest: 7.06.10
echo $? echo $?
1 1
``` ```
@ -73,7 +73,7 @@ echo $?
Print the current version number without details Print the current version number without details
``` ```
gam version simple gam version simple
7.06.09 7.06.10
``` ```
In Linux/MacOS you can do: In Linux/MacOS you can do:
``` ```
@ -83,7 +83,7 @@ echo $VER
Print the current version of Gam and address of this Wiki Print the current version of Gam and address of this Wiki
``` ```
gam help gam help
GAM 7.06.09 - https://github.com/GAM-team/GAM GAM 7.06.10 - https://github.com/GAM-team/GAM
GAM Team <google-apps-manager@googlegroups.com> GAM Team <google-apps-manager@googlegroups.com>
Python 3.13.3 64-bit final Python 3.13.3 64-bit final
MacOS Sequoia 15.4.1 x86_64 MacOS Sequoia 15.4.1 x86_64