Update kv dep

This commit is contained in:
Jeff Mitchell 2019-04-04 17:27:13 -04:00
parent eec3f9afb2
commit a2c6022010
2 changed files with 11 additions and 7 deletions

View File

@ -273,6 +273,14 @@ func (b *versionedKVBackend) Upgrade(ctx context.Context, s logical.Storage) err
b.Logger().Info("upgrading keys finished")
// We do this now so that we ensure it's written by the primary before
// secondaries unblock
b.l.Lock()
if _, err = b.policy(ctx, s); err != nil {
b.Logger().Error("error checking/creating policy after upgrade", "error", err)
}
b.l.Unlock()
// Write upgrade done value
upgradeInfo.Done = true
info, err := proto.Marshal(upgradeInfo)
@ -288,10 +296,6 @@ func (b *versionedKVBackend) Upgrade(ctx context.Context, s logical.Storage) err
b.Logger().Error("writing upgrade done resulted in an error", "error", err)
}
if _, err = b.policy(ctx, s); err != nil {
b.Logger().Error("error checking/creating policy after upgrade", "error", err)
}
atomic.StoreUint32(b.upgrading, 0)
}()

6
vendor/vendor.json vendored
View File

@ -1463,10 +1463,10 @@
"revisionTime": "2019-03-20T21:33:25Z"
},
{
"checksumSHA1": "A8tsACuzNEX1vbMj08xOo34gXPA=",
"checksumSHA1": "489Mmb5wg9htQYN9+IdfJZ6i378=",
"path": "github.com/hashicorp/vault-plugin-secrets-kv",
"revision": "79cbd437d5729b3363170e52072d36476f6e7db7",
"revisionTime": "2019-04-04T20:53:28Z"
"revision": "4807e6564154e2b4aba2cbc8e2707e68f384c5ab",
"revisionTime": "2019-04-04T21:26:40Z"
},
{
"checksumSHA1": "ldkAQ1CpiAaQ9sti0qIch+UyRsI=",