Skip to content

Commit 6cd4484

Browse files
add scope to resource for EntitlementExclusionGroup
1 parent cb9fda1 commit 6cd4484

20 files changed

Lines changed: 252 additions & 83 deletions

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/conductorone/baton-github
33
go 1.25.2
44

55
require (
6-
github.com/conductorone/baton-sdk v0.9.14
6+
github.com/conductorone/baton-sdk v0.9.16
77
github.com/deckarep/golang-set/v2 v2.9.0
88
github.com/ennyjfrick/ruleguard-logfatal v0.0.2
99
github.com/golang-jwt/jwt/v5 v5.2.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
6262
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
6363
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
6464
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
65-
github.com/conductorone/baton-sdk v0.9.14 h1:tRu3BAadvCUbdnqCKyvO58T7+y9/q6zG8h42D+QWgD8=
66-
github.com/conductorone/baton-sdk v0.9.14/go.mod h1:treFEoFwbzu9hgPqpCRD+Sr+p71xkeH98Y4ofDGrjSg=
65+
github.com/conductorone/baton-sdk v0.9.16 h1:/f9S1umZc7utfDXuWuNLkweCzqToo93LMLvhoNW8ABw=
66+
github.com/conductorone/baton-sdk v0.9.16/go.mod h1:treFEoFwbzu9hgPqpCRD+Sr+p71xkeH98Y4ofDGrjSg=
6767
github.com/conductorone/dpop v0.2.6 h1:fakwai/Xm2b/fcDUwJN41WtcSI/2UhQOyRIVvnnrrNA=
6868
github.com/conductorone/dpop v0.2.6/go.mod h1:gyo8TtzB9SCFCsjsICH4IaLZ7y64CcrDXMOPBwfq/3s=
6969
github.com/conductorone/dpop/integrations/dpop_grpc v0.2.4 h1:lYxYi9/WTSL9sE96CO0QF2BY3kehs8dTTApI134TGCA=

pkg/connector/repository.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,18 +126,23 @@ func (o *repositoryResourceType) List(ctx context.Context, parentID *v2.Resource
126126
}
127127

128128
func (o *repositoryResourceType) Entitlements(_ context.Context, resource *v2.Resource, _ resourceSdk.SyncOpAttrs) ([]*v2.Entitlement, *resourceSdk.SyncOpResults, error) {
129+
return nil, nil, nil
130+
}
131+
132+
func (o *repositoryResourceType) StaticEntitlements(_ context.Context, _ resourceSdk.SyncOpAttrs) ([]*v2.Entitlement, *resourceSdk.SyncOpResults, error) {
129133
rv := make([]*v2.Entitlement, 0, len(repoAccessLevels))
130134
for i, level := range repoAccessLevels {
131135
rv = append(rv, entitlement.NewPermissionEntitlement(
132-
resource,
136+
nil,
133137
level,
134138
entitlement.WithDisplayName(fmt.Sprintf("Repo %s", titleCase(level))),
135139
entitlement.WithDescription(fmt.Sprintf("Access to repository in GitHub as %s", level)),
136140
entitlement.WithGrantableTo(resourceTypeUser, resourceTypeTeam),
137141
entitlement.WithAnnotation(&v2.EntitlementExclusionGroup{
138-
ExclusionGroupId: "repository-permission-" + resource.GetId().GetResource(),
142+
ExclusionGroupId: "repository",
139143
Order: uint32(i),
140144
IsDefault: level == repoPermissionPush,
145+
ScopeToResource: true,
141146
}),
142147
))
143148
}

vendor/github.com/conductorone/baton-sdk/pb/c1/connector/v2/annotation_exclusion_group.pb.go

Lines changed: 36 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/conductorone/baton-sdk/pb/c1/connector/v2/annotation_exclusion_group.pb.validate.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/conductorone/baton-sdk/pb/c1/connector/v2/annotation_exclusion_group_protoopaque.pb.go

Lines changed: 25 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/conductorone/baton-sdk/pkg/dotc1z/assets.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/conductorone/baton-sdk/pkg/dotc1z/c1file.go

Lines changed: 82 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/conductorone/baton-sdk/pkg/dotc1z/clone_sync.go

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/conductorone/baton-sdk/pkg/dotc1z/entitlements.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)