refactor!: cobra migrate

cli/internal/validate.go

@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"errors"
 	"strings"
 
 	"coopcloud.tech/abra/pkg/app"
@@ -9,12 +8,14 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/urfave/cli/v3"
 )
 
 // ValidateRecipe ensures the recipe arg is valid.
-func ValidateRecipe(cmd *cli.Command) recipe.Recipe {
-	recipeName := cmd.Args().First()
+func ValidateRecipe(args []string, cmdName string) recipe.Recipe {
+	var recipeName string
+	if len(args) > 0 {
+		recipeName = args[0]
+	}
 
 	if recipeName == "" && !NoInput {
 		var recipes []string
@@ -54,7 +55,7 @@ func ValidateRecipe(cmd *cli.Command) recipe.Recipe {
 	}
 
 	if recipeName == "" {
-		ShowSubcommandHelpAndError(cmd, errors.New("no recipe name provided"))
+		log.Fatal("no recipe name provided")
 	}
 
 	chosenRecipe := recipe.Get(recipeName)
@@ -64,7 +65,7 @@ func ValidateRecipe(cmd *cli.Command) recipe.Recipe {
 	}
 	_, err = chosenRecipe.GetComposeConfig(nil)
 	if err != nil {
-		if cmd.Name == "generate" {
+		if cmdName == "generate" {
 			if strings.Contains(err.Error(), "missing a compose") {
 				log.Fatal(err)
 			}
@@ -83,13 +84,13 @@ func ValidateRecipe(cmd *cli.Command) recipe.Recipe {
 }
 
 // ValidateApp ensures the app name arg is valid.
-func ValidateApp(cmd *cli.Command) app.App {
-	appName := cmd.Args().First()
-
-	if appName == "" {
-		ShowSubcommandHelpAndError(cmd, errors.New("no app provided"))
+func ValidateApp(args []string) app.App {
+	if len(args) == 0 {
+		log.Fatal("no app provided")
 	}
 
+	appName := args[0]
+
 	app, err := app.Get(appName)
 	if err != nil {
 		log.Fatal(err)
@@ -101,8 +102,11 @@ func ValidateApp(cmd *cli.Command) app.App {
 }
 
 // ValidateDomain ensures the domain name arg is valid.
-func ValidateDomain(cmd *cli.Command) string {
-	domainName := cmd.Args().First()
+func ValidateDomain(args []string) string {
+	var domainName string
+	if len(args) > 0 {
+		domainName = args[0]
+	}
 
 	if domainName == "" && !NoInput {
 		prompt := &survey.Input{
@@ -115,7 +119,7 @@ func ValidateDomain(cmd *cli.Command) string {
 	}
 
 	if domainName == "" {
-		ShowSubcommandHelpAndError(cmd, errors.New("no domain provided"))
+		log.Fatal("no domain provided")
 	}
 
 	log.Debugf("validated %s as domain argument", domainName)
@@ -123,23 +127,12 @@ func ValidateDomain(cmd *cli.Command) string {
 	return domainName
 }
 
-// ValidateSubCmdFlags ensures flag order conforms to correct order
-func ValidateSubCmdFlags(cmd *cli.Command) bool {
-	for argIdx, arg := range cmd.Args().Slice() {
-		if !strings.HasPrefix(arg, "--") {
-			for _, flag := range cmd.Args().Slice()[argIdx:] {
-				if strings.HasPrefix(flag, "--") {
-					return false
-				}
-			}
-		}
-	}
-	return true
-}
-
 // ValidateServer ensures the server name arg is valid.
-func ValidateServer(cmd *cli.Command) string {
-	serverName := cmd.Args().First()
+func ValidateServer(args []string) string {
+	var serverName string
+	if len(args) > 0 {
+		serverName = args[0]
+	}
 
 	serverNames, err := config.ReadServerNames()
 	if err != nil {
@@ -164,11 +157,11 @@ func ValidateServer(cmd *cli.Command) string {
 	}
 
 	if serverName == "" {
-		ShowSubcommandHelpAndError(cmd, errors.New("no server provided"))
+		log.Fatal("no server provided")
 	}
 
 	if !matched {
-		ShowSubcommandHelpAndError(cmd, errors.New("server doesn't exist?"))
+		log.Fatal("server doesn't exist?")
 	}
 
 	log.Debugf("validated %s as server argument", serverName)