swap over to using generated config in prep for lambda (#50)

Author: kans

Makefile

@@ -1,16 +1,30 @@
 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-github.exe
 else
 OUTPUT_PATH = ${BUILD_DIR}/baton-github
 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-github
+build: $(GENERATED_CONF)
+	go build ${BUILD_TAGS} -o ${OUTPUT_PATH} ./cmd/baton-github
+
+$(GENERATED_CONF): pkg/config/config.go go.mod
+	@echo "Generating $(GENERATED_CONF)..."
+	go generate ./pkg/config
+
+generate: $(GENERATED_CONF)
 
 .PHONY: update-deps
 update-deps:

cmd/baton-github/main.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"os"
 
+	cfg "github.com/conductorone/baton-github/pkg/config"
 	"github.com/conductorone/baton-sdk/pkg/config"
 	"github.com/conductorone/baton-sdk/pkg/connectorbuilder"
 	"github.com/conductorone/baton-sdk/pkg/field"
 	"github.com/conductorone/baton-sdk/pkg/types"
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
-	"github.com/spf13/viper"
 	"go.uber.org/zap"
 
 	"github.com/conductorone/baton-github/pkg/connector"
@@ -25,7 +25,7 @@ func main() {
 		ctx,
 		"baton-github",
 		getConnector,
-		configuration,
+		cfg.Config,
 	)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
@@ -40,20 +40,15 @@ func main() {
 	}
 }
 
-func getConnector(ctx context.Context, v *viper.Viper) (types.ConnectorServer, error) {
+func getConnector(ctx context.Context, ghc *cfg.Github) (types.ConnectorServer, error) {
 	l := ctxzap.Extract(ctx)
 
-	err := field.Validate(configuration, v)
+	err := field.Validate(cfg.Config, ghc)
 	if err != nil {
 		return nil, err
 	}
 
-	cb, err := connector.New(
-		ctx,
-		v.GetStringSlice(orgsField.FieldName),
-		v.GetString(instanceUrlField.FieldName),
-		v.GetString(accessTokenField.FieldName),
-	)
+	cb, err := connector.New(ctx, ghc)
 	if err != nil {
 		l.Error("error creating connector", zap.Error(err))
 		return nil, err

pkg/config/conf.gen.go

@@ -1,4 +1,4 @@
-package main
+package config
 
 import (
 	"github.com/conductorone/baton-sdk/pkg/field"
@@ -18,12 +18,11 @@ var (
 		"instance-url",
 		field.WithDescription(`The GitHub instance URL to connect to. (default "https://github.com")`),
 	)
-	// configuration defines the external configuration required for the connector to run.
-	configuration = field.Configuration{
-		Fields: []field.SchemaField{
-			accessTokenField,
-			orgsField,
-			instanceUrlField,
-		},
-	}
 )
+
+//go:generate go run ./gen
+var Config = field.NewConfiguration([]field.SchemaField{
+	accessTokenField,
+	orgsField,
+	instanceUrlField,
+})

cmd/baton-github/config.go pkg/config/config.gocmd/baton-github/config.go renamed to pkg/config/config.go

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

pkg/config/gen/gen.go

@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"strings"
 
+	cfg "github.com/conductorone/baton-github/pkg/config"
 	v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
 	"github.com/conductorone/baton-sdk/pkg/annotations"
 	"github.com/conductorone/baton-sdk/pkg/connectorbuilder"
@@ -155,19 +156,19 @@ func newGitHubClient(ctx context.Context, instanceURL string, accessToken string
 }
 
 // New returns the GitHub connector configured to sync against the instance URL.
-func New(ctx context.Context, githubOrgs []string, instanceURL, accessToken string) (*GitHub, error) {
-	client, err := newGitHubClient(ctx, instanceURL, accessToken)
+func New(ctx context.Context, ghc *cfg.Github) (*GitHub, error) {
+	client, err := newGitHubClient(ctx, ghc.InstanceUrl, ghc.Token)
 	if err != nil {
 		return nil, err
 	}
-	graphqlClient, err := newGitHubGraphqlClient(ctx, instanceURL, accessToken)
+	graphqlClient, err := newGitHubGraphqlClient(ctx, ghc.InstanceUrl, ghc.Token)
 	if err != nil {
 		return nil, err
 	}
 	gh := &GitHub{
 		client:        client,
-		instanceURL:   instanceURL,
-		orgs:          githubOrgs,
+		instanceURL:   ghc.InstanceUrl,
+		orgs:          ghc.Orgs,
 		graphqlClient: graphqlClient,
 		orgCache:      newOrgNameCache(client),
 	}