deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 22:23:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Updated gam report users to support new orgUnitID argument in Reports API (#833)

Browse Source
This commit is contained in:
Ross Scroggs
2019-01-02 12:43:35 -08:00
committed by Jay Lee
parent eb041e9e65
commit df3ea385ee
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GamCommands.txt
View File

@ -830,7 +830,7 @@ gam info resoldsubscriptions <CustomerID> [customer_auth_token <String>]
<ReportsAppList> ::= "<ReportsApp>(,<ReportsApp>)*"
gam report users|user [todrive] [date <Date>] [fulldatarequired all|<ReportsAppList>]
[(user all|<UserItem>)] [filter|filters <String>] [fields|parameters <String>]
[(user all|<UserItem>)|(orgunit|org|ou <OrgUnitPath>)] [filter|filters <String>] [fields|parameters <String>]
gam report customers|customer|domain [todrive] [date <Date>] [fulldatarequired all|<ReportsAppList>]
[fields|parameters <String>]
gam report admin|calendar|calendars|drive|docs|doc|groups|group|logins|login|mobile|tokens|token [todrive]

9
src/gam.py
View File

@ -1272,7 +1272,7 @@ def showReport():
customerId = GC_Values[GC_CUSTOMER_ID]
if customerId == MY_CUSTOMER:
customerId = None
filters = parameters = actorIpAddress = startTime = endTime = eventName = None
filters = parameters = actorIpAddress = startTime = endTime = eventName = orgUnitId = None
tryDate = datetime.date.today().strftime(YYYYMMDD_FORMAT)
to_drive = False
userKey = u'all'
@ -1283,6 +1283,9 @@ def showReport():
if myarg == u'date':
tryDate = getYYYYMMDD(sys.argv[i+1])
i += 2
elif myarg in [u'orgunit', u'org', u'ou']:
_, orgUnitId = getOrgUnitId(sys.argv[i+1])
i += 2
elif myarg == u'fulldatarequired':
fullDataRequired = []
fdr = sys.argv[i+1].lower()
@ -1321,7 +1324,7 @@ def showReport():
if fullDataRequired is not None:
warnings = callGAPIitems(rep.userUsageReport(), u'get', u'warnings',
throw_reasons=[GAPI_INVALID],
date=tryDate, userKey=userKey, customerId=customerId, fields=u'warnings')
date=tryDate, userKey=userKey, customerId=customerId, orgUnitID=orgUnitId, fields=u'warnings')
fullData, tryDate = _checkFullDataAvailable(warnings, tryDate, fullDataRequired)
if fullData < 0:
print u'No user report available.'
@ -1330,7 +1333,7 @@ def showReport():
continue
page_message = u'Got %%num_items%% Users\n'
usage = callGAPIpages(rep.userUsageReport(), u'get', u'usageReports', page_message=page_message, throw_reasons=[GAPI_INVALID],
date=tryDate, userKey=userKey, customerId=customerId, filters=filters, parameters=parameters)
date=tryDate, userKey=userKey, customerId=customerId, orgUnitID=orgUnitId, filters=filters, parameters=parameters)
break
except GAPI_invalid as e:
tryDate = _adjustDate(str(e))