Move cmd to internal package

cmoog · cmoog · commit 9b61d347608c · 2020-08-12T13:12:06.000-05:00
diff --git a/cmd/coder/main.go b/cmd/coder/main.go
@@ -9,8 +9,8 @@ import (
 	"os"
 	"runtime"
 
+	"cdr.dev/coder-cli/internal/cmd"
 	"cdr.dev/coder-cli/internal/x/xterminal"
-	"github.com/spf13/cobra"
 
 	"go.coder.com/flog"
 )
@@ -35,78 +35,11 @@ func main() {
 	}
 	defer xterminal.Restore(os.Stdout.Fd(), stdoutState)
 
-	app := &cobra.Command{
-		Use:     "coder",
-		Short:   "coder provides a CLI for working with an existing Coder Enterprise installation",
-		Version: fmt.Sprintf("%s %s %s/%s", version, runtime.Version(), runtime.GOOS, runtime.GOARCH),
-	}
+	app := cmd.Make()
+	app.Version = fmt.Sprintf("%s %s %s/%s", version, runtime.Version(), runtime.GOOS, runtime.GOARCH)
 
-	app.AddCommand(
-		makeLoginCmd(),
-		makeLogoutCmd(),
-		makeShellCmd(),
-		makeUsersCmd(),
-		makeConfigSSHCmd(),
-		makeSecretsCmd(),
-		makeEnvsCommand(),
-		makeSyncCmd(),
-		makeURLCmd(),
-		completionCmd,
-	)
 	err = app.ExecuteContext(ctx)
 	if err != nil {
 		os.Exit(1)
 	}
 }
-
-// reference: https://github.com/spf13/cobra/blob/master/shell_completions.md
-var completionCmd = &cobra.Command{
-	Use:   "completion [bash|zsh|fish|powershell]",
-	Short: "Generate completion script",
-	Long: `To load completions:
-
-Bash:
-
-$ source <(yourprogram completion bash)
-
-# To load completions for each session, execute once:
-Linux:
-  $ yourprogram completion bash > /etc/bash_completion.d/yourprogram
-MacOS:
-  $ yourprogram completion bash > /usr/local/etc/bash_completion.d/yourprogram
-
-Zsh:
-
-# If shell completion is not already enabled in your environment you will need
-# to enable it.  You can execute the following once:
-
-$ echo "autoload -U compinit; compinit" >> ~/.zshrc
-
-# To load completions for each session, execute once:
-$ yourprogram completion zsh > "${fpath[1]}/_yourprogram"
-
-# You will need to start a new shell for this setup to take effect.
-
-Fish:
-
-$ yourprogram completion fish | source
-
-# To load completions for each session, execute once:
-$ yourprogram completion fish > ~/.config/fish/completions/yourprogram.fish
-`,
-	DisableFlagsInUseLine: true,
-	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-	Args:                  cobra.ExactValidArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		switch args[0] {
-		case "bash":
-			cmd.Root().GenBashCompletion(os.Stdout)
-		case "zsh":
-			cmd.Root().GenZshCompletion(os.Stdout)
-		case "fish":
-			cmd.Root().GenFishCompletion(os.Stdout, true)
-		case "powershell":
-			cmd.Root().GenPowerShellCompletion(os.Stdout)
-		}
-	},
-}
diff --git a/internal/cmd/auth.go b/internal/cmd/auth.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"net/url"
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"context"
diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go
@@ -0,0 +1,80 @@
+package cmd
+
+import (
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+func Make() *cobra.Command {
+	app := &cobra.Command{
+		Use:   "coder",
+		Short: "coder provides a CLI for working with an existing Coder Enterprise installation",
+	}
+
+	app.AddCommand(
+		makeLoginCmd(),
+		makeLogoutCmd(),
+		makeShellCmd(),
+		makeUsersCmd(),
+		makeConfigSSHCmd(),
+		makeSecretsCmd(),
+		makeEnvsCommand(),
+		makeSyncCmd(),
+		makeURLCmd(),
+		completionCmd,
+	)
+	return app
+}
+
+// reference: https://github.com/spf13/cobra/blob/master/shell_completions.md
+var completionCmd = &cobra.Command{
+	Use:   "completion [bash|zsh|fish|powershell]",
+	Short: "Generate completion script",
+	Long: `To load completions:
+
+Bash:
+
+$ source <(coder completion bash)
+
+# To load completions for each session, execute once:
+Linux:
+  $ coder completion bash > /etc/bash_completion.d/coder
+MacOS:
+  $ coder completion bash > /usr/local/etc/bash_completion.d/coder
+
+Zsh:
+
+# If shell completion is not already enabled in your environment you will need
+# to enable it.  You can execute the following once:
+
+$ echo "autoload -U compinit; compinit" >> ~/.zshrc
+
+# To load completions for each session, execute once:
+$ coder completion zsh > "${fpath[1]}/_coder"
+
+# You will need to start a new shell for this setup to take effect.
+
+Fish:
+
+$ coder completion fish | source
+
+# To load completions for each session, execute once:
+$ coder completion fish > ~/.config/fish/completions/coder.fish
+`,
+	DisableFlagsInUseLine: true,
+	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
+	Args:                  cobra.ExactValidArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		switch args[0] {
+		case "bash":
+			cmd.Root().GenBashCompletion(os.Stdout)
+		case "zsh":
+			cmd.Root().GenZshCompletion(os.Stdout)
+		case "fish":
+			cmd.Root().GenFishCompletion(os.Stdout, true)
+		case "powershell":
+			cmd.Root().GenPowerShellCompletion(os.Stdout)
+		}
+	},
+}
diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"context"
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"
diff --git a/internal/cmd/login.go b/internal/cmd/login.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"net"
diff --git a/internal/cmd/logout.go b/internal/cmd/logout.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"os"
diff --git a/internal/cmd/secrets.go b/internal/cmd/secrets.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/internal/cmd/shell.go b/internal/cmd/shell.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"context"
diff --git a/internal/cmd/sync.go b/internal/cmd/sync.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"
diff --git a/internal/cmd/urls.go b/internal/cmd/urls.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"context"
diff --git a/internal/cmd/users.go b/internal/cmd/users.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package main`
	`1`	`+package cmd`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"net/url"`