Merge branch 'main' of https://github.com/GAM-team/GAM

Two updates
Updated `gam report <ActivityApplicationName>` to display `id:<actor.profileId>` in the `emailAddress` column when `actor.email` is empty. This typically occurs when the actor is not in your workspace. Updated `gam <UserTypeEntity> copy drivefile` to ignore ACLs referencing deleted user/groups.
2026-06-25 08:31:35 +00:00 · 2025-01-23 15:26:09 -08:00 · 2025-01-23 15:26:01 -08:00
2 changed files with 13 additions and 4 deletions
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -1,3 +1,10 @@
+7.02.11
+
+Updated `gam report <ActivityApplicationName>` to display `id:<actor.profileId>` in the `emailAddress` column
+when `actor.email` is empty. This typically occurs when the actor is not in your workspace.
+
+Updated `gam <UserTypeEntity> copy drivefile` to ignore ACLs referencing deleted user/groups.
+
 7.02.10

 Added option `bydate` to `gam report <ActivityApplicationName> ... countsonly` that provides an additional display option.
--- a/src/gam/init.py
+++ b/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.02.10'
+__version__ = '7.02.11'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'

 #pylint: disable=wrong-import-position
@@ -14185,7 +14185,9 @@ def doReport():
          accessErrorExit(None)
        for activity in feed:
          events = activity.pop('events')
-          actor = activity['actor'].get('email', activity['actor'].get('key', UNKNOWN))
+          actor = activity['actor'].get('email')
+          if not actor:
+            actor = 'id:'+activity['actor'].get('profileId', UNKNOWN)
          if showOrgUnit:
            activity['actor']['orgUnitPath'] = userOrgUnits.get(actor, UNKNOWN)
          if countsOnly and countsByDate:
@@ -59105,8 +59107,8 @@ def _copyPermissions(drive, user, i, count, j, jcount,
      notCopiedMessage = f'domain {domain} excluded'
    elif domain and copyMoveOptions['includePermissionsFromDomains'] and domain not in copyMoveOptions['includePermissionsFromDomains']:
      notCopiedMessage = f'domain {domain} not included'
-    elif permission.pop('deleted', False):
-      notCopiedMessage = f"{permission['type']} {permission['emailAddress']} deleted"
+    elif permission.pop('deleted', False) or (permission['type'] in {'group', 'user'} and not emailAddress):
+      notCopiedMessage = f"{permission['type']} deleted or has blank email address"
    elif ((copyInherited == 'copySheetProtectedRangesInheritedPermissions' and copyMoveOptions[copyInherited]) or
          (copyNonInherited == 'copySheetProtectedRangesNonInheritedPermissions' and
           copyMoveOptions[copyNonInherited] != COPY_NONINHERITED_PERMISSIONS_NEVER)):
Author	SHA1	Message	Date
Ross Scroggs	54eb666bc5	Merge branch 'main' of https://github.com/GAM-team/GAM Some checks failed Build and test GAM / build (Win64, build, 10, VC-WIN64A, windows-2022) (push) Has been cancelled Details Build and test GAM / build (aarch64, build, 3, linux-aarch64, ubuntu-24.04-arm) (push) Has been cancelled Details Build and test GAM / build (aarch64, build, 4, linux-aarch64, ubuntu-22.04-arm) (push) Has been cancelled Details Build and test GAM / build (aarch64, build, 6, linux-aarch64, ubuntu-22.04-arm, yes) (push) Has been cancelled Details Build and test GAM / build (aarch64, build, 8, darwin64-arm64, macos-14) (push) Has been cancelled Details Build and test GAM / build (aarch64, build, 9, darwin64-arm64, macos-15) (push) Has been cancelled Details Build and test GAM / build (x86_64, build, 1, linux-x86_64, ubuntu-22.04) (push) Has been cancelled Details Build and test GAM / build (x86_64, build, 2, linux-x86_64, ubuntu-24.04) (push) Has been cancelled Details Build and test GAM / build (x86_64, build, 5, linux-x86_64, ubuntu-22.04, yes) (push) Has been cancelled Details Build and test GAM / build (x86_64, build, 7, darwin64-x86_64, macos-13) (push) Has been cancelled Details Build and test GAM / build (x86_64, test, 11, ubuntu-24.04, 3.10) (push) Has been cancelled Details Build and test GAM / build (x86_64, test, 12, ubuntu-24.04, 3.11) (push) Has been cancelled Details Build and test GAM / build (x86_64, test, 13, ubuntu-24.04, 3.12) (push) Has been cancelled Details CodeQL / Analyze (python) (push) Has been cancelled Details Check for Google Root CA Updates / check-apis (push) Has been cancelled Details Build and test GAM / merge (push) Has been cancelled Details Build and test GAM / publish (push) Has been cancelled Details	2025-01-23 15:26:09 -08:00
Ross Scroggs	f6ea570888	Two updates Updated `gam report <ActivityApplicationName>` to display `id:<actor.profileId>` in the `emailAddress` column when `actor.email` is empty. This typically occurs when the actor is not in your workspace. Updated `gam <UserTypeEntity> copy drivefile` to ignore ACLs referencing deleted user/groups.	2025-01-23 15:26:01 -08:00