Skip to content

Commit

Permalink
Disable session recording for TestDynamicClientReuse (#47004)
Browse files Browse the repository at this point in the history
Also removes references to boltdb, which hasn't been supported
for several years.

Closes #46958
  • Loading branch information
zmb3 authored Oct 1, 2024
1 parent 0cffff4 commit 82bbf36
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions lib/backend/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/config/configuration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"}),
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lib/service/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
3 changes: 1 addition & 2 deletions lib/service/servicecfg/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions lib/services/local/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 82bbf36

Please sign in to comment.