From 93ae96858085be55f58947a8446f0f235daefcaa Mon Sep 17 00:00:00 2001
From: Adam Martin <adam.martin@rancherfederal.com>
Date: Tue, 5 Dec 2023 10:37:29 -0500
Subject: [PATCH 1/2] add autocompletion

Signed-off-by: Adam Martin <adam.martin@rancherfederal.com>
---
 cmd/hauler/cli/completion.go | 130 +++++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 cmd/hauler/cli/completion.go

diff --git a/cmd/hauler/cli/completion.go b/cmd/hauler/cli/completion.go
new file mode 100644
index 00000000..95fd8a3a
--- /dev/null
+++ b/cmd/hauler/cli/completion.go
@@ -0,0 +1,130 @@
+package cli
+
+import (
+	"fmt"
+	"os"
+	"github.com/spf13/cobra"
+)
+
+var cmd = &cobra.Command{
+	Use:   "completion",
+	Short: "Generates completion scripts for various shells",
+	Long:  `The completion sub-command generates completion scripts for various shells.`,
+}
+
+
+func addCompletion(parent *cobra.Command) {
+	cmd := &cobra.Command{
+		Use:     "completion",
+		Short:   "Generates completion scripts for various shells",
+		Long:  `The completion sub-command generates completion scripts for various shells.`,
+	}
+	
+	cmd.AddCommand(
+		addCompletionZsh(),
+		addCompletionBash(),
+		addCompletionFish(),
+		addCompletionPowershell(),
+	)
+	
+	parent.AddCommand(cmd)
+}
+
+func completionError(err error) ([]string, cobra.ShellCompDirective) {
+	cobra.CompError(err.Error())
+	return nil, cobra.ShellCompDirectiveError
+}
+
+func addCompletionZsh() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "zsh",
+		Short: "Generates zsh completion scripts",
+		Long:  `The completion sub-command generates completion scripts for zsh.`,
+		Example: `To load completion run
+	
+	. <(hauler completion zsh)
+	
+	To configure your zsh shell to load completions for each session add to your zshrc
+	
+	# ~/.zshrc or ~/.profile
+	command -v hauler >/dev/null && . <(hauler completion zsh)
+	
+	or write a cached file in one of the completion directories in your ${fpath}:
+	
+	echo "${fpath// /\n}" | grep -i completion
+	hauler completion zsh > _hauler
+	
+	mv _hauler ~/.oh-my-zsh/completions  # oh-my-zsh
+	mv _hauler ~/.zprezto/modules/completion/external/src/  # zprezto`,
+		Run: func(cmd *cobra.Command, args []string) {
+			cmd.GenZshCompletion(os.Stdout)
+			// Cobra doesn't source zsh completion file, explicitly doing it here
+			fmt.Println("compdef _hauler hauler")
+		},
+	}
+	return cmd
+}
+
+func addCompletionBash() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "bash",
+		Short: "Generates bash completion scripts",
+		Long:  `The completion sub-command generates completion scripts for bash.`,
+		Example: `To load completion run
+	
+	. <(hauler completion bash)
+	
+	To configure your bash shell to load completions for each session add to your bashrc
+	
+	# ~/.bashrc or ~/.profile
+	command -v hauler >/dev/null && . <(hauler completion bash)`,
+		Run: func(cmd *cobra.Command, args []string) {
+			cmd.GenBashCompletion(os.Stdout)
+		},
+	}
+	return cmd
+}
+
+func addCompletionFish() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "fish",
+		Short: "Generates fish completion scripts",
+		Long:  `The completion sub-command generates completion scripts for fish.`,
+		Example: `To configure your fish shell to load completions for each session write this script to your completions dir:
+	
+	hauler completion fish > ~/.config/fish/completions/hauler.fish
+	
+	See http://fishshell.com/docs/current/index.html#completion-own for more details`,
+		Run: func(cmd *cobra.Command, args []string) {
+			cmd.GenFishCompletion(os.Stdout, true)
+		},
+	}
+	return cmd
+}
+
+func addCompletionPowershell() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "powershell",
+		Short: "Generates powershell completion scripts",
+		Long:  `The completion sub-command generates completion scripts for powershell.`,
+		Example: `To load completion run
+	
+	. <(hauler completion powershell)
+	
+	To configure your powershell shell to load completions for each session add to your powershell profile
+	
+	Windows:
+	
+	cd "$env:USERPROFILE\Documents\WindowsPowerShell\Modules"
+	hauler completion powershell >> hauler-completion.ps1
+	
+	Linux:
+	
+	cd "${XDG_CONFIG_HOME:-"$HOME/.config/"}/powershell/modules"
+	hauler completion powershell >> hauler-completions.ps1`,
+		Run: func(cmd *cobra.Command, args []string) {
+			cmd.GenPowerShellCompletion(os.Stdout)
+		},
+	}
+	return cmd
+}
\ No newline at end of file

From e2176d211a5080dbe5de32d2aeddd02aa41e3167 Mon Sep 17 00:00:00 2001
From: Adam Martin <adam.martin@rancherfederal.com>
Date: Tue, 5 Dec 2023 11:29:01 -0500
Subject: [PATCH 2/2] keep consistent with other subcommands

Signed-off-by: Adam Martin <adam.martin@rancherfederal.com>
---
 cmd/hauler/cli/cli.go        | 1 +
 cmd/hauler/cli/completion.go | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/cmd/hauler/cli/cli.go b/cmd/hauler/cli/cli.go
index 4d365286..9f3aa035 100644
--- a/cmd/hauler/cli/cli.go
+++ b/cmd/hauler/cli/cli.go
@@ -35,6 +35,7 @@ func New() *cobra.Command {
 	addStore(cmd)
 	addServe(cmd)
 	addVersion(cmd)
+	addCompletion(cmd)
 
 	return cmd
 }
diff --git a/cmd/hauler/cli/completion.go b/cmd/hauler/cli/completion.go
index 95fd8a3a..67929a95 100644
--- a/cmd/hauler/cli/completion.go
+++ b/cmd/hauler/cli/completion.go
@@ -6,13 +6,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var cmd = &cobra.Command{
-	Use:   "completion",
-	Short: "Generates completion scripts for various shells",
-	Long:  `The completion sub-command generates completion scripts for various shells.`,
-}
-
-
 func addCompletion(parent *cobra.Command) {
 	cmd := &cobra.Command{
 		Use:     "completion",