deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-05 13:21:35 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Dynamic maxResults from discovery or exception

Browse Source
This commit is contained in:
Jay Lee
2019-08-14 16:11:14 -04:00
parent 2bc6c8bca0
commit 584ddba1a5
2 changed files with 70 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/gam.py
View File

@@ -673,7 +673,6 @@ def SetGlobalVariables():
_getOldEnvVar(GC_AUTO_BATCH_MIN, 'GAM_AUTOBATCH') _getOldEnvVar(GC_AUTO_BATCH_MIN, 'GAM_AUTOBATCH')
_getOldEnvVar(GC_BATCH_SIZE, 'GAM_BATCH_SIZE') _getOldEnvVar(GC_BATCH_SIZE, 'GAM_BATCH_SIZE')
_getOldEnvVar(GC_DEVICE_MAX_RESULTS, 'GAM_DEVICE_MAX_RESULTS') _getOldEnvVar(GC_DEVICE_MAX_RESULTS, 'GAM_DEVICE_MAX_RESULTS')
_getOldEnvVar(GC_DRIVE_MAX_RESULTS, 'GAM_DRIVE_MAX_RESULTS')
_getOldEnvVar(GC_MEMBER_MAX_RESULTS, 'GAM_MEMBER_MAX_RESULTS') _getOldEnvVar(GC_MEMBER_MAX_RESULTS, 'GAM_MEMBER_MAX_RESULTS')
_getOldEnvVar(GC_USER_MAX_RESULTS, 'GAM_USER_MAX_RESULTS') _getOldEnvVar(GC_USER_MAX_RESULTS, 'GAM_USER_MAX_RESULTS')
_getOldEnvVar(GC_CSV_HEADER_FILTER, 'GAM_CSV_HEADER_FILTER') _getOldEnvVar(GC_CSV_HEADER_FILTER, 'GAM_CSV_HEADER_FILTER')
@@ -1083,6 +1082,19 @@ def callGAPI(service, function,
except TypeError as e: except TypeError as e:
systemErrorExit(4, str(e)) systemErrorExit(4, str(e))
def getPageSize(service, function, kwargs):
"""Gets maximum maxResults value for API call. Uses value from discovery if
it exists, otherwise value from MAX_RESULTS_API_EXCEPTIONS, otherwise None"""
method = getattr(service, function)
api_id = method(**kwargs).methodId
for resource in service._rootDesc.get('resources', {}).values():
for a_method in resource.get('methods', {}).values():
if a_method.get('id') == api_id:
if a_method['parameters'].get('pageSize'):
return
return {'maxResults': a_method['parameters']['maxResults'].get('maximum', MAX_RESULTS_API_EXCEPTIONS.get(api_id, None))}
def callGAPIpages(service, function, items='items', def callGAPIpages(service, function, items='items',
page_message=None, message_attribute=None, page_message=None, message_attribute=None,
soft_errors=False, throw_reasons=None, retry_reasons=None, soft_errors=False, throw_reasons=None, retry_reasons=None,
@@ -1125,6 +1137,10 @@ def callGAPIpages(service, function, items='items',
Returns: Returns:
A list of all items received from all paged responses. A list of all items received from all paged responses.
""" """
if 'maxResults' not in kwargs and 'pageSize' not in kwargs:
page_key = getPageSize(service, function, kwargs)
if page_key:
kwargs.update(page_key)
all_items = [] all_items = []
page_token = None page_token = None
total_items = 0 total_items = 0
@@ -2344,8 +2360,7 @@ def buildRoleIdToNameToIdMap():
cd = buildGAPIObject('directory') cd = buildGAPIObject('directory')
result = callGAPIpages(cd.roles(), 'list', 'items', result = callGAPIpages(cd.roles(), 'list', 'items',
customer=GC_Values[GC_CUSTOMER_ID], customer=GC_Values[GC_CUSTOMER_ID],
fields='nextPageToken,items(roleId,roleName)', fields='nextPageToken,items(roleId,roleName)')
maxResults=100)
GM_Globals[GM_MAP_ROLE_ID_TO_NAME] = {} GM_Globals[GM_MAP_ROLE_ID_TO_NAME] = {}
GM_Globals[GM_MAP_ROLE_NAME_TO_ID] = {} GM_Globals[GM_MAP_ROLE_NAME_TO_ID] = {}
for role in result: for role in result:
@@ -2376,8 +2391,7 @@ def buildUserIdToNameMap():
cd = buildGAPIObject('directory') cd = buildGAPIObject('directory')
result = callGAPIpages(cd.users(), 'list', 'users', result = callGAPIpages(cd.users(), 'list', 'users',
customer=GC_Values[GC_CUSTOMER_ID], customer=GC_Values[GC_CUSTOMER_ID],
fields='nextPageToken,users(id,primaryEmail)', fields='nextPageToken,users(id,primaryEmail)')
maxResults=GC_Values[GC_USER_MAX_RESULTS])
GM_Globals[GM_MAP_USER_ID_TO_NAME] = {} GM_Globals[GM_MAP_USER_ID_TO_NAME] = {}
for user in result: for user in result:
GM_Globals[GM_MAP_USER_ID_TO_NAME][user['id']] = user['primaryEmail'] GM_Globals[GM_MAP_USER_ID_TO_NAME][user['id']] = user['primaryEmail']
@@ -3162,7 +3176,10 @@ def changeCalendarAttendees(users):
continue continue
page_token = None page_token = None
while True: while True:
events_page = callGAPI(cal.events(), 'list', calendarId=user, pageToken=page_token, timeMin=start_date, timeMax=end_date, showDeleted=False, showHiddenInvitations=False) events_page = callGAPI(cal.events(), 'list', calendarId=user,
pageToken=page_token, timeMin=start_date,
timeMax=end_date, showDeleted=False,
showHiddenInvitations=False)
print('Got %s items' % len(events_page.get('items', []))) print('Got %s items' % len(events_page.get('items', [])))
for event in events_page.get('items', []): for event in events_page.get('items', []):
if event['status'] == 'cancelled': if event['status'] == 'cancelled':
@@ -3843,8 +3860,8 @@ def doCalendarPrintEvents():
systemErrorExit(2, '%s is not a valid argument for "gam calendar <email> printevents"' % sys.argv[i]) systemErrorExit(2, '%s is not a valid argument for "gam calendar <email> printevents"' % sys.argv[i])
page_message = 'Got %%%%total_items%%%% events for %s' % calendarId page_message = 'Got %%%%total_items%%%% events for %s' % calendarId
results = callGAPIpages(cal.events(), 'list', 'items', page_message=page_message, results = callGAPIpages(cal.events(), 'list', 'items', page_message=page_message,
maxResults=2500, calendarId=calendarId, calendarId=calendarId, q=q, showDeleted=showDeleted,
q=q, showDeleted=showDeleted, showHiddenInvitations=showHiddenInvitations, showHiddenInvitations=showHiddenInvitations,
timeMin=timeMin, timeMax=timeMax, timeZone=timeZone, updatedMin=updatedMin) timeMin=timeMin, timeMax=timeMax, timeZone=timeZone, updatedMin=updatedMin)
for result in results: for result in results:
row = {'calendarId': calendarId} row = {'calendarId': calendarId}
@@ -4309,7 +4326,7 @@ def printDriveActivity(users):
feed = callGAPIpages(activity.activities(), 'list', 'activities', feed = callGAPIpages(activity.activities(), 'list', 'activities',
page_message=page_message, source='drive.google.com', userId='me', page_message=page_message, source='drive.google.com', userId='me',
drive_ancestorId=drive_ancestorId, groupingStrategy='none', drive_ancestorId=drive_ancestorId, groupingStrategy='none',
drive_fileId=drive_fileId, pageSize=GC_Values[GC_ACTIVITY_MAX_RESULTS]) drive_fileId=drive_fileId)
for item in feed: for item in feed:
addRowTitlesToCSVfile(flatten_json(item['combinedEvent']), csvRows, titles) addRowTitlesToCSVfile(flatten_json(item['combinedEvent']), csvRows, titles)
writeCSVfile(csvRows, titles, 'Drive Activity', todrive) writeCSVfile(csvRows, titles, 'Drive Activity', todrive)
@@ -4589,7 +4606,7 @@ def printDriveFileList(users):
page_message = ' Got %%%%total_items%%%% files for %s...\n' % user page_message = ' Got %%%%total_items%%%% files for %s...\n' % user
feed = callGAPIpages(drive.files(), 'list', 'items', feed = callGAPIpages(drive.files(), 'list', 'items',
page_message=page_message, soft_errors=True, page_message=page_message, soft_errors=True,
q=query, orderBy=orderBy, fields=fields, maxResults=GC_Values[GC_DRIVE_MAX_RESULTS]) q=query, orderBy=orderBy, fields=fields)
for f_file in feed: for f_file in feed:
a_file = {'Owner': user} a_file = {'Owner': user}
for attrib in f_file: for attrib in f_file:
@@ -4643,7 +4660,7 @@ def doDriveSearch(drive, query=None, quiet=False):
page_message = None page_message = None
files = callGAPIpages(drive.files(), 'list', 'items', files = callGAPIpages(drive.files(), 'list', 'items',
page_message=page_message, page_message=page_message,
q=query, fields='nextPageToken,items(id)', maxResults=GC_Values[GC_DRIVE_MAX_RESULTS]) q=query, fields='nextPageToken,items(id)')
ids = list() ids = list()
for f_file in files: for f_file in files:
ids.append(f_file['id']) ids.append(f_file['id'])
@@ -4763,7 +4780,7 @@ def showDriveFileTree(users):
sys.stderr.write('Getting all files for %s...\n' % user) sys.stderr.write('Getting all files for %s...\n' % user)
page_message = ' Got %%%%total_items%%%% files for %s...\n' % user page_message = ' Got %%%%total_items%%%% files for %s...\n' % user
feed = callGAPIpages(drive.files(), 'list', 'items', page_message=page_message, feed = callGAPIpages(drive.files(), 'list', 'items', page_message=page_message,
q=query, orderBy=orderBy, fields='items(id,title,parents(id),mimeType),nextPageToken', maxResults=GC_Values[GC_DRIVE_MAX_RESULTS]) q=query, orderBy=orderBy, fields='items(id,title,parents(id),mimeType),nextPageToken')
printDriveFolderContents(feed, root_folder, 0) printDriveFolderContents(feed, root_folder, 0)
def deleteEmptyDriveFolders(users): def deleteEmptyDriveFolders(users):
@@ -4777,7 +4794,7 @@ def deleteEmptyDriveFolders(users):
sys.stderr.write('Getting folders for %s...\n' % user) sys.stderr.write('Getting folders for %s...\n' % user)
page_message = ' Got %%%%total_items%%%% folders for %s...\n' % user page_message = ' Got %%%%total_items%%%% folders for %s...\n' % user
feed = callGAPIpages(drive.files(), 'list', 'items', page_message=page_message, feed = callGAPIpages(drive.files(), 'list', 'items', page_message=page_message,
q=query, fields='items(title,id),nextPageToken', maxResults=GC_Values[GC_DRIVE_MAX_RESULTS]) q=query, fields='items(title,id),nextPageToken')
deleted_empty = False deleted_empty = False
for folder in feed: for folder in feed:
children = callGAPI(drive.children(), 'list', children = callGAPI(drive.children(), 'list',
@@ -9518,7 +9535,7 @@ def doUpdateGroup():
result = callGAPIpages(cd.members(), 'list', 'members', result = callGAPIpages(cd.members(), 'list', 'members',
page_message=page_message, page_message=page_message,
throw_reasons=GAPI_MEMBERS_THROW_REASONS, throw_reasons=GAPI_MEMBERS_THROW_REASONS,
groupKey=group, roles=listRoles, fields=listFields, maxResults=GC_Values[GC_MEMBER_MAX_RESULTS]) groupKey=group, roles=listRoles, fields=listFields)
if not result: if not result:
print('Group already has 0 members') print('Group already has 0 members')
return return
@@ -9699,7 +9716,10 @@ def doUpdateMobile():
query = resourceIds[6:] query = resourceIds[6:]
fields = 'nextPageToken,mobiledevices(resourceId,email)' fields = 'nextPageToken,mobiledevices(resourceId,email)'
page_message = 'Got %%total_items%% mobile devices...\n' page_message = 'Got %%total_items%% mobile devices...\n'
devices = callGAPIpages(cd.mobiledevices(), 'list', page_message=page_message, customerId=GC_Values[GC_CUSTOMER_ID], items='mobiledevices', query=query, fields=fields) devices = callGAPIpages(cd.mobiledevices(), 'list',
page_message=page_message,
customerId=GC_Values[GC_CUSTOMER_ID],
items='mobiledevices', query=query, fields=fields)
else: else:
devices = [{'resourceId': resourceIds, 'email': ['not set']}] devices = [{'resourceId': resourceIds, 'email': ['not set']}]
doit = True doit = True
@@ -10344,7 +10364,7 @@ def doGetGroupInfo(group_name=None):
for groupm in groups: for groupm in groups:
print(' %s: %s' % (groupm['name'], groupm['email'])) print(' %s: %s' % (groupm['name'], groupm['email']))
if getUsers: if getUsers:
members = callGAPIpages(cd.members(), 'list', 'members', groupKey=group_name, fields='nextPageToken,members(email,id,role,type)', maxResults=GC_Values[GC_MEMBER_MAX_RESULTS]) members = callGAPIpages(cd.members(), 'list', 'members', groupKey=group_name, fields='nextPageToken,members(email,id,role,type)')
print('Members:') print('Members:')
for member in members: for member in members:
print(' %s: %s (%s)' % (member.get('role', ROLE_MEMBER).lower(), member.get('email', member['id']), member['type'].lower())) print(' %s: %s (%s)' % (member.get('role', ROLE_MEMBER).lower(), member.get('email', member['id']), member['type'].lower()))
@@ -10824,7 +10844,7 @@ def doGetOrgInfo(name=None, return_attrib=None):
page_message = 'Got %%total_items%% Users: %%first_item%% - %%last_item%%\n' page_message = 'Got %%total_items%% Users: %%first_item%% - %%last_item%%\n'
users = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message, users = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message,
message_attribute='primaryEmail', customer=GC_Values[GC_CUSTOMER_ID], query=orgUnitPathQuery(name, checkSuspended), message_attribute='primaryEmail', customer=GC_Values[GC_CUSTOMER_ID], query=orgUnitPathQuery(name, checkSuspended),
fields='users(primaryEmail,orgUnitPath),nextPageToken', maxResults=GC_Values[GC_USER_MAX_RESULTS]) fields='users(primaryEmail,orgUnitPath),nextPageToken')
if checkSuspended is None: if checkSuspended is None:
print('Users:') print('Users:')
elif not checkSuspended: elif not checkSuspended:
@@ -11067,7 +11087,7 @@ def doUndeleteUser():
else: else:
print('Looking up UID for %s...' % user) print('Looking up UID for %s...' % user)
deleted_users = callGAPIpages(cd.users(), 'list', 'users', deleted_users = callGAPIpages(cd.users(), 'list', 'users',
customer=GC_Values[GC_CUSTOMER_ID], showDeleted=True, maxResults=GC_Values[GC_USER_MAX_RESULTS]) customer=GC_Values[GC_CUSTOMER_ID], showDeleted=True)
matching_users = list() matching_users = list()
for deleted_user in deleted_users: for deleted_user in deleted_users:
if str(deleted_user['primaryEmail']).lower() == user: if str(deleted_user['primaryEmail']).lower() == user:
@@ -11559,7 +11579,7 @@ def doPrintUsers():
all_users = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message, all_users = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message,
message_attribute='primaryEmail', customer=customer, domain=domain, fields=fields, message_attribute='primaryEmail', customer=customer, domain=domain, fields=fields,
showDeleted=deleted_only, orderBy=orderBy, sortOrder=sortOrder, viewType=viewType, showDeleted=deleted_only, orderBy=orderBy, sortOrder=sortOrder, viewType=viewType,
query=query, projection=projection, customFieldMask=customFieldMask, maxResults=GC_Values[GC_USER_MAX_RESULTS]) query=query, projection=projection, customFieldMask=customFieldMask)
for user in all_users: for user in all_users:
if email_parts and ('primaryEmail' in user): if email_parts and ('primaryEmail' in user):
user_email = user['primaryEmail'] user_email = user['primaryEmail']
@@ -11709,7 +11729,6 @@ def doPrintGroups():
titles = [] titles = []
csvRows = [] csvRows = []
addFieldTitleToCSVfile('email', GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList, fieldsTitles, titles) addFieldTitleToCSVfile('email', GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList, fieldsTitles, titles)
maxResults = None
roles = [] roles = []
getSettings = sortHeaders = False getSettings = sortHeaders = False
while i < len(sys.argv): while i < len(sys.argv):
@@ -11730,7 +11749,7 @@ def doPrintGroups():
usemember = None usemember = None
i += 2 i += 2
elif myarg == 'maxresults': elif myarg == 'maxresults':
maxResults = getInteger(sys.argv[i+1], myarg, minVal=0) # deprecated argument
i += 2 i += 2
elif myarg == 'delimiter': elif myarg == 'delimiter':
aliasDelimiter = memberDelimiter = sys.argv[i+1] aliasDelimiter = memberDelimiter = sys.argv[i+1]
@@ -11812,8 +11831,7 @@ def doPrintGroups():
entityList = callGAPIpages(cd.groups(), 'list', 'groups', entityList = callGAPIpages(cd.groups(), 'list', 'groups',
page_message=page_message, message_attribute='email', page_message=page_message, message_attribute='email',
customer=customer, domain=usedomain, userKey=usemember, query=usequery, customer=customer, domain=usedomain, userKey=usemember, query=usequery,
fields='nextPageToken,groups({0})'.format(cdfields), fields='nextPageToken,groups({0})'.format(cdfields))
maxResults=maxResults)
i = 0 i = 0
count = len(entityList) count = len(entityList)
for groupEntity in entityList: for groupEntity in entityList:
@@ -11833,7 +11851,7 @@ def doPrintGroups():
groupMembers = callGAPIpages(cd.members(), 'list', 'members', groupMembers = callGAPIpages(cd.members(), 'list', 'members',
page_message=page_message, message_attribute='email', page_message=page_message, message_attribute='email',
soft_errors=True, soft_errors=True,
groupKey=groupEmail, roles=listRoles, fields=listFields, maxResults=GC_Values[GC_MEMBER_MAX_RESULTS]) groupKey=groupEmail, roles=listRoles, fields=listFields)
if members: if members:
membersList = [] membersList = []
membersCount = 0 membersCount = 0
@@ -12020,7 +12038,7 @@ def doPrintAliases():
page_message = 'Got %%num_items%% Users %%first_item%% - %%last_item%%\n' page_message = 'Got %%num_items%% Users %%first_item%% - %%last_item%%\n'
all_users = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message, all_users = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message,
message_attribute='primaryEmail', customer=GC_Values[GC_CUSTOMER_ID], query=query, message_attribute='primaryEmail', customer=GC_Values[GC_CUSTOMER_ID], query=query,
fields='nextPageToken,users({0})'.format(','.join(userFields)), maxResults=GC_Values[GC_USER_MAX_RESULTS]) fields='nextPageToken,users({0})'.format(','.join(userFields)))
for user in all_users: for user in all_users:
for alias in user.get('aliases', []): for alias in user.get('aliases', []):
csvRows.append({'Alias': alias, 'Target': user['primaryEmail'], 'TargetType': 'User'}) csvRows.append({'Alias': alias, 'Target': user['primaryEmail'], 'TargetType': 'User'})
@@ -12109,7 +12127,7 @@ def doPrintGroupMembers():
validRoles, listRoles, listFields = _getRoleVerification(','.join(roles), fields) validRoles, listRoles, listFields = _getRoleVerification(','.join(roles), fields)
group_members = callGAPIpages(cd.members(), 'list', 'members', group_members = callGAPIpages(cd.members(), 'list', 'members',
soft_errors=True, soft_errors=True,
groupKey=group_email, roles=listRoles, fields=listFields, maxResults=GC_Values[GC_MEMBER_MAX_RESULTS]) groupKey=group_email, roles=listRoles, fields=listFields)
for member in group_members: for member in group_members:
if not _checkMemberRoleIsSuspended(member, validRoles, checkSuspended): if not _checkMemberRoleIsSuspended(member, validRoles, checkSuspended):
continue continue
@@ -12303,7 +12321,7 @@ def doPrintMobileDevices():
page_message = 'Got %%num_items%% Mobile Devices...\n' page_message = 'Got %%num_items%% Mobile Devices...\n'
all_mobile = callGAPIpages(cd.mobiledevices(), 'list', 'mobiledevices', page_message=page_message, all_mobile = callGAPIpages(cd.mobiledevices(), 'list', 'mobiledevices', page_message=page_message,
customerId=GC_Values[GC_CUSTOMER_ID], query=query, projection=projection, fields=fields, customerId=GC_Values[GC_CUSTOMER_ID], query=query, projection=projection, fields=fields,
orderBy=orderBy, sortOrder=sortOrder, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS]) orderBy=orderBy, sortOrder=sortOrder)
for mobile in all_mobile: for mobile in all_mobile:
row = {} row = {}
for attrib in mobile: for attrib in mobile:
@@ -12420,7 +12438,7 @@ def doPrintCrosActivity():
page_message = 'Got %%total_items%% CrOS Devices...\n' page_message = 'Got %%total_items%% CrOS Devices...\n'
all_cros = callGAPIpages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message, all_cros = callGAPIpages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message,
query=query, customerId=GC_Values[GC_CUSTOMER_ID], projection='FULL', query=query, customerId=GC_Values[GC_CUSTOMER_ID], projection='FULL',
fields=fields, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS], orgUnitPath=orgUnitPath) fields=fields, orgUnitPath=orgUnitPath)
for cros in all_cros: for cros in all_cros:
row = {} row = {}
for attrib in cros: for attrib in cros:
@@ -12601,7 +12619,7 @@ def doPrintCrosDevices():
page_message = 'Got %%total_items%% CrOS Devices...\n' page_message = 'Got %%total_items%% CrOS Devices...\n'
all_cros = callGAPIpages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message, all_cros = callGAPIpages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message,
query=query, customerId=GC_Values[GC_CUSTOMER_ID], projection=projection, orgUnitPath=orgUnitPath, query=query, customerId=GC_Values[GC_CUSTOMER_ID], projection=projection, orgUnitPath=orgUnitPath,
orderBy=orderBy, sortOrder=sortOrder, fields=fields, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS]) orderBy=orderBy, sortOrder=sortOrder, fields=fields)
for cros in all_cros: for cros in all_cros:
_checkTPMVulnerability(cros) _checkTPMVulnerability(cros)
if guess_aue: if guess_aue:
@@ -13005,7 +13023,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=No
page_message = 'Got %%%%total_items%%%% %s...' % member_type_message page_message = 'Got %%%%total_items%%%% %s...' % member_type_message
validRoles, listRoles, listFields = _getRoleVerification(member_type, 'nextPageToken,members(email,id,type,status)') validRoles, listRoles, listFields = _getRoleVerification(member_type, 'nextPageToken,members(email,id,type,status)')
members = callGAPIpages(cd.members(), 'list', 'members', page_message=page_message, members = callGAPIpages(cd.members(), 'list', 'members', page_message=page_message,
groupKey=group, roles=listRoles, fields=listFields, maxResults=GC_Values[GC_MEMBER_MAX_RESULTS]) groupKey=group, roles=listRoles, fields=listFields)
users = [] users = []
for member in members: for member in members:
if ((not groupUserMembersOnly) or (member['type'] == 'USER')) and _checkMemberRoleIsSuspended(member, validRoles, checkSuspended): if ((not groupUserMembersOnly) or (member['type'] == 'USER')) and _checkMemberRoleIsSuspended(member, validRoles, checkSuspended):
@@ -13028,7 +13046,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=No
page_message = 'Got %%total_items%% Users...' page_message = 'Got %%total_items%% Users...'
members = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message, members = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message,
customer=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,users(primaryEmail,orgUnitPath)', customer=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,users(primaryEmail,orgUnitPath)',
query=query, maxResults=GC_Values[GC_USER_MAX_RESULTS]) query=query)
ou = ou.lower() ou = ou.lower()
for member in members: for member in members:
if ou == member.get('orgUnitPath', '').lower(): if ou == member.get('orgUnitPath', '').lower():
@@ -13050,7 +13068,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=No
page_message = 'Got %%total_items%% Users...' page_message = 'Got %%total_items%% Users...'
members = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message, members = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message,
customer=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,users(primaryEmail)', customer=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,users(primaryEmail)',
query=query, maxResults=GC_Values[GC_USER_MAX_RESULTS]) query=query)
for member in members: for member in members:
users.append(member['primaryEmail']) users.append(member['primaryEmail'])
if not silent: if not silent:
@@ -13069,7 +13087,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=No
page_message = 'Got %%total_items%% Users...' page_message = 'Got %%total_items%% Users...'
members = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message, members = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message,
customer=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,users(primaryEmail,suspended)', customer=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,users(primaryEmail,suspended)',
query=query, maxResults=GC_Values[GC_USER_MAX_RESULTS]) query=query)
for member in members: for member in members:
email = member['primaryEmail'] email = member['primaryEmail']
if (checkSuspended is None or checkSuspended == member['suspended']) and email not in usersSet: if (checkSuspended is None or checkSuspended == member['suspended']) and email not in usersSet:
@@ -13135,7 +13153,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=No
page_message = 'Got %%total_items%% Users...' page_message = 'Got %%total_items%% Users...'
all_users = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message, all_users = callGAPIpages(cd.users(), 'list', 'users', page_message=page_message,
customer=GC_Values[GC_CUSTOMER_ID], query=query, customer=GC_Values[GC_CUSTOMER_ID], query=query,
fields='nextPageToken,users(primaryEmail)', maxResults=GC_Values[GC_USER_MAX_RESULTS]) fields='nextPageToken,users(primaryEmail)')
for member in all_users: for member in all_users:
users.append(member['primaryEmail']) users.append(member['primaryEmail'])
if not silent: if not silent:
@@ -13145,8 +13163,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=No
printGettingAllItems('CrOS Devices', None) printGettingAllItems('CrOS Devices', None)
page_message = 'Got %%total_items%% CrOS Devices...' page_message = 'Got %%total_items%% CrOS Devices...'
all_cros = callGAPIpages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message, all_cros = callGAPIpages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message,
customerId=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,chromeosdevices(deviceId)', customerId=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,chromeosdevices(deviceId)')
maxResults=GC_Values[GC_DEVICE_MAX_RESULTS])
for member in all_cros: for member in all_cros:
users.append(member['deviceId']) users.append(member['deviceId'])
if not silent: if not silent:
@@ -13171,7 +13188,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=No
page_message = 'Got %%total_items%% CrOS Devices...' page_message = 'Got %%total_items%% CrOS Devices...'
members = callGAPIpages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message, members = callGAPIpages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message,
customerId=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,chromeosdevices(deviceId)', customerId=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,chromeosdevices(deviceId)',
query=query, maxResults=GC_Values[GC_DEVICE_MAX_RESULTS]) query=query)
for member in members: for member in members:
deviceId = member['deviceId'] deviceId = member['deviceId']
if deviceId not in usersSet: if deviceId not in usersSet:

16
src/var.py
View File

@@ -1203,3 +1203,19 @@ LANGUAGE_CODES_MAP = {
'ur': 'ur', 'uz': 'uz', 'vi': 'vi', 'wo': 'wo', 'xh': 'xh', 'yi': 'yi', 'yo': 'yo', #Urdu, Uzbek, Vietnamese, Wolof, Xhosa, Yiddish, Yoruba 'ur': 'ur', 'uz': 'uz', 'vi': 'vi', 'wo': 'wo', 'xh': 'xh', 'yi': 'yi', 'yo': 'yo', #Urdu, Uzbek, Vietnamese, Wolof, Xhosa, Yiddish, Yoruba
'zh-cn': 'zh-CN', 'zh-hk': 'zh-HK', 'zh-tw': 'zh-TW', 'zu': 'zu', #Chinese (Simplified), Chinese (Hong Kong/Traditional), Chinese (Taiwan/Traditional), Zulu 'zh-cn': 'zh-CN', 'zh-hk': 'zh-HK', 'zh-tw': 'zh-TW', 'zu': 'zu', #Chinese (Simplified), Chinese (Hong Kong/Traditional), Chinese (Taiwan/Traditional), Zulu
} }
# maxResults exception values for API list calls. Should only be listed if:
# - discovery doc does not specify maximum value (we use maximum value if it
# exists, not this)
# - actual max API returns with maxResults=<bigNum> > default API returns
# when maxResults isn't specified (we should use default otherwise by not
# setting maxResults)
MAX_RESULTS_API_EXCEPTIONS = {
'calendar.acl.list': 250,
'calendar.calendarList.list': 250,
'calendar.events.list': 2500,
'calendar.settings.list': 250,
'directory.chromeosdevices.list': 200,
'drive.files.list': 1000,
}