Skip to content

Commit

Permalink
Merge pull request #11411 from hashicorp/f-gh-11406
Browse files Browse the repository at this point in the history
cli: add json and template flag opts to acl bootstrap command.
  • Loading branch information
jrasell committed Nov 2, 2021
2 parents 4cfc6a0 + 9542b2e commit 8ba1444
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .changelog/11411.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
cli: added json and template flag opts to the acl bootstrap command
```
32 changes: 31 additions & 1 deletion command/acl_bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,24 @@ General Options:
` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
Bootstrap Options:
-json
Output the bootstrap response in JSON format.
-t
Format and display the bootstrap response using a Go template.
`
return strings.TrimSpace(helpText)
}

func (c *ACLBootstrapCommand) AutocompleteFlags() complete.Flags {
return mergeAutocompleteFlags(c.Meta.AutocompleteFlags(FlagSetClient),
complete.Flags{})
complete.Flags{
"-json": complete.PredictNothing,
"-t": complete.PredictAnything,
})
}

func (c *ACLBootstrapCommand) AutocompleteArgs() complete.Predictor {
Expand All @@ -42,8 +53,16 @@ func (c *ACLBootstrapCommand) Synopsis() string {
func (c *ACLBootstrapCommand) Name() string { return "acl bootstrap" }

func (c *ACLBootstrapCommand) Run(args []string) int {

var (
json bool
tmpl string
)

flags := c.Meta.FlagSet(c.Name(), FlagSetClient)
flags.Usage = func() { c.Ui.Output(c.Help()) }
flags.BoolVar(&json, "json", false, "")
flags.StringVar(&tmpl, "t", "", "")
if err := flags.Parse(args); err != nil {
return 1
}
Expand All @@ -70,6 +89,17 @@ func (c *ACLBootstrapCommand) Run(args []string) int {
return 1
}

if json || len(tmpl) > 0 {
out, err := Format(json, tmpl, token)
if err != nil {
c.Ui.Error(err.Error())
return 1
}

c.Ui.Output(out)
return 0
}

// Format the output
c.Ui.Output(formatKVACLToken(token))
return 0
Expand Down
5 changes: 5 additions & 0 deletions website/content/docs/commands/acl/bootstrap.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ The `acl bootstrap` command requires no arguments.

@include 'general_options_no_namespace.mdx'

## Bootstrap Options

- `-json` : Output the bootstrap response in JSON format.
- `-t` : Format and display the deployments using a Go template.

## Examples

Bootstrap the initial token:
Expand Down

0 comments on commit 8ba1444

Please sign in to comment.