diff --git a/vault/core_util.go b/vault/core_util.go index efa155bc2..2a609acfd 100644 --- a/vault/core_util.go +++ b/vault/core_util.go @@ -7,7 +7,6 @@ import ( "fmt" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/command/server" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/sdk/helper/license" "github.com/hashicorp/vault/sdk/logical" @@ -71,16 +70,6 @@ func (c *Core) barrierViewForNamespace(namespaceId string) (*BarrierView, error) return c.systemBarrierView, nil } -// GetCoreConfigInternal returns the server configuration -// in struct format. -func (c *Core) GetCoreConfigInternal() *server.Config { - conf := c.rawConfig.Load() - if conf == nil { - return nil - } - return conf.(*server.Config) -} - func (c *Core) teardownReplicationResolverHandler() {} func createSecondaries(*Core, *CoreConfig) {} diff --git a/vault/core_util_common.go b/vault/core_util_common.go index 6e0594774..35b2962dc 100644 --- a/vault/core_util_common.go +++ b/vault/core_util_common.go @@ -4,9 +4,20 @@ import ( "context" uuid "github.com/hashicorp/go-uuid" + "github.com/hashicorp/vault/command/server" "github.com/hashicorp/vault/sdk/logical" ) +// GetCoreConfigInternal returns the server configuration +// in struct format. +func (c *Core) GetCoreConfigInternal() *server.Config { + conf := c.rawConfig.Load() + if conf == nil { + return nil + } + return conf.(*server.Config) +} + func (c *Core) loadHeaderHMACKey(ctx context.Context) error { ent, err := c.barrier.Get(ctx, indexHeaderHMACKeyPath) if err != nil {