From 2fca81e3c27330176b1c92caaf508e230608dd71 Mon Sep 17 00:00:00 2001 From: Vault Automation Date: Thu, 4 Dec 2025 09:15:29 -0500 Subject: [PATCH] Backport Re-use kmip integ tests into ce/main (#11147) * no-op commit * Re-use kmip integ tests (#11050) --------- Co-authored-by: Nick Cabatoff --- helper/testhelpers/replication/testcluster.go | 11 ++++++++--- vault/core.go | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/helper/testhelpers/replication/testcluster.go b/helper/testhelpers/replication/testcluster.go index 152f35a486..8babf36515 100644 --- a/helper/testhelpers/replication/testcluster.go +++ b/helper/testhelpers/replication/testcluster.go @@ -40,9 +40,14 @@ func NewReplicationSetCore(t *testing.T, conf *vault.CoreConfig, opts *vault.Tes } r.Builder = func(ctx context.Context, name string, baseLogger hclog.Logger) (testcluster.VaultCluster, error) { - conf, opts := teststorage.ClusterSetup(conf, opts, setup) - opts.Logger = baseLogger.Named(name) - return vault.NewTestCluster(t, conf, opts), nil + newconf, newopts := teststorage.ClusterSetup(conf, opts, setup) + newopts.Logger = baseLogger.Named(name) + if opts.NumCores > 0 { + opts.FirstCoreNumber += opts.NumCores + } else { + opts.FirstCoreNumber += 3 + } + return vault.NewTestCluster(t, newconf, newopts), nil } a, err := r.Builder(context.TODO(), "A", r.Logger) diff --git a/vault/core.go b/vault/core.go index b4dcf26d50..de5841154c 100644 --- a/vault/core.go +++ b/vault/core.go @@ -4855,3 +4855,7 @@ func (c *Core) SetSealMigrationDone() { } var errRemovedHANode = errors.New("node has been removed from the HA cluster") + +func (c *Core) CoreNumber() int { + return c.coreNumber +}