gam7 7.13.3__tar.gz → 7.14.0__tar.gz

{gam7-7.13.3 → gam7-7.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.13.3
+Version: 7.14.0
 Summary: CLI tool to manage Google Workspace
 Project-URL: Homepage, https://github.com/GAM-team/GAM
 Project-URL: Issues, https://github.com/GAM-team/GAM/issues

{gam7-7.13.3 → gam7-7.14.0}/src/GamCommands.txt

@@ -622,6 +622,14 @@ If an item contains spaces, it should be surrounded by ".
         gs://<StorageBucketName>/<StorageObjectName>|
         <StorageBucketName>/<StorageObjectName>
 <Tag> ::= <String>
+<TagManagerAccountID> ::= <String>
+<TagManagerAccountPath> ::= accounts/<TagManagerAccountID>
+<TagManagerContainerID> ::= <String>
+<TagManagerContainerPath> ::= accounts/<TagManagerAccountID>/containers/<TagManagerContainerID>
+<TagManagerWorkspaceID> ::= <String>
+<TagManagerWorkspacePath> ::= accounts/<TagManagerAccountID>/containers/<TagManagerContainerID>/workspaces/<TagManagerWorkspaceID>
+<TagManagerTagID> ::= <String>
+<TagManagerTagPath> ::= accounts/<TagManagerAccountID>/containers/<TagManagerContainerID>/workspaces/<TagManagerWorkspaceID>/tags/<TagManagerTagID>
 <TakeoutBucketName> ::= takeout-export-[a-f,0-9,-]*
 <TaskID> ::= <String>
 <TaskListID> ::= <String>
@@ -771,6 +779,9 @@ If an item contains spaces, it should be surrounded by ".
 <SharedDriveACLRoleList> ::= "<SharedDriveACLRole>(,<SharedDriveACLRole>)*"
 <SharedDriveIDList> ::= "<SharedDriveID>(,<SharedDriveID>)*"
 <StringList> ::= "<String>(,<String>)*"
+<TagManagerAccountPathList> ::= "<TagManagerAccountPath>(,<TagManagerAccountPath>)*"
+<TagManagerContainerPathList> ::= "<TagManagerContainerPath>(,<TagManagerContainerPath>)*"
+<TagManagerWorkspacePathList> ::= "<TagManagerWorkspacePath>(,<TagManagerWorkspacePath>)*"
 <TasklistIDList> ::= "<TasklistID>(,<TasklistID>)*"
 <TasklistTitleList> ::= "'<TasklistTitle>'(,'<TasklistTitle>')*"
 <TasklistIDTaskIDList> ::= "<TasklistIDTaskID>(,<TasklistIDTaskID>)*"
@@ -1026,7 +1037,10 @@ Specify a collection of items by directly specifying them; the item type is dete
 <CalendarEntity> ::=
         <CalendarList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <ChromeProfileNameEntity> ::=
-        <ChromeProfileNameList> | <FileSelector> | <CSVFileSelector>
+        <ChromeProfileNameList> |
+        (select <FileSelector>|<CSVFileSelector>) |
+        (filter <String> (filtertime<String> <Time>)* [orderby <ChromeProfileOrderByFieldName> [ascending|descending]]) |
+        (commands <ChromeProfileCommandNameList>|<FileSelector>|<CSVFileSelector>)
 <CIPolicyNameEntity> ::=
         <CIPolicyNameList> | <FileSelector> | <CSVFileSelector>
 <ClassificationLabelNameEntity> ::=
@@ -1229,6 +1243,15 @@ Specify a collection of items by directly specifying them; the item type is dete
         <SiteACLScopeList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <SiteEntity> ::=
         <SiteList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
+<TagManagerAccountPathEntity> ::=
+        <TagManagerAccountPathList> |
+        (select <FileSelector>|<CSVFileSelector>) |
+<TagManagerContainerPathEntity> ::=
+        <TagManagerContainerPathList> |
+        (select <FileSelector>|<CSVFileSelector>) |
+<TagManagerWorkspacePathEntity> ::=
+        <TagManagerWorkspacePathList> |
+        (select <FileSelector>|<CSVFileSelector>) |
 <TasklistEntity> ::=
         <TasklistIDList> | <TaskListTitleList> | <FileSelector> | <CSVFileSelector>
 <TasklistIDTaskIDEntity> ::=
@@ -8337,6 +8360,59 @@ gam <UserTypeEntity> profile share|shared|unshare|unshared
 
 gam <UserTypeEntity> show profile
 
+# Users - Tag Manager
+
+<TagManagerAccountID> ::= <String>
+<TagManagerAccountPath> ::= accounts/<TagManagerAccountID>
+<TagManagerAccountPathList> ::= "<TagManagerAccountPath>(,<TagManagerAccountPath>)*"
+<TagManagerAccountPathEntity> ::=
+        <TagManagerAccountPathList> |
+        (select <FileSelector>|<CSVFileSelector>) |
+
+<TagManagerContainerID> ::= <String>
+<TagManagerContainerPath> ::= accounts/<TagManagerAccountID>/containers/<TagManagerContainerID>
+<TagManagerContainerPathList> ::= "<TagManagerContainerPath>(,<TagManagerContainerPath>)*"
+<TagManagerContainerPathEntity> ::=
+        <TagManagerContainerPathList> |
+        (select <FileSelector>|<CSVFileSelector>) |
+
+<TagManagerWorkspaceID> ::= <String>
+<TagManagerWorkspacePath> ::= accounts/<TagManagerAccountID>/containers/<TagManagerContainerID>/workspaces/<TagManagerWorkspaceID>
+<TagManagerWorkspacePathList> ::= "<TagManagerWorkspacePath>(,<TagManagerWorkspacePath>)*"
+<TagManagerWorkspacePathEntity> ::=
+        <TagManagerWorkspacePathList> |
+        (select <FileSelector>|<CSVFileSelector>) |
+
+<TagManagerTagID> ::= <String>
+<TagManagerTagPath> ::= accounts/<TagManagerAccountID>/containers/<TagManagerContainerID>/workspaces/<TagManagerWorkspaceID>/tags/<TagManagerTagID>
+
+gam <UserTypeEntity> show tagmanageraccounts
+        [includegoogletags [<Boolean>]]
+        [formatjson]
+gam <UserTypeEntity> print tagmanagerccounts [todrive <ToDriveAttribute>*]
+        [includegoogletags [<Boolean>]]
+        [formatjson [quotechar <Character>]]
+
+gam <UserTypeEntity> show tagmanagercontainers <TagManagerAccountPathEntity>
+        [formatjson]
+gam <UserTypeEntity> print tagmanagercontainers <TagManagerAccountPathEntity> [todrive <ToDriveAttribute>*]
+        [formatjson [quotechar <Character>]]
+
+gam <UserTypeEntity> show tagmanagerworkspaces <TagManagerContainerPathEntity>
+        [formatjson]
+gam <UserTypeEntity> print tagmanagerworkspaces <TagManagerContainerPathEntity> [todrive <ToDriveAttribute>*]
+        [formatjson [quotechar <Character>]]
+
+gam <UserTypeEntity> show tagmanagertags <TagManagerWorkspacePathEntity>
+        [formatjson]
+gam <UserTypeEntity> print tagmanagertags <TagManagerWorkspacePathEntity> [todrive <ToDriveAttribute>*]
+        [formatjson [quotechar <Character>]]
+
+gam <UserTypeEntity> show tagmanagerpermissions <TagManagerAccountPathEntity>
+        [formatjson]
+gam <UserTypeEntity> print tagmanagerpermissions <TagManagerAccountPathEntity> [todrive <ToDriveAttribute>*]
+        [formatjson [quotechar <Character>]]
+
 # Users - Tasks
 
 <TaskAttribute> ::=

{gam7-7.13.3 → gam7-7.14.0}/src/GamUpdate.txt

@@ -1,3 +1,9 @@
+7.14.00
+
+Added commands to display Google Tag Manager accounts, containers, workspaces and tags.
+
+* See: https://github.com/GAM-team/GAM/wiki/Users-Tag-Manager
+
 7.13.03
 
 Added option `csv [todrive <ToDriveAttribute>*] [formatjson [quotechar <Character>]]]`

{gam7-7.13.3 → gam7-7.14.0}/src/gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.13.03'
+__version__ = '7.14.00'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -24113,7 +24113,10 @@ def infoCrOSDevices(entityList):
         printKeyValueList([up, ''])
         Ind.Increment()
         for key, value in sorted(iter(cros[up].items())):
-          printKeyValueList([key, value])
+          if key not in CROS_TIME_OBJECTS:
+            printKeyValueList([key, value])
+          else:
+            printKeyValueList([key, formatLocalTime(value)])
         Ind.Decrement()
     if not noLists:
       activeTimeRanges = _filterActiveTimeRanges(cros, True, listLimit, startDate, endDate, activeTimeRangesOrder)
@@ -76488,6 +76491,147 @@ def importTasklist(users):
                           tasklist=tasklistId, parent=parent, body=task)
         parentIdMap[taskId] = result['id']
 
+TAGMANAGER_PARAMETERS = {
+  Ent.TAGMANAGER_ACCOUNT: {'api': API.TAGMANAGER, 'respType': 'account', 'parentEntityType': None,
+                           'name': 'name', 'idList': ['accountId']},
+  Ent.TAGMANAGER_CONTAINER: {'api': API.TAGMANAGER, 'respType': 'container', 'parentEntityType': Ent.TAGMANAGER_ACCOUNT,
+                             'name': 'name', 'idList': ['accountId', 'containerId']},
+  Ent.TAGMANAGER_WORKSPACE: {'api': API.TAGMANAGER, 'respType': 'workspace', 'parentEntityType': Ent.TAGMANAGER_CONTAINER,
+                             'name': 'name', 'idList': ['accountId', 'containerId', 'workspaceId']},
+  Ent.TAGMANAGER_TAG: {'api': API.TAGMANAGER, 'respType': 'tag', 'parentEntityType': Ent.TAGMANAGER_WORKSPACE,
+                       'name': 'name', 'idList': ['accountId', 'containerId', 'workspaceId', 'tagId']},
+  Ent.TAGMANAGER_PERMISSION: {'api': API.TAGMANAGER_USERS, 'respType': 'userPermission', 'parentEntityType': Ent.TAGMANAGER_ACCOUNT,
+                             'name': 'emailAddress', 'idList': ['accountId']},
+  }
+
+def printShowTagManagerObjects(users, entityType):
+  csvPF = CSVPrintFile(['User']) if Act.csvFormat() else None
+  FJQC = FormatJSONQuoteChar(csvPF)
+  if entityType == Ent.TAGMANAGER_ACCOUNT:
+    kwargs = {'includeGoogleTags': False}
+    parentList = [None]
+  else:
+    kwargs = {'parent': None}
+    if not checkArgumentPresent('select'):
+      parentList = getString(Cmd.OB_TAGMANAGER_PATH_LIST).replace(',', ' ').split()
+    else:
+      parentList = getEntityList(Cmd.OB_TAGMANAGER_PATH_LIST)
+  parameters = TAGMANAGER_PARAMETERS[entityType]
+  if csvPF:
+    csvPF.AddTitles([parameters['name'], 'path'])
+  while Cmd.ArgumentsRemaining():
+    myarg = getArgument()
+    if csvPF and myarg == 'todrive':
+      csvPF.GetTodriveParameters()
+    elif entityType == Ent.TAGMANAGER_ACCOUNT and myarg == 'includegoogletags':
+      kwargs['includeGoogleTags'] = getBoolean()
+    else:
+      FJQC.GetFormatJSONQuoteChar(myarg, True)
+  i, count, users = getEntityArgument(users)
+  for user in users:
+    i += 1
+    user, svc = buildGAPIServiceObject(parameters['api'], user, i, count)
+    if not svc:
+      continue
+    if entityType == Ent.TAGMANAGER_ACCOUNT:
+      svc = svc.accounts()
+    elif entityType == Ent.TAGMANAGER_CONTAINER:
+      svc = svc.accounts().containers()
+    elif entityType == Ent.TAGMANAGER_WORKSPACE:
+      svc = svc.accounts().containers().workspaces()
+    elif entityType == Ent.TAGMANAGER_TAG:
+      svc = svc.accounts().containers().workspaces().tags()
+    else: #elif entityType == Ent.TAGMANAGER_PERMISSION:
+      svc = svc.accounts().user_permissions()
+    jcount = len(parentList)
+    j = 0
+    for parent in parentList:
+      j += 1
+      if entityType == Ent.TAGMANAGER_ACCOUNT:
+        printGettingAllEntityItemsForWhom(entityType, user, i, count)
+      else:
+        kwargs['parent'] = parent
+        qualifier = f' for {Ent.Singular(parameters["parentEntityType"])}: {parent}'
+        printGettingAllEntityItemsForWhom(entityType, user, i, count, qualifier=qualifier)
+      try:
+        results = callGAPIpages(svc, 'list', parameters['respType'],
+                                 pageMessage=getPageMessageForWhom(),
+                                 throwReasons=GAPI.TAGMANAGER_THROW_REASONS,
+                                 **kwargs)
+      except (GAPI.badRequest, GAPI.invalid, GAPI.notFound) as e:
+        entityActionFailedWarning([Ent.USER, user, entityType, kwargs['parent']], str(e), j, jcount)
+        continue
+      kcount = len(results)
+      if not csvPF:
+        if not  FJQC.formatJSON:
+          entityPerformActionNumItems([Ent.USER, user], kcount, entityType, j, jcount)
+        Ind.Increment()
+        k = 0
+        for result in results:
+          k += 1
+          if not  FJQC.formatJSON:
+            printEntity([entityType, result['path']], k, kcount)
+            Ind.Increment()
+            printKeyValueList([parameters['name'], result.pop(parameters['name'])])
+            for tmid in parameters['idList']:
+              printKeyValueList([tmid, result.pop(tmid)])
+            showJSON(None, result)
+            Ind.Decrement()
+          else:
+            printLine(json.dumps(cleanJSON(result), ensure_ascii=False, sort_keys=True))
+        Ind.Decrement()
+      else:
+        for result in results:
+          baseRow = {'User': user}
+          for tmid in parameters['idList']:
+            baseRow[tmid] = result.pop(tmid)
+          row = flattenJSON(result, flattened=baseRow)
+          if not FJQC.formatJSON:
+            csvPF.WriteRowTitles(row)
+          elif csvPF.CheckRowTitles(row):
+            row = {'User': user, parameters['name']: result[parameters['name']], 'path': result['path']}
+            row['JSON'] = json.dumps(cleanJSON(result), ensure_ascii=False, sort_keys=True)
+            csvPF.WriteRowNoFilter(row)
+  if csvPF:
+    csvPF.writeCSVfile(Ent.Plural(entityType))
+
+# gam <UserTypeEntity> show tagmanageraccounts
+#	[includegoogletags [<Boolean>]]
+#	[formatjson]
+# gam <UserTypeEntity> print tagmanagerccounts [todrive <ToDriveAttribute>*]
+#	[includegoogletags [<Boolean>]]
+#	[formatjson [quotechar <Character>]]
+def printShowTagManagerAccounts(users):
+  printShowTagManagerObjects(users, Ent.TAGMANAGER_ACCOUNT)
+
+# gam <UserTypeEntity> show tagmanagercontainers <TagManagerAccountPathEntity>
+#	[formatjson]
+# gam <UserTypeEntity> print tagmanagercontainers <TagManagerAccountPathEntity> [todrive <ToDriveAttribute>*]
+#	[formatjson [quotechar <Character>]]
+def printShowTagManagerContainers(users):
+  printShowTagManagerObjects(users, Ent.TAGMANAGER_CONTAINER)
+
+# gam <UserTypeEntity> show tagmanagerworkspaces <TagManagerContainerPathEntity>
+#	[formatjson]
+# gam <UserTypeEntity> print tagmanagerworkspaces <TagManagerContainerPathEntity>
+#	[formatjson [quotechar <Character>]]
+def printShowTagManagerWorkspaces(users):
+  printShowTagManagerObjects(users, Ent.TAGMANAGER_WORKSPACE)
+
+# gam <UserTypeEntity> show tagmanagertags <TagManagerWorkspacePathEntity>
+#	[formatjson]
+# gam <UserTypeEntity> print tagmanagertags <TagManagerWorkspacePathEntity> [todrive <ToDriveAttribute>*]
+#	[formatjson [quotechar <Character>]]
+def printShowTagManagerTags(users):
+  printShowTagManagerObjects(users, Ent.TAGMANAGER_TAG)
+
+# gam <UserTypeEntity> show tagmanagerpermissions <TagManagerAccountPathEntity>
+#	[formatjson]
+# gam <UserTypeEntity> print tagmanagerpermissions <TagManagerAccountPathEntity> [todrive <ToDriveAttribute>*]
+#	[formatjson [quotechar <Character>]]
+def printShowTagManagerPermissions(users):
+  printShowTagManagerObjects(users, Ent.TAGMANAGER_PERMISSION)
+
 def getCRMOrgId():
   setTrueCustomerId()
   _, crm = buildGAPIServiceObject(API.CLOUDRESOURCEMANAGER, None)
@@ -78216,6 +78360,11 @@ USER_COMMANDS_WITH_OBJECTS = {
       Cmd.ARG_SITE:		deprecatedUserSites,
       Cmd.ARG_SITEACL:		deprecatedUserSites,
       Cmd.ARG_SITEACTIVITY:	deprecatedUserSites,
+      Cmd.ARG_TAGMANAGERACCOUNT:	printShowTagManagerAccounts,
+      Cmd.ARG_TAGMANAGERCONTAINER:	printShowTagManagerContainers,
+      Cmd.ARG_TAGMANAGERPERMISSION:	printShowTagManagerPermissions,
+      Cmd.ARG_TAGMANAGERTAG:	printShowTagManagerTags,
+      Cmd.ARG_TAGMANAGERWORKSPACE:	printShowTagManagerWorkspaces,
       Cmd.ARG_TASK:		printShowTasks,
       Cmd.ARG_TASKLIST:		printShowTasklists,
       Cmd.ARG_THREAD:		printShowThreads,
@@ -78323,6 +78472,11 @@ USER_COMMANDS_WITH_OBJECTS = {
       Cmd.ARG_SITE:		deprecatedUserSites,
       Cmd.ARG_SITEACL:		deprecatedUserSites,
       Cmd.ARG_SMIME:		printShowSmimes,
+      Cmd.ARG_TAGMANAGERACCOUNT:	printShowTagManagerAccounts,
+      Cmd.ARG_TAGMANAGERCONTAINER:	printShowTagManagerContainers,
+      Cmd.ARG_TAGMANAGERPERMISSION:	printShowTagManagerPermissions,
+      Cmd.ARG_TAGMANAGERTAG:	printShowTagManagerTags,
+      Cmd.ARG_TAGMANAGERWORKSPACE:	printShowTagManagerWorkspaces,
       Cmd.ARG_TASK:		printShowTasks,
       Cmd.ARG_TASKLIST:		printShowTasklists,
       Cmd.ARG_THREAD:		printShowThreads,
@@ -78562,6 +78716,11 @@ USER_COMMANDS_OBJ_ALIASES = {
   Cmd.ARG_SITES:		Cmd.ARG_SITE,
   Cmd.ARG_SITEACLS:		Cmd.ARG_SITEACL,
   Cmd.ARG_SMIMES:		Cmd.ARG_SMIME,
+  Cmd.ARG_TAGMANAGERACCOUNTS:	Cmd.ARG_TAGMANAGERACCOUNT,
+  Cmd.ARG_TAGMANAGERCONTAINERS:	Cmd.ARG_TAGMANAGERCONTAINER,
+  Cmd.ARG_TAGMANAGERPERMISSIONS:	Cmd.ARG_TAGMANAGERPERMISSION,
+  Cmd.ARG_TAGMANAGERTAGS:	Cmd.ARG_TAGMANAGERTAG,
+  Cmd.ARG_TAGMANAGERWORKSPACES:	Cmd.ARG_TAGMANAGERWORKSPACE,
   Cmd.ARG_TASKS:		Cmd.ARG_TASK,
   Cmd.ARG_TASKLISTS:		Cmd.ARG_TASKLIST,
   Cmd.ARG_TEAMDRIVE:		Cmd.ARG_SHAREDDRIVE,

{gam7-7.13.3 → gam7-7.14.0}/src/gam/gamlib/glapi.py

@@ -94,6 +94,8 @@ SITEVERIFICATION = 'siteVerification'
 STORAGE = 'storage'
 STORAGEREAD = 'storageread'
 STORAGEWRITE = 'storagewrite'
+TAGMANAGER = 'tagmanager'
+TAGMANAGER_USERS = 'tagmanagerusers'
 TASKS = 'tasks'
 VAULT = 'vault'
 YOUTUBE = 'youtube'
@@ -199,6 +201,7 @@ PROJECT_APIS = [
   'sheets.googleapis.com',
   'siteverification.googleapis.com',
   'storage-api.googleapis.com',
+  'tagmanager.googleapis.com',
   'tasks.googleapis.com',
   'vault.googleapis.com',
   'youtube.googleapis.com',
@@ -277,6 +280,8 @@ _INFO = {
   STORAGE: {'name': 'Cloud Storage API', 'version': 'v1', 'v2discovery': True},
   STORAGEREAD: {'name': 'Cloud Storage API - Read', 'version': 'v1', 'v2discovery': True, 'mappedAPI': STORAGE},
   STORAGEWRITE: {'name': 'Cloud Storage API - Write', 'version': 'v1', 'v2discovery': True, 'mappedAPI': STORAGE},
+  TAGMANAGER: {'name': 'Tag Manager API', 'version': 'v2', 'v2discovery': True},
+  TAGMANAGER_USERS: {'name': 'Tag Manager API - Users', 'version': 'v2', 'v2discovery': True, 'mappedAPI': TAGMANAGER},
   TASKS: {'name': 'Tasks API', 'version': 'v1', 'v2discovery': True},
   VAULT: {'name': 'Vault API', 'version': 'v1', 'v2discovery': True},
   YOUTUBE: {'name': 'Youtube API', 'version': 'v3', 'v2discovery': True},
@@ -696,6 +701,16 @@ _SVCACCT_SCOPES = [
    'api': SHEETS,
    'subscopes': READONLY,
    'scope': 'https://www.googleapis.com/auth/spreadsheets'},
+  {'name': 'Tag Manager API - read only',
+   'api': TAGMANAGER,
+   'subscopes': [],
+   'offByDefault': True,
+   'scope': 'https://www.googleapis.com/auth/tagmanager.readonly'},
+  {'name': 'Tag Manager API - Users',
+   'api': TAGMANAGER_USERS,
+   'subscopes': [],
+   'offByDefault': True,
+   'scope': 'https://www.googleapis.com/auth/tagmanager.manage.users'},
   {'name': 'Tasks API',
    'api': TASKS,
    'subscopes': READONLY,

{gam7-7.13.3 → gam7-7.14.0}/src/gam/gamlib/glclargs.py

@@ -782,6 +782,16 @@ class GamCLArgs():
   ARG_SUSPENDED = 'suspended'
   ARG_SVCACCT = 'svcacct'
   ARG_SVCACCTS = 'svcaccts'
+  ARG_TAGMANAGERACCOUNT = 'tagmanageraccount'
+  ARG_TAGMANAGERACCOUNTS = 'tagmanageraccounts'
+  ARG_TAGMANAGERCONTAINER = 'tagmanagercontainer'
+  ARG_TAGMANAGERCONTAINERS = 'tagmanagercontainers'
+  ARG_TAGMANAGERPERMISSION = 'tagmanagerpermission'
+  ARG_TAGMANAGERPERMISSIONS = 'tagmanagerpermissions'
+  ARG_TAGMANAGERTAG = 'tagmanagertag'
+  ARG_TAGMANAGERTAGS = 'tagmanagertags'
+  ARG_TAGMANAGERWORKSPACE = 'tagmanagerworkspace'
+  ARG_TAGMANAGERWORKSPACES = 'tagmanagerworkspaces'
   ARG_TASK = 'task'
   ARG_TASKS = 'tasks'
   ARG_TASKLIST = 'tasklist'
@@ -1039,6 +1049,7 @@ class GamCLArgs():
   OB_STRING_LIST = 'StringList'
   OB_STUDENT_ITEM = 'StudentItem'
   OB_TAG = 'Tag'
+  OB_TAGMANAGER_PATH_LIST = 'TagManagerPathList'
   OB_TASK_ID = 'TaskID'
   OB_TASKLIST_ID = 'TaskListID'
   OB_TASKLIST_ID_ENTITY = 'TaskListIDEntity'

{gam7-7.13.3 → gam7-7.14.0}/src/gam/gamlib/glentity.py

@@ -358,7 +358,12 @@ class GamEntity():
   SUBSCRIPTION = 'subs'
   SVCACCT = 'svac'
   SVCACCT_KEY = 'svky'
-  TARGET_USER = 'tgt'
+  TAGMANAGER_ACCOUNT = 'tmac'
+  TAGMANAGER_CONTAINER = 'tmco'
+  TAGMANAGER_PERMISSION = 'tmpm'
+  TAGMANAGER_TAG = 'tmtg'
+  TAGMANAGER_WORKSPACE = 'tmws'
+  TARGET_USER = 'tgt '
   TASK = 'task'
   TASKLIST = 'tali'
   TEACHER = 'teac'
@@ -710,6 +715,11 @@ class GamEntity():
     SUBSCRIPTION: ['Subscriptions', 'Subscription'],
     SVCACCT: ['Service Accounts', 'Service Account'],
     SVCACCT_KEY: ['Service Account Keys', 'Service Account Key'],
+    TAGMANAGER_ACCOUNT: ['Tag Manager Accounts', 'Tag Manager Account'],
+    TAGMANAGER_CONTAINER: ['Tag Manager Containers', 'Tag Manager Container'],
+    TAGMANAGER_PERMISSION: ['Tag Manager Permissions', 'Tag Manager Permission'],
+    TAGMANAGER_TAG: ['Tag Manager Tags', 'Tag Manager Tag'],
+    TAGMANAGER_WORKSPACE: ['Tag Manager Workspaces', 'Tag Manager Workspace'],
     TARGET_USER: ['Target Users', 'Target User'],
     TASK: ['Tasks', 'Task'],
     TASKLIST: ['Tasklists', 'Tasklist'],

{gam7-7.13.3 → gam7-7.14.0}/src/gam/gamlib/glgapi.py

@@ -287,6 +287,7 @@ PEOPLE_ACCESS_THROW_REASONS = [SERVICE_NOT_AVAILABLE, FORBIDDEN, PERMISSION_DENI
 RESELLER_THROW_REASONS = [BAD_REQUEST, RESOURCE_NOT_FOUND, FORBIDDEN, INVALID]
 SHEETS_ACCESS_THROW_REASONS = DRIVE_USER_THROW_REASONS+[NOT_FOUND, PERMISSION_DENIED, FORBIDDEN, INTERNAL_ERROR, INSUFFICIENT_FILE_PERMISSIONS,
                                                         BAD_REQUEST, INVALID, INVALID_ARGUMENT, FAILED_PRECONDITION]
+TAGMANAGER_THROW_REASONS = [BAD_REQUEST, PERMISSION_DENIED, INVALID, NOT_FOUND, ACCESS_NOT_CONFIGURED]
 TASK_THROW_REASONS = [BAD_REQUEST, PERMISSION_DENIED, INVALID, NOT_FOUND, ACCESS_NOT_CONFIGURED]
 TASKLIST_THROW_REASONS = [BAD_REQUEST, PERMISSION_DENIED, INVALID, NOT_FOUND, ACCESS_NOT_CONFIGURED]
 USER_GET_THROW_REASONS = [USER_NOT_FOUND, DOMAIN_NOT_FOUND, DOMAIN_CANNOT_USE_APIS, FORBIDDEN, BAD_REQUEST, SYSTEM_ERROR]

{gam7-7.13.3 → gam7-7.14.0}/src/setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name = GAM for Google Workspace
 #version = attr: gam.var.GAM_VERSION
-version = 7.13.02
+version = 7.14.
 description = Command line management for Google Workspaces
 long_description = file: readme.md
 long_description_content_type = text/markdown

{gam7-7.13.3 → gam7-7.14.0}/wiki/Basic-Items.md

@@ -519,6 +519,14 @@
         gs://<StorageBucketName>/<StorageObjectName>|
         <StorageBucketName>/<StorageObjectName>
 <Tag> ::= <String>
+<TagManagerAccountID> ::= <String>
+<TagManagerAccountPath> ::= accounts/<TagManagerAccountID>
+<TagManagerContainerID> ::= <String>
+<TagManagerContainerPath> ::= accounts/<TagManagerAccountID>/containers/<TagManagerContainerID>
+<TagManagerWorkspaceID> ::= <String>
+<TagManagerWorkspacePath> ::= accounts/<TagManagerAccountID>/containers/<TagManagerContainerID>/workspaces/<TagManagerWorkspaceID>
+<TagManagerTagID> ::= <String>
+<TagManagerTagPath> ::= accounts/<TagManagerAccountID>/containers/<TagManagerContainerID>/workspaces/<TagManagerWorkspaceID>/tags/<TagManagerTagID>
 <TakeoutBucketName> ::= takeout-export-[a-f,0-9,-]*
 <TaskID> ::= <String>
 <TaskListID> ::= <String>

{gam7-7.13.3 → gam7-7.14.0}/wiki/Chrome-Profile-Management.md

@@ -34,12 +34,14 @@ Follow instructions at: Turn on managed profile reporting
 <CustomerID> ::= <String>
 <ChromeProfilePermanentID> ::= <String>
 <ChromeProfileName> ::= customers/<CustomerID>/profiles/<ChromeProfilePermanentID> | <ChromeProfilePermanentID>
-<ChromeProfileCommandName> ::= <ChomeProfileName>/commands/<String>
 <ChromeProfileNameList> ::= "<ChromeProfileName>(,<ChromeProfileName>)*"
+<ChromeProfileCommandName> ::= <ChomeProfileName>/commands/<String>
+<ChromeProfileCommandNameList> ::= "<ChromeProfileCommandName>(,<ChromeProfileCommandName>)*"
 <ChromeProfileNameEntity> ::=
         <ChromeProfileNameList> |
         (select <FileSelector>|<CSVFileSelector>) |
-        (filter <String> (filtertime<String> <Time>)* [orderby <ChromeProfileOrderByFieldName> [ascending|descending]])
+        (filter <String> (filtertime<String> <Time>)* [orderby <ChromeProfileOrderByFieldName> [ascending|descending]]) |
+        (commands <ChromeProfileCommandNameList>|<FileSelector>|<CSVFileSelector>)
 
 <ChromeProfileFieldName> ::=
         affiliationstate|
@@ -209,12 +211,16 @@ gam print chromeprofiles filter "osPlatformType=WINDOWS"
 ```
 <ChromeProfileNameEntity> ::=
         <ChromeProfileNameList> |
-        (select <FileSelector>|<CSVFileSelector>) |
-        (filter <String> (filtertime<String> <Time>)* [orderby <ChromeProfileOrderByFieldName> [ascending|descending]])
+        (select <ChromeProfileNameList>|<FileSelector>|<CSVFileSelector>) |
+        (filter <String> (filtertime<String> <Time>)* [orderby <ChromeProfileOrderByFieldName> [ascending|descending]]) |
+        (commands <ChromeProfileCommandNameList>|<FileSelector>|<CSVFileSelector>)
 ```
-* `<ChromeProfileNameList>` - List of Chrome profile names
+* `<ChromeProfileNameList>` - A list of Chrome profile names
+* `select <ChromeProfileNameList>` - A list of Chrome profile names
 * `select <FileSelector>|<CSVFileSelector>` - A flat or CSV file containing Chrome profile names
 * `filter <String> (filtertime<String> <Time>)*` - A filter to select Chrome profiles
+* `commands  <ChromeProfileCommandNameList>` - A list of  Chrome profile command names
+* `commands  <FileSelector>|<CSVFileSelector>` - A flat or CSV file containing Chrome profile command names
 
 Use the `filtertime<String> <Time>` option to allow times, usually relative, to be substituted into the `filter <String>` option.
 The `filtertime<String> <Time>` value replaces the string `#filtertime<String>#` in the `filter <String>`.
@@ -225,8 +231,12 @@ Clear a Chrome Browser profile cache and/or cookies.
 ```
 gam create chromeprofilecommand <ChromeProfileNameEntity>
         [clearcache [<Boolean>]] [clearcookies [<Boolean>]]
-        [formatjson]
+        [csv [todrive <ToDriveAttribute>*] [formatjson [quotechar <Character>]]]
 ```
+By default, when a Chrome profile command is created, GAM outputs details of the command as indented keywords and values.
+* `formatjson` - Display the details in JSON format.
+* `csv [todrive <ToDriveAttribute>*] [formatjson [quotechar <Character>]]` - Output the details in CSV format.
+
 ## Display Chrome Profile commands
 Display the status of a specific Chrome Browser profile command.
 ```
@@ -266,7 +276,7 @@ Clear cache and cookies for two specific Chrome profiles:
 gam create chromeprofilecommand 4c6c0a9f-de78-4285-be86-713fca8cffff,aa03151c-7c1d-41fe-b793-5753e167ffff clearcache clearcookies
 ```
 
-Display the status for those Chrome profiles:
+Display the command status for those Chrome profiles:
 ```
 gam show chromeprofilecommand 4c6c0a9f-de78-4285-be86-713fca8cffff,aa03151c-7c1d-41fe-b793-5753e167ffff
 gam print chromeprofilecommand 4c6c0a9f-de78-4285-be86-713fca8cffff,aa03151c-7c1d-41fe-b793-5753e167ffff
@@ -277,7 +287,7 @@ Clear cache and cookies for Chrome profiles in a CSV file named `ChromeProfiles.
 gam create chromeprofilecommand select csvfile ChromeProfiles.csv:name clearcache clearcookies
 ```
 
-Display the status for those Chrome profiles:
+Display the command status for those Chrome profiles:
 ```
 gam show chromeprofilecommand select csvfile ChromeProfiles.csv:name
 gam print chromeprofilecommand select csvfile ChromeProfiles.csv:name
@@ -288,8 +298,19 @@ Clear cache and cookies for Chrome profiles with last activity more that 60 days
 gam create chromeprofilecommand filter "lastActivityTime < \"#filtertime1#\"" filtertime1 -60d clearcache clearcookies
 ```
 
-Display the status for those Chrome profiles:
+Display the command status for those Chrome profiles:
 ```
 gam show chromeprofilecommand filter "lastActivityTime < \"#filtertime1#\"" filtertime1 -60d
 gam print chromeprofilecommand filter "lastActivityTime < \"#filtertime1#\"" filtertime1 -60d
 ```
+
+Clear cache and cookies for Chrome profiles with last activity more that 60 days ago:
+```
+gam redirect csv ./ChromeProfileCmds.csv create chromeprofilecommand filter "lastActivityTime < \"#filtertime1#\"" filtertime1 -60d clearcache clearcookies csv
+```
+
+Display the command status for those Chrome profile commands
+```
+gam show chromeprofilecommand commands ChromeProfileCmds.csv:name
+gam print chromeprofilecommand commands ChromeProfileCmds.csv:name
+```

{gam7-7.13.3 → gam7-7.14.0}/wiki/Collections-of-Items.md

@@ -147,7 +147,8 @@ Data fields identified in a `csvkmd` argument.
 <ChromeProfileNameEntity> ::=
         <ChromeProfileNameList> |
         (select <FileSelector>|<CSVFileSelector>) |
-        (filter <String> (filtertime<String> <Time>)* [orderby <ChromeProfileOrderByFieldName> [ascending|descending]])
+        (filter <String> (filtertime<String> <Time>)* [orderby <ChromeProfileOrderByFieldName> [ascending|descending]]) |
+        (commands <ChromeProfileCommandNameList>|<FileSelector>|<CSVFileSelector>)
 <CIPolicyNameEntity> ::=
         <CIPolicyNameList> | <FileSelector> | <CSVFileSelector>
 <ClassificationLabelNameEntity> ::=
@@ -350,6 +351,15 @@ Data fields identified in a `csvkmd` argument.
         <SiteACLScopeList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <SiteEntity> ::=
         <SiteList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
+<TagManagerAccountPathEntity> ::=
+        <TagManagerAccountPathList> |
+        (select <FileSelector>|<CSVFileSelector>) |
+<TagManagerContainerPathEntity> ::=
+        <TagManagerContainerPathList> |
+        (select <FileSelector>|<CSVFileSelector>) |
+<TagManagerWorkspacePathEntity> ::=
+        <TagManagerWorkspacePathList> |
+        (select <FileSelector>|<CSVFileSelector>) |
 <TasklistEntity> ::=
         <TasklistIDList> | <TaskListTitleList> | <FileSelector> | <CSVFileSelector>
 <TasklistIDTaskIDEntity> ::=

{gam7-7.13.3 → gam7-7.14.0}/wiki/Domain-SharedContacts.md

@@ -308,12 +308,3 @@ the quote character itself, the column delimiter (comma by default) and new-line
 When using the `formatjson` option, double quotes are used extensively in the data resulting in hard to read/process output.
 The `quotechar <Character>` 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.
-
-## Display global address list
-As of mid-October 2024, Google deprecated the API that retrieved the Global Address List.
-
-These commands are a work-around.
-```
-gam config csv_output_row_filter "includeInGlobalAddressList:boolean:true" redirect csv ./UserGAL.csv print users fields name,gal
-gam config csv_output_row_filter "includeInGlobalAddressList:boolean:true" batch_size 25 redirect csv ./GroupGAL.csv print groups fields name,gal
-```

{gam7-7.13.3 → gam7-7.14.0}/wiki/GamUpdates.md

@@ -10,6 +10,21 @@ 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.14.00
+
+Added commands to display Google Tag Manager accounts, containers, workspaces and tags.
+
+* See: https://github.com/GAM-team/GAM/wiki/Users-Tag-Manager
+
+### 7.13.03
+
+Added option `csv [todrive <ToDriveAttribute>*] [formatjson [quotechar <Character>]]]`
+to `gam create chromeprofilecommand` so that command details are displayed in CSV format.
+
+Added option `commands <ChromeProfileCommandNameList>|<FileSelector>|<CSVFileSelector>` to `<ChromeProfileNameEntity>`
+so that `gam print|show chromeprofilecommands` can directly display the commands generated by
+`gam create chromeprofilecommand` with the `csv` option.
+
 ### 7.13.02
 
 Fixed bug in `gam create chromeprofilecommand` where `select|filter` were not recognized.

gam7-7.14.0/wiki/Global-Address-List.md

@@ -0,0 +1,17 @@
+# Global Address List
+
+As of mid-October 2024, Google deprecated the API that retrieved the Global Address List.
+
+These commands are a work-around.
+
+Display users/groups in GAL.
+```
+gam config csv_output_row_filter "includeInGlobalAddressList:boolean:true" redirect csv ./UserGAL.csv print users fields name,gal
+gam config csv_output_row_filter "includeInGlobalAddressList:boolean:true" batch_size 25 redirect csv ./GroupGAL.csv print groups fields name,gal
+```
+
+Display users/groups not in GAL.
+```
+gam config csv_output_row_filter "includeInGlobalAddressList:boolean:false" redirect csv ./UserNotGAL.csv print users fields name,gal
+gam config csv_output_row_filter "includeInGlobalAddressList:boolean:false" batch_size 25 redirect csv ./GroupNotGAL.csv print groups fields name,gal
+```