upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-03 20:40:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Backport Add kmip cluster tests. Also fix a bug in EnableDRSecondaryNoWait. into ce/main (#12059)

Browse source 
* no-op commit

* Apply CE changes from #12052

---------

Co-authored-by: ncabatoff <ncabatoff@hashicorp.com>
This commit is contained in:
Vault Automation 2026-01-29 10:38:19 -05:00 committed by GitHub
parent c499aa5288
commit d7d140a3a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,21 @@ func SetCorePerf(t *testing.T, conf *vault.CoreConfig, opts *vault.TestClusterOp
return r
}
func SetCoreDR(t *testing.T, conf *vault.CoreConfig, opts *vault.TestClusterOptions) *testcluster.ReplicationSet {
r := NewReplicationSetCore(t, conf, opts, teststorage.InmemBackendSetup)
t.Cleanup(r.Cleanup)
// By default NewTestCluster will mount a kv under secret/. This isn't
// done by docker-based clusters, so remove this to make us more like that.
require.Nil(t, r.Clusters["A"].Nodes()[0].APIClient().Sys().Unmount("secret"))
err := r.StandardDRReplication(context.Background())
if err != nil {
t.Fatal(err)
}
return r
}
func NewReplicationSetCore(t *testing.T, conf *vault.CoreConfig, opts *vault.TestClusterOptions, setup teststorage.ClusterSetupMutator) *testcluster.ReplicationSet {
r := &testcluster.ReplicationSet{
Clusters: map[string]testcluster.VaultCluster{},

6
sdk/helper/testcluster/replication.go
View file

@ -463,10 +463,10 @@ func WaitForDRSecondary(ctx context.Context, pri, sec VaultCluster, skipPoisonPi
return nil
}
func EnableDRSecondaryNoWait(ctx context.Context, sec VaultCluster, drToken string) error {
func EnableDRSecondaryNoWait(ctx context.Context, pri, sec VaultCluster, drToken string) error {
postData := map[string]interface{}{
"token": drToken,
"ca_file": sec.GetCACertPEMFile(),
"ca_file": pri.GetCACertPEMFile(),
}
_, err := sec.Nodes()[0].APIClient().Logical().Write("sys/replication/dr/secondary/enable", postData)
@ -553,7 +553,7 @@ func WaitForDRReplicationWorking(ctx context.Context, pri, sec VaultCluster) err
}
func EnableDrSecondary(ctx context.Context, pri, sec VaultCluster, drToken string) error {
err := EnableDRSecondaryNoWait(ctx, sec, drToken)
err := EnableDRSecondaryNoWait(ctx, pri, sec, drToken)
if err != nil {
return err
}