Fixed bug in gam user admin@domain.com print chatspaces asadmin

src/gam/__init__.py

@@ -25920,12 +25920,11 @@ def printShowChatSpaces(users):
   csvPF = CSVPrintFile(['User', 'name'] if not isinstance(users, list) else ['name']) if Act.csvFormat() else None
   FJQC = FormatJSONQuoteChar(csvPF)
   OBY = OrderBy(CHAT_SPACES_ADMIN_ORDERBY_CHOICE_MAP)
-  useAdminAccess, api, kwargs = _getChatAdminAccess(API.CHAT_SPACES_ADMIN, API.CHAT_SPACES)
+  useAdminAccess, api, kwargsCS = _getChatAdminAccess(API.CHAT_SPACES_ADMIN, API.CHAT_SPACES)
   fieldsList = []
   queries = []
   queryTimes = {}
   pfilter = ''
-  kwargs = {}
   if useAdminAccess:
     function = 'search'
     queries = ['customer = "customers/my_customer" AND spaceType = "SPACE"']
@@ -25937,7 +25936,7 @@ def printShowChatSpaces(users):
       csvPF.GetTodriveParameters()
     elif getFieldsList(myarg, CHAT_SPACES_FIELDS_CHOICE_MAP, fieldsList, initialField='name', onlyFieldsArg=True):
       pass
-    elif not useAdminAccess and _getChatSpaceListParms(myarg, kwargs):
+    elif not useAdminAccess and _getChatSpaceListParms(myarg, kwargsCS):
       pass
     elif useAdminAccess and _getChatSpaceSearchParms(myarg, queries, queryTimes, OBY):
       pass
@@ -25947,9 +25946,10 @@ def printShowChatSpaces(users):
   i, count, users = getEntityArgument(users)
   if useAdminAccess:
     _chkChatAdminAccess(count)
-    kwargs['orderBy'] = OBY.orderBy
+    kwargsCS['orderBy'] = OBY.orderBy
     substituteQueryTimes(queries, queryTimes)
-    pfilter = kwargs['query'] = queries[0]
+    pfilter = kwargsCS['query'] = queries[0]
+    kwargsCS['useAdminAccess'] = True
   for user in users:
     i += 1
     user, chat, kvList = buildChatServiceObject(api, user, i, count, None, useAdminAccess)
@@ -25961,7 +25961,7 @@ def printShowChatSpaces(users):
                              bailOnInternalError=True,
                              throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.INTERNAL_ERROR,
                                            GAPI.PERMISSION_DENIED, GAPI.FAILED_PRECONDITION],
-                             fields=fields, pageSize=CHAT_PAGE_SIZE, **kwargs)
+                             fields=fields, pageSize=CHAT_PAGE_SIZE, **kwargsCS)
     except (GAPI.notFound, GAPI.invalidArgument, GAPI.internalError,
             GAPI.permissionDenied, GAPI.failedPrecondition) as e:
       exitIfChatNotConfigured(chat, kvList, str(e), i, count)
@@ -26600,6 +26600,7 @@ def printShowChatMembers(users):
         members = callGAPIpages(chat.spaces().members(), 'list', 'memberships',
                                 pageMessage=_getChatPageMessage(Ent.CHAT_MEMBER, user, j, jcount, qfilter),
                                 throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
+                                retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
                                 parent=parentName, fields=fields, pageSize=CHAT_PAGE_SIZE, **kwargs, **kwargsUAA)
         for member in members:
           _getChatMemberEmail(cd, member)

src/gam/gamlib/glapi.py

@@ -259,7 +259,7 @@ _INFO = {
   PUBSUB: {'name': 'Pub / Sub API', 'version': 'v1', 'v2discovery': True},
   REPORTS: {'name': 'Reports API', 'version': 'reports_v1', 'v2discovery': True, 'mappedAPI': 'admin'},
   RESELLER: {'name': 'Reseller API', 'version': 'v1', 'v2discovery': True},
-  SERVICEACCOUNTLOOKUP: {'name': 'Service Account Lookup psuedo-API', 'version': 'v1', 'v2discovery': True, 'localjson': True},
+  SERVICEACCOUNTLOOKUP: {'name': 'Service Account Lookup pseudo-API', 'version': 'v1', 'v2discovery': True, 'localjson': True},
   SERVICEMANAGEMENT: {'name': 'Service Management API', 'version': 'v1', 'v2discovery': True},
   SERVICEUSAGE: {'name': 'Service Usage API', 'version': 'v1', 'v2discovery': True},
   SHEETS: {'name': 'Sheets API', 'version': 'v4', 'v2discovery': True},
@@ -475,7 +475,7 @@ _CLIENT_SCOPES = [
    'subscopes': [],
    'offByDefault': True,
    'scope': 'https://www.googleapis.com/auth/apps.order'},
-  {'name': 'Service Account Lookup psuedo-API',
+  {'name': 'Service Account Lookup pseudo-API',
    'api': SERVICEACCOUNTLOOKUP,
    'subscopes': [],
    'scope': ''},

src/gam/serviceaccountlookup-v1.json

@@ -2,7 +2,7 @@
   "basePath": "",
   "baseUrl": "https://www.googleapis.com/service_accounts/v1",
   "canonicalName": "serviceaccountlookup",
-  "description": "Psuedo-API to lookup public certificates for a service account anonymously",
+  "description": "Pseudo-API to lookup public certificates for a service account anonymously",
   "discoveryVersion": "v1",
   "documentationLink": "https://example.com/",
   "fullyEncodeReservedExpansion": true,
@@ -135,7 +135,7 @@
     }
   },
   "servicePath": "",
-  "title": "Service Account Lookup Psuedo-API",
+  "title": "Service Account Lookup Pseudo-API",
   "version": "v1",
   "version_module": true
 }