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

Standarize usage/usageparameters under gam report (#1151)

Browse Source 
gam report usage customer|user ...
gam report usageparameters customer|user
This commit is contained in:
Ross Scroggs
2020-04-06 16:52:12 -07:00
committed by GitHub
parent c83430a537
commit c4f1a7eb70
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gam.py
View File

@@ -11236,12 +11236,6 @@ def ProcessGAMCommand(args):
elif command == 'report': elif command == 'report':
gapi.reports.showReport() gapi.reports.showReport()
sys.exit(0) sys.exit(0)
elif command == 'usage':
gapi.reports.showUsage()
sys.exit(0)
elif command == 'usageparameters':
gapi.reports.showUsageParameters()
sys.exit(0)
elif command == 'whatis': elif command == 'whatis':
doWhatIs() doWhatIs()
sys.exit(0) sys.exit(0)

17
src/gapi/reports.py
View File

@@ -33,6 +33,8 @@ REPORT_CHOICE_MAP = {
'logins': 'login', 'logins': 'login',
'oauthtoken': 'token', 'oauthtoken': 'token',
'tokens': 'token', 'tokens': 'token',
'usage': 'usage',
'usageparameters': 'usageparameters',
'users': 'user', 'users': 'user',
'useraccounts': 'user_accounts', 'useraccounts': 'user_accounts',
} }
@@ -42,7 +44,7 @@ def showUsageParameters():
rep = buildGAPIObject() rep = buildGAPIObject()
throw_reasons = [gapi.errors.ErrorReason.INVALID, throw_reasons = [gapi.errors.ErrorReason.INVALID,
gapi.errors.ErrorReason.BAD_REQUEST] gapi.errors.ErrorReason.BAD_REQUEST]
report = sys.argv[2].lower() report = sys.argv[3].lower()
if report == 'customer': if report == 'customer':
endpoint = rep.customerUsageReports() endpoint = rep.customerUsageReports()
kwargs = {} kwargs = {}
@@ -95,7 +97,7 @@ def showUsage():
throw_reasons = [gapi.errors.ErrorReason.INVALID, throw_reasons = [gapi.errors.ErrorReason.INVALID,
gapi.errors.ErrorReason.BAD_REQUEST] gapi.errors.ErrorReason.BAD_REQUEST]
todrive = False todrive = False
report = sys.argv[2].lower() report = sys.argv[3].lower()
titles = ['date'] titles = ['date']
if report == 'customer': if report == 'customer':
endpoint = rep.customerUsageReports() endpoint = rep.customerUsageReports()
@@ -110,11 +112,12 @@ def showUsage():
customerId = GC_Values[GC_CUSTOMER_ID] customerId = GC_Values[GC_CUSTOMER_ID]
if customerId == MY_CUSTOMER: if customerId == MY_CUSTOMER:
customerId = None customerId = None
parameters = filters = None parameters = []
filters = None
start_date = end_date = orgUnitId = None start_date = end_date = orgUnitId = None
skip_day_numbers = [] skip_day_numbers = []
skip_dates = [] skip_dates = []
i = 3 i = 4
while i < len(sys.argv): while i < len(sys.argv):
myarg = sys.argv[i].lower().replace('_', '') myarg = sys.argv[i].lower().replace('_', '')
if myarg == 'startdate': if myarg == 'startdate':
@@ -218,6 +221,12 @@ def showReport():
throw_reasons = [gapi.errors.ErrorReason.INVALID] throw_reasons = [gapi.errors.ErrorReason.INVALID]
report = sys.argv[2].lower() report = sys.argv[2].lower()
report = REPORT_CHOICE_MAP.get(report.replace('_', ''), report) report = REPORT_CHOICE_MAP.get(report.replace('_', ''), report)
if report == 'usage':
showUsage()
return
if report == 'usageparameters':
showUsageParameters()
return
valid_apps = gapi.get_enum_values_minus_unspecified( valid_apps = gapi.get_enum_values_minus_unspecified(
rep._rootDesc['resources']['activities']['methods']['list'][ rep._rootDesc['resources']['activities']['methods']['list'][
'parameters']['applicationName']['enum'])+['customer', 'user'] 'parameters']['applicationName']['enum'])+['customer', 'user']