diff --git a/docs/Authorization.md b/docs/Authorization.md index 9d60e6d5..322be919 100644 --- a/docs/Authorization.md +++ b/docs/Authorization.md @@ -232,7 +232,7 @@ perform these steps and then you should be able to authorize and use your projec * Under IAM & Admin select IAM * Click the down arrow in the box to the right of Google Cloud * Click the three dots at the right and select Manage Resources -* Click the three dots and the end of the line for the GAM project just created +* Click the three dots at the end of the line for the GAM project just created * Click Settings * Click Organization Policies in the left column * Now you should be at "Policies for Gam Project" diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 0bedc44f..48861572 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,11 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads-Installs](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads-Installs) for Windows or other options, including manual installation +### 6.80.08 + +Updated `gam print|show oushareddrives` to display the Shared Drive ID, name and orgUnitPath as +individual, separate entities in the output. + ### 6.80.07 Updated `dateheaderformat iso` in `gam info|print|show messages` to include a colon @@ -5065,7 +5070,7 @@ converting `` values to the `gam.cfg timezone`. Updated option `dateheaderformat iso|rfc2822|` to `gam print|show messages|threads` that allows reformatting of the message `Date` header value from RFC2822 format to the the following: -* `iso` - Format is `%Y-%m-%dT%H:%M:%S%z` +* `iso` - Format is `%Y-%m-%dT%H:%M:%S%:z` * `rfc2822` - Format is `%a, %d %b %Y %H:%M:%S %z` * `` - Format according to: https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 53e5d338..722b4393 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -251,7 +251,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin$ gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAMADV-XTD3 6.80.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.80.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.5 64-bit final MacOS Sonoma 14.5 x86_64 @@ -923,7 +923,7 @@ writes the credentials into the file oauth2.txt. C:\>del C:\GAMConfig\oauth2.txt C:\>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.80.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.80.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.5 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 01fcc985..eeb2d468 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.80.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.80.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.5 64-bit final MacOS Sonoma 14.5 x86_64 @@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAMADV-XTD3 6.80.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.80.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.5 64-bit final MacOS Sonoma 14.5 x86_64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAMADV-XTD3 6.80.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.80.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.5 64-bit final MacOS Sonoma 14.5 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.80.07 + Latest: 6.80.08 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.80.07 +6.80.08 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.80.07 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.80.08 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.5 64-bit final MacOS Sonoma 14.5 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 69e4d671..a6dc6422 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,11 @@ Merged GAM-Team version +6.80.08 + +Updated `gam print|show oushareddrives` to display the Shared Drive ID, name and orgUnitPath as +individual, separate entities in the output. + 6.80.07 Updated `dateheaderformat iso` in `gam info|print|show messages` to include a colon diff --git a/src/gam/__init__.py b/src/gam/__init__.py index cadecb16..22da1dac 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -64133,6 +64133,11 @@ def doPrintShowSharedDrives(): # [ou|org|orgunit ] # [formatjson] def doPrintShowOrgunitSharedDrives(): + def _getOrgUnitSharedDriveInfo(shareddrive): + shareddrive['driveId'] = shareddrive['name'].rsplit(';')[1] + shareddrive['driveName'] = _getSharedDriveNameFromId(drive, shareddrive['driveId'], useDomainAdminAccess=True) + shareddrive['orgUnitPath'] = orgUnitPath + def _showOrgUnitSharedDrive(shareddrive, j, jcount, FJQC): if FJQC.formatJSON: printLine(json.dumps(cleanJSON(shareddrive), ensure_ascii=False, sort_keys=True)) @@ -64142,10 +64147,17 @@ def doPrintShowOrgunitSharedDrives(): printEntity([Ent.TYPE, shareddrive['type']]) printEntity([Ent.MEMBER, shareddrive['member']]) printEntity([Ent.MEMBER_URI, shareddrive['memberUri']]) + printEntity([Ent.SHAREDDRIVE_ID, shareddrive['driveId']]) + printEntity([Ent.SHAREDDRIVE_NAME, shareddrive['driveName']]) + printEntity([Ent.ORGANIZATIONAL_UNIT, shareddrive['orgUnit']]) Ind.Decrement() ci = buildGAPIObject(API.CLOUDIDENTITY_ORGUNITS_BETA) - csvPF = CSVPrintFile(['name', 'type', 'member', 'memberUri']) if Act.csvFormat() else None + cd = buildGAPIObject(API.DIRECTORY) + _, drive = buildGAPIServiceObject(API.DRIVE3, _getAdminEmail()) + if not drive: + return + csvPF = CSVPrintFile(['name', 'type', 'member', 'memberUri', 'driveId', 'driveName', 'orgUnitPath']) if Act.csvFormat() else None FJQC = FormatJSONQuoteChar(csvPF) orgUnitPath = '/' while Cmd.ArgumentsRemaining(): @@ -64158,7 +64170,7 @@ def doPrintShowOrgunitSharedDrives(): FJQC.GetFormatJSONQuoteChar(myarg, True) if csvPF and FJQC.formatJSON: csvPF.SetJSONTitles(['name', 'JSON']) - _, orgUnitId = getOrgUnitId(None, orgUnitPath) + orgUnitPath, orgUnitId = getOrgUnitId(cd, orgUnitPath) printGettingAllEntityItemsForWhom(Ent.SHAREDDRIVE, orgUnitPath, entityType=Ent.ORGANIZATIONAL_UNIT) sds = callGAPIpages(ci.orgUnits().memberships(), 'list', 'orgMemberships', pageMessage=getPageMessageForWhom(), @@ -64177,10 +64189,12 @@ def doPrintShowOrgunitSharedDrives(): j = 0 for shareddrive in sds: j += 1 + _getOrgUnitSharedDriveInfo(shareddrive) _showOrgUnitSharedDrive(shareddrive, j, jcount, FJQC) Ind.Decrement() else: for shareddrive in sds: + _getOrgUnitSharedDriveInfo(shareddrive) if FJQC.formatJSON: row = {'name': shareddrive['name']} row['JSON'] = json.dumps(cleanJSON(shareddrive), ensure_ascii=False, sort_keys=True)