luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix panic on acl token read with -self and -expanded

This commit is contained in:
Jared Kirschner 2022-07-15 16:05:53 -07:00
parent 303e7ff2e0
commit 47c3a92711
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/13787.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
cli: when `acl token read` is used with the `-self` and `-expanded` flags, return an error instead of panicking
```

7
command/acl/token/read/token_read.go
View File

@ -92,6 +92,13 @@ func (c *cmd) Run(args []string) int {
return 1 return 1
} }
} else { } else {
// TODO: consider updating this CLI command and underlying HTTP API endpoint
// to support expanded read of a "self" token, which is a much better user workflow.
if c.expanded {
c.UI.Error("Cannot use both -expanded and -self. Instead, use -expanded and -id=<accessor id>.")
return 1
}
t, _, err = client.ACL().TokenReadSelf(nil) t, _, err = client.ACL().TokenReadSelf(nil)
if err != nil { if err != nil {
c.UI.Error(fmt.Sprintf("Error reading token: %v", err)) c.UI.Error(fmt.Sprintf("Error reading token: %v", err))