mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-11-02 11:38:02 +00:00
OSS changes for new update-primary API endpoint (#20277)
* OSS changes for new update-primary API endpoint * remove ENT specific piece * remove another ENT specific field
This commit is contained in:
@@ -39,4 +39,8 @@ const (
|
||||
VaultEnableFilePermissionsCheckEnv = "VAULT_ENABLE_FILE_PERMISSIONS_CHECK"
|
||||
|
||||
VaultDisableUserLockout = "VAULT_DISABLE_USER_LOCKOUT"
|
||||
|
||||
PerformanceReplicationPathTarget = "performance"
|
||||
|
||||
DRReplicationPathParget = "dr"
|
||||
)
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user