From 215368a895faa95c6a8312010887a5ea9c01f804 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 17:37:23 +0000 Subject: [PATCH 1/2] Bump github.com/hashicorp/vault/sdk from 0.5.1 to 0.5.3 Bumps [github.com/hashicorp/vault/sdk](https://github.com/hashicorp/vault) from 0.5.1 to 0.5.3. - [Release notes](https://github.com/hashicorp/vault/releases) - [Changelog](https://github.com/hashicorp/vault/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/vault/compare/v0.5.1...v0.5.3) --- updated-dependencies: - dependency-name: github.com/hashicorp/vault/sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1470ee72b..4c3b30fad 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/hashicorp/go-version v1.6.0 github.com/hashicorp/golang-lru v0.5.4 github.com/hashicorp/hcl v1.0.0 - github.com/hashicorp/vault/sdk v0.5.1 + github.com/hashicorp/vault/sdk v0.5.3 github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 github.com/kelseyhightower/envconfig v1.4.0 github.com/letsencrypt/boulder v0.0.0-20220331220046-b23ab962616e diff --git a/go.sum b/go.sum index a3c773737..e09d65cde 100644 --- a/go.sum +++ b/go.sum @@ -1460,8 +1460,9 @@ github.com/hashicorp/vault/api v1.7.2/go.mod h1:xbfA+1AvxFseDzxxdWaL0uO99n1+tndu github.com/hashicorp/vault/sdk v0.3.0/go.mod h1:aZ3fNuL5VNydQk8GcLJ2TV8YCRVvyaakYkhZRoVuhj0= github.com/hashicorp/vault/sdk v0.4.1/go.mod h1:aZ3fNuL5VNydQk8GcLJ2TV8YCRVvyaakYkhZRoVuhj0= github.com/hashicorp/vault/sdk v0.5.0/go.mod h1:UJZHlfwj7qUJG8g22CuxUgkdJouFrBNvBHCyx8XAPdo= -github.com/hashicorp/vault/sdk v0.5.1 h1:zly/TmNgOXCGgWIRA8GojyXzG817POtVh3uzIwzZx+8= github.com/hashicorp/vault/sdk v0.5.1/go.mod h1:DoGraE9kKGNcVgPmTuX357Fm6WAx1Okvde8Vp3dPDoU= +github.com/hashicorp/vault/sdk v0.5.3 h1:PWY8sq/9pRrK9vUIy75qCH2Jd8oeENAgkaa/qbhzFrs= +github.com/hashicorp/vault/sdk v0.5.3/go.mod h1:DoGraE9kKGNcVgPmTuX357Fm6WAx1Okvde8Vp3dPDoU= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 h1:xixZ2bWeofWV68J+x6AzmKuVM/JWCQwkWm6GW/MUR6I= github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= From 76331abdff43b74695e417033c451ae3e9be66fa Mon Sep 17 00:00:00 2001 From: cpanato Date: Fri, 22 Jul 2022 11:36:54 +0200 Subject: [PATCH 2/2] update codegen Signed-off-by: cpanato --- .../hashicorp/vault/sdk/helper/logging/logging.go | 7 ++++--- .../vault/sdk/helper/pluginutil/multiplexing.pb.go | 2 +- .../hashicorp/vault/sdk/logical/identity.pb.go | 2 +- .../github.com/hashicorp/vault/sdk/logical/plugin.pb.go | 2 +- .../github.com/hashicorp/vault/sdk/logical/request.go | 1 + .../github.com/hashicorp/vault/sdk/logical/response.go | 9 +++++++++ 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/helper/logging/logging.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/helper/logging/logging.go index a8d30674b..211a545e3 100644 --- a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/helper/logging/logging.go +++ b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/helper/logging/logging.go @@ -42,9 +42,10 @@ func NewVaultLogger(level log.Level) log.Logger { // writer and a Vault formatter func NewVaultLoggerWithWriter(w io.Writer, level log.Level) log.Logger { opts := &log.LoggerOptions{ - Level: level, - Output: w, - JSONFormat: ParseEnvLogFormat() == JSONFormat, + Level: level, + IndependentLevels: true, + Output: w, + JSONFormat: ParseEnvLogFormat() == JSONFormat, } return log.New(opts) } diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/helper/pluginutil/multiplexing.pb.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/helper/pluginutil/multiplexing.pb.go index d0ff51e57..b681bf359 100644 --- a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/helper/pluginutil/multiplexing.pb.go +++ b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/helper/pluginutil/multiplexing.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.0 // protoc v3.19.4 // source: sdk/helper/pluginutil/multiplexing.proto diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/identity.pb.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/identity.pb.go index 4b1a36b39..d0e2ab622 100644 --- a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/identity.pb.go +++ b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/identity.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.0 // protoc v3.19.4 // source: sdk/logical/identity.proto diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/plugin.pb.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/plugin.pb.go index 1fb53f9a7..ed456ef2d 100644 --- a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/plugin.pb.go +++ b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/plugin.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.0 // protoc v3.19.4 // source: sdk/logical/plugin.proto diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/request.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/request.go index 1c400a4cb..1edb51b3f 100644 --- a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/request.go +++ b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/request.go @@ -365,6 +365,7 @@ const ( ListOperation = "list" HelpOperation = "help" AliasLookaheadOperation = "alias-lookahead" + ResolveRoleOperation = "resolve-role" // The operations below are called globally, the path is less relevant. RevokeOperation Operation = "revoke" diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/response.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/response.go index e8276c789..19194f524 100644 --- a/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/response.go +++ b/third_party/VENDOR-LICENSE/github.com/hashicorp/vault/sdk/logical/response.go @@ -310,3 +310,12 @@ func (w *StatusHeaderResponseWriter) setCustomResponseHeaders(status int) { } var _ WrappingResponseWriter = &StatusHeaderResponseWriter{} + +// ResolveRoleResponse returns a standard response to be returned by functions handling a ResolveRoleOperation +func ResolveRoleResponse(roleName string) (*Response, error) { + return &Response{ + Data: map[string]interface{}{ + "role": roleName, + }, + }, nil +}