From f12b36701932ec578222c9c956f185798d5cb532 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Sat, 22 Mar 2025 09:32:08 -0700 Subject: [PATCH] Updated license product names to match Google. --- src/GamUpdate.txt | 6 +++++- src/gam/__init__.py | 2 +- src/gam/gamlib/glskus.py | 8 ++++---- src/project-apis.txt | 23 ----------------------- 4 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 src/project-apis.txt diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 3f32e734..4f34ef0c 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,7 @@ +7.05.13 + +Updated license product names to match Google. + 7.05.12 Fixed bug in `gam update chromepolicy` where `appid` was misinterpreted for `chrome.devices.kiosk` policies @@ -6,7 +10,7 @@ and an error was generated. ERROR: Chrome Policy Schema: customers/C123abc456/policySchemas/, Does not exist ``` -!7.05.11 +7.05.11 Added the following License SKUs: ``` diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 8e9fc4cd..167c9e64 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.05.12' +__version__ = '7.05.13' __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 3099cabd..d0a59862 100644 --- a/src/gam/gamlib/glskus.py +++ b/src/gam/gamlib/glskus.py @@ -22,7 +22,7 @@ # Products/SKUs _PRODUCTS = { - '101001': 'Cloud Identity Free', + '101001': 'Cloud Identity', '101005': 'Cloud Identity Premium', '101031': 'Google Workspace for Education', '101033': 'Google Voice', @@ -127,7 +127,7 @@ _SKUS = { 'product': 'Google-Apps', 'aliases': ['gau', 'gsb', 'unlimited', 'gsuitebusiness'], 'displayName': 'G Suite Business'}, '1010020020': { 'product': 'Google-Apps', 'aliases': ['gae', 'gse', 'enterprise', 'gsuiteenterprise', - 'wsentplus', 'workspaceenterpriseplus'], 'displayName': 'Google Workspace Enterprise Plus'}, + 'wsentplus', 'workspaceenterpriseplus'], 'displayName': 'Google Workspace Enterprise Plus (formerly G Suite Enterprise)'}, '1010020025': { 'product': 'Google-Apps', 'aliases': ['wsbizplus', 'workspacebusinessplus'], 'displayName': 'Google Workspace Business Plus'}, '1010020026': { @@ -159,11 +159,11 @@ _SKUS = { '1010060001': { 'product': '101006', 'aliases': ['gsuiteessentials', 'essentials', 'd4e', 'driveenterprise', 'drive4enterprise', - 'wsess', 'workspaceesentials'], 'displayName': 'Google Workspace Essentials'}, + 'wsess', 'workspaceesentials'], 'displayName': 'Google Workspace Essentials (formerly G Suite Essentials)'}, '1010060003': { 'product': 'Google-Apps', 'aliases': ['wsentess', 'workspaceenterpriseessentials'], 'displayName': 'Google Workspace Enterprise Essentials'}, '1010060005': { - 'product': 'Google-Apps', 'aliases': ['wsessplus', 'workspaceessentialsplus'], 'displayName': 'Google Workspace Essentials Plus'}, + 'product': 'Google-Apps', 'aliases': ['wsessplus', 'workspaceessentialsplus'], 'displayName': 'Google Workspace Enterprise Essentials Plus'}, 'Google-Drive-storage-20GB': { 'product': 'Google-Drive-storage', 'aliases': ['drive20gb', '20gb', 'googledrivestorage20gb'], 'displayName': 'Google Drive Storage 20GB'}, 'Google-Drive-storage-50GB': { diff --git a/src/project-apis.txt b/src/project-apis.txt deleted file mode 100644 index c2a01468..00000000 --- a/src/project-apis.txt +++ /dev/null @@ -1,23 +0,0 @@ -accesscontextmanager.googleapis.com -admin.googleapis.com -alertcenter.googleapis.com -calendar-json.googleapis.com -chat.googleapis.com -chromemanagement.googleapis.com -chromepolicy.googleapis.com -classroom.googleapis.com -cloudidentity.googleapis.com -cloudresourcemanager.googleapis.com -contacts.googleapis.com -drive.googleapis.com -driveactivity.googleapis.com -iap.googleapis.com -gmail.googleapis.com -groupssettings.googleapis.com -iam.googleapis.com -licensing.googleapis.com -reseller.googleapis.com -sheets.googleapis.com -siteverification.googleapis.com -storage-api.googleapis.com -vault.googleapis.com