From 41521f4c04ae7645a891e47c30032a9b9332702c Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Fri, 21 Feb 2020 12:25:23 -0800 Subject: [PATCH] Fix gam report user/customer not being recognized (#1103) --- src/gam.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gam.py b/src/gam.py index dd891041..c1d8e55f 100755 --- a/src/gam.py +++ b/src/gam.py @@ -1272,9 +1272,9 @@ def showReport(): rep = buildGAPIObject('reports') report = sys.argv[2].lower() report = REPORT_CHOICE_MAP.get(report.replace('_', ''), report) - valid_apps = _getEnumValuesMinusUnspecified(rep._rootDesc['resources']['activities']['methods']['list']['parameters']['applicationName']['enum']) + valid_apps = _getEnumValuesMinusUnspecified(rep._rootDesc['resources']['activities']['methods']['list']['parameters']['applicationName']['enum'])+['customer', 'user'] if report not in valid_apps: - controlflow.expected_argument_exit("report", ", ".join(valid_apps), report) + controlflow.expected_argument_exit("report", ", ".join(sorted(valid_apps)), report) customerId = GC_Values[GC_CUSTOMER_ID] if customerId == MY_CUSTOMER: customerId = None