mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-12-16 15:01:13 +01:00
Code Issues Projects Releases Wiki Activity

Support and use TTL instead of lease for token creation

Browse Source
This commit is contained in:
Jeff Mitchell 2015-10-09 19:52:13 -04:00
parent a087e943c7
commit 27029d9744
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/auth_token.go
View File

@ -81,6 +81,7 @@ type TokenCreateRequest struct {
Policies []string `json:"policies,omitempty"` Policies []string `json:"policies,omitempty"`
Metadata map[string]string `json:"meta,omitempty"` Metadata map[string]string `json:"meta,omitempty"`
Lease string `json:"lease,omitempty"` Lease string `json:"lease,omitempty"`
TTL string `json:"ttl,omitempty"`
NoParent bool `json:"no_parent,omitempty"` NoParent bool `json:"no_parent,omitempty"`
DisplayName string `json:"display_name"` DisplayName string `json:"display_name"`
NumUses int `json:"num_uses"` NumUses int `json:"num_uses"`

9
command/token_create.go
View File

@ -16,7 +16,7 @@ type TokenCreateCommand struct {
func (c *TokenCreateCommand) Run(args []string) int { func (c *TokenCreateCommand) Run(args []string) int {
var format string var format string
var id, displayName, lease string var id, displayName, lease, ttl string
var orphan bool var orphan bool
var metadata map[string]string var metadata map[string]string
var numUses int var numUses int
@ -26,6 +26,7 @@ func (c *TokenCreateCommand) Run(args []string) int {
flags.StringVar(&displayName, "display-name", "", "") flags.StringVar(&displayName, "display-name", "", "")
flags.StringVar(&id, "id", "", "") flags.StringVar(&id, "id", "", "")
flags.StringVar(&lease, "lease", "", "") flags.StringVar(&lease, "lease", "", "")
flags.StringVar(&ttl, "ttl", "", "")
flags.BoolVar(&orphan, "orphan", false, "") flags.BoolVar(&orphan, "orphan", false, "")
flags.IntVar(&numUses, "use-limit", 0, "") flags.IntVar(&numUses, "use-limit", 0, "")
flags.Var((*kvFlag.Flag)(&metadata), "metadata", "") flags.Var((*kvFlag.Flag)(&metadata), "metadata", "")
@ -50,15 +51,19 @@ func (c *TokenCreateCommand) Run(args []string) int {
return 2 return 2
} }
if ttl == "" {
ttl = lease
}
secret, err := client.Auth().Token().Create(&api.TokenCreateRequest{ secret, err := client.Auth().Token().Create(&api.TokenCreateRequest{
ID: id, ID: id,
Policies: policies, Policies: policies,
Metadata: metadata, Metadata: metadata,
Lease: lease, TTL: ttl,
NoParent: orphan, NoParent: orphan,
DisplayName: displayName, DisplayName: displayName,
NumUses: numUses, NumUses: numUses,
}) })
if err != nil { if err != nil {
c.Ui.Error(fmt.Sprintf( c.Ui.Error(fmt.Sprintf(
"Error creating token: %s", err)) "Error creating token: %s", err))