lxd: Enable cobra's completion support

Signed-off-by: Stéphane Graber <[email protected]> (cherry picked from commit c0200b455a1468685d762649120ce7e2bb25adc9) Signed-off-by: Kadin Sayani <[email protected]> License: Apache-2.0
canonical · Sep 4, 2024 · 64cdeb3 · 64cdeb3
1 parent f969631
commit 64cdeb3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lxc/main.go b/lxc/main.go
@@ -87,7 +87,7 @@ All of LXD's features can be driven through the various commands below.
 For help with any of those, simply call them with --help.`))
 	app.SilenceUsage = true
 	app.SilenceErrors = true
-	app.CompletionOptions = cobra.CompletionOptions{DisableDefaultCmd: true}
+	app.CompletionOptions = cobra.CompletionOptions{HiddenDefaultCmd: true}
 
 	// Global flags
 	globalCmd := cmdGlobal{cmd: app, asker: cli.NewAsker(bufio.NewReader(os.Stdin), nil)}
@@ -278,9 +278,14 @@ For help with any of those, simply call them with --help.`))
 		if globalCmd.flagHelpAll {
 			// Show all commands
 			for _, cmd := range app.Commands() {
+				if cmd.Name() == "completion" {
+					continue
+				}
+
 				cmd.Hidden = false
 			}
 		}
+
 		if globalCmd.flagSubCmds {
 			app.SetUsageTemplate(usageTemplateSubCmds())
 		}

diff --git a/lxc/manpage.go b/lxc/manpage.go
@@ -36,6 +36,15 @@ func (c *cmdManpage) run(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	// If asked to do all commands, mark them all visible.
+	for _, c := range c.global.cmd.Commands() {
+		if c.Name() == "completion" {
+			continue
+		}
+
+		c.Hidden = false
+	}
+
 	// Generate the documentation.
 	switch c.flagFormat {
 	case "man":