Skip to content

Commit 27bbfd9

Browse files
authored
Update purpose on group admin and project owner entitlements to convey ownership (#93)
* Update baton-sdk to v0.6.17 and add ownership entitlement support * Refactor entitlement creation to use OwnershipEntitlement for group and project owners
1 parent acce289 commit 27bbfd9

File tree

10 files changed

+53
-16
lines changed

10 files changed

+53
-16
lines changed

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-demo
33
go 1.25.2
44

55
require (
6-
github.com/conductorone/baton-sdk v0.6.14
6+
github.com/conductorone/baton-sdk v0.6.17
77
github.com/doug-martin/goqu/v9 v9.19.0
88
github.com/ennyjfrick/ruleguard-logfatal v0.0.2
99
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY
6060
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
6161
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
6262
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
63-
github.com/conductorone/baton-sdk v0.6.14 h1:PAFx8Wvl13SpYfVLCn+1xDA2Tnxrop4lIlDvl/AaFDU=
64-
github.com/conductorone/baton-sdk v0.6.14/go.mod h1:9S5feBOuIJxlNdGmkv3ObkCNHbVyOHr6foNrIrk+d4Y=
63+
github.com/conductorone/baton-sdk v0.6.17 h1:ZC+pcsh/iGA1wjS5GGQjIg+mIIK/Mr0E7G3Dg72f03Y=
64+
github.com/conductorone/baton-sdk v0.6.17/go.mod h1:9S5feBOuIJxlNdGmkv3ObkCNHbVyOHr6foNrIrk+d4Y=
6565
github.com/conductorone/dpop v0.2.3 h1:s91U3845GHQ6P6FWrdNr2SEOy1ES/jcFs1JtKSl2S+o=
6666
github.com/conductorone/dpop v0.2.3/go.mod h1:gyo8TtzB9SCFCsjsICH4IaLZ7y64CcrDXMOPBwfq/3s=
6767
github.com/conductorone/dpop/integrations/dpop_grpc v0.2.3 h1:kLMCNIh0Mo2vbvvkCmJ3ixsPbXEJ6HPcW53Ku9yje3s=

pkg/connector/groups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (o *groupBuilder) Entitlements(ctx context.Context, resource *v2.Resource,
8686
member := sdkEntitlement.NewAssignmentEntitlement(resource, groupMemberEntitlement, sdkEntitlement.WithGrantableTo(userResourceType))
8787
member.Description = fmt.Sprintf("Is a member of the %s group", resource.DisplayName)
8888

89-
admin := sdkEntitlement.NewPermissionEntitlement(resource, groupAdminEntitlement, sdkEntitlement.WithGrantableTo(userResourceType))
89+
admin := sdkEntitlement.NewOwnershipEntitlement(resource, groupAdminEntitlement, sdkEntitlement.WithGrantableTo(userResourceType))
9090
admin.Description = fmt.Sprintf("Is an admin of the %s group", resource.DisplayName)
9191

9292
return []*v2.Entitlement{member, admin}, nil, nil

pkg/connector/projects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (o *projectBuilder) Entitlements(ctx context.Context, r *v2.Resource, ops r
7171
access := sdkEntitlement.NewAssignmentEntitlement(r, projectAccessEntitlement, sdkEntitlement.WithGrantableTo(groupResourceType, userResourceType))
7272
access.Description = fmt.Sprintf("Has access to the %s project", r.DisplayName)
7373

74-
owner := sdkEntitlement.NewPermissionEntitlement(r, projectOwnerEntitlement, sdkEntitlement.WithGrantableTo(userResourceType))
74+
owner := sdkEntitlement.NewOwnershipEntitlement(r, projectOwnerEntitlement, sdkEntitlement.WithGrantableTo(userResourceType))
7575
owner.Description = fmt.Sprintf("Is the owner of the %s project", r.DisplayName)
7676

7777
return []*v2.Entitlement{access, owner}, nil, nil

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

Lines changed: 7 additions & 3 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/entitlement_protoopaque.pb.go

Lines changed: 7 additions & 3 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/cli/lambda_server__added.go

Lines changed: 15 additions & 3 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/sdk/version.go

Lines changed: 1 addition & 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/types/entitlement/entitlement.go

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

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ github.com/benbjohnson/clock
159159
# github.com/cenkalti/backoff/v4 v4.3.0
160160
## explicit; go 1.18
161161
github.com/cenkalti/backoff/v4
162-
# github.com/conductorone/baton-sdk v0.6.14
162+
# github.com/conductorone/baton-sdk v0.6.17
163163
## explicit; go 1.25.2
164164
github.com/conductorone/baton-sdk/internal/connector
165165
github.com/conductorone/baton-sdk/pb/c1/c1z/v1

0 commit comments

Comments
 (0)