Skip to content

[BB-1927] remove business+ dependency for getting workspace role grants #70

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
aldevv merged 1 commit into from
Jan 6, 2026
Merged

[BB-1927] remove business+ dependency for getting workspace role grants #70

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
32 changes: 3 additions & 29 deletions pkg/connector/workspace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ import (
"fmt"

v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
"github.com/conductorone/baton-sdk/pkg/annotations"
"github.com/conductorone/baton-sdk/pkg/types/entitlement"
"github.com/conductorone/baton-sdk/pkg/types/grant"
resources "github.com/conductorone/baton-sdk/pkg/types/resource"
"github.com/conductorone/baton-slack/pkg"
"github.com/conductorone/baton-slack/pkg/connector/client"
"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
"github.com/slack-go/slack"
)

Expand Down Expand Up @@ -140,31 +138,9 @@ func (o *workspaceResourceType) Grants(
resource *v2.Resource,
attrs resources.SyncOpAttrs,
) ([]*v2.Grant, *resources.SyncOpResults, error) {
l := ctxzap.Extract(ctx)
if o.businessPlusClient == nil {
l.Debug("Business+ client not available, skipping workspace grants")
return nil, &resources.SyncOpResults{}, nil
}

bag, err := pkg.ParsePageToken(attrs.PageToken.Token, &v2.ResourceId{ResourceType: resourceTypeUser.Id})
if err != nil {
return nil, nil, fmt.Errorf("parsing page token: %w", err)
}

outputAnnotations := annotations.New()
users, nextCursor, ratelimitData, err := o.businessPlusClient.GetUsers(
ctx,
resource.Id.Resource,
bag.PageToken(),
)
outputAnnotations.WithRateLimiting(ratelimitData)
users, err := o.client.GetUsers()
Copy link

@laurenleach laurenleach Jan 6, 2026

Choose a reason for hiding this comment

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

I think we could emit the grants from the users Grants method to avoid listing users here. We should have the workspace id since it is the parent resource

if err != nil {
return nil, nil, fmt.Errorf("fetching users for workspace: %w", err)
}

pageToken, err := bag.NextToken(nextCursor)
if err != nil {
return nil, nil, fmt.Errorf("creating next page token: %w", err)
return nil, nil, client.WrapError(err, "fetching users for workspace")
}

var rv []*v2.Grant
Expand Down Expand Up @@ -247,9 +223,7 @@ func (o *workspaceResourceType) Grants(
rv = append(rv, grant.NewGrant(resource, memberEntitlement, userID))
}

return rv, &resources.SyncOpResults{
NextPageToken: pageToken,
}, nil
return rv, &resources.SyncOpResults{}, nil
}

// Grant and Revoke are not implemented for workspace membership because they require
Expand Down