Merge pull request #3412 from hashicorp/jbs-autocomplete

Autocomplete support via @brianshumate

main.go

@@ -42,9 +42,11 @@ func realMain() int {
 	}
 
 	cli := &cli.CLI{
-		Args:     args,
-		Commands: command.Commands,
-		HelpFunc: cli.FilteredHelpFunc(cmds, cli.BasicHelpFunc("consul")),
+		Args:         args,
+		Commands:     command.Commands,
+		Autocomplete: true,
+		Name:         "consul",
+		HelpFunc:     cli.FilteredHelpFunc(cmds, cli.BasicHelpFunc("consul")),
 	}
 
 	exitCode, err := cli.Run()

website/source/docs/commands/index.html.md

@@ -79,6 +79,25 @@ Command Options
      Joins a server to another server in the WAN pool.
 ```
 
+## Autocompletion
+
+The `consul` command features opt-in subcommand autocompletion that you can
+enable for your shell with `consul -autocomplete-install`. After doing so,
+you can invoke a new shell and use the feature.
+
+For example, assume a tab is typed at the end of each prompt line:
+
+```
+$ consul e
+event  exec
+
+$ consul r
+reload  rtt
+
+$ consul operator raft
+list-peers   remove-peer
+```
+
 ## Environment Variables
 
 In addition to CLI flags, Consul reads environment variables for behavior