Merge ef68143 into backport/b-remove-acl-token-update-type-default/co…

…rrectly-tidy-bass
hashicorp · Oct 10, 2023 · 64941b1 · 64941b1
2 parents 34bc4d3 + ef68143
commit 64941b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.changelog/18689.txt b/.changelog/18689.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fixed an unexpected behavior of the `nomad acl token update` command that could cause a management token to be downgraded to client on update
+```
diff --git a/command/acl_token_update.go b/command/acl_token_update.go
@@ -27,7 +27,7 @@ Update Options:
     Sets the human readable name for the ACL token.
 
   -type="client"
-    Sets the type of token. Must be one of "client" (default), or "management".
+    Sets the type of token. Must be one of "client" or "management".
 
   -global=false
     Toggles the global mode of the token. Global tokens are replicated to all regions.
@@ -67,7 +67,7 @@ func (c *ACLTokenUpdateCommand) Run(args []string) int {
 	flags := c.Meta.FlagSet(c.Name(), FlagSetClient)
 	flags.Usage = func() { c.Ui.Output(c.Help()) }
 	flags.StringVar(&name, "name", "", "")
-	flags.StringVar(&tokenType, "type", "client", "")
+	flags.StringVar(&tokenType, "type", "", "")
 	flags.BoolVar(&global, "global", false, "")
 	flags.Var((funcVar)(func(s string) error {
 		policies = append(policies, s)

diff --git a/website/content/docs/commands/acl/token/update.mdx b/website/content/docs/commands/acl/token/update.mdx
@@ -25,8 +25,7 @@ The `acl token update` command requires an existing token's accessor ID.
 
 - `-name`: Sets the human readable name for the ACL token.
 
-- `-type`: Sets the type of token. Must be one of "client" (default), or
-  "management".
+- `-type`: Sets the type of token. Must be one of "client" or "management".
 
 - `-global`: Toggles the global mode of the token. Global tokens are replicated
   to all regions. Defaults false.