When displaying printers, add orgUnitPath (#1338)

src/gam/__init__.py

@@ -1739,7 +1739,7 @@ def doPrintAdmins():
                 value = f'id:{value}'
                 admin_attrib[
                     'orgUnit'] = gapi_directory_orgunits.orgunit_from_orgunitid(
-                        value)
+                        value, cd)
             admin_attrib[key] = value
         csvRows.append(admin_attrib)
     display.write_csv_file(csvRows, titles, 'Admins', todrive)

src/gam/gapi/directory/orgunits.py

@@ -402,20 +402,16 @@ def getOrgUnitId(orgUnit, cd=None):
     return (orgUnit, result['orgUnitId'])
 
 
-def buildOrgUnitIdToNameMap():
-    cd = gapi_directory.build()
-    result = gapi.call(cd.orgunits(),
-                       'list',
+def orgunit_from_orgunitid(orgunitid, cd):
+    orgunitpath = GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME].get(orgunitid)
+    if not orgunitpath:
+        try:
+            orgunitpath = gapi.call(cd.orgunits(),
+                                    'get',
                                     customerId=GC_Values[GC_CUSTOMER_ID],
-                       fields='organizationUnits(orgUnitPath,orgUnitId)',
-                       type='all')
-    GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME] = {}
-    for orgUnit in result['organizationUnits']:
-        GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME][
-            orgUnit['orgUnitId']] = orgUnit['orgUnitPath']
-
-
-def orgunit_from_orgunitid(orgunitid):
-    if not GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME]:
-        buildOrgUnitIdToNameMap()
-    return GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME].get(orgunitid, orgunitid)
+                                    orgUnitPath=f'id:{orgunitid}' if not orgunitid.startswith('id:') else orgunitid,
+                                    fields='orgUnitPath')['orgUnitPath']
+        except:
+            orgunitpath = orgunitid
+        GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME][orgunitid] = orgunitpath
+    return orgunitpath

src/gam/gapi/directory/printers.py

@@ -89,10 +89,13 @@ def info():
     customer = _get_customerid()
     printer_id = sys.argv[3]
     name = f'{customer}/chrome/printers/{printer_id}'
-    result = gapi.call(cdapi.customers().chrome().printers(),
+    printer = gapi.call(cdapi.customers().chrome().printers(),
                        'get',
                        name=name)
-    display.print_json(result)
+    if 'orgUnitId' in printer:
+        printer['orgUnitPath'] = gapi_directory_orgunits.orgunit_from_orgunitid(
+            printer['orgUnitId'], cdapi)
+    display.print_json(printer)
 
 
 def print_():
@@ -120,6 +123,9 @@ def print_():
                                   parent=parent,
                                   filter=filter_)
     for printer in printers:
+        if 'orgUnitId' in printer:
+            printer['orgUnitPath'] = gapi_directory_orgunits.orgunit_from_orgunitid(
+                printer['orgUnitId'], cdapi)
         row = {}
         for key, val in printer.items():
             if key not in titles:

src/gam/var.py

@@ -1180,7 +1180,7 @@ GM_Globals = {
     GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID: None,
     GM_ENABLEDASA_TXT: '',
     GM_LAST_UPDATE_CHECK_TXT: '',
-    GM_MAP_ORGUNIT_ID_TO_NAME: None,
+    GM_MAP_ORGUNIT_ID_TO_NAME: {},
     GM_MAP_ROLE_ID_TO_NAME: None,
     GM_MAP_ROLE_NAME_TO_ID: None,
     GM_MAP_USER_ID_TO_NAME: None,