Skip to content

fix: remove enterpriseLicensesAvailable gate from ResourceSyncers #138

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

Merged
madison-c-evans merged 1 commit into from
Apr 7, 2026
Merged

fix: remove enterpriseLicensesAvailable gate from ResourceSyncers #138

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
23 changes: 5 additions & 18 deletions pkg/connector/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,13 @@ type GitHub struct {
syncSecrets bool
omitArchivedRepositories bool
enterprises []string
enterpriseLicensesAvailable bool // set during Validate; guards enterprise role sync and SAML enrichment
}

func (gh *GitHub) ResourceSyncers(ctx context.Context) []connectorbuilder.ResourceSyncerV2 {
// Only pass enterprises to builders that need them if the consumed-licenses
// API is confirmed accessible. Otherwise, skip enterprise SAML enrichment
// and enterprise role sync gracefully.
var activeEnterprises []string
if gh.enterpriseLicensesAvailable {
activeEnterprises = gh.enterprises
}

resourceSyncers := []connectorbuilder.ResourceSyncerV2{
orgBuilder(gh.client, gh.appClient, gh.orgCache, gh.orgs, gh.syncSecrets),
teamBuilder(gh.client, gh.orgCache),
userBuilder(gh.client, gh.graphqlClient, gh.orgCache, gh.orgs, gh.customClient, activeEnterprises),
userBuilder(gh.client, gh.graphqlClient, gh.orgCache, gh.orgs, gh.customClient, gh.enterprises),
repositoryBuilder(gh.client, gh.orgCache, gh.omitArchivedRepositories),
orgRoleBuilder(gh.client, gh.orgCache),
invitationBuilder(invitationBuilderParams{
Expand All @@ -133,8 +124,8 @@ func (gh *GitHub) ResourceSyncers(ctx context.Context) []connectorbuilder.Resour
resourceSyncers = append(resourceSyncers, apiTokenBuilder(gh.client, gh.orgCache))
}

if len(activeEnterprises) > 0 {
resourceSyncers = append(resourceSyncers, enterpriseRoleBuilder(gh.client, gh.customClient, activeEnterprises))
if len(gh.enterprises) > 0 {
resourceSyncers = append(resourceSyncers, enterpriseRoleBuilder(gh.client, gh.customClient, gh.enterprises))
}
return resourceSyncers
}
Expand Down Expand Up @@ -221,10 +212,8 @@ func (gh *GitHub) Validate(ctx context.Context) (annotations.Annotations, error)
l := ctxzap.Extract(ctx)
_, _, err := gh.customClient.ListEnterpriseConsumedLicenses(ctx, gh.enterprises[0], 1)
if err != nil {
l.Debug("failed to access enterprise consumed licenses — enterprise SAML email enrichment and enterprise role sync will be skipped",
l.Debug("enterprise consumed licenses API is not accessible — enterprise SAML email enrichment and enterprise role sync may fail at sync time",
zap.Error(err))
} else {
gh.enterpriseLicensesAvailable = true
}
}
return nil, nil
Expand All @@ -245,11 +234,9 @@ func (gh *GitHub) validateAppCredentials(ctx context.Context) (annotations.Annot
l := ctxzap.Extract(ctx)
_, _, err := gh.customClient.ListEnterpriseConsumedLicenses(ctx, gh.enterprises[0], 1)
if err != nil {
l.Debug("failed to access enterprise consumed licenses — enterprise SAML email enrichment and enterprise role sync will be skipped"+
l.Debug("enterprise consumed licenses API is not accessible — enterprise SAML email enrichment and enterprise role sync may fail at sync time"+
" (GitHub App installations cannot access this endpoint — use a PAT with enterprise admin scope)",
zap.Error(err))
} else {
gh.enterpriseLicensesAvailable = true
}
}

Expand Down
Loading