Updated gam print group-members|cigroup-members to include the email column when fields <MembersFieldNameList> did not include email.

src/GamCommands.txt

@@ -3997,13 +3997,14 @@ gam print cigroups [todrive <ToDriveAttribute>*]
 
 <CIGroupMembersFieldName> ::=
         createtime
+        email|useremail|
         expiretime|
         memberkey|
         name|
         role|
         type|
-        updatetime|
-        useremail
+        updatetime
+
 <CIGroupMembersFieldNameList> ::= "<CIGroupMembersFieldName>(,<CIGroupMembersFieldName>)*"
 
 gam <UserTypeEntity> info cimember <GroupEntity>
@@ -4017,16 +4018,19 @@ gam print cigroup-members [todrive <ToDriveAttribute>*]
         [types <CIGroupMemberTypeList>]
         [memberemaildisplaypattern|memberemailskippattern <RegularExpression>]
         <CIGroupMembersFieldName>* [fields <CIGroupMembersFieldNameList>]
-        [(recursive [noduplicates])includederivedmembership] [nogroupeemail]
+        [minimal|basic|full]
+        [(recursive [noduplicates]) | includederivedmembership] [nogroupemail]
         [formatjson [quotechar <Character>]]
 gam show cigroup-members
         [(cimember|ciowner <UserItem>)|(cigroup <GroupItem>)|(select <GroupEntity>)]
         [showownedby <UserItem>]
         [emailmatchpattern [not] <RegularExpression>] [namematchpattern [not] <RegularExpression>]
         [descriptionmatchpattern [not] <RegularExpression>]
-        [roles <GroupRoleList>] [members] [managers] [owners] [depth <Number>]
+        [roles <GroupRoleList>] [members] [managers] [owners]
         [types <CIGroupMemberTypeList>]
         [memberemaildisplaypattern|memberemailskippattern <RegularExpression>]
+        [minimal|basic|full]
+        [(depth <Number>) | includederivedmembership]
 
 # Cloud Identity Devices
 

src/GamUpdate.txt

@@ -1,3 +1,35 @@
+7.04.04
+
+Updated `gam print group-members|cigroup-members` to include the `email` column
+when `fields <MembersFieldNameList>` did not include `email`.
+
+7.04.03
+
+Added option `minimal|basic|full` to `gam print cigroup-members`:
+* `minimal` - Fields displayed: group, id, role, email
+* `basic` - Fields displayed: group, type, id, role, email
+* `full` - Fields displayed: group, type, id, role, email, createTime, updateTime; this is the default
+
+Added option `minimal|basic|full` to `gam show cigroup-members`:
+* `minimal` - Fields displayed: role, email
+* `basic` - Fields displayed: type, role, email
+* `full` - Fields displayed: type, role, email, createTime, updateTime; this is the default
+
+Upgraded `gam print cigroup-members ... recursive` to display sub-group email addresses rather than IDs.
+
+7.04.02
+
+Improved output formatting for the following commands:
+```
+gam info peoplecontact
+gam show peoplecontacts
+gam info peopleprofile
+gam show peopleprofile
+gam <UserTypeEntity> info contacts
+gam <UserTypeEntity> show contacts
+gam <UserTypeEntity> show peopleprofile
+```
+
 7.04.01
 
 Fixed bug where multiple `querytime<String>` values in a query were not properly processed;

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.04.01'
+__version__ = '7.04.04'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -5981,6 +5981,8 @@ def getCIGroupTransitiveMemberRoleFixType(groupName, tmember):
       member['type'] = Ent.TYPE_USER if not tid.endswith('.iam.gserviceaccount.com') else Ent.TYPE_SERVICE_ACCOUNT
     elif ttype == 'groups':
       member['type'] = Ent.TYPE_GROUP
+    elif tid.startswith('cbcm-browser.'):
+      member['type'] = Ent.TYPE_CBCM_BROWSER
     else:
       member['type'] = Ent.TYPE_OTHER
   else:
@@ -7322,12 +7324,6 @@ def _getRawFields(requiredField=None):
     return rawFields
   return f'{requiredField},{rawFields}'
 
-def _addInitialField(fieldsList, initialField):
-  if isinstance(initialField, list):
-    fieldsList.extend(initialField)
-  else:
-    fieldsList.append(initialField)
-
 def CheckInputRowFilterHeaders(titlesList, rowFilter, rowDropFilter):
   status = True
   for filterVal in rowFilter:
@@ -7742,6 +7738,12 @@ def RowFilterMatch(row, titlesList, rowFilter, rowFilterModeAll, rowDropFilter,
 #  }
 # fieldsList is the list of API fields
 def getFieldsList(myarg, fieldsChoiceMap, fieldsList, initialField=None, fieldsArg='fields', onlyFieldsArg=False):
+  def addInitialField():
+    if isinstance(initialField, list):
+      fieldsList.extend(initialField)
+    else:
+      fieldsList.append(initialField)
+
   def addMappedFields(mappedFields):
     if isinstance(mappedFields, list):
       fieldsList.extend(mappedFields)
@@ -7750,11 +7752,11 @@ def getFieldsList(myarg, fieldsChoiceMap, fieldsList, initialField=None, fieldsA
 
   if not onlyFieldsArg and myarg in fieldsChoiceMap:
     if not fieldsList and initialField is not None:
-      _addInitialField(fieldsList, initialField)
+      addInitialField()
     addMappedFields(fieldsChoiceMap[myarg])
   elif myarg == fieldsArg:
     if not fieldsList and initialField is not None:
-      _addInitialField(fieldsList, initialField)
+      addInitialField()
     for field in _getFieldsList():
       if field in fieldsChoiceMap:
         addMappedFields(fieldsChoiceMap[field])
@@ -7931,14 +7933,21 @@ class CSVPrintFile():
       fieldsList.append(fields)
       self.AddTitles(fields.replace('.', GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]))
 
+  def addInitialField(self, initialField, fieldsChoiceMap, fieldsList):
+    if isinstance(initialField, list):
+      for field in initialField:
+        self.AddField(field, fieldsChoiceMap, fieldsList)
+    else:
+      self.AddField(initialField, fieldsChoiceMap, fieldsList)
+
   def GetFieldsListTitles(self, fieldName, fieldsChoiceMap, fieldsList, initialField=None):
     if fieldName in fieldsChoiceMap:
       if not fieldsList and initialField is not None:
-        _addInitialField(fieldsList, initialField)
+        self.addInitialField(initialField, fieldsChoiceMap, fieldsList)
       self.AddField(fieldName, fieldsChoiceMap, fieldsList)
     elif fieldName == 'fields':
       if not fieldsList and initialField is not None:
-        _addInitialField(fieldsList, initialField)
+        self.addInitialField(initialField, fieldsChoiceMap, fieldsList)
       for field in _getFieldsList():
         if field in fieldsChoiceMap:
           self.AddField(field, fieldsChoiceMap, fieldsList)
@@ -21864,12 +21873,29 @@ def _printPerson(entityTypeName, user, person, csvPF, FJQC, parameters):
                             'JSON': json.dumps(cleanJSON(person),
                                                ensure_ascii=False, sort_keys=True)})
 
+PEOPLE_CONTACT_OBJECT_KEYS = {
+  'addresses': 'type',
+  'calendarUrls': 'type',
+  'emailAddresses': 'type',
+  'events': 'type',
+  'externalIds': 'type',
+  'genders': 'value',
+  'imClients': 'type',
+  'locations': 'type',
+  'miscKeywords': 'type',
+  'nicknames': 'type',
+  'organizations': 'type',
+  'relations': 'type',
+  'urls': 'type',
+  'userDefined': 'key',
+  }
+
 def _showPerson(userEntityType, user, entityType, person, i, count, FJQC, parameters):
   _processPersonMetadata(person, parameters)
   if not FJQC.formatJSON:
     printEntity([userEntityType, user, entityType, person['resourceName']], i, count)
     Ind.Increment()
-    showJSON(None, person)
+    showJSON(None, person, dictObjectsKey=PEOPLE_CONTACT_OBJECT_KEYS)
     Ind.Decrement()
   else:
     printLine(json.dumps(cleanJSON(person), ensure_ascii=False, sort_keys=True))
@@ -33942,6 +33968,8 @@ def infoGroupMembers(entityList, ciGroupsAPI=False):
           printKeyValueList(['type', result['type']])
           for field in ['createTime', 'updateTime']:
             printKeyValueList([field, formatLocalTime(result[field])])
+          if 'deliverySetting' in result:
+            printKeyValueList(['deliverySetting', result['deliverySetting']])
           Ind.Decrement()
         except (GAPI.groupNotFound, GAPI.domainNotFound, GAPI.domainCannotUseApis, GAPI.invalid, GAPI.forbidden) as e:
           entityActionFailedWarning([entityType, groupKey], str(e), j, jcount)
@@ -34185,7 +34213,7 @@ def doPrintGroupMembers():
       pass
     elif getMemberMatchOptions(myarg, memberOptions):
       pass
-    elif csvPF.GetFieldsListTitles(myarg, GROUPMEMBERS_FIELDS_CHOICE_MAP, fieldsList):
+    elif csvPF.GetFieldsListTitles(myarg, GROUPMEMBERS_FIELDS_CHOICE_MAP, fieldsList, initialField='email'):
       pass
     elif myarg == 'membernames':
       memberOptions[MEMBEROPTION_MEMBERNAMES] = True
@@ -36104,8 +36132,9 @@ def getCIGroupTransitiveMembers(ci, groupName, membersList, i, count):
   return True
 
 def getCIGroupMembers(ci, groupName, memberRoles, membersList, membersSet, i, count,
-                      memberOptions, memberDisplayOptions, level, typesSet):
-  printGettingAllEntityItemsForWhom(memberRoles if memberRoles else Ent.ROLE_MANAGER_MEMBER_OWNER, groupName, i, count)
+                      memberOptions, memberDisplayOptions, level, typesSet, groupEmail, kwargs):
+  nameToPrint = groupEmail if groupEmail else groupName
+  printGettingAllEntityItemsForWhom(memberRoles if memberRoles else Ent.ROLE_MANAGER_MEMBER_OWNER, nameToPrint, i, count)
   validRoles = _getCIRoleVerification(memberRoles)
   if memberOptions[MEMBEROPTION_INCLUDEDERIVEDMEMBERSHIP]:
     groupMembers = []
@@ -36120,12 +36149,11 @@ def getCIGroupMembers(ci, groupName, memberRoles, membersList, membersSet, i, co
     groupMembers = callGAPIpages(ci.groups().memberships(), 'list', 'memberships',
                                  pageMessage=getPageMessageForWhom(),
                                  throwReasons=GAPI.CIGROUP_LIST_THROW_REASONS, retryReasons=GAPI.CIGROUP_RETRY_REASONS,
-                                 parent=groupName, view='FULL',
-                                 fields='nextPageToken,memberships(*)', pageSize=GC.Values[GC.MEMBER_MAX_RESULTS])
+                                 parent=groupName, **kwargs)
   except (GAPI.resourceNotFound, GAPI.domainNotFound, GAPI.domainCannotUseApis,
           GAPI.forbidden, GAPI.badRequest, GAPI.invalid, GAPI.invalidArgument, GAPI.systemError,
           GAPI.permissionDenied, GAPI.serviceNotAvailable):
-    entityUnknownWarning(Ent.CLOUD_IDENTITY_GROUP, groupName, i, count)
+    entityUnknownWarning(Ent.CLOUD_IDENTITY_GROUP, nameToPrint, i, count)
     return
   checkCategory = memberDisplayOptions['showCategory']
   if not memberOptions[MEMBEROPTION_RECURSIVE]:
@@ -36159,7 +36187,7 @@ def getCIGroupMembers(ci, groupName, memberRoles, membersList, membersSet, i, co
             memberName not in membersSet):
           membersSet.add(memberName)
           member['level'] = level
-          member['subgroup'] = groupName
+          member['subgroup'] = nameToPrint
           membersList.append(member)
       else:
         if memberName not in membersSet:
@@ -36168,37 +36196,41 @@ def getCIGroupMembers(ci, groupName, memberRoles, membersList, membersSet, i, co
               checkCIMemberMatch(member, memberOptions) and
               (not checkCategory or _checkCIMemberCategory(member, memberDisplayOptions))):
             member['level'] = level
-            member['subgroup'] = groupName
+            member['subgroup'] = nameToPrint
             membersList.append(member)
           _, gname = member['name'].rsplit('/', 1)
-          groupMemberList.append(f'groups/{gname}')
+          groupMemberList.append((f'groups/{gname}', memberName))
     for member in groupMemberList:
-      getCIGroupMembers(ci, member, memberRoles, membersList, membersSet, i, count,
-                        memberOptions, memberDisplayOptions, level+1, typesSet)
+      getCIGroupMembers(ci, member[0], memberRoles, membersList, membersSet, i, count,
+                        memberOptions, memberDisplayOptions, level+1, typesSet, member[1], kwargs)
   else:
     for member in groupMembers:
       getCIGroupMemberRoleFixType(member)
+      memberName = member.get('preferredMemberKey', {}).get('id', '')
       if member['type'] != Ent.TYPE_GROUP:
         if (member['type'] in typesSet and
             checkCIMemberMatch(member, memberOptions) and
             _checkMemberRole(member, validRoles) and
             (not checkCategory or _checkCIMemberCategory(member, memberDisplayOptions))):
           member['level'] = level
-          member['subgroup'] = groupName
+          member['subgroup'] = nameToPrint
           membersList.append(member)
       else:
         if (member['type'] in typesSet and
             checkCIMemberMatch(member, memberOptions) and
             (not checkCategory or _checkCIMemberCategory(member, memberDisplayOptions))):
           member['level'] = level
-          member['subgroup'] = groupName
+          member['subgroup'] = nameToPrint
           membersList.append(member)
         _, gname = member['name'].rsplit('/', 1)
         getCIGroupMembers(ci, f'groups/{gname}', memberRoles, membersList, membersSet, i, count,
-                          memberOptions, memberDisplayOptions, level+1, typesSet)
+                          memberOptions, memberDisplayOptions, level+1, typesSet, memberName, kwargs)
 
 CIGROUPMEMBERS_FIELDS_CHOICE_MAP = {
   'createtime': 'createTime',
+  'delivery': 'deliverySetting',
+  'deliverysettings': 'deliverySetting',
+  'email': 'preferredMemberKey',
   'expiretime': 'expireTime',
   'id': 'name',
   'memberkey': 'preferredMemberKey',
@@ -36219,6 +36251,16 @@ CIGROUPMEMBERS_SORT_FIELDS = [
   ]
 CIGROUPMEMBERS_TIME_OBJECTS = {'createTime', 'updateTime', 'expireTime'}
 
+def _getCIListGroupMembersArgs(listView):
+  if listView == 'full':
+    return  {'view': 'FULL', 'pageSize': GC.Values[GC.MEMBER_MAX_RESULTS_CI_FULL],
+             'fields': 'nextPageToken,memberships(*)'}
+  if listView == 'basic':
+    return  {'view': 'FULL', 'pageSize': GC.Values[GC.MEMBER_MAX_RESULTS_CI_FULL],
+             'fields': 'nextPageToken,memberships(name,preferredMemberKey,roles,type)'}
+  return {'view': 'BASIC', 'pageSize': GC.Values[GC.MEMBER_MAX_RESULTS_CI_BASIC],
+             'fields': 'nextPageToken,memberships(*)'}
+
 # gam print cigroup-members [todrive <ToDriveAttribute>*]
 #	[(cimember|ciowner <UserItem>)|(cigroup <GroupItem>)|(select <GroupEntity>)]
 #	[showownedby <UserItem>]
@@ -36228,6 +36270,7 @@ CIGROUPMEMBERS_TIME_OBJECTS = {'createTime', 'updateTime', 'expireTime'}
 #	[types <CIGroupMemberTypeList>]
 #	[memberemaildisplaypattern|memberemailskippattern <RegularExpression>]
 #	<CIGroupMembersFieldName>* [fields <CIGroupMembersFieldNameList>]
+#	[minimal|basic|full]
 #	[(recursive [noduplicates])|includederivedmembership] [nogroupeemail]
 #	[formatjson [quotechar <Character>]]
 def doPrintCIGroupMembers():
@@ -36245,6 +36288,7 @@ def doPrintCIGroupMembers():
   rolesSet = set()
   typesSet = set()
   matchPatterns = {}
+  listView = 'full'
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if myarg == 'todrive':
@@ -36273,7 +36317,7 @@ def doPrintCIGroupMembers():
       pass
     elif getMemberMatchOptions(myarg, memberOptions):
       pass
-    elif getFieldsList(myarg, CIGROUPMEMBERS_FIELDS_CHOICE_MAP, fieldsList):
+    elif getFieldsList(myarg, CIGROUPMEMBERS_FIELDS_CHOICE_MAP, fieldsList, initialField='preferredMemberKey'):
       pass
     elif myarg == 'noduplicates':
       memberOptions[MEMBEROPTION_NODUPLICATES] = True
@@ -36285,8 +36329,12 @@ def doPrintCIGroupMembers():
       memberOptions[MEMBEROPTION_RECURSIVE] = False
     elif myarg == 'nogroupemail':
       groupColumn = False
+    elif myarg in {'minimal', 'basic', 'full'}:
+      listView = myarg
     else:
       FJQC.GetFormatJSONQuoteChar(myarg, False)
+  if listView == 'minimal' and memberOptions[MEMBEROPTION_RECURSIVE]:
+    usageErrorExit(Msg.ARE_MUTUALLY_EXCLUSIVE.format('minimal', 'recursive'))
   if not typesSet:
     typesSet = {Ent.TYPE_USER} if memberOptions[MEMBEROPTION_RECURSIVE] else ALL_CIGROUP_MEMBER_TYPES
   fields = ','.join(set(groupFieldsLists['ci']))
@@ -36313,6 +36361,7 @@ def doPrintCIGroupMembers():
   if showOwnedBy:
     getRolesSet.add(Ent.ROLE_OWNER)
   getRoles = ','.join(sorted(getRolesSet))
+  kwargs = _getCIListGroupMembersArgs(listView)
   level = 0
   i = 0
   count = len(entityList)
@@ -36339,7 +36388,7 @@ def doPrintCIGroupMembers():
     membersList = []
     membersSet = set()
     getCIGroupMembers(ci, groupEntity['name'], getRoles, membersList, membersSet, i, count,
-                      memberOptions, memberDisplayOptions, level, typesSet)
+                      memberOptions, memberDisplayOptions, level, typesSet, groupEmail, kwargs)
     if showOwnedBy and not checkCIGroupShowOwnedBy(showOwnedBy, membersList):
       continue
     for member in membersList:
@@ -36357,6 +36406,8 @@ def doPrintCIGroupMembers():
         row['subgroup'] = member['subgroup']
       if memberDisplayOptions['showCategory']:
         row['category'] = member['category']
+      if listView == 'minimal':
+        dmember.pop('type', None)
       mapCIGroupMemberFieldNames(dmember)
       if not FJQC.formatJSON:
         csvPF.WriteRowTitles(flattenJSON(dmember, flattened=row, timeObjects=CIGROUPMEMBERS_TIME_OBJECTS))
@@ -36386,17 +36437,19 @@ def doPrintCIGroupMembers():
 #	[showownedby <UserItem>]
 #	[emailmatchpattern [not] <RegularExpression>] [namematchpattern [not] <RegularExpression>]
 #	[descriptionmatchpattern [not] <RegularExpression>]
-#	[roles <GroupRoleList>] [members] [managers] [owners] [depth <Number>]
+#	[roles <GroupRoleList>] [members] [managers] [owners]
 #	[internal] [internaldomains <DomainList>] [external]
 #	[types <CIGroupMemberTypeList>]
 #	[memberemaildisplaypattern|memberemailskippattern <RegularExpression>]
-#	[includederivedmembership]
+#	[minimal|basic|full]
+#	[(depth <Number>) | includederivedmembership]
 def doShowCIGroupMembers():
   def _roleOrder(key):
     return {Ent.ROLE_OWNER: 0, Ent.ROLE_MANAGER: 1, Ent.ROLE_MEMBER: 2}.get(key, 3)
 
   def _typeOrder(key):
-    return {Ent.TYPE_CUSTOMER: 0, Ent.TYPE_USER: 1, Ent.TYPE_GROUP: 2, Ent.TYPE_EXTERNAL: 3}.get(key, 4)
+    return {Ent.TYPE_CUSTOMER: 0, Ent.TYPE_USER: 1, Ent.TYPE_GROUP: 2,
+            Ent.TYPE_CBCM_BROWSER: 3, Ent.TYPE_OTHER: 4, Ent.TYPE_EXTERNAL: 5}.get(key, 6)
 
   def _showGroup(groupName, groupEmail, depth):
     if includeDerivedMembership:
@@ -36407,8 +36460,7 @@ def doShowCIGroupMembers():
       try:
         membersList = callGAPIpages(ci.groups().memberships(), 'list', 'memberships',
                                     throwReasons=GAPI.CIGROUP_LIST_THROW_REASONS, retryReasons=GAPI.CIGROUP_RETRY_REASONS,
-                                    parent=groupName, view='FULL',
-                                    fields='nextPageToken,memberships(*)', pageSize=GC.Values[GC.MEMBER_MAX_RESULTS])
+                                    parent=groupName, **kwargs)
         for member in membersList:
           getCIGroupMemberRoleFixType(member)
       except (GAPI.resourceNotFound, GAPI.domainNotFound, GAPI.domainCannotUseApis,
@@ -36429,7 +36481,10 @@ def doShowCIGroupMembers():
         if (_checkMemberRole(member, rolesSet) and
             member['type'] in typesSet and
             checkCIMemberMatch(member, memberOptions)):
-          memberDetails = f'{member.get("role", Ent.ROLE_MEMBER)}, {member["type"]}, {member["preferredMemberKey"]["id"]}'
+          if listView != 'minimal':
+            memberDetails = f'{member.get("role", Ent.ROLE_MEMBER)}, {member["type"]}, {member["preferredMemberKey"]["id"]}'
+          else:
+            memberDetails = f'{member.get("role", Ent.ROLE_MEMBER)}, {member["preferredMemberKey"]["id"]}'
           if checkCategory:
             memberDetails += f', {member["category"]}'
           for field in ['createTime', 'updateTime', 'expireTime']:
@@ -36454,6 +36509,7 @@ def doShowCIGroupMembers():
   matchPatterns = {}
   maxdepth = -1
   includeDerivedMembership = False
+  listView = 'full'
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if myarg == 'showownedby':
@@ -36484,6 +36540,8 @@ def doShowCIGroupMembers():
       maxdepth = getInteger(minVal=-1)
     elif myarg == 'includederivedmembership':
       includeDerivedMembership = True
+    elif myarg in {'minimal', 'basic', 'full'}:
+      listView = myarg
     else:
       unknownArgumentExit()
   if not rolesSet:
@@ -36493,6 +36551,7 @@ def doShowCIGroupMembers():
   checkCategory = memberDisplayOptions['showCategory']
   fields = ','.join(set(groupFieldsLists['ci']))
   entityList = getCIGroupMembersEntityList(ci, entityList, query, subTitle, matchPatterns, groupFieldsLists['ci'], None)
+  kwargs = _getCIListGroupMembersArgs(listView)
   i = 0
   count = len(entityList)
   for group in entityList:

src/gam/gamlib/glcfg.py

@@ -179,6 +179,10 @@ LICENSE_MAX_RESULTS = 'license_max_results'
 LICENSE_SKUS = 'license_skus'
 # When retrieving lists of Google Group members from API, how many should be retrieved in each chunk
 MEMBER_MAX_RESULTS = 'member_max_results'
+# CI API Group members max page size when view=BASIC
+MEMBER_MAX_RESULTS_CI_BASIC = 'member_max_results_ci_basic'
+# CI API Group members max page size when view=FULL
+MEMBER_MAX_RESULTS_CI_FULL = 'member_max_results_ci_full'
 # When deleting or modifying Gmail messages, how many should be processed in each batch
 MESSAGE_BATCH_SIZE = 'message_batch_size'
 # When retrieving lists of Gmail messages from API, how many should be retrieved in each chunk
@@ -385,6 +389,8 @@ Defaults = {
   LICENSE_MAX_RESULTS: '100',
   LICENSE_SKUS: '',
   MEMBER_MAX_RESULTS: '200',
+  MEMBER_MAX_RESULTS_CI_BASIC: '1000',
+  MEMBER_MAX_RESULTS_CI_FULL: '500',
   MESSAGE_BATCH_SIZE: '50',
   MESSAGE_MAX_RESULTS: '500',
   MOBILE_MAX_RESULTS: '100',
@@ -550,6 +556,8 @@ VAR_INFO = {
   LICENSE_MAX_RESULTS: {VAR_TYPE: TYPE_INTEGER, VAR_LIMITS: (10, 1000)},
   LICENSE_SKUS: {VAR_TYPE: TYPE_STRING, VAR_LIMITS: (0, None)},
   MEMBER_MAX_RESULTS: {VAR_TYPE: TYPE_INTEGER, VAR_LIMITS: (1, 200)},
+  MEMBER_MAX_RESULTS_CI_BASIC: {VAR_TYPE: TYPE_INTEGER, VAR_LIMITS: (1, 1000)},
+  MEMBER_MAX_RESULTS_CI_FULL: {VAR_TYPE: TYPE_INTEGER, VAR_LIMITS: (1, 500)},
   MESSAGE_BATCH_SIZE: {VAR_TYPE: TYPE_INTEGER, VAR_LIMITS: (1, 1000)},
   MESSAGE_MAX_RESULTS: {VAR_TYPE: TYPE_INTEGER, VAR_LIMITS: (1, 10000)},
   MOBILE_MAX_RESULTS: {VAR_TYPE: TYPE_INTEGER, VAR_LIMITS: (1, 100)},