Skip to content

sync: pre-build entitlement-id set in processGrantsWithExternalPrincipals #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
btipling wants to merge 1 commit into
base: main
Choose a base branch
from
Open

sync: pre-build entitlement-id set in processGrantsWithExternalPrincipals #851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 40 additions & 14 deletions pkg/sync/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2150,6 +2150,31 @@ func (s *syncer) listExternalResourcesForResourceType(ctx context.Context, resou
return resources, nil
}

// listAllEntitlementIDs paginates every entitlement in the local store and
// returns just the ID set. processGrantsWithExternalPrincipals needs only
// existence, not the full entitlement blob, so this avoids the per-slug
// GetEntitlement N+1 inside its nested match-by-id / match-by-key loops.
func (s *syncer) listAllEntitlementIDs(ctx context.Context) (mapset.Set[string], error) {
ids := mapset.NewSet[string]()
pageToken := ""
for {
resp, err := s.store.ListEntitlements(ctx, v2.EntitlementsServiceListEntitlementsRequest_builder{
PageToken: pageToken,
}.Build())
if err != nil {
return nil, err
}
for _, ent := range resp.GetList() {
ids.Add(ent.GetId())
}
pageToken = resp.GetNextPageToken()
if pageToken == "" {
break
}
}
return ids, nil
}

func (s *syncer) listExternalEntitlementsForResource(ctx context.Context, resource *v2.Resource) ([]*v2.Entitlement, error) {
ents := make([]*v2.Entitlement, 0)
entitlementToken := ""
Expand Down Expand Up @@ -2238,6 +2263,15 @@ func (s *syncer) processGrantsWithExternalPrincipals(ctx context.Context, princi

l := ctxzap.Extract(ctx)

// One ListEntitlements paginate replaces the per-slug GetEntitlement
// existence checks below. Entitlement counts are 10^2-10^4 on real
// tenants, so the in-memory set fits comfortably and the grant-iteration
// loop's inner GetEntitlement fanout collapses to set membership.
knownEntitlementIDs, err := s.listAllEntitlementIDs(ctx)
Copy link
Copy Markdown
Contributor

@kans kans May 21, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Do you know the biggest entitlement count, currently? Some connectors have dynamic ents.
  2. We do this before we know that we need it. We could make it lazy (use a once or something). IF the answer to 1 is actually 10^4, I don't care anymore.

if err != nil {
return err
}

groupPrincipals := make([]*v2.Resource, 0)
userPrincipals := make([]*v2.Resource, 0)
principalMap := make(map[string]*v2.Resource)
Expand Down Expand Up @@ -2347,13 +2381,9 @@ func (s *syncer) processGrantsWithExternalPrincipals(ctx context.Context, princi
principalEntitlementSlugs := expandableEntitlementsResourceMap[groupPrincipalBID]
for _, slug := range principalEntitlementSlugs {
newExpandableEntId := entitlement.NewEntitlementID(principal, slug)
_, err := s.store.GetEntitlement(ctx, reader_v2.EntitlementsReaderServiceGetEntitlementRequest_builder{EntitlementId: newExpandableEntId}.Build())
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
l.Error("found no entitlement with entitlement id generated from external source sync", zap.Any("entitlementId", newExpandableEntId))
continue
}
return err
if !knownEntitlementIDs.ContainsOne(newExpandableEntId) {
l.Error("found no entitlement with entitlement id generated from external source sync", zap.Any("entitlementId", newExpandableEntId))
continue
}
newExpandableEntitlementIDs = append(newExpandableEntitlementIDs, newExpandableEntId)
}
Expand Down Expand Up @@ -2426,13 +2456,9 @@ func (s *syncer) processGrantsWithExternalPrincipals(ctx context.Context, princi
principalEntitlementSlugs := expandableEntitlementsResourceMap[groupPrincipalBID]
for _, slug := range principalEntitlementSlugs {
newExpandableEntId := entitlement.NewEntitlementID(groupPrincipal, slug)
_, err := s.store.GetEntitlement(ctx, reader_v2.EntitlementsReaderServiceGetEntitlementRequest_builder{EntitlementId: newExpandableEntId}.Build())
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
l.Error("found no entitlement with entitlement id generated from external source sync", zap.Any("entitlementId", newExpandableEntId))
continue
}
return err
if !knownEntitlementIDs.ContainsOne(newExpandableEntId) {
l.Error("found no entitlement with entitlement id generated from external source sync", zap.Any("entitlementId", newExpandableEntId))
continue
}
newExpandableEntitlementIDs = append(newExpandableEntitlementIDs, newExpandableEntId)
}
Expand Down
Loading