From b50a88c2097aafb929c52ca1f048fc495fab7339 Mon Sep 17 00:00:00 2001 From: subencheng Date: Thu, 3 Jul 2025 11:00:59 -0700 Subject: [PATCH 1/2] baton-sql-server: set up BATON_CONFIG_PATH in windows service --- cmd/baton-sql-server/main.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cmd/baton-sql-server/main.go b/cmd/baton-sql-server/main.go index 714b83a1..8938d757 100644 --- a/cmd/baton-sql-server/main.go +++ b/cmd/baton-sql-server/main.go @@ -5,6 +5,8 @@ import ( "fmt" "os" + "path/filepath" + config "github.com/conductorone/baton-sdk/pkg/config" "github.com/conductorone/baton-sdk/pkg/connectorbuilder" "github.com/conductorone/baton-sdk/pkg/types" @@ -16,9 +18,24 @@ import ( var version = "dev" +func getConfigDir(name string) string { + return filepath.Join(os.Getenv("PROGRAMDATA"), "ConductorOne", name) +} + func main() { ctx := context.Background() + connectorName := "baton-sql-server" + configPath := os.Getenv("BATON_CONFIG_PATH") + if configPath == "" && os.Getenv("PROGRAMDATA") != "" { + // Set BATON_CONFIG_PATH so that if we're running as a windows service, we use the correct config file + err := os.Setenv("BATON_CONFIG_PATH", filepath.Join(getConfigDir(connectorName), "config.yaml")) + if err != nil { + fmt.Fprintln(os.Stderr, err.Error()) + os.Exit(1) + } + } + _, cmd, err := config.DefineConfiguration(ctx, "baton-sql-server", getConnector, cfg) if err != nil { fmt.Fprintln(os.Stderr, err.Error()) From a5b0c42d08441b7c99fe7c1c2300599158a6ba4b Mon Sep 17 00:00:00 2001 From: subencheng Date: Thu, 3 Jul 2025 11:02:06 -0700 Subject: [PATCH 2/2] more --- cmd/baton-sql-server/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/baton-sql-server/main.go b/cmd/baton-sql-server/main.go index 8938d757..1da538eb 100644 --- a/cmd/baton-sql-server/main.go +++ b/cmd/baton-sql-server/main.go @@ -36,7 +36,7 @@ func main() { } } - _, cmd, err := config.DefineConfiguration(ctx, "baton-sql-server", getConnector, cfg) + _, cmd, err := config.DefineConfiguration(ctx, connectorName, getConnector, cfg) if err != nil { fmt.Fprintln(os.Stderr, err.Error()) os.Exit(1)