From 86a62130fdb38f584be2586438fed74c01db6bf7 Mon Sep 17 00:00:00 2001 From: Clint Date: Mon, 18 May 2020 15:59:11 -0500 Subject: [PATCH] Update to latest version of vault-plugin-secrets-openldap (#9006) --- go.mod | 2 +- go.sum | 2 ++ .../vault-plugin-secrets-openldap/go.mod | 4 +-- .../vault-plugin-secrets-openldap/go.sum | 8 +++--- .../path_rotate.go | 27 +++++++++++++------ vendor/modules.txt | 2 +- 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 0ece87a81..d360ff208 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( github.com/hashicorp/vault-plugin-secrets-gcpkms v0.5.5 github.com/hashicorp/vault-plugin-secrets-kv v0.5.5 github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.1.2 - github.com/hashicorp/vault-plugin-secrets-openldap v0.1.2 + github.com/hashicorp/vault-plugin-secrets-openldap v0.1.0-beta1.0.20200515114020-e19ec0ccabc3 github.com/hashicorp/vault/api v1.0.5-0.20200514164214-89b1987e38c2 github.com/hashicorp/vault/sdk v0.1.14-0.20200514164214-89b1987e38c2 github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4 diff --git a/go.sum b/go.sum index 956dd7ef1..456ed9067 100644 --- a/go.sum +++ b/go.sum @@ -506,6 +506,8 @@ github.com/hashicorp/vault-plugin-secrets-kv v0.5.5 h1:yLtfsAiJOkpRkk+OxQmFluQJ3 github.com/hashicorp/vault-plugin-secrets-kv v0.5.5/go.mod h1:oNyUoMMQq6uNTwyYPnkldiedaknYbPfQIdKoyKQdy2g= github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.1.2 h1:X9eK6NSb1qafvoEYxH5nomAW3JXl12KybR77NpgqpIU= github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.1.2/go.mod h1:YRW9zn9NZNitRlPYNAWRp/YEdKCF/X8aOg8IYSxFT5Y= +github.com/hashicorp/vault-plugin-secrets-openldap v0.1.0-beta1.0.20200515114020-e19ec0ccabc3 h1:7SLyjXdy1QwQgIb2XU39pr0J0W0fZxKq/pm8M3pv05Y= +github.com/hashicorp/vault-plugin-secrets-openldap v0.1.0-beta1.0.20200515114020-e19ec0ccabc3/go.mod h1:mfMeH+oOuVMgJVQahScA7ic+q8HfzHTocE3xJhmk4Co= github.com/hashicorp/vault-plugin-secrets-openldap v0.1.2 h1:618nyNUHX2Oc7pcQh6r0Zm0kaMrhkfAyUyFmDFwyYnQ= github.com/hashicorp/vault-plugin-secrets-openldap v0.1.2/go.mod h1:9Cy4Jp779BjuIOhYLjEfH3M3QCUxZgPnvJ3tAOOmof4= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/go.mod b/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/go.mod index abf694ad7..b66211b9e 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/go.mod +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/go.mod @@ -8,8 +8,8 @@ require ( github.com/hashicorp/go-hclog v0.12.0 github.com/hashicorp/go-multierror v1.0.0 github.com/hashicorp/go-version v1.2.0 // indirect - github.com/hashicorp/vault/api v1.0.5-0.20200317185738-82f498082f02 - github.com/hashicorp/vault/sdk v0.1.14-0.20200317185738-82f498082f02 + github.com/hashicorp/vault/api v1.0.5-0.20200215224050-f6547fa8e820 + github.com/hashicorp/vault/sdk v0.1.14-0.20200215224050-f6547fa8e820 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect github.com/stretchr/testify v1.4.0 // indirect golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/go.sum b/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/go.sum index 572719b9a..fad9613ba 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/go.sum +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/go.sum @@ -70,12 +70,12 @@ github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/vault/api v1.0.5-0.20200317185738-82f498082f02 h1:OGEV0U0+lb8SP5aZA1m456Sr3MYxFel2awVr55QRri0= -github.com/hashicorp/vault/api v1.0.5-0.20200317185738-82f498082f02/go.mod h1:3f12BMfgDGjTsTtIUj+ZKZwSobQpZtYGFIEehOv5z1o= +github.com/hashicorp/vault/api v1.0.5-0.20200215224050-f6547fa8e820 h1:biZidYDDEWnuOI9mXnJre8lwHKhb5ym85aSXk3oz/dc= +github.com/hashicorp/vault/api v1.0.5-0.20200215224050-f6547fa8e820/go.mod h1:3f12BMfgDGjTsTtIUj+ZKZwSobQpZtYGFIEehOv5z1o= github.com/hashicorp/vault/sdk v0.1.14-0.20200215195600-2ca765f0a500 h1:tiMX2ewq4ble+e2zENzBvaH2dMoFHe80NbnrF5Ir9Kk= github.com/hashicorp/vault/sdk v0.1.14-0.20200215195600-2ca765f0a500/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= -github.com/hashicorp/vault/sdk v0.1.14-0.20200317185738-82f498082f02 h1:vVrOAVfunVvkTkE9iF3Fe1+PGPLwGIp3nP4qgHGrHFs= -github.com/hashicorp/vault/sdk v0.1.14-0.20200317185738-82f498082f02/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= +github.com/hashicorp/vault/sdk v0.1.14-0.20200215224050-f6547fa8e820 h1:TmDZ1sS6gU0hFeFlFuyJVUwRPEzifZIHCBeS2WF2uSc= +github.com/hashicorp/vault/sdk v0.1.14-0.20200215224050-f6547fa8e820/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/path_rotate.go b/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/path_rotate.go index 6c9b45713..2635865a3 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/path_rotate.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-openldap/path_rotate.go @@ -25,10 +25,14 @@ func (b *backend) pathRotateCredentials() []*framework.Path { Fields: map[string]*framework.FieldSchema{}, Operations: map[logical.Operation]framework.OperationHandler{ logical.UpdateOperation: &framework.PathOperation{ - Callback: b.pathRotateCredentialsUpdate, + Callback: b.pathRotateCredentialsUpdate, + ForwardPerformanceStandby: true, + ForwardPerformanceSecondary: true, }, logical.CreateOperation: &framework.PathOperation{ - Callback: b.pathRotateCredentialsUpdate, + Callback: b.pathRotateCredentialsUpdate, + ForwardPerformanceStandby: true, + ForwardPerformanceSecondary: true, }, }, HelpSynopsis: pathRotateCredentialsUpdateHelpSyn, @@ -44,10 +48,14 @@ func (b *backend) pathRotateCredentials() []*framework.Path { }, Operations: map[logical.Operation]framework.OperationHandler{ logical.UpdateOperation: &framework.PathOperation{ - Callback: b.pathRotateRoleCredentialsUpdate, + Callback: b.pathRotateRoleCredentialsUpdate, + ForwardPerformanceStandby: true, + ForwardPerformanceSecondary: true, }, logical.CreateOperation: &framework.PathOperation{ - Callback: b.pathRotateRoleCredentialsUpdate, + Callback: b.pathRotateRoleCredentialsUpdate, + ForwardPerformanceStandby: true, + ForwardPerformanceSecondary: true, }, }, HelpSynopsis: pathRotateRoleCredentialsUpdateHelpSyn, @@ -137,14 +145,17 @@ func (b *backend) pathRotateRoleCredentialsUpdate(ctx context.Context, req *logi item.Priority = resp.RotationTime.Add(role.StaticAccount.RotationPeriod).Unix() } - // Add their rotation to the queue - if err := b.pushItem(item); err != nil { - return nil, err + // Add their rotation to the queue. We use pushErr here to distinguish between + // the error returned from setStaticAccount. They are scoped differently but + // it's more clear to developers that err above can still be non nil, and not + // overwritten or reused here. + if pushErr := b.pushItem(item); pushErr != nil { + return nil, pushErr } // We're not returning creds here because we do not know if its been processed // by the queue. - return nil, nil + return nil, err } // rollBackPassword uses naive exponential backoff to retry updating to an old password, diff --git a/vendor/modules.txt b/vendor/modules.txt index ce2df3bf2..45e36dc84 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -448,7 +448,7 @@ github.com/hashicorp/vault-plugin-secrets-gcpkms github.com/hashicorp/vault-plugin-secrets-kv # github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.1.2 github.com/hashicorp/vault-plugin-secrets-mongodbatlas -# github.com/hashicorp/vault-plugin-secrets-openldap v0.1.2 +# github.com/hashicorp/vault-plugin-secrets-openldap v0.1.0-beta1.0.20200515114020-e19ec0ccabc3 github.com/hashicorp/vault-plugin-secrets-openldap github.com/hashicorp/vault-plugin-secrets-openldap/client # github.com/hashicorp/vault/api v1.0.5-0.20200514164214-89b1987e38c2 => ./api