Make compile
This commit is contained in:
parent
a25dae82dd
commit
65f664be47
|
@ -677,18 +677,6 @@ CLUSTER_SYNTHESIS_COMPLETE:
|
|||
go server.Serve(ln)
|
||||
}
|
||||
|
||||
if sealConfigError != nil {
|
||||
init, err := core.Initialized()
|
||||
if err != nil {
|
||||
c.Ui.Error(fmt.Sprintf("Error checking if core is initialized: %v", err))
|
||||
return 1
|
||||
}
|
||||
if init {
|
||||
c.Ui.Error("Vault is initialized but no Seal key could be loaded")
|
||||
return 1
|
||||
}
|
||||
}
|
||||
|
||||
if newCoreError != nil {
|
||||
c.Ui.Output("==> Warning:\n\nNon-fatal error during initialization; check the logs for more information.")
|
||||
c.Ui.Output("")
|
||||
|
|
|
@ -7,6 +7,7 @@ import (
|
|||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/hashicorp/errwrap"
|
||||
"github.com/hashicorp/vault/helper/consts"
|
||||
|
|
|
@ -62,7 +62,7 @@ func TestSysRekey_Init_Setup(t *testing.T) {
|
|||
defer ln.Close()
|
||||
TestServerAuth(t, addr, token)
|
||||
|
||||
// Start rekey
|
||||
// Start rekey
|
||||
resp := testHttpPut(t, token, addr+"/v1/sys/rekey/init", map[string]interface{}{
|
||||
"secret_shares": 5,
|
||||
"secret_threshold": 3,
|
||||
|
@ -89,7 +89,7 @@ func TestSysRekey_Init_Setup(t *testing.T) {
|
|||
t.Fatalf("\nexpected: %#v\nactual: %#v", expected, actual)
|
||||
}
|
||||
|
||||
// Get rekey status
|
||||
// Get rekey status
|
||||
resp = testHttpGet(t, token, addr+"/v1/sys/rekey/init")
|
||||
|
||||
actual = map[string]interface{}{}
|
||||
|
|
Loading…
Reference in New Issue