From d51ae039b2c53e2c960b4d8f4fd5cd30f84f7f4d Mon Sep 17 00:00:00 2001
From: Josh Black <raskchanky@users.noreply.github.com>
Date: Thu, 20 Apr 2023 13:13:37 -0700
Subject: [PATCH] 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
---
 sdk/helper/consts/consts.go | 4 ++++
 vault/core.go               | 8 --------
 vault/testing.go            | 8 ++++++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sdk/helper/consts/consts.go b/sdk/helper/consts/consts.go
index b51191050748..744d2aa81c72 100644
--- a/sdk/helper/consts/consts.go
+++ b/sdk/helper/consts/consts.go
@@ -39,4 +39,8 @@ const (
 	VaultEnableFilePermissionsCheckEnv = "VAULT_ENABLE_FILE_PERMISSIONS_CHECK"
 
 	VaultDisableUserLockout = "VAULT_DISABLE_USER_LOCKOUT"
+
+	PerformanceReplicationPathTarget = "performance"
+
+	DRReplicationPathParget = "dr"
 )
diff --git a/vault/core.go b/vault/core.go
index ec4452499e9d..18715ece749c 100644
--- a/vault/core.go
+++ b/vault/core.go
@@ -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),
diff --git a/vault/testing.go b/vault/testing.go
index 17d25ef8feda..791a5994a9f3 100644
--- a/vault/testing.go
+++ b/vault/testing.go
@@ -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 {