deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Fixed bug in gam print cigroup-members includederivedmembership that caused a trap.

Browse Source
This commit is contained in:
Ross Scroggs
2025-07-18 14:14:09 -07:00
parent bda51867c8
commit fe4268230e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GamUpdate.txt
View File

@@ -1,3 +1,7 @@
7.14.03
Fixed bug in `gam print cigroup-members includederivedmembership` that caused a trap.
7.14.02 7.14.02
Fixed bug in `gam print|show cigroups|cigroups-members cimember <UserItem>` that generated the following error: Fixed bug in `gam print|show cigroups|cigroups-members cimember <UserItem>` that generated the following error:

6
src/gam/__init__.py
View File

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
""" """
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>' __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
__version__ = '7.14.02' __version__ = '7.14.03'
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
#pylint: disable=wrong-import-position #pylint: disable=wrong-import-position
@@ -6011,7 +6011,11 @@ def getCIGroupMemberRoleFixType(member):
def getCIGroupTransitiveMemberRoleFixType(groupName, tmember): def getCIGroupTransitiveMemberRoleFixType(groupName, tmember):
''' map transitive member to normal member ''' ''' map transitive member to normal member '''
tid = tmember['preferredMemberKey'][0].get('id', GC.Values[GC.CUSTOMER_ID]) if tmember['preferredMemberKey'] else '' tid = tmember['preferredMemberKey'][0].get('id', GC.Values[GC.CUSTOMER_ID]) if tmember['preferredMemberKey'] else ''
if '/' in tmember['member']:
ttype, tname = tmember['member'].split('/') ttype, tname = tmember['member'].split('/')
else:
ttype = ''
tname = tmember['member']
member = {'name': f'{groupName}/membershipd/{tname}', 'preferredMemberKey': {'id': tid}} member = {'name': f'{groupName}/membershipd/{tname}', 'preferredMemberKey': {'id': tid}}
if 'type' not in tmember: if 'type' not in tmember:
if tid == GC.Values[GC.CUSTOMER_ID]: if tid == GC.Values[GC.CUSTOMER_ID]: