Fixed issue that caused gam print/show policies to fail on some gro…

…up policies.
taers232c · Oct 23, 2024 · 4df6c8f · 4df6c8f
1 parent ffe2ae3
commit 4df6c8f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: taers232c.GAMADV-XTD3
-          release-tag: v7.00.27
+          release-tag: v7.00.28
           max-versions-to-keep: 1 # keep only latest versions
           installers-regex: '\.msi$'
           token: ${{ secrets.WINGET_TOKEN }}
diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
@@ -1,3 +1,7 @@
+7.00.28
+
+Fixed issue that caused `gam print/show policies` to fail on some group policies.
+
 7.00.27
 
 Updated `gam <UserTypeEntity> collect orphans` and all commands that print file paths to recognize

diff --git a/src/gam/__init__.py b/src/gam/__init__.py
@@ -25,7 +25,7 @@
 """
 
 __author__ = 'Ross Scroggs <ross.scroggs@gmail.com>'
-__version__ = '7.00.27'
+__version__ = '7.00.28'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -35166,7 +35166,7 @@ def _printPolicy(policy):
     if groupId := policy['policyQuery'].get('group'):
       _, _, policy['policyQuery']['groupEmail'] = convertGroupCloudIDToEmail(groups_ci, groupId)
       # all groups are in the root OU so the orgUnit attribute is useless
-      policy['policyQuery'].pop('orgUnit')
+      policy['policyQuery'].pop('orgUnit', None)
     elif orgId := policy['policyQuery'].get('orgUnit'):
       policy['policyQuery']['orgUnitPath'] = convertOrgUnitIDtoPath(cd, orgId)
   if not csvPF: