Merge pull request #896 from rackerlabs/understack-bin

feat(cli): nest commands under 'deploy' and rename 'init' to 'quickstart'

Author: cardoe

go/understack/.goreleaser.yaml

@@ -21,7 +21,7 @@ export UC_AIO=yes
 * Run
 
 ```
-go run *.go init
+go run *.go quickstart
 go run *.go help
 ```
 

go/understack/cmd/root.go

@@ -6,8 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/rackerlabs/understack/go/understack/cmd"
-	"github.com/rackerlabs/understack/go/understack/helpers"
+	"github.com/rackerlabs/understack/go/understackctl/helpers"
 
 	"github.com/charmbracelet/log"
 	"github.com/gookit/goutil/envutil"
@@ -28,24 +27,22 @@ const (
 	argoNamespace        = "argocd"
 )
 
-var ArgoCMD = &cobra.Command{
-	Use:   "argocd-secrets",
-	Short: "Generate ArgoCD secrets",
-	Long:  "Generate repository and cluster secrets for ArgoCD deployment",
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := GenerateSecrets(); err != nil {
-			log.Fatal("Failed to generate secrets", "error", err)
-			os.Exit(1)
-		}
-	},
-}
-
-func init() {
-	cmd.RootCmd.AddCommand(ArgoCMD)
+func NewCmdArgocdSecret() *cobra.Command {
+	return &cobra.Command{
+		Use:   "argocd-secrets",
+		Short: "Generate ArgoCD secrets",
+		Long:  "Generate repository and cluster secrets for ArgoCD deployment",
+		Run: func(cmd *cobra.Command, args []string) {
+			if err := generateSecrets(); err != nil {
+				log.Fatal("Failed to generate secrets", "error", err)
+				os.Exit(1)
+			}
+		},
+	}
 }
 
-// GenerateSecrets orchestrates the generation of all ArgoCD secrets
-func GenerateSecrets() error {
+// generateSecrets orchestrates the generation of all ArgoCD secrets
+func generateSecrets() error {
 	basePath := helpers.GetManifestPathToService("argocd")
 
 	if err := generateDeployRepoSecret(basePath); err != nil {

go/understack/main.go

@@ -5,8 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/rackerlabs/understack/go/understack/cmd"
-	"github.com/rackerlabs/understack/go/understack/helpers"
+	"github.com/rackerlabs/understack/go/understackctl/helpers"
 
 	"github.com/charmbracelet/log"
 	"github.com/gookit/goutil/envutil"
@@ -18,15 +17,13 @@ import (
 //go:embed templates/clusterIssuer.tmpl
 var clusterIssuerTemplate string
 
-func init() {
-	cmd.RootCmd.AddCommand(CertManager)
-}
-
-var CertManager = &cobra.Command{
-	Use:   "certmanager-secrets",
-	Short: "Generate certmanager-secrets secrets",
-	Long:  "",
-	Run:   certManagerGen,
+func NewCmdCertManagerSecret() *cobra.Command {
+	return &cobra.Command{
+		Use:   "certmanager-secrets",
+		Short: "Generate certmanager-secrets secrets",
+		Long:  "",
+		Run:   certManagerGen,
+	}
 }
 
 func certManagerGen(cmd *cobra.Command, args []string) {