From c9ffc1b10b2bd4fccbf9eefb480a6590f5d32c3d Mon Sep 17 00:00:00 2001 From: Jim Kalafut Date: Wed, 20 May 2020 13:18:22 -0700 Subject: [PATCH] Update vault-plugin-secret-ad dependency (#9025) (#9048) Co-authored-by: Clint --- go.mod | 2 +- go.sum | 2 ++ .../plugin/path_rotate_root_creds.go | 15 ++++++++++----- vendor/modules.txt | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 2f5c93b46f30..18466262ad01 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,7 @@ require ( github.com/hashicorp/vault-plugin-auth-oci v0.5.4 github.com/hashicorp/vault-plugin-database-elasticsearch v0.5.4 github.com/hashicorp/vault-plugin-database-mongodbatlas v0.1.1 - github.com/hashicorp/vault-plugin-secrets-ad v0.6.5 + github.com/hashicorp/vault-plugin-secrets-ad v0.6.4-beta1.0.20200518124111-3dceeb3ce90e github.com/hashicorp/vault-plugin-secrets-alicloud v0.5.5 github.com/hashicorp/vault-plugin-secrets-azure v0.5.6 github.com/hashicorp/vault-plugin-secrets-gcp v0.6.2-0.20200507171538-2548e2b5058d diff --git a/go.sum b/go.sum index 85dbc42e4b08..d716cab0f48e 100644 --- a/go.sum +++ b/go.sum @@ -414,6 +414,8 @@ github.com/hashicorp/vault-plugin-database-elasticsearch v0.5.4 h1:YE4qndazWmYGp github.com/hashicorp/vault-plugin-database-elasticsearch v0.5.4/go.mod h1:QjGrrxcRXv/4XkEZAlM0VMZEa3uxKAICFqDj27FP/48= github.com/hashicorp/vault-plugin-database-mongodbatlas v0.1.1 h1:fA6cFH8lIPH2M4KNTEzf1bpc6Tbyy5ZvoYP8H/TI9ts= github.com/hashicorp/vault-plugin-database-mongodbatlas v0.1.1/go.mod h1:MP3kfr0N+7miOTZFwKv952b9VkXM4S2Q6YtQCiNKWq8= +github.com/hashicorp/vault-plugin-secrets-ad v0.6.4-beta1.0.20200518124111-3dceeb3ce90e h1:0GK1BNBfglD2sydZ4XXMjJElhY8bC2TDdc0vk1Q9zbA= +github.com/hashicorp/vault-plugin-secrets-ad v0.6.4-beta1.0.20200518124111-3dceeb3ce90e/go.mod h1:SCsKcChP8yrtOHXOeTD7oRk0oflj3IxA9y9zTOGtQ8s= github.com/hashicorp/vault-plugin-secrets-ad v0.6.5 h1:wrHzXSD6qmKvkuHaQn+BNj89+HGhMNchxAckGnd7YTc= github.com/hashicorp/vault-plugin-secrets-ad v0.6.5/go.mod h1:kk98nB+cwDbt3I7UGQq3ota7+eHZrGSTQZfSRGpluvA= github.com/hashicorp/vault-plugin-secrets-alicloud v0.5.5 h1:BOOtSls+BQ1EtPmpE9LoqZztsEZ1fRWVSkHWtRIrCB4= diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_rotate_root_creds.go b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_rotate_root_creds.go index a7b4448c0363..402a0aa79392 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_rotate_root_creds.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_rotate_root_creds.go @@ -4,19 +4,24 @@ import ( "context" "errors" "fmt" - "github.com/hashicorp/vault-plugin-secrets-ad/plugin/util" - "github.com/hashicorp/vault/sdk/framework" - "github.com/hashicorp/vault/sdk/logical" "math" "sync/atomic" "time" + + "github.com/hashicorp/vault-plugin-secrets-ad/plugin/util" + "github.com/hashicorp/vault/sdk/framework" + "github.com/hashicorp/vault/sdk/logical" ) func (b *backend) pathRotateCredentials() *framework.Path { return &framework.Path{ Pattern: "rotate-root", - Callbacks: map[logical.Operation]framework.OperationFunc{ - logical.ReadOperation: b.pathRotateCredentialsUpdate, + Operations: map[logical.Operation]framework.OperationHandler{ + logical.ReadOperation: &framework.PathOperation{ + Callback: b.pathRotateCredentialsUpdate, + ForwardPerformanceStandby: true, + ForwardPerformanceSecondary: true, + }, }, HelpSynopsis: pathRotateCredentialsUpdateHelpSyn, diff --git a/vendor/modules.txt b/vendor/modules.txt index e76f4f5918a2..358eb80a9264 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -407,7 +407,7 @@ github.com/hashicorp/vault-plugin-auth-oci github.com/hashicorp/vault-plugin-database-elasticsearch # github.com/hashicorp/vault-plugin-database-mongodbatlas v0.1.1 github.com/hashicorp/vault-plugin-database-mongodbatlas -# github.com/hashicorp/vault-plugin-secrets-ad v0.6.5 +# github.com/hashicorp/vault-plugin-secrets-ad v0.6.4-beta1.0.20200518124111-3dceeb3ce90e github.com/hashicorp/vault-plugin-secrets-ad/plugin github.com/hashicorp/vault-plugin-secrets-ad/plugin/client github.com/hashicorp/vault-plugin-secrets-ad/plugin/util