CXH-434: map no_such_subteam to Unavailable for retry support

.github/workflows/ci.yaml

@@ -20,5 +20,5 @@ jobs:
         with:
           connector: ./baton-slack
           baton-entitlement: 'group:S0A1RHL4CP5:member'
-          baton-principal: 'U0847EPUZ0R'
+          baton-principal: 'U0A3NPX9Z5L'
           baton-principal-type: 'user'

pkg/connector/actions.go

@@ -8,7 +8,6 @@ import (
 	v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
 	"github.com/conductorone/baton-sdk/pkg/actions"
 	"github.com/conductorone/baton-sdk/pkg/annotations"
-	"github.com/conductorone/baton-sdk/pkg/connectorbuilder"
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -96,26 +95,24 @@ var (
 	}
 )
 
-func (s *Slack) RegisterActionManager(ctx context.Context) (connectorbuilder.CustomActionManager, error) {
+func (s *Slack) GlobalActions(ctx context.Context, registry actions.ActionRegistry) error {
 	l := ctxzap.Extract(ctx)
 
-	actionManager := actions.NewActionManager(ctx)
-
-	err := actionManager.RegisterAction(ctx, ActionDisableUser, disableUserSchema, s.handleDisableUser)
+	err := registry.Register(ctx, disableUserSchema, s.handleDisableUser)
 	if err != nil {
 		l.Error("failed to register disable_user action", zap.Error(err))
-		return nil, err
+		return err
 	}
 	l.Info("registered disable_user action")
 
-	err = actionManager.RegisterAction(ctx, ActionEnableUser, enableUserSchema, s.handleEnableUser)
+	err = registry.Register(ctx, enableUserSchema, s.handleEnableUser)
 	if err != nil {
 		l.Error("failed to register enable_user action", zap.Error(err))
-		return nil, err
+		return err
 	}
 
 	l.Info("registered enable_user action")
-	return actionManager, nil
+	return nil
 }
 
 // handleDisableUser deactivates a Slack user by setting active to false via SCIM API.

pkg/connector/client/helpers.go

@@ -126,6 +126,13 @@ func MapSlackErrorToGRPCCode(slackError string) codes.Code {
 		return codes.NotFound
 	}
 
+	// no_such_subteam is returned when fetching user group members. We determined
+	// empirically that retrying on this error allows syncs to complete successfully,
+	// so we map it to Unavailable to trigger the SDK's automatic retry logic.
+	if containsAny(err, SlackErrNoSuchSubteam) {
+		return codes.Unavailable
+	}
+
 	if containsAny(err, "user_already_team_member") {
 		return codes.AlreadyExists
 	}

pkg/connector/client/slack.go

@@ -19,8 +19,11 @@ const (
 	// Slack API error string constants.
 	SlackErrUserAlreadyTeamMember = "user_already_team_member"
 	SlackErrUserAlreadyDeleted    = "user_already_deleted"
-	ScimVersionV2                 = "v2"
-	ScimVersionV1                 = "v1"
+	// SlackErrNoSuchSubteam is returned when fetching user group members. Retrying
+	// on this error was determined empirically to allow syncs to complete.
+	SlackErrNoSuchSubteam = "no_such_subteam"
+	ScimVersionV2         = "v2"
+	ScimVersionV1         = "v1"
 )
 
 var workspaceNameNamespace = sessions.WithPrefix("workspace_name")