From 82bbf364ba715fe70306be731047ec87320d1139 Mon Sep 17 00:00:00 2001 From: Zac Bergquist Date: Tue, 1 Oct 2024 16:25:35 -0600 Subject: [PATCH] Disable session recording for TestDynamicClientReuse (#47004) Also removes references to boltdb, which hasn't been supported for several years. Closes #46958 --- lib/backend/backend.go | 4 ++-- lib/config/configuration_test.go | 4 ++-- lib/service/service_test.go | 2 +- lib/service/servicecfg/config.go | 3 +-- lib/services/local/doc.go | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/backend/backend.go b/lib/backend/backend.go index 55c386944c7e2..9b0b02007e902 100644 --- a/lib/backend/backend.go +++ b/lib/backend/backend.go @@ -268,9 +268,9 @@ func (e Event) String() string { } // Config is used for 'storage' config section. It's a combination of -// values for various backends: 'boltdb', 'etcd', 'filesystem' and 'dynamodb' +// values for various backends: 'etcd', 'filesystem', 'dynamodb', etc. type Config struct { - // Type can be "bolt" or "etcd" or "dynamodb" + // Type indicates which backend to use (etcd, dynamodb, etc) Type string `yaml:"type,omitempty"` // Params is a generic key/value property bag which allows arbitrary diff --git a/lib/config/configuration_test.go b/lib/config/configuration_test.go index 52c1a46b91c66..90802c056e5c9 100644 --- a/lib/config/configuration_test.go +++ b/lib/config/configuration_test.go @@ -321,7 +321,7 @@ func TestConfigReading(t *testing.T) { }, }, Storage: backend.Config{ - Type: "bolt", + Type: "sqlite", }, DataDir: "/path/to/data", CAPin: apiutils.Strings([]string{"rsa256:123", "rsa256:456"}), @@ -1538,7 +1538,7 @@ func makeConfigFixture() string { conf.Logger.Output = "stderr" conf.Logger.Severity = "INFO" conf.Logger.Format = LogFormat{Output: "text"} - conf.Storage.Type = "bolt" + conf.Storage.Type = "sqlite" conf.CAPin = []string{"rsa256:123", "rsa256:456"} // auth service: diff --git a/lib/service/service_test.go b/lib/service/service_test.go index 14e12c4c2b67c..1889b30b2fd82 100644 --- a/lib/service/service_test.go +++ b/lib/service/service_test.go @@ -195,8 +195,8 @@ 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["path"] = t.TempDir() cfg.Auth.ListenAddr = utils.NetAddr{AddrNetwork: "tcp", Addr: "127.0.0.1:0"} + cfg.Auth.SessionRecordingConfig.SetMode(types.RecordOff) cfg.Proxy.Enabled = true cfg.Proxy.DisableWebInterface = true cfg.Proxy.WebAddr = utils.NetAddr{AddrNetwork: "tcp", Addr: "localhost:0"} diff --git a/lib/service/servicecfg/config.go b/lib/service/servicecfg/config.go index 8a769ace38223..f42c8824e6f5d 100644 --- a/lib/service/servicecfg/config.go +++ b/lib/service/servicecfg/config.go @@ -58,8 +58,7 @@ import ( type Config struct { // Teleport configuration version. Version string - // DataDir is the directory where teleport stores its permanent state - // (in case of auth server backed by BoltDB) or local state, e.g. keys + // DataDir is the directory where teleport stores its local state, e.g. keys DataDir string // Hostname is a node host name diff --git a/lib/services/local/doc.go b/lib/services/local/doc.go index 8e53a12ad982b..e841187268fa6 100644 --- a/lib/services/local/doc.go +++ b/lib/services/local/doc.go @@ -17,6 +17,5 @@ */ // Package local implements services interfaces using abstract -// key value backend provided by lib/backend, what makes it possible -// for teleport to run using boltdb or etcd +// key value backend provided by lib/backend. package local