upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-18 18:38:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

OSS changes for new update-primary API endpoint (#20277)

Browse source 
* OSS changes for new update-primary API endpoint

* remove ENT specific piece

* remove another ENT specific field
This commit is contained in:
Josh Black 2023-04-20 13:13:37 -07:00 committed by GitHub
parent c94e213ac6
commit d51ae039b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sdk/helper/consts/consts.go
View file

@ -39,4 +39,8 @@ const (
VaultEnableFilePermissionsCheckEnv = "VAULT_ENABLE_FILE_PERMISSIONS_CHECK"
VaultDisableUserLockout = "VAULT_DISABLE_USER_LOCKOUT"
PerformanceReplicationPathTarget = "performance"
DRReplicationPathParget = "dr"
)

8
vault/core.go
View file

@ -517,12 +517,6 @@ type Core struct {
// CORS Information
corsConfig *CORSConfig
// The active set of upstream cluster addresses; stored via the Echo
// mechanism, loaded by the balancer
atomicPrimaryClusterAddrs *atomic.Value
atomicPrimaryFailoverAddrs *atomic.Value
// replicationState keeps the current replication state cached for quick
// lookup; activeNodeReplicationState stores the active value on standbys
replicationState *uint32
@ -990,8 +984,6 @@ func CreateCore(conf *CoreConfig) (*Core, error) {
introspectionEnabled: conf.EnableIntrospection,
shutdownDoneCh: new(atomic.Value),
replicationState: new(uint32),
atomicPrimaryClusterAddrs: new(atomic.Value),
atomicPrimaryFailoverAddrs: new(atomic.Value),
localClusterPrivateKey: new(atomic.Value),
localClusterCert: new(atomic.Value),
localClusterParsedCert: new(atomic.Value),

8
vault/testing.go
View file

@ -971,6 +971,10 @@ func (c *TestClusterCore) Seal(t testing.T) {
}
}
func (c *TestClusterCore) LogicalStorage() logical.Storage {
return c.barrier
}
func (c *TestClusterCore) stop() error {
c.Logger().Info("stopping vault test core")
@ -1025,6 +1029,10 @@ func (c *TestClusterCore) TLSConfig() *tls.Config {
return c.tlsConfig.Clone()
}
func (c *TestClusterCore) ClusterListener() *cluster.Listener {
return c.getClusterListener()
}
func (c *TestCluster) Cleanup() {
c.Logger.Info("cleaning up vault cluster")
if tl, ok := c.Logger.(*corehelpers.TestLogger); ok {