sessions (#59)

* migrate to sessions

* fix config

* use connector name

* use connector name

* add missing vendor packages

* update baton-sdk

* use setWorkspaceNames instead of setWorkspaceName

* use getworkspacenames

* handle codes

* add cache to avoid network calls

* remove useless cache

* fix imports

Author: aldevv

Makefile

@@ -1,25 +1,39 @@
 GOOS = $(shell go env GOOS)
 GOARCH = $(shell go env GOARCH)
 BUILD_DIR = dist/${GOOS}_${GOARCH}
+GENERATED_CONF := pkg/config/conf.gen.go
 
 ifeq ($(GOOS),windows)
 OUTPUT_PATH = ${BUILD_DIR}/baton-slack.exe
 else
 OUTPUT_PATH = ${BUILD_DIR}/baton-slack
 endif
 
+# Set the build tag conditionally based on ENABLE_LAMBDA
+ifdef BATON_LAMBDA_SUPPORT
+	BUILD_TAGS=-tags baton_lambda_support
+else
+	BUILD_TAGS=
+endif
+
 .PHONY: build
-build:
-	go build -o ${OUTPUT_PATH} ./cmd/baton-slack
+build: $(GENERATED_CONF)
+	go build ${BUILD_TAGS} -o ${OUTPUT_PATH} ./cmd/baton-slack
+
+$(GENERATED_CONF): pkg/config/config.go go.mod
+	@echo "Generating $(GENERATED_CONF)..."
+	go generate ./pkg/config
+
+generate: $(GENERATED_CONF)
 
 .PHONY: update-deps
 update-deps:
 	go get -d -u ./...
 	go mod tidy -v
 	go mod vendor
 
-.PHONY: add-dep
-add-dep:
+.PHONY: add-deps
+add-deps:
 	go mod tidy -v
 	go mod vendor
 

cmd/baton-slack/main.go

@@ -2,17 +2,11 @@ package main
 
 import (
 	"context"
-	"fmt"
-	"os"
 
-	configSdk "github.com/conductorone/baton-sdk/pkg/config"
-	"github.com/conductorone/baton-sdk/pkg/connectorbuilder"
-	"github.com/conductorone/baton-sdk/pkg/types"
-	"github.com/conductorone/baton-slack/pkg/config"
+	"github.com/conductorone/baton-sdk/pkg/config"
+	"github.com/conductorone/baton-sdk/pkg/connectorrunner"
+	cfg "github.com/conductorone/baton-slack/pkg/config"
 	"github.com/conductorone/baton-slack/pkg/connector"
-	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
-	"github.com/spf13/viper"
-	"go.uber.org/zap"
 )
 
 var (
@@ -22,46 +16,6 @@ var (
 
 func main() {
 	ctx := context.Background()
-
-	_, cmd, err := configSdk.DefineConfiguration(
-		ctx,
-		connectorName,
-		getConnector,
-		config.Configuration,
-	)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	cmd.Version = version
-
-	err = cmd.Execute()
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-}
-
-func getConnector(ctx context.Context, v *viper.Viper) (types.ConnectorServer, error) {
-	logger := ctxzap.Extract(ctx)
-	cb, err := connector.New(
-		ctx,
-		v.GetString(config.AccessTokenField.FieldName),
-		v.GetString(config.EnterpriseTokenField.FieldName),
-		v.GetBool(config.SSOEnabledField.FieldName),
-		v.GetBool(config.GovEnvironmentField.FieldName),
-	)
-	if err != nil {
-		logger.Error("error creating connector", zap.Error(err))
-		return nil, err
-	}
-
-	c, err := connectorbuilder.NewConnector(ctx, cb)
-	if err != nil {
-		logger.Error("error creating connector", zap.Error(err))
-		return nil, err
-	}
-
-	return c, nil
+	config.RunConnector(ctx, connectorName, version, cfg.Configuration, connector.New,
+		connectorrunner.WithSessionStoreEnabled())
 }

go.mod

@@ -3,12 +3,11 @@ module github.com/conductorone/baton-slack
 go 1.25.2
 
 require (
-	github.com/conductorone/baton-sdk v0.4.11
+	github.com/conductorone/baton-sdk v0.5.12
 	github.com/ennyjfrick/ruleguard-logfatal v0.0.2
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22
 	github.com/slack-go/slack v0.14.0
-	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/zap v1.27.0
 	google.golang.org/grpc v1.71.0
@@ -47,13 +46,11 @@ require (
 	github.com/conductorone/dpop/integrations/dpop_oauth2 v0.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/deckarep/golang-set/v2 v2.7.0 // indirect
-	github.com/dolthub/maphash v0.1.0 // indirect
 	github.com/doug-martin/goqu/v9 v9.19.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/ebitengine/purego v0.8.4 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/gammazero/deque v1.0.0 // indirect
 	github.com/glebarez/go-sqlite v1.22.0 // indirect
 	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
@@ -70,7 +67,7 @@ require (
 	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
 	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/maypok86/otter v1.2.4 // indirect
+	github.com/maypok86/otter/v2 v2.2.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
@@ -89,6 +86,7 @@ require (
 	github.com/spf13/cast v1.7.1 // indirect
 	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/spf13/viper v1.19.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.15 // indirect
 	github.com/tklauser/numcpus v0.10.0 // indirect
@@ -113,7 +111,7 @@ require (
 	golang.org/x/net v0.35.0 // indirect
 	golang.org/x/oauth2 v0.26.0 // indirect
 	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
 	golang.org/x/term v0.29.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect

pkg/config/conf.gen.go

@@ -1,5 +1,7 @@
 package config
 
+//go:generate go run ./gen
+
 import (
 	"github.com/conductorone/baton-sdk/pkg/field"
 )
@@ -10,11 +12,13 @@ var (
 		field.WithDisplayName("Access Token"),
 		field.WithDescription("The Slack bot user oauth token used to connect to the Slack API"),
 		field.WithRequired(true),
+		field.WithIsSecret(true),
 	)
 	EnterpriseTokenField = field.StringField(
 		"enterprise-token",
 		field.WithDisplayName("Enterprise Token"),
 		field.WithDescription("The Slack user oauth token used to connect to the Slack Enterprise Grid Admin API"),
+		field.WithIsSecret(true),
 	)
 	SSOEnabledField = field.BoolField(
 		"sso-enabled",
@@ -49,5 +53,11 @@ var (
 		),
 	}
 
-	Configuration = field.NewConfiguration(ConfigurationFields, field.WithConstraints(FieldRelationships...))
+	Configuration = field.NewConfiguration(
+		ConfigurationFields,
+		field.WithConnectorDisplayName("Slack"),
+		field.WithHelpUrl("/docs/baton/slack"),
+		field.WithIconUrl("/static/app-icons/slack.svg"),
+		field.WithConstraints(FieldRelationships...),
+	)
 )

pkg/config/config.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"github.com/conductorone/baton-sdk/pkg/config"
+	cfg "github.com/conductorone/baton-slack/pkg/config"
+)
+
+func main() {
+	config.Generate("slack", cfg.Configuration)
+}