From 94cefffe08789977830e4e1f1a6d1d987b6fa14b Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 18 Jun 2019 12:24:15 -0400 Subject: [PATCH] Update api/sdk in main repo --- go.mod | 4 ++-- vendor/github.com/hashicorp/vault/api/go.mod | 2 +- .../hashicorp/vault/sdk/helper/tokenutil/tokenutil.go | 8 ++++---- vendor/modules.txt | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 8bcd498259..b70a7e625b 100644 --- a/go.mod +++ b/go.mod @@ -81,8 +81,8 @@ require ( github.com/hashicorp/vault-plugin-secrets-gcp v0.5.2 github.com/hashicorp/vault-plugin-secrets-gcpkms v0.5.1 github.com/hashicorp/vault-plugin-secrets-kv v0.5.2-0.20190416155133-fd495225dea0 - github.com/hashicorp/vault/api v1.0.3-0.20190618151822-daa6a789fd8a - github.com/hashicorp/vault/sdk v0.1.12-0.20190618145338-1ce8868aafe9 + github.com/hashicorp/vault/api v1.0.3-0.20190618162316-fb8482810248 + github.com/hashicorp/vault/sdk v0.1.12-0.20190618162316-fb8482810248 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 73f506ae41..40c6b1169a 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.3 github.com/hashicorp/go-rootcerts v1.0.0 github.com/hashicorp/hcl v1.0.0 - github.com/hashicorp/vault/sdk v0.1.12-0.20190618145338-1ce8868aafe9 + github.com/hashicorp/vault/sdk v0.1.12-0.20190618162212-0d8de0b54889 github.com/mitchellh/mapstructure v1.1.2 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 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 5945fd47e0..97be833f13 100644 --- a/vendor/github.com/hashicorp/vault/sdk/helper/tokenutil/tokenutil.go +++ b/vendor/github.com/hashicorp/vault/sdk/helper/tokenutil/tokenutil.go @@ -195,13 +195,13 @@ func (t *TokenParams) ParseTokenFields(req *logical.Request, d *framework.FieldD // PopulateTokenData adds information from TokenParams into the map func (t *TokenParams) PopulateTokenData(m map[string]interface{}) { m["token_bound_cidrs"] = t.TokenBoundCIDRs - m["token_explicit_max_ttl"] = t.TokenExplicitMaxTTL.Seconds() - m["token_max_ttl"] = t.TokenMaxTTL.Seconds() + m["token_explicit_max_ttl"] = int64(t.TokenExplicitMaxTTL.Seconds()) + m["token_max_ttl"] = int64(t.TokenMaxTTL.Seconds()) m["token_no_default_policy"] = t.TokenNoDefaultPolicy - m["token_period"] = t.TokenPeriod.Seconds() + m["token_period"] = int64(t.TokenPeriod.Seconds()) m["token_policies"] = t.TokenPolicies m["token_type"] = t.TokenType.String() - m["token_ttl"] = t.TokenTTL.Seconds() + m["token_ttl"] = int64(t.TokenTTL.Seconds()) m["token_num_uses"] = t.TokenNumUses } diff --git a/vendor/modules.txt b/vendor/modules.txt index b7ff5dbf7e..0135588003 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -348,9 +348,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.20190416155133-fd495225dea0 github.com/hashicorp/vault-plugin-secrets-kv -# github.com/hashicorp/vault/api v1.0.3-0.20190618151822-daa6a789fd8a => ./api +# github.com/hashicorp/vault/api v1.0.3-0.20190618162316-fb8482810248 => ./api github.com/hashicorp/vault/api -# github.com/hashicorp/vault/sdk v0.1.12-0.20190618145338-1ce8868aafe9 => ./sdk +# github.com/hashicorp/vault/sdk v0.1.12-0.20190618162316-fb8482810248 => ./sdk github.com/hashicorp/vault/sdk/helper/salt github.com/hashicorp/vault/sdk/helper/strutil github.com/hashicorp/vault/sdk/helper/wrapping @@ -366,6 +366,7 @@ github.com/hashicorp/vault/sdk/helper/jsonutil github.com/hashicorp/vault/sdk/helper/certutil github.com/hashicorp/vault/sdk/helper/password github.com/hashicorp/vault/sdk/helper/ldaputil +github.com/hashicorp/vault/sdk/helper/tokenutil github.com/hashicorp/vault/sdk/helper/tlsutil github.com/hashicorp/vault/sdk/database/dbplugin github.com/hashicorp/vault/sdk/database/helper/dbutil @@ -388,7 +389,6 @@ github.com/hashicorp/vault/sdk/helper/pathmanager github.com/hashicorp/vault/sdk/database/helper/connutil github.com/hashicorp/vault/sdk/helper/license github.com/hashicorp/vault/sdk/helper/pluginutil -github.com/hashicorp/vault/sdk/helper/tokenutil github.com/hashicorp/vault/sdk/plugin/pb github.com/hashicorp/vault/sdk/helper/kdf github.com/hashicorp/vault/sdk/plugin/mock