Bump api/sdk

This commit is contained in:
Jeff Mitchell 2019-06-27 18:01:05 -04:00
parent 4484de3ea6
commit ff0ba7a926
5 changed files with 17 additions and 7 deletions

4
go.mod
View File

@ -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.20190621032639-b2bd2690d46a
github.com/hashicorp/vault/sdk v0.1.12-0.20190626183508-cc3a81801f98
github.com/hashicorp/vault/api v1.0.3-0.20190627213952-21b5ec5dc34c
github.com/hashicorp/vault/sdk v0.1.12-0.20190627213952-21b5ec5dc34c
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

View File

@ -24,6 +24,7 @@ func (c *Client) Help(path string) (*Help, error) {
}
type Help struct {
Help string `json:"help"`
SeeAlso []string `json:"see_also"`
Help string `json:"help"`
SeeAlso []string `json:"see_also"`
OpenAPI map[string]interface{} `json:"openapi"`
}

View File

@ -257,6 +257,7 @@ func (p *Path) helpCallback(b *Backend) OperationFunc {
Key: k,
Type: schema.Type.String(),
Description: description,
Deprecated: schema.Deprecated,
}
}
@ -286,6 +287,7 @@ type pathTemplateData struct {
type pathTemplateFieldData struct {
Key string
Type string
Deprecated bool
Description string
URL bool
}
@ -300,8 +302,11 @@ Matching Route: {{.RoutePattern}}
## PARAMETERS
{{range .Fields}}
{{indent 4 .Key}} ({{.Type}})
{{if .Deprecated}}
{{printf "(DEPRECATED) %s" .Description | indent 8}}
{{else}}
{{indent 8 .Description}}
{{end}}{{end}}
{{end}}{{end}}{{end}}
## DESCRIPTION
{{.Description}}

View File

@ -218,6 +218,10 @@ func (t *TokenParams) PopulateTokenAuth(auth *logical.Auth) {
auth.NumUses = t.TokenNumUses
}
func DeprecationText(param string) string {
return fmt.Sprintf("Use %q instead. If this and %q are both specified, only %q will be used.", param, param, param)
}
const (
tokenPeriodHelp = `If set, tokens created via this role
will have no max lifetime; instead, their

4
vendor/modules.txt vendored
View File

@ -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.20190621032639-b2bd2690d46a => ./api
# github.com/hashicorp/vault/api v1.0.3-0.20190627213952-21b5ec5dc34c => ./api
github.com/hashicorp/vault/api
# github.com/hashicorp/vault/sdk v0.1.12-0.20190626183508-cc3a81801f98 => ./sdk
# github.com/hashicorp/vault/sdk v0.1.12-0.20190627213952-21b5ec5dc34c => ./sdk
github.com/hashicorp/vault/sdk/helper/salt
github.com/hashicorp/vault/sdk/helper/strutil
github.com/hashicorp/vault/sdk/helper/wrapping