Fix the data dir for tests (WIP)

gravitational · Oct 31, 2024 · 42c91a5 · 42c91a5
1 parent c1f368e
commit 42c91a5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/lib/service/service.go b/lib/service/service.go
@@ -6135,8 +6135,12 @@ func warnOnErr(ctx context.Context, err error, log *slog.Logger) {
 // initAuthStorage initializes the storage backend for the auth service.
 func (process *TeleportProcess) initAuthStorage() (backend.Backend, error) {
 	ctx := context.TODO()
-	process.logger.DebugContext(process.ExitContext(), "Initializing auth backend.", "backend", process.Config.Auth.StorageConfig.Type)
 	bc := process.Config.Auth.StorageConfig
+	process.logger.DebugContext(process.ExitContext(), "Initializing auth backend.",
+		"backend", process.Config.Auth.StorageConfig.Type,
+		"type", bc.Type,
+		"params", bc.Params,
+	)
 	bk, err := backend.New(ctx, bc.Type, bc.Params)
 	if err != nil {
 		return nil, trace.Wrap(err)

diff --git a/lib/service/service_test.go b/lib/service/service_test.go
@@ -195,6 +195,7 @@ func TestDynamicClientReuse(t *testing.T) {
 	cfg.DiagnosticAddr = utils.NetAddr{AddrNetwork: "tcp", Addr: "127.0.0.1:0"}
 	cfg.SetAuthServerAddress(utils.NetAddr{AddrNetwork: "tcp", Addr: "127.0.0.1:0"})
 	cfg.Auth.Enabled = true
+	// cfg.Auth.StorageConfig.Params[defaults.BackendPath] = filepath.Join(cfg.DataDir, "backend")
 	cfg.Auth.ListenAddr = utils.NetAddr{AddrNetwork: "tcp", Addr: "127.0.0.1:0"}
 	cfg.Auth.SessionRecordingConfig.SetMode(types.RecordOff)
 	cfg.Proxy.Enabled = true

diff --git a/lib/service/servicecfg/config.go b/lib/service/servicecfg/config.go
@@ -671,6 +671,16 @@ func ValidateConfig(cfg *Config) error {
 
 	cfg.SSH.Namespace = types.ProcessNamespace(cfg.SSH.Namespace)
 
+	// If we've overridden the process's data dir, but left auth's backend
+	// pointing at the default data dir this is probably a test that forgot
+	// to customize the auth storage config. Fix it.
+	if cfg.Auth.Enabled && cfg.Auth.StorageConfig.Type == lite.GetName() {
+		storagePath := cfg.Auth.StorageConfig.Params.GetString(defaults.BackendPath)
+		if storagePath == filepath.Join(defaults.DataDir, defaults.BackendDir) && cfg.DataDir != defaults.DataDir {
+			cfg.Auth.StorageConfig.Params[defaults.BackendPath] = filepath.Join(cfg.DataDir, defaults.BackendDir)
+		}
+	}
+
 	return nil
 }