Skip to content
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

Add grants to the connector builder grant response #89

Merged
merged 7 commits into from
Nov 30, 2023
Merged

Add grants to the connector builder grant response #89

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc21f78
Enable returning grants for connectors using the connector builder
loganintech Nov 29, 2023
a23e76d
Fix getting from wrong map
loganintech Nov 29, 2023
93356f6
Check that we're not implementing _both_ resource provisioners
loganintech Nov 29, 2023
6a4866e
"Thank god, code quality is preserved" - Brad Morgan
loganintech Nov 29, 2023
e442c4f
Revoke v2
loganintech Nov 29, 2023
681f915
Formatting
loganintech Nov 29, 2023
74f2446
Check provisioner versions in one place
loganintech Nov 30, 2023
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
98 changes: 74 additions & 24 deletions pkg/connectorbuilder/connectorbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"context"
"fmt"

"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
"go.uber.org/zap"

v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
"github.com/conductorone/baton-sdk/pkg/annotations"
"github.com/conductorone/baton-sdk/pkg/pagination"
"github.com/conductorone/baton-sdk/pkg/types"
"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
"go.uber.org/zap"
)

type ResourceSyncer interface {
Expand All @@ -25,26 +26,34 @@ type ResourceProvisioner interface {
Revoke(ctx context.Context, grant *v2.Grant) (annotations.Annotations, error)
}

type ResourceProvisionerV2 interface {
ResourceType(ctx context.Context) *v2.ResourceType
Grant(ctx context.Context, resource *v2.Resource, entitlement *v2.Entitlement) ([]*v2.Grant, annotations.Annotations, error)
Revoke(ctx context.Context, grant *v2.Grant) (annotations.Annotations, error)
}

type ConnectorBuilder interface {
Metadata(ctx context.Context) (*v2.ConnectorMetadata, error)
Validate(ctx context.Context) (annotations.Annotations, error)
ResourceSyncers(ctx context.Context) []ResourceSyncer
}

type builderImpl struct {
resourceBuilders map[string]ResourceSyncer
resourceProvisioners map[string]ResourceProvisioner
cb ConnectorBuilder
resourceBuilders map[string]ResourceSyncer
resourceProvisioners map[string]ResourceProvisioner
resourceProvisionersV2 map[string]ResourceProvisionerV2
cb ConnectorBuilder
}

// NewConnector creates a new ConnectorServer for a new resource.
func NewConnector(ctx context.Context, in interface{}) (types.ConnectorServer, error) {
switch c := in.(type) {
case ConnectorBuilder:
ret := &builderImpl{
resourceBuilders: make(map[string]ResourceSyncer),
resourceProvisioners: make(map[string]ResourceProvisioner),
cb: c,
resourceBuilders: make(map[string]ResourceSyncer),
resourceProvisioners: make(map[string]ResourceProvisioner),
resourceProvisionersV2: make(map[string]ResourceProvisionerV2),
cb: c,
}

for _, rb := range c.ResourceSyncers(ctx) {
Expand All @@ -53,12 +62,23 @@ func NewConnector(ctx context.Context, in interface{}) (types.ConnectorServer, e
return nil, fmt.Errorf("error: duplicate resource type found %s", rType.Id)
}
ret.resourceBuilders[rType.Id] = rb

if err := validateProvisionerVersion(ctx, rb); err != nil {
return nil, err
}

if provisioner, ok := rb.(ResourceProvisioner); ok {
if _, ok := ret.resourceProvisioners[rType.Id]; ok {
return nil, fmt.Errorf("error: duplicate resource type found %s", rType.Id)
}
ret.resourceProvisioners[rType.Id] = provisioner
}
if provisioner, ok := rb.(ResourceProvisionerV2); ok {
if _, ok := ret.resourceProvisionersV2[rType.Id]; ok {
return nil, fmt.Errorf("error: duplicate resource type found %s", rType.Id)
}
ret.resourceProvisionersV2[rType.Id] = provisioner
}
}
return ret, nil

Expand All @@ -70,6 +90,16 @@ func NewConnector(ctx context.Context, in interface{}) (types.ConnectorServer, e
}
}

func validateProvisionerVersion(ctx context.Context, p ResourceSyncer) error {
_, ok := p.(ResourceProvisioner)
_, okV2 := p.(ResourceProvisionerV2)

if ok && okV2 {
return fmt.Errorf("error: resource type %s implements both ResourceProvisioner and ResourceProvisionerV2", p.ResourceType(ctx).Id)
}
return nil
}

// ListResourceTypes lists all available resource types.
func (b *builderImpl) ListResourceTypes(
ctx context.Context,
Expand Down Expand Up @@ -194,37 +224,57 @@ func (b *builderImpl) Grant(ctx context.Context, request *v2.GrantManagerService

rt := request.Entitlement.Resource.Id.ResourceType
provisioner, ok := b.resourceProvisioners[rt]
if !ok {
l.Error("error: resource type does not have provisioner configured", zap.String("resource_type", rt))
return nil, fmt.Errorf("error: resource type does not have provisioner configured")
if ok {
annos, err := provisioner.Grant(ctx, request.Principal, request.Entitlement)
if err != nil {
l.Error("error: grant failed", zap.Error(err))
return nil, fmt.Errorf("error: grant failed: %w", err)
}

return &v2.GrantManagerServiceGrantResponse{Annotations: annos}, nil
}

annos, err := provisioner.Grant(ctx, request.Principal, request.Entitlement)
if err != nil {
l.Error("error: grant failed", zap.Error(err))
return nil, fmt.Errorf("error: grant failed: %w", err)
provisionerV2, ok := b.resourceProvisionersV2[rt]
if ok {
grants, annos, err := provisionerV2.Grant(ctx, request.Principal, request.Entitlement)
if err != nil {
l.Error("error: grant failed", zap.Error(err))
return nil, fmt.Errorf("error: grant failed: %w", err)
}

return &v2.GrantManagerServiceGrantResponse{Annotations: annos, Grants: grants}, nil
}

return &v2.GrantManagerServiceGrantResponse{Annotations: annos}, nil
l.Error("error: resource type does not have provisioner configured", zap.String("resource_type", rt))
return nil, fmt.Errorf("error: resource type does not have provisioner configured")
}

func (b *builderImpl) Revoke(ctx context.Context, request *v2.GrantManagerServiceRevokeRequest) (*v2.GrantManagerServiceRevokeResponse, error) {
l := ctxzap.Extract(ctx)

rt := request.Grant.Entitlement.Resource.Id.ResourceType
provisioner, ok := b.resourceProvisioners[rt]
if !ok {
l.Error("error: resource type does not have provisioner configured", zap.String("resource_type", rt))
return nil, fmt.Errorf("error: resource type does not have provisioner configured")
if ok {
annos, err := provisioner.Revoke(ctx, request.Grant)
if err != nil {
l.Error("error: revoke failed", zap.Error(err))
return nil, fmt.Errorf("error: revoke failed: %w", err)
}
return &v2.GrantManagerServiceRevokeResponse{Annotations: annos}, nil
}

annos, err := provisioner.Revoke(ctx, request.Grant)
if err != nil {
l.Error("error: revoke failed", zap.Error(err))
return nil, fmt.Errorf("error: revoke failed: %w", err)
provisionerV2, ok := b.resourceProvisionersV2[rt]
if ok {
annos, err := provisionerV2.Revoke(ctx, request.Grant)
if err != nil {
l.Error("error: revoke failed", zap.Error(err))
return nil, fmt.Errorf("error: revoke failed: %w", err)
}
return &v2.GrantManagerServiceRevokeResponse{Annotations: annos}, nil
}

return &v2.GrantManagerServiceRevokeResponse{Annotations: annos}, nil
l.Error("error: resource type does not have provisioner configured", zap.String("resource_type", rt))
return nil, fmt.Errorf("error: resource type does not have provisioner configured")
}

// GetAsset streams the asset to the client.
Expand Down
Loading