refactor!: cobra migrate

cli/app/run.go

@@ -2,7 +2,6 @@ package app
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"coopcloud.tech/abra/cli/internal"
@@ -14,54 +13,48 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/urfave/cli/v3"
+	"github.com/spf13/cobra"
 )
 
-var user string
-var userFlag = &cli.StringFlag{
-	Name:        "user",
-	Aliases:     []string{"u"},
-	Value:       "",
-	Destination: &user,
-}
-
-var noTTY bool
-var noTTYFlag = &cli.BoolFlag{
-	Name:        "no-tty",
-	Aliases:     []string{"t"},
-	Destination: &noTTY,
-}
-
-var appRunCommand = cli.Command{
-	Name:    "run",
+var AppRunCommand = &cobra.Command{
+	Use:     "run <app> <service> <cmd> [[args] [flags] | [flags] -- [args]]",
 	Aliases: []string{"r"},
-	Flags: []cli.Flag{
-		noTTYFlag,
-		userFlag,
+	Short:   "Run a command inside a service container",
+	Example: `  # run <cmd> with args/flags
+  abra app run 1312.net app -- ls -lha
+
+  # run <cmd> without args/flags
+  abra app run 1312.net app bash --user nobody
+
+  # run <cmd> with both kinds of args/flags 
+  abra app run 1312.net app --user nobody -- ls -lha`,
+	Args: cobra.MinimumNArgs(3),
+	ValidArgsFunction: func(
+		cmd *cobra.Command,
+		args []string,
+		toComplete string) ([]string, cobra.ShellCompDirective) {
+		switch l := len(args); l {
+		case 0:
+			return autocomplete.AppNameComplete()
+		case 1:
+			return autocomplete.ServiceNameComplete(args[0])
+		case 2:
+			return autocomplete.CommandNameComplete(args[0])
+		default:
+			return nil, cobra.ShellCompDirectiveError
+		}
 	},
-	Before:        internal.SubCommandBefore,
-	Usage:         "Run a command in an app service",
-	UsageText:     "abra app run <domain> <service> <args> [options]",
-	ShellComplete: autocomplete.AppNameComplete,
-	HideHelp:      true,
-	Action: func(ctx context.Context, cmd *cli.Command) error {
-		app := internal.ValidateApp(cmd)
-
-		if cmd.Args().Len() < 2 {
-			internal.ShowSubcommandHelpAndError(cmd, errors.New("no <service> provided?"))
-		}
-
-		if cmd.Args().Len() < 3 {
-			internal.ShowSubcommandHelpAndError(cmd, errors.New("no <args> provided?"))
-		}
+	Run: func(cmd *cobra.Command, args []string) {
+		app := internal.ValidateApp(args)
 
 		cl, err := client.New(app.Server)
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		serviceName := cmd.Args().Get(1)
+		serviceName := args[1]
 		stackAndServiceName := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
+
 		filters := filters.NewArgs()
 		filters.Add("name", stackAndServiceName)
 
@@ -70,24 +63,23 @@ var appRunCommand = cli.Command{
 			log.Fatal(err)
 		}
 
-		c := cmd.Args().Slice()[2:]
+		userCmd := args[2:]
 		execCreateOpts := types.ExecConfig{
 			AttachStderr: true,
 			AttachStdin:  true,
 			AttachStdout: true,
-			Cmd:          c,
+			Cmd:          userCmd,
 			Detach:       false,
 			Tty:          true,
 		}
 
-		if user != "" {
-			execCreateOpts.User = user
+		if runAsUser != "" {
+			execCreateOpts.User = runAsUser
 		}
 		if noTTY {
 			execCreateOpts.Tty = false
 		}
 
-		// FIXME: avoid instantiating a new CLI
 		dcli, err := command.NewDockerCli()
 		if err != nil {
 			log.Fatal(err)
@@ -96,7 +88,27 @@ var appRunCommand = cli.Command{
 		if _, err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
 			log.Fatal(err)
 		}
-
-		return nil
 	},
 }
+
+var (
+	noTTY     bool
+	runAsUser string
+)
+
+func init() {
+	AppRunCommand.Flags().BoolVarP(&noTTY,
+		"no-tty",
+		"t",
+		false,
+		"do not request a TTY",
+	)
+
+	AppRunCommand.Flags().StringVarP(
+		&runAsUser,
+		"user",
+		"u",
+		"",
+		"run command as user",
+	)
+}