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 7

Backport Re-use kmip integ tests into ce/main (#11147)

Browse source 
* no-op commit

* Re-use kmip integ tests (#11050)

---------

Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
This commit is contained in:
Vault Automation 2025-12-04 09:15:29 -05:00 committed by GitHub
parent 93a339547f
commit 2fca81e3c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
helper/testhelpers/replication/testcluster.go
View file

@ -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)

4
vault/core.go
View file

@ -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
}