From 907011f8d7e7e66646ae53433c220123faa5db41 Mon Sep 17 00:00:00 2001
From: Matt Button <matt.button@geckoboard.com>
Date: Thu, 6 Aug 2015 16:38:26 +0000
Subject: [PATCH] Allow the `vault token-create` command to specify the token's
 id

---
 command/token_create.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/command/token_create.go b/command/token_create.go
index a53cade67e..dab0f0b260 100644
--- a/command/token_create.go
+++ b/command/token_create.go
@@ -16,7 +16,7 @@ type TokenCreateCommand struct {
 
 func (c *TokenCreateCommand) Run(args []string) int {
 	var format string
-	var displayName, lease string
+	var id, displayName, lease string
 	var orphan bool
 	var metadata map[string]string
 	var numUses int
@@ -24,6 +24,7 @@ func (c *TokenCreateCommand) Run(args []string) int {
 	flags := c.Meta.FlagSet("mount", FlagSetDefault)
 	flags.StringVar(&format, "format", "table", "")
 	flags.StringVar(&displayName, "display-name", "", "")
+	flags.StringVar(&id, "id", "", "")
 	flags.StringVar(&lease, "lease", "", "")
 	flags.BoolVar(&orphan, "orphan", false, "")
 	flags.IntVar(&numUses, "use-limit", 0, "")
@@ -50,6 +51,7 @@ func (c *TokenCreateCommand) Run(args []string) int {
 	}
 
 	secret, err := client.Auth().Token().Create(&api.TokenCreateRequest{
+		ID:          id,
 		Policies:    policies,
 		Metadata:    metadata,
 		Lease:       lease,
@@ -92,6 +94,11 @@ General Options:
 
 Token Options:
 
+  -id="7699125c-d8...."   The token value that clients will use to authenticate
+                          with vault. If not provided this defaults to a 36
+                          character UUID. A root token is required to specify 
+                          the ID of a token.
+
   -display-name="name"    A display name to associate with this token. This
                           is a non-security sensitive value used to help
                           identify created secrets, i.e. prefixes.