Skip to content

Commit e1c8259

Browse files
Add Identity Center member sync to group provisioner (#26)
## Summary SCIM from Google syncs users to Identity Center but NOT group membership. The group provisioner now reads Google group members and adds them to the corresponding Identity Center groups. This bridges the SCIM gap. - Cognito: unchanged (JIT handles user creation + groups via SAML claims) - Identity Center: reads Google group → adds SCIM-provisioned users to IC group ## Test plan - [ ] After merge+apply, re-run group provisioner from registry - [ ] Verify Identity Center groups have members - [ ] Test sign-in at start URL — users should see their assigned AWS accounts
1 parent 4394704 commit e1c8259

1 file changed

Lines changed: 103 additions & 9 deletions

File tree

‎terraform/lambda-src/team_provisioner/handler.py‎

Lines changed: 103 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -719,15 +719,39 @@ def sync_identity_center_group(team):
719719

720720

721721
# ---------------------------------------------------------------------------
722-
# Group provisioning — create groups + assign permission sets
722+
# Group provisioning — create groups, sync members, assign permission sets
723723
#
724-
# No member sync. Membership is handled by:
725-
# - Identity Center: Google SAML federation syncs group membership automatically
726-
# - Cognito: Pre-token Lambda trigger reads Google groups at sign-in time
724+
# Identity Center: SCIM syncs users from Google, but NOT group membership.
725+
# The provisioner reads Google group members and adds them to IC groups.
726+
# Cognito: JIT creates users on first sign-in. Groups come via SAML claims.
727+
# The provisioner only creates group names, no member sync needed.
727728
# ---------------------------------------------------------------------------
728729

730+
def _get_google_group_members(group_email):
731+
"""Fetch all members of a Google Workspace group."""
732+
access_token = _get_google_access_token()
733+
group_key = urllib.parse.quote(group_email, safe="")
734+
735+
members = []
736+
page_token = None
737+
while True:
738+
path = f"/groups/{group_key}/members?maxResults=200"
739+
if page_token:
740+
path += f"&pageToken={urllib.parse.quote(page_token, safe='')}"
741+
resp = _google_api("GET", path, access_token)
742+
if resp and "members" in resp:
743+
for m in resp["members"]:
744+
members.append(m["email"].lower())
745+
if resp and resp.get("nextPageToken"):
746+
page_token = resp["nextPageToken"]
747+
else:
748+
break
749+
750+
return members
751+
752+
729753
def sync_group_to_cognito(group):
730-
"""Ensure a Cognito group exists. No member sync — handled by pre-token trigger."""
754+
"""Ensure a Cognito group exists. No member sync — JIT handles it at sign-in."""
731755
if not COGNITO_INTERNAL_POOL_ID:
732756
return {"skipped": True, "reason": "cognito_pool_not_configured"}
733757
if not group.get("cognito"):
@@ -752,9 +776,11 @@ def sync_group_to_cognito(group):
752776

753777

754778
def sync_group_to_identity_center(group):
755-
"""Ensure an Identity Center group exists and has a permission set assigned.
779+
"""Create Identity Center group, sync members from Google, assign permission set.
756780
757-
No member sync — Google SAML federation handles membership automatically.
781+
SCIM only provisions users — it does NOT sync Google group membership to
782+
Identity Center groups. This function bridges that gap by reading the
783+
Google group members and adding them to the Identity Center group.
758784
"""
759785
if not IDENTITY_STORE_ID:
760786
return {"skipped": True, "reason": "identity_store_not_configured"}
@@ -779,13 +805,81 @@ def sync_group_to_identity_center(group):
779805
create_resp = identitystore_client.create_group(
780806
IdentityStoreId=store_id,
781807
DisplayName=group_name,
782-
Description=f"{group_name} (membership via Google SAML, source: {google_email})",
808+
Description=f"{group_name} (synced from {google_email})",
783809
)
784810
group_id = create_resp["GroupId"]
785811
logger.info("Created Identity Center group %s", group_name)
786812

813+
# Read members from Google group
814+
google_members = _get_google_group_members(google_email)
815+
816+
# Current Identity Center group members
817+
current_members = {} # user_id -> membership_id
818+
next_token = None
819+
while True:
820+
kwargs = {"IdentityStoreId": store_id, "GroupId": group_id}
821+
if next_token:
822+
kwargs["NextToken"] = next_token
823+
resp = identitystore_client.list_group_memberships(**kwargs)
824+
for membership in resp.get("GroupMemberships", []):
825+
member_id = membership.get("MemberId", {}).get("UserId")
826+
if member_id:
827+
current_members[member_id] = membership["MembershipId"]
828+
next_token = resp.get("NextToken")
829+
if not next_token:
830+
break
831+
832+
# Reverse lookup: email -> user_id for current members
833+
current_emails = {}
834+
for user_id in current_members:
835+
try:
836+
user = identitystore_client.describe_user(
837+
IdentityStoreId=store_id, UserId=user_id
838+
)
839+
for email_obj in user.get("Emails", []):
840+
current_emails[email_obj["Value"].lower()] = user_id
841+
except Exception:
842+
pass
843+
844+
# Add Google group members not yet in Identity Center group
845+
synced_count = 0
846+
for email in google_members:
847+
if email in current_emails:
848+
synced_count += 1
849+
continue
850+
# Look up user in Identity Center (must exist via SCIM)
851+
users_resp = identitystore_client.list_users(
852+
IdentityStoreId=store_id,
853+
Filters=[{"AttributePath": "UserName", "AttributeValue": email}],
854+
)
855+
if users_resp.get("Users"):
856+
user_id = users_resp["Users"][0]["UserId"]
857+
try:
858+
identitystore_client.create_group_membership(
859+
IdentityStoreId=store_id,
860+
GroupId=group_id,
861+
MemberId={"UserId": user_id},
862+
)
863+
logger.info("Added %s to Identity Center group %s", email, group_name)
864+
synced_count += 1
865+
except identitystore_client.exceptions.ConflictException:
866+
synced_count += 1
867+
else:
868+
logger.info("User %s not in Identity Center (not SCIM-provisioned) — skipping", email)
869+
870+
# Remove members no longer in the Google group
871+
desired = set(google_members)
872+
for email, user_id in current_emails.items():
873+
if email not in desired:
874+
membership_id = current_members.get(user_id)
875+
if membership_id:
876+
identitystore_client.delete_group_membership(
877+
IdentityStoreId=store_id, MembershipId=membership_id,
878+
)
879+
logger.info("Removed %s from Identity Center group %s", email, group_name)
880+
787881
# Assign permission set (if specified)
788-
result = {"synced": True, "group": group_name}
882+
result = {"synced": True, "group": group_name, "member_count": synced_count}
789883
if permission_set_name and SSO_INSTANCE_ARN:
790884
result["permission_set"] = _assign_permission_set(group_id, permission_set_name)
791885

0 commit comments

Comments
 (0)