mirror of
https://github.com/kemko/nomad.git
synced 2026-01-08 11:25:41 +03:00
Merge pull request #11411 from hashicorp/f-gh-11406
cli: add json and template flag opts to acl bootstrap command.
This commit is contained in:
3
.changelog/11411.txt
Normal file
3
.changelog/11411.txt
Normal file
@@ -0,0 +1,3 @@
|
||||
```release-note:improvement
|
||||
cli: added json and template flag opts to the acl bootstrap command
|
||||
```
|
||||
@@ -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 {
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user