From b6699afb7e53efe580f10b1984d7a5e813cecd0f Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 2 Jul 2019 22:18:30 -0400 Subject: [PATCH] Update api/sdk --- go.mod | 4 ++-- vendor/github.com/hashicorp/vault/api/go.mod | 2 +- .../hashicorp/vault/sdk/helper/tokenutil/tokenutil.go | 6 ++---- vendor/modules.txt | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index bd63e8b951..e6549f01a2 100644 --- a/go.mod +++ b/go.mod @@ -82,8 +82,8 @@ require ( github.com/hashicorp/vault-plugin-secrets-gcp v0.5.3-0.20190620162751-272efd334652 github.com/hashicorp/vault-plugin-secrets-gcpkms v0.5.2-0.20190516000311-88f9a4f11829 github.com/hashicorp/vault-plugin-secrets-kv v0.5.2-0.20190626201950-a6e92ff82578 - github.com/hashicorp/vault/api v1.0.3-0.20190702221840-056e90b5d0ab - github.com/hashicorp/vault/sdk v0.1.12-0.20190703010025-1db05c386d79 + github.com/hashicorp/vault/api v1.0.3-0.20190703021809-ed34f18c60df + github.com/hashicorp/vault/sdk v0.1.12-0.20190703021809-ed34f18c60df github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect github.com/jackc/pgx v3.3.0+incompatible // indirect diff --git a/vendor/github.com/hashicorp/vault/api/go.mod b/vendor/github.com/hashicorp/vault/api/go.mod index c50f401109..c7663652e3 100644 --- a/vendor/github.com/hashicorp/vault/api/go.mod +++ b/vendor/github.com/hashicorp/vault/api/go.mod @@ -11,7 +11,7 @@ require ( github.com/hashicorp/go-retryablehttp v0.5.4 github.com/hashicorp/go-rootcerts v1.0.1 github.com/hashicorp/hcl v1.0.0 - github.com/hashicorp/vault/sdk v0.1.12-0.20190702142346-e39f88dbdf82 + github.com/hashicorp/vault/sdk v0.1.12-0.20190703021735-d6566ee36f36 github.com/mitchellh/mapstructure v1.1.2 golang.org/x/net v0.0.0-20190620200207-3b0461eec859 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 diff --git a/vendor/github.com/hashicorp/vault/sdk/helper/tokenutil/tokenutil.go b/vendor/github.com/hashicorp/vault/sdk/helper/tokenutil/tokenutil.go index cf89406a36..e225f86619 100644 --- a/vendor/github.com/hashicorp/vault/sdk/helper/tokenutil/tokenutil.go +++ b/vendor/github.com/hashicorp/vault/sdk/helper/tokenutil/tokenutil.go @@ -186,14 +186,12 @@ func (t *TokenParams) ParseTokenFields(req *logical.Request, d *framework.FieldD var tokenType logical.TokenType tokenTypeStr := tokenTypeRaw.(string) switch tokenTypeStr { + case "", "default": + tokenType = logical.TokenTypeDefault case "service": tokenType = logical.TokenTypeService case "batch": tokenType = logical.TokenTypeBatch - case "", "default", "default-service": - tokenType = logical.TokenTypeDefaultService - case "default-batch": - tokenType = logical.TokenTypeDefaultBatch default: return fmt.Errorf("invalid 'token_type' value %q", tokenTypeStr) } diff --git a/vendor/modules.txt b/vendor/modules.txt index c713d5ca6f..fea07c30f4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -362,9 +362,9 @@ github.com/hashicorp/vault-plugin-secrets-gcp/plugin/util github.com/hashicorp/vault-plugin-secrets-gcpkms # github.com/hashicorp/vault-plugin-secrets-kv v0.5.2-0.20190626201950-a6e92ff82578 github.com/hashicorp/vault-plugin-secrets-kv -# github.com/hashicorp/vault/api v1.0.3-0.20190702221840-056e90b5d0ab => ./api +# github.com/hashicorp/vault/api v1.0.3-0.20190703021809-ed34f18c60df => ./api github.com/hashicorp/vault/api -# github.com/hashicorp/vault/sdk v0.1.12-0.20190703010025-1db05c386d79 => ./sdk +# github.com/hashicorp/vault/sdk v0.1.12-0.20190703021809-ed34f18c60df => ./sdk github.com/hashicorp/vault/sdk/helper/salt github.com/hashicorp/vault/sdk/helper/strutil github.com/hashicorp/vault/sdk/helper/wrapping