scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-29 17:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

backport of commit c0014c9640 (#24211)

Browse Source 
Co-authored-by: Victor Rodriguez <vrizo@hashicorp.com>
This commit is contained in:
hc-github-team-secure-vault-core
2023-11-21 09:24:51 -05:00
committed by GitHub
parent 8753d08451
commit 9055b7e197
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vault/rekey_test.go
View File

@@ -151,6 +151,10 @@ func TestCore_Rekey_Update(t *testing.T) {
}
func testCore_Rekey_Update_Common(t *testing.T, c *Core, keys [][]byte, root string, recovery bool) {
testCore_Rekey_Update_Common_Error(t, c, keys, root, recovery, false)
}
func testCore_Rekey_Update_Common_Error(t *testing.T, c *Core, keys [][]byte, root string, recovery bool, wantRekeyUpdateError bool) {
var err error
// Start a rekey
var expType string
@@ -184,12 +188,19 @@ func testCore_Rekey_Update_Common(t *testing.T, c *Core, keys [][]byte, root str
for _, key := range keys {
result, err = c.RekeyUpdate(context.Background(), key, rkconf.Nonce, recovery)
if err != nil {
t.Fatalf("err: %v", err)
if !wantRekeyUpdateError {
t.Fatalf("err: %v", err)
} else {
return
}
}
if result != nil {
break
}
}
if wantRekeyUpdateError {
t.Fatal("expected and error during RekeyUpdate")
}
if result == nil {
t.Fatal("nil result after update")
}