Update deps (#38)

* Update deps

* Update against latest Vault dep
This commit is contained in:
Jeff Mitchell authored and GitHub committed 2020-05-11 13:27:54 -04:00
1 parent 7f2aa5ca8f
commit 5a721f0ce3
6 files changed
+186 -153

No files matched your search

@@ -166,10 +166,18 @@ func (c *Command) Run(args []string) int {
return 1
}
if err := c.SetupKMSes(c.UI, c.Config.SharedConfig, 2); err != nil {
if err := c.SetupKMSes(c.UI, c.Config.SharedConfig, []string{"controller", "worker-auth"}); err != nil {
c.UI.Error(err.Error())
return 1
}
if c.ControllerKMS == nil {
c.UI.Error("Controller KMS not found after parsing KMS blocks")
return 1
}
if c.WorkerAuthKMS == nil {
c.UI.Error("Worker Auth KMS not found after parsing KMS blocks")
return 1
}
if c.Config.DefaultMaxRequestDuration != 0 {
globals.DefaultMaxRequestDuration = c.Config.DefaultMaxRequestDuration