From 78f0c6b2a910c25522ac88ff63343bb371d72bff Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 2 Nov 2023 08:52:21 -0700 Subject: [PATCH] cli: update acl bootstrap help to match docs (#18961) See https://developer.hashicorp.com/nomad/docs/commands/acl/bootstrap --- .changelog/18961.txt | 3 +++ command/acl_bootstrap.go | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .changelog/18961.txt diff --git a/.changelog/18961.txt b/.changelog/18961.txt new file mode 100644 index 000000000..1cde2b65f --- /dev/null +++ b/.changelog/18961.txt @@ -0,0 +1,3 @@ +```release-note:improvement +cli: Added help text to `acl bootstrap` about reading the initial token from a file +``` diff --git a/command/acl_bootstrap.go b/command/acl_bootstrap.go index dc3c66507..408d28c96 100644 --- a/command/acl_bootstrap.go +++ b/command/acl_bootstrap.go @@ -21,10 +21,20 @@ type ACLBootstrapCommand struct { func (c *ACLBootstrapCommand) Help() string { helpText := ` -Usage: nomad acl bootstrap [options] +Usage: nomad acl bootstrap [options] [] Bootstrap is used to bootstrap the ACL system and get an initial token. + The acl bootstrap command can be used in two ways: + + - If you provide no arguments it will return a system generated bootstrap + token. + + - If you would like to provide an operator generated token it is possible to + provide the token using a file located at . The Token can be read + from stdin by setting to "-". Please make sure you secure this token + in an appropriate manner as it could be written to your terminal history. + General Options: ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `