deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 12:51:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

store org ID in GC.Values so we ony retrieve it once. Fixes #1891

Browse Source
This commit is contained in:
Jay Lee
2026-03-19 16:17:39 +00:00
parent 6ce8f5dd10
commit 47a97a07df
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gam/__init__.py
View File

@@ -72458,7 +72458,7 @@ def _printShowTokens(entityType, users):
throwReasons=[GAPI.PERMISSION_DENIED], throwReasons=[GAPI.PERMISSION_DENIED],
projectId=result['project']) projectId=result['project'])
for ancestor in results.get('ancestor', []): for ancestor in results.get('ancestor', []):
if ancestor.get('resourceId', {}).get('type') == 'organization' and ancestor.get('resourceId', {}).get('id') == org_id: if ancestor.get('resourceId', {}).get('type') == 'organization' and ancestor.get('resourceId', {}).get('id') == GC.Values['GCP_ORG_ID']:
result['internal'] = True result['internal'] = True
internal_projects.add(result['project']) internal_projects.add(result['project'])
except GAPI.permissionDenied: except GAPI.permissionDenied:
@@ -72520,7 +72520,8 @@ def _printShowTokens(entityType, users):
crm1 = buildGAPIObject('cloudresourcemanagerv1') crm1 = buildGAPIObject('cloudresourcemanagerv1')
admin_email = _getAdminEmail() admin_email = _getAdminEmail()
admin_domain = getEmailAddressDomain(admin_email) admin_domain = getEmailAddressDomain(admin_email)
org_id = getGCPOrg(crm, admin_email, admin_domain).split('/')[1] if 'GCP_ORG_ID' not in GC.Values:
GC.Values['GCP_ORG_ID'] = getGCPOrg(crm, admin_email, admin_domain).split('/')[1]
fields = ','.join(TOKENS_FIELDS_TITLES) fields = ','.join(TOKENS_FIELDS_TITLES)
i, count, users = getEntityArgument(users) i, count, users = getEntityArgument(users)
for user in users: for user in users: