rebuild to see if we're only failing on cached runs

.github/workflows/build.yml

@@ -158,7 +158,7 @@ jobs:
         with:
           path: |
             cache.tar.xz
-          key: gam-${{ matrix.jid }}-20251007
+          key: gam-${{ matrix.jid }}-20251031
 
       - name: Untar Cache archive
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'

src/GamCommands.txt

@@ -4651,6 +4651,7 @@ gam report customers|customer|domain [todrive <ToDriveAttribute>*]
         [(nodatechange | limitdatechanges <Integer>) | (fulldatarequired all|<CustomerServiceNameList>)]
         [(fields|parameters <String>)|(services <CustomerServiceNameList>)] [noauthorizedapps]
         [convertmbtogb]
+        (addcsvdata <FieldName> <String>)*
 
 <UserServiceName> ::=
         accounts|
@@ -4673,6 +4674,7 @@ gam report users|user [todrive <ToDriveAttribute>*]
         [aggregatebydate|aggregatebyuser [Boolean]]
         [maxresults <Number>]
         [convertmbtogb]
+        (addcsvdata <FieldName> <String>)*
 
 # Reseller
 

src/GamUpdate.txt

@@ -1,3 +1,14 @@
+7.28.00
+
+Added option `addcsvdata <FieldName> <String>` to `gam report [usage] customers|users`
+that adds additional columns of data to the CSV file output. This will be most useful
+when reading a CSV of user information and you want to include some of the user information,
+e.g., orgUnitPath, in the output.
+```
+gam redirect csv ./Users.csv print users fields ou
+gam redirect csv ./UserStorageInfo.csv multiprocess csv Users.csv gam report users user "~primaryEmail" parameters accounts:drive_used_quota_in_mb,accounts:gmail_used_quota_in_mb,accounts:gplus_photos_used_quota_in_mb,accounts:total_quota_in_mb,accounts:used_quota_in_mb,accounts:used_quota_in_percentage addcsvdata orgUnitPath "~orgUnitPath"
+```
+
 7.27.05
 
 Added option `addcsvdata <FieldName> <String>` to `gam print courses`

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.27.05'
+__version__ = '7.28.00'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -13411,12 +13411,14 @@ REPORTS_PARAMETERS_SIMPLE_TYPES = ['intValue', 'boolValue', 'datetimeValue', 'st
 #	[skipdates <Date>[:<Date>](,<Date>[:<Date>])*] [skipdaysofweek <DayOfWeek>(,<DayOfWeek>)*]
 #	[fields|parameters <String>)]
 #	[convertmbtogb]
+#	(addcsvdata <FieldName> <String>)*
 # gam report usage customer [todrive <ToDriveAttribute>*]
 #	[([start|startdate <Date>] [end|enddate <Date>])|(range <Date> <Date>)|
 #	 thismonth|(previousmonths <Integer>)]
 #	[skipdates <Date>[:<Date>](,<Date>[:<Date>])*] [skipdaysofweek <DayOfWeek>(,<DayOfWeek>)*]
 #	[fields|parameters <String>)]
 #	[convertmbtogb]
+#	(addcsvdata <FieldName> <String>)*
 def doReportUsage():
   def usageEntitySelectors():
     selectorChoices = Cmd.USER_ENTITY_SELECTORS+Cmd.USER_CSVDATA_ENTITY_SELECTORS
@@ -13468,6 +13470,7 @@ def doReportUsage():
   startEndTime = StartEndTime('startdate', 'enddate', 'date')
   skipDayNumbers = []
   skipDates = set()
+  addCSVData = {}
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if csvPF and myarg == 'todrive':
@@ -13522,6 +13525,9 @@ def doReportUsage():
       select = True
     elif myarg == 'convertmbtogb':
       convertMbToGb = True
+    elif myarg == 'addcsvdata':
+      k = getString(Cmd.OB_STRING)
+      addCSVData[k] = getString(Cmd.OB_STRING, minLen=0)
     else:
       unknownArgumentExit()
   if startEndTime.endDateTime is None:
@@ -13555,6 +13561,8 @@ def doReportUsage():
       titles.append('orgUnitPath')
   else:
     pageMessage = None
+  if addCSVData:
+    titles.extend(sorted(addCSVData.keys()))
   csvPF.SetTitles(titles)
   csvPF.SetSortAllTitles()
   parameters = ','.join(parameters) if parameters else None
@@ -13589,6 +13597,8 @@ def doReportUsage():
                 row['orgUnitPath'] = userOrgUnits.get(row['user'], UNKNOWN)
             else:
               row['user'] = UNKNOWN
+          if addCSVData:
+            row.update(addCSVData)
           for item in entity.get('parameters', []):
             if 'name' not in item:
               continue
@@ -13720,12 +13730,14 @@ REPORT_ACTIVITIES_TIME_OBJECTS = {'time'}
 #	[aggregatebydate|aggregatebyuser [Boolean]]
 #	[maxresults <Number>]
 #	[convertmbtogb]
+#	(addcsvdata <FieldName> <String>)*
 # gam report customers|customer|domain [todrive <ToDriveAttribute>*]
 #	[(date <Date>)|(range <Date> <Date>)|
 #	 yesterday|today|thismonth|(previousmonths <Integer>)]
 #	[nodatechange | (fulldatarequired all|<CustomerServiceNameList>)]
 #	[(fields|parameters <String>)|(services <CustomerServiceNameList>)] [noauthorizedapps]
 #	[convertmbtogb]
+#	(addcsvdata <FieldName> <String>)*
 def doReport():
   def processUserUsage(usage, lastDate):
     if not usage:
@@ -13743,6 +13755,8 @@ def doReport():
           row['orgUnitPath'] = userOrgUnits.get(row['email'], UNKNOWN)
       else:
         row['email'] = UNKNOWN
+      if addCSVData:
+        row.update(addCSVData)
       for item in user_report.get('parameters', []):
         if 'name' not in item:
           continue
@@ -13834,6 +13848,8 @@ def doReport():
       return (False, lastDate)
     lastDate = usage[0]['date']
     row = {'date': lastDate}
+    if addCSVData:
+      row.update(addCSVData)
     for item in usage[0].get('parameters', []):
       if 'name' not in item:
         continue
@@ -13908,12 +13924,16 @@ def doReport():
         continue
       for ptype in REPORTS_PARAMETERS_SIMPLE_TYPES:
         if ptype in item:
+          row = {'date': lastDate}
+          if addCSVData:
+            row.update(addCSVData)
           if ptype != 'datetimeValue':
             if convertMbToGb and name.endswith('_in_mb'):
               name = convertReportMBtoGB(name, item)
-            csvPF.WriteRow({'date': lastDate, 'name': name, 'value': item[ptype]})
+            row.update({'name': name, 'value': item[ptype]})
           else:
-            csvPF.WriteRow({'date': lastDate, 'name': name, 'value': formatLocalTime(item[ptype])})
+            row.update({'name': name, 'value': formatLocalTime(item[ptype])})
+          csvPF.WriteRow(row)
           break
       else:
         if 'msgValue' in item:
@@ -13922,6 +13942,8 @@ def doReport():
               continue
             for subitem in item['msgValue']:
               app = {'date': lastDate}
+              if addCSVData:
+                app.update(addCSVData)
               for an_item in subitem:
                 if an_item == 'client_name':
                   app['name'] = f'App: {escapeCRsNLs(subitem[an_item])}'
@@ -13934,7 +13956,11 @@ def doReport():
             values = []
             for subitem in item['msgValue']:
               values.append(f'{subitem["version_number"]}:{subitem["num_devices"]}')
-            csvPF.WriteRow({'date': lastDate, 'name': name, 'value': ' '.join(sorted(values, reverse=True))})
+            row = {'date': lastDate}
+            if addCSVData:
+              row.update(addCSVData)
+            row.update({'name': name, 'value': ' '.join(sorted(values, reverse=True))})
+            csvPF.WriteRow(row)
           else:
             values = []
             for subitem in item['msgValue']:
@@ -13949,7 +13975,11 @@ def doReport():
                     values.append(f'{myvalue}:{mycount}')
               else:
                 continue
-            csvPF.WriteRow({'date': lastDate, 'name': name, 'value': ' '.join(sorted(values, reverse=True))})
+            row = {'date': lastDate}
+            if addCSVData:
+              row.update(addCSVData)
+            row.update({'name': name, 'value': ' '.join(sorted(values, reverse=True))})
+            csvPF.WriteRow(row)
     csvPF.SortRowsTwoTitles('date', 'name', False)
     if authorizedApps:
       csvPF.AddTitle('client_id')
@@ -14099,7 +14129,7 @@ def doReport():
       eventRowFilter = True
     elif activityReports and myarg == 'groupidfilter':
       groupIdFilter = getString(Cmd.OB_STRING)
-    elif activityReports and myarg == 'addcsvdata':
+    elif myarg == 'addcsvdata':
       k = getString(Cmd.OB_STRING)
       addCSVData[k] = getString(Cmd.OB_STRING, minLen=0)
     elif activityReports and myarg == 'shownoactivities':
@@ -14164,6 +14194,8 @@ def doReport():
       titles = ['email'] if not showOrgUnit else ['email', 'orgUnitPath']
     else:
       titles = ['email', 'date'] if not showOrgUnit else ['email', 'orgUnitPath', 'date']
+    if addCSVData:
+      titles.extend(sorted(addCSVData.keys()))
     csvPF.SetTitles(titles)
     csvPF.SetSortAllTitles()
     i = 0
@@ -14250,6 +14282,8 @@ def doReport():
     if aggregateByDate:
       for usageDate, events in eventCounts.items():
         row = {'date': usageDate}
+        if addCSVData:
+          row.update(addCSVData)
         for event, count in events.items():
           if convertMbToGb and event.endswith('_in_gb'):
             count = f'{count/1024:.2f}'
@@ -14262,6 +14296,8 @@ def doReport():
         row = {'email': email}
         if showOrgUnit:
           row['orgUnitPath'] = userOrgUnits.get(email, UNKNOWN)
+        if addCSVData:
+          row.update(addCSVData)
         for event, count in events.items():
           if convertMbToGb and event.endswith('_in_gb'):
             count = f'{count/1024:.2f}'
@@ -14276,6 +14312,8 @@ def doReport():
     if startEndTime.startDateTime is None:
       startEndTime.startDateTime = startEndTime.endDateTime = todaysDate()
     csvPF.SetTitles('date')
+    if addCSVData:
+      csvPF.AddTitles(sorted(addCSVData.keys()))
     if not userCustomerRange or (startEndTime.startDateTime == startEndTime.endDateTime):
       csvPF.AddTitles(['name', 'value'])
     authorizedApps = []
@@ -24227,6 +24265,7 @@ CROS_LIST_FIELDS_CHOICE_MAP = {
 
 CROS_TIME_OBJECTS = {
   'createTime',
+  'extendedSupportStart',
   'firstEnrollmentTime',
   'lastDeprovisionTimestamp',
   'lastEnrollmentTime',