WIP: feat: translation support

See #483

.envrc.sample

@@ -1,6 +1,6 @@
 # integration test suite
 # export ABRA_DIR="$HOME/.abra_test"
-# export ABRA_TEST_DOMAIN=test.example.com
+# export TEST_SERVER=test.example.com
 # export ABRA_CI=1
 
 # release automation

README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://build.coopcloud.tech/api/badges/toolshed/abra/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/toolshed/abra)
 [![Go Report Card](https://goreportcard.com/badge/git.coopcloud.tech/toolshed/abra)](https://goreportcard.com/report/git.coopcloud.tech/toolshed/abra)
 [![Go Reference](https://pkg.go.dev/badge/coopcloud.tech/abra.svg)](https://pkg.go.dev/coopcloud.tech/abra)
+[![Translation status](https://translate.coopcloud.tech/widget/co-op-cloud/svg-badge.svg)](https://translate.coopcloud.tech/engage/co-op-cloud/)
 
 The Co-op Cloud utility belt 🎩🐇
 

cli/app/app.go

@@ -1,11 +1,12 @@
 package app
 
 import (
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var AppCommand = &cobra.Command{
-	Use:     "app [cmd] [args] [flags]",
-	Aliases: []string{"a"},
-	Short:   "Manage apps",
+	Use:     gotext.Get("app [cmd] [args] [flags]"),
+	Aliases: []string{gotext.Get("a")},
+	Short:   gotext.Get("Manage apps"),
 }

cli/app/backup.go

@@ -7,13 +7,14 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var AppBackupListCommand = &cobra.Command{
-	Use:     "list <domain> [flags]",
-	Aliases: []string{"ls"},
-	Short:   "List the contents of a snapshot",
+	Use:     gotext.Get("list <domain> [flags]"),
+	Aliases: []string{gotext.Get("ls")},
+	Short:   gotext.Get("List the contents of a snapshot"),
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -40,17 +41,17 @@ var AppBackupListCommand = &cobra.Command{
 		}
 
 		if snapshot != "" {
-			log.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
+			log.Debug(gotext.Get("including SNAPSHOT=%s in backupbot exec invocation", snapshot))
 			execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
 		}
 
 		if showAllPaths {
-			log.Debugf("including SHOW_ALL=%v in backupbot exec invocation", showAllPaths)
+			log.Debug(gotext.Get("including SHOW_ALL=%v in backupbot exec invocation", showAllPaths))
 			execEnv = append(execEnv, fmt.Sprintf("SHOW_ALL=%v", showAllPaths))
 		}
 
 		if timestamps {
-			log.Debugf("including TIMESTAMPS=%v in backupbot exec invocation", timestamps)
+			log.Debug(gotext.Get("including TIMESTAMPS=%v in backupbot exec invocation", timestamps))
 			execEnv = append(execEnv, fmt.Sprintf("TIMESTAMPS=%v", timestamps))
 		}
 
@@ -61,13 +62,13 @@ var AppBackupListCommand = &cobra.Command{
 }
 
 var AppBackupDownloadCommand = &cobra.Command{
-	Use:     "download <domain> [flags]",
-	Aliases: []string{"d"},
-	Short:   "Download a snapshot",
-	Long: `Downloads a backup.tar.gz to the current working directory.
+	Use:     gotext.Get("download <domain> [flags]"),
+	Aliases: []string{gotext.Get("d")},
+	Short:   gotext.Get("Download a snapshot"),
+	Long: gotext.Get(`Downloads a backup.tar.gz to the current working directory.
 
 "--volumes/-v" includes data contained in volumes alongide paths specified in
-"backupbot.backup.path" labels.`,
+"backupbot.backup.path" labels.`),
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -98,22 +99,22 @@ var AppBackupDownloadCommand = &cobra.Command{
 		}
 
 		if snapshot != "" {
-			log.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
+			log.Debug(gotext.Get("including SNAPSHOT=%s in backupbot exec invocation", snapshot))
 			execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
 		}
 
 		if includePath != "" {
-			log.Debugf("including INCLUDE_PATH=%s in backupbot exec invocation", includePath)
+			log.Debug(gotext.Get("including INCLUDE_PATH=%s in backupbot exec invocation", includePath))
 			execEnv = append(execEnv, fmt.Sprintf("INCLUDE_PATH=%s", includePath))
 		}
 
 		if includeSecrets {
-			log.Debugf("including SECRETS=%v in backupbot exec invocation", includeSecrets)
+			log.Debug(gotext.Get("including SECRETS=%v in backupbot exec invocation", includeSecrets))
 			execEnv = append(execEnv, fmt.Sprintf("SECRETS=%v", includeSecrets))
 		}
 
 		if includeVolumes {
-			log.Debugf("including VOLUMES=%v in backupbot exec invocation", includeVolumes)
+			log.Debug(gotext.Get("including VOLUMES=%v in backupbot exec invocation", includeVolumes))
 			execEnv = append(execEnv, fmt.Sprintf("VOLUMES=%v", includeVolumes))
 		}
 
@@ -130,9 +131,9 @@ var AppBackupDownloadCommand = &cobra.Command{
 }
 
 var AppBackupCreateCommand = &cobra.Command{
-	Use:     "create <domain> [flags]",
-	Aliases: []string{"c"},
-	Short:   "Create a new snapshot",
+	Use:     gotext.Get("create <domain> [flags]"),
+	Aliases: []string{gotext.Get("c")},
+	Short:   gotext.Get("Create a new snapshot"),
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -163,7 +164,7 @@ var AppBackupCreateCommand = &cobra.Command{
 		}
 
 		if retries != "" {
-			log.Debugf("including RETRIES=%s in backupbot exec invocation", retries)
+			log.Debug(gotext.Get("including RETRIES=%s in backupbot exec invocation", retries))
 			execEnv = append(execEnv, fmt.Sprintf("RETRIES=%s", retries))
 		}
 
@@ -174,9 +175,9 @@ var AppBackupCreateCommand = &cobra.Command{
 }
 
 var AppBackupSnapshotsCommand = &cobra.Command{
-	Use:     "snapshots <domain> [flags]",
+	Use:     gotext.Get("snapshots <domain> [flags]"),
 	Aliases: []string{"s"},
-	Short:   "List all snapshots",
+	Short:   gotext.Get("List all snapshots"),
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -209,9 +210,9 @@ var AppBackupSnapshotsCommand = &cobra.Command{
 }
 
 var AppBackupCommand = &cobra.Command{
-	Use:     "backup [cmd] [args] [flags]",
-	Aliases: []string{"b"},
-	Short:   "Manage app backups",
+	Use:     gotext.Get("backup [cmd] [args] [flags]"),
+	Aliases: []string{gotext.Get("b")},
+	Short:   gotext.Get("Manage app backups"),
 }
 
 var (
@@ -230,7 +231,7 @@ func init() {
 		"snapshot",
 		"s",
 		"",
-		"list specific snapshot",
+		gotext.Get("list specific snapshot"),
 	)
 
 	AppBackupListCommand.Flags().BoolVarP(
@@ -238,7 +239,7 @@ func init() {
 		"all",
 		"a",
 		false,
-		"show all paths",
+		gotext.Get("show all paths"),
 	)
 
 	AppBackupListCommand.Flags().BoolVarP(
@@ -246,7 +247,7 @@ func init() {
 		"timestamps",
 		"t",
 		false,
-		"include timestamps",
+		gotext.Get("include timestamps"),
 	)
 
 	AppBackupDownloadCommand.Flags().StringVarP(
@@ -254,7 +255,7 @@ func init() {
 		"snapshot",
 		"s",
 		"",
-		"list specific snapshot",
+		gotext.Get("list specific snapshot"),
 	)
 
 	AppBackupDownloadCommand.Flags().StringVarP(
@@ -262,7 +263,7 @@ func init() {
 		"path",
 		"p",
 		"",
-		"volumes path",
+		gotext.Get("volumes path"),
 	)
 
 	AppBackupDownloadCommand.Flags().BoolVarP(
@@ -270,7 +271,7 @@ func init() {
 		"secrets",
 		"S",
 		false,
-		"include secrets",
+		gotext.Get("include secrets"),
 	)
 
 	AppBackupDownloadCommand.Flags().BoolVarP(
@@ -278,7 +279,7 @@ func init() {
 		"volumes",
 		"v",
 		false,
-		"include volumes",
+		gotext.Get("include volumes"),
 	)
 
 	AppBackupDownloadCommand.Flags().BoolVarP(
@@ -286,7 +287,7 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		"ignore uncommitted recipes changes",
+		gotext.Get("ignore uncommitted recipes changes"),
 	)
 
 	AppBackupCreateCommand.Flags().StringVarP(
@@ -294,7 +295,7 @@ func init() {
 		"retries",
 		"r",
 		"1",
-		"number of retry attempts",
+		gotext.Get("number of retry attempts"),
 	)
 
 	AppBackupCreateCommand.Flags().BoolVarP(
@@ -302,6 +303,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		"ignore uncommitted recipes changes",
+		gotext.Get("ignore uncommitted recipes changes"),
 	)
 }

cli/app/check.go

@@ -9,14 +9,15 @@ import (
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var AppCheckCommand = &cobra.Command{
-	Use:     "check <domain> [flags]",
-	Aliases: []string{"chk"},
-	Short:   "Ensure an app is well configured",
-	Long: `Compare env vars in both the app ".env" and recipe ".env.sample" file.
+	Use:     gotext.Get("check <domain> [flags]"),
+	Aliases: []string{gotext.Get("chk")},
+	Short:   gotext.Get("Ensure an app is well configured"),
+	Long: gotext.Get(`Compare env vars in both the app ".env" and recipe ".env.sample" file.
 
 The goal is to ensure that recipe ".env.sample" env vars are defined in your
 app ".env" file. Only env var definitions in the ".env.sample" which are
@@ -25,7 +26,7 @@ these env vars, then "check" will complain.
 
 Recipe maintainers may or may not provide defaults for env vars within their
 recipes regardless of commenting or not (e.g. through the use of
-${FOO:<default>} syntax). "check" does not confirm or deny this for you.`,
+${FOO:<default>} syntax). "check" does not confirm or deny this for you.`),
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -86,6 +87,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		"ignore uncommitted recipes changes",
+		gotext.Get("ignore uncommitted recipes changes"),
 	)
 }

cli/app/cmd.go

@@ -14,14 +14,15 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var AppCmdCommand = &cobra.Command{
-	Use:     "command <domain> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]",
-	Aliases: []string{"cmd"},
-	Short:   "Run app commands",
-	Long: `Run an app specific command.
+	Use:     gotext.Get("command <domain> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]"),
+	Aliases: []string{gotext.Get("cmd")},
+	Short:   gotext.Get("Run app commands"),
+	Long: gotext.Get(`Run an app specific command.
 
 These commands are bash functions, defined in the abra.sh of the recipe itself.
 They can be run within the context of a service (e.g. app) or locally on your
@@ -30,24 +31,24 @@ work station by passing "--local/-l".
 N.B. If using the "--" style to pass arguments, flags (e.g. "--local/-l") must
 be passed *before* the "--". It is possible to pass arguments without the "--"
 as long as no dashes are present (i.e. "foo" works without "--", "-foo"
-does not).`,
-	Example: `  # pass <cmd> args/flags without "--"
+does not).`),
+	Example: gotext.Get(`  # pass <cmd> args/flags without "--"
   abra app cmd 1312.net app my_cmd_arg foo --user bar
 
   # pass <cmd> args/flags with "--"
   abra app cmd 1312.net app my_cmd_args --user bar -- foo -vvv
 
   # drop the [service] arg if using "--local/-l"
-  abra app cmd 1312.net my_cmd --local`,
+  abra app cmd 1312.net my_cmd --local`),
 	Args: func(cmd *cobra.Command, args []string) error {
 		if local {
 			if !(len(args) >= 2) {
-				return errors.New("requires at least 2 arguments with --local/-l")
+				return errors.New(gotext.Get("requires at least 2 arguments with --local/-l"))
 			}
 
 			if slices.Contains(os.Args, "--") {
 				if cmd.ArgsLenAtDash() > 2 {
-					return errors.New("accepts at most 2 args with --local/-l")
+					return errors.New(gotext.Get("accepts at most 2 args with --local/-l"))
 				}
 			}
 
@@ -63,7 +64,7 @@ does not).`,
 		}
 
 		if !(len(args) >= 3) {
-			return errors.New("requires at least 3 arguments")
+			return errors.New(gotext.Get("requires at least 3 arguments"))
 		}
 
 		return nil
@@ -97,14 +98,14 @@ does not).`,
 		}
 
 		if local && remoteUser != "" {
-			log.Fatal("cannot use --local & --user together")
+			log.Fatal(gotext.Get("cannot use --local & --user together"))
 		}
 
 		hasCmdArgs, parsedCmdArgs := parseCmdArgs(args, local)
 
 		if _, err := os.Stat(app.Recipe.AbraShPath); err != nil {
 			if os.IsNotExist(err) {
-				log.Fatalf("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name)
+				log.Fatal(gotext.Get("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name))
 			}
 			log.Fatal(err)
 		}
@@ -115,7 +116,7 @@ does not).`,
 				log.Fatal(err)
 			}
 
-			log.Debugf("--local detected, running %s on local work station", cmdName)
+			log.Debug(gotext.Get("--local detected, running %s on local work station", cmdName))
 
 			var exportEnv string
 			for k, v := range app.Env {
@@ -124,16 +125,16 @@ does not).`,
 
 			var sourceAndExec string
 			if hasCmdArgs {
-				log.Debugf("parsed following command arguments: %s", parsedCmdArgs)
+				log.Debug(gotext.Get("parsed following command arguments: %s", parsedCmdArgs))
 				sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; %s . %s; %s %s", app.Name, app.StackName(), exportEnv, app.Recipe.AbraShPath, cmdName, parsedCmdArgs)
 			} else {
-				log.Debug("did not detect any command arguments")
+				log.Debug(gotext.Get("did not detect any command arguments"))
 				sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; %s . %s; %s", app.Name, app.StackName(), exportEnv, app.Recipe.AbraShPath, cmdName)
 			}
 
 			shell := "/bin/bash"
 			if _, err := os.Stat(shell); errors.Is(err, os.ErrNotExist) {
-				log.Debugf("%s does not exist locally, use /bin/sh as fallback", shell)
+				log.Debug(gotext.Get("%s does not exist locally, use /bin/sh as fallback", shell))
 				shell = "/bin/sh"
 			}
 			cmd := exec.Command(shell, "-c", sourceAndExec)
@@ -164,15 +165,15 @@ does not).`,
 		}
 
 		if !matchingServiceName {
-			log.Fatalf("no service %s for %s?", targetServiceName, app.Name)
+			log.Fatal(gotext.Get("no service %s for %s?", targetServiceName, app.Name))
 		}
 
-		log.Debugf("running command %s within the context of %s_%s", cmdName, app.StackName(), targetServiceName)
+		log.Debug(gotext.Get("running command %s within the context of %s_%s", cmdName, app.StackName(), targetServiceName))
 
 		if hasCmdArgs {
-			log.Debugf("parsed following command arguments: %s", parsedCmdArgs)
+			log.Debug(gotext.Get("parsed following command arguments: %s", parsedCmdArgs))
 		} else {
-			log.Debug("did not detect any command arguments")
+			log.Debug(gotext.Get("did not detect any command arguments"))
 		}
 
 		cl, err := client.New(app.Server)
@@ -183,7 +184,7 @@ does not).`,
 		if err := internal.RunCmdRemote(
 			cl,
 			app,
-			requestTTY,
+			disableTTY,
 			app.Recipe.AbraShPath,
 			targetServiceName, cmdName, parsedCmdArgs, remoteUser); err != nil {
 			log.Fatal(err)
@@ -192,9 +193,9 @@ does not).`,
 }
 
 var AppCmdListCommand = &cobra.Command{
-	Use:     "list <domain> [flags]",
-	Aliases: []string{"ls"},
-	Short:   "List all available commands",
+	Use:     gotext.Get("list <domain> [flags]"),
+	Aliases: []string{gotext.Get("ls")},
+	Short:   gotext.Get("List all available commands"),
 	Args:    cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
@@ -238,7 +239,7 @@ func parseCmdArgs(args []string, isLocal bool) (bool, string) {
 var (
 	local      bool
 	remoteUser string
-	requestTTY bool
+	disableTTY bool
 )
 
 func init() {
@@ -247,7 +248,7 @@ func init() {
 		"local",
 		"l",
 		false,
-		"run command locally",
+		gotext.Get("run command locally"),
 	)
 
 	AppCmdCommand.Flags().StringVarP(
@@ -255,15 +256,15 @@ func init() {
 		"user",
 		"u",
 		"",
-		"request remote user",
+		gotext.Get("request remote user"),
 	)
 
 	AppCmdCommand.Flags().BoolVarP(
-		&requestTTY,
+		&disableTTY,
 		"tty",
 		"T",
 		false,
-		"request remote TTY",
+		gotext.Get("disable remote TTY"),
 	)
 
 	AppCmdCommand.Flags().BoolVarP(
@@ -271,6 +272,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		"ignore uncommitted recipes changes",
+		gotext.Get("ignore uncommitted recipes changes"),
 	)
 }

cli/app/config.go

@@ -8,14 +8,15 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var AppConfigCommand = &cobra.Command{
-	Use:     "config <domain> [flags]",
-	Aliases: []string{"cfg"},
-	Short:   "Edit app config",
-	Example: "  abra config 1312.net",
+	Use:     gotext.Get("config <domain> [flags]"),
+	Aliases: []string{gotext.Get("cfg")},
+	Short:   gotext.Get("Edit app config"),
+	Example: gotext.Get("  abra config 1312.net"),
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -32,13 +33,13 @@ var AppConfigCommand = &cobra.Command{
 		appName := args[0]
 		appFile, exists := files[appName]
 		if !exists {
-			log.Fatalf("cannot find app with name %s", appName)
+			log.Fatal(gotext.Get("cannot find app with name %s", appName))
 		}
 
 		ed, ok := os.LookupEnv("EDITOR")
 		if !ok {
 			edPrompt := &survey.Select{
-				Message: "which editor do you wish to use?",
+				Message: gotext.Get("which editor do you wish to use?"),
 				Options: []string{"vi", "vim", "nvim", "nano", "pico", "emacs"},
 			}
 			if err := survey.AskOne(edPrompt, &ed); err != nil {

cli/app/cp.go

@@ -3,7 +3,6 @@ package app
 import (
 	"context"
 	"errors"
-	"fmt"
 	"io"
 	"os"
 	"path"
@@ -22,18 +21,19 @@ import (
 	dockerClient "github.com/docker/docker/client"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/archive"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var AppCpCommand = &cobra.Command{
-	Use:     "cp <domain> <src> <dst> [flags]",
-	Aliases: []string{"c"},
-	Short:   "Copy files to/from a deployed app service",
-	Example: `  # copy myfile.txt to the root of the app service
+	Use:     gotext.Get("cp <domain> <src> <dst> [flags]"),
+	Aliases: []string{gotext.Get("c")},
+	Short:   gotext.Get("Copy files to/from a deployed app service"),
+	Example: gotext.Get(`  # copy myfile.txt to the root of the app service
   abra app cp 1312.net myfile.txt app:/
 
   # copy that file back to your current working directory locally
-  abra app cp 1312.net app:/myfile.txt`,
+  abra app cp 1312.net app:/myfile.txt ./`),
 	Args: cobra.ExactArgs(3),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -69,7 +69,7 @@ var AppCpCommand = &cobra.Command{
 		if err != nil {
 			log.Fatal(err)
 		}
-		log.Debugf("retrieved %s as target container on %s", formatter.ShortenID(container.ID), app.Server)
+		log.Debug(gotext.Get("retrieved %s as target container on %s", formatter.ShortenID(container.ID), app.Server))
 
 		if toContainer {
 			err = CopyToContainer(cl, container.ID, srcPath, dstPath)
@@ -82,7 +82,7 @@ var AppCpCommand = &cobra.Command{
 	},
 }
 
-var errServiceMissing = errors.New("one of <src>/<dest> arguments must take $SERVICE:$PATH form")
+var errServiceMissing = errors.New(gotext.Get("one of <src>/<dest> arguments must take $SERVICE:$PATH form"))
 
 // parseSrcAndDst parses src and dest string. One of src or dst must be of the form $SERVICE:$PATH
 func parseSrcAndDst(src, dst string) (srcPath string, dstPath string, service string, toContainer bool, err error) {
@@ -105,7 +105,7 @@ func parseSrcAndDst(src, dst string) (srcPath string, dstPath string, service st
 func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath string) error {
 	srcStat, err := os.Stat(srcPath)
 	if err != nil {
-		return fmt.Errorf("local %s ", err)
+		return errors.New(gotext.Get("local %s ", err))
 	}
 
 	dstStat, err := cl.ContainerStatPath(context.Background(), containerID, dstPath)
@@ -114,7 +114,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 		if errdefs.IsNotFound(err) {
 			dstExists = false
 		} else {
-			return fmt.Errorf("remote path: %s", err)
+			return errors.New(gotext.Get("remote path: %s", err))
 		}
 	}
 
@@ -142,7 +142,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 			Detach:       false,
 			Tty:          true,
 		}); err != nil {
-			return fmt.Errorf("create remote directory: %s", err)
+			return errors.New(gotext.Get("create remote directory: %s", err))
 		}
 	case CopyModeFileToFile:
 		// Remove the file component from the path, since docker can only copy
@@ -161,7 +161,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 		return err
 	}
 
-	log.Debugf("copy %s from local to %s on container", srcPath, dstPath)
+	log.Debug(gotext.Get("copy %s from local to %s on container", srcPath, dstPath))
 	copyOpts := containertypes.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
 	if err := cl.CopyToContainer(context.Background(), containerID, dstPath, content, copyOpts); err != nil {
 		return err
@@ -181,7 +181,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 			Detach:       false,
 			Tty:          true,
 		}); err != nil {
-			return fmt.Errorf("create remote directory: %s", err)
+			return errors.New(gotext.Get("create remote directory: %s", err))
 		}
 	}
 
@@ -194,9 +194,9 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 	srcStat, err := cl.ContainerStatPath(context.Background(), containerID, srcPath)
 	if err != nil {
 		if errdefs.IsNotFound(err) {
-			return fmt.Errorf("remote: %s does not exist", srcPath)
+			return errors.New(gotext.Get("remote: %s does not exist", srcPath))
 		} else {
-			return fmt.Errorf("remote path: %s", err)
+			return errors.New(gotext.Get("remote path: %s", err))
 		}
 	}
 
@@ -207,7 +207,7 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 		if os.IsNotExist(err) {
 			dstExists = false
 		} else {
-			return fmt.Errorf("remote path: %s", err)
+			return errors.New(gotext.Get("remote path: %s", err))
 		}
 	} else {
 		dstMode = dstStat.Mode()
@@ -242,7 +242,7 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 
 	content, _, err := cl.CopyFromContainer(context.Background(), containerID, srcPath)
 	if err != nil {
-		return fmt.Errorf("copy: %s", err)
+		return errors.New(gotext.Get("copy: %s", err))
 	}
 	defer content.Close()
 	if err := archive.Untar(content, dstPath, &archive.TarOptions{
@@ -250,7 +250,7 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 		Compression:          archive.Gzip,
 		NoLchown:             true,
 	}); err != nil {
-		return fmt.Errorf("untar: %s", err)
+		return errors.New(gotext.Get("untar: %s", err))
 	}
 
 	if moveDstFile != "" {
@@ -269,8 +269,8 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 }
 
 var (
-	ErrCopyDirToFile  = fmt.Errorf("can't copy dir to file")
-	ErrDstDirNotExist = fmt.Errorf("destination directory does not exist")
+	ErrCopyDirToFile  = errors.New(gotext.Get("can't copy dir to file"))
+	ErrDstDirNotExist = errors.New(gotext.Get("destination directory does not exist"))
 )
 
 type CopyMode int
@@ -378,6 +378,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		"ignore uncommitted recipes changes",
+		gotext.Get("ignore uncommitted recipes changes"),
 	)
 }

cli/app/deploy.go

@@ -2,7 +2,7 @@ package app
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
@@ -20,19 +20,20 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/stack"
 	dockerClient "github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var AppDeployCommand = &cobra.Command{
-	Use:     "deploy <domain> [version] [flags]",
-	Aliases: []string{"d"},
-	Short:   "Deploy an app",
-	Long: `Deploy an app.
+	Use:     gotext.Get("deploy <domain> [version] [flags]"),
+	Aliases: []string{gotext.Get("d")},
+	Short:   gotext.Get("Deploy an app"),
+	Long: gotext.Get(`Deploy an app.
 
 This command supports chaos operations. Use "--chaos/-C" to deploy your recipe
 checkout as-is. Recipe commit hashes are also supported as values for
-"[version]". Please note, "upgrade"/"rollback" do not support chaos operations.`,
-	Example: `  # standard deployment
+"[version]". Please note, "upgrade"/"rollback" do not support chaos operations.`),
+	Example: gotext.Get(`  # standard deployment
   abra app deploy 1312.net
 
   # chaos deployment
@@ -42,7 +43,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
   abra app deploy 1312.net 2.0.0+1.2.3
 
   # deploy a specific git hash
-  abra app deploy 1312.net 886db76d`,
+  abra app deploy 1312.net 886db76d`),
 	Args: cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -55,7 +56,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		case 1:
 			app, err := appPkg.Get(args[0])
 			if err != nil {
-				errMsg := fmt.Sprintf("autocomplete failed: %s", err)
+				errMsg := gotext.Get("autocomplete failed: %s", err)
 				return []string{errMsg}, cobra.ShellCompDirectiveError
 			}
 			return autocomplete.RecipeVersionComplete(app.Recipe.Name)
@@ -84,7 +85,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			log.Fatal(err)
 		}
 
-		log.Debugf("checking whether %s is already deployed", app.StackName())
+		log.Debug(gotext.Get("checking whether %s is already deployed", app.StackName()))
 
 		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
 		if err != nil {
@@ -92,23 +93,27 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		}
 
 		if deployMeta.IsDeployed && !(internal.Force || internal.Chaos) {
-			log.Fatalf("%s is already deployed", app.Name)
+			log.Fatal(gotext.Get("%s is already deployed", app.Name))
 		}
 
 		toDeployVersion, err = getDeployVersion(args, deployMeta, app)
 		if err != nil {
-			log.Fatal(fmt.Errorf("get deploy version: %s", err))
+			log.Fatal(gotext.Get("get deploy version: %s", err))
 		}
 
 		if !internal.Chaos {
 			_, err = app.Recipe.EnsureVersion(toDeployVersion)
 			if err != nil {
-				log.Fatalf("ensure recipe: %s", err)
+				log.Fatal(gotext.Get("ensure recipe: %s", err))
 			}
 		}
 
 		if err := lint.LintForErrors(app.Recipe); err != nil {
-			log.Fatal(err)
+			if internal.Chaos {
+				log.Warn(err)
+			} else {
+				log.Fatal(err)
+			}
 		}
 
 		if err := validateSecrets(cl, app); err != nil {
@@ -158,7 +163,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		for _, envVar := range envVars {
 			if !envVar.Present {
 				deployWarnMessages = append(deployWarnMessages,
-					fmt.Sprintf("%s missing from %s.env", envVar.Name, app.Domain),
+					gotext.Get("%s missing from %s.env", envVar.Name, app.Domain),
 				)
 			}
 		}
@@ -169,10 +174,10 @@ checkout as-is. Recipe commit hashes are also supported as values for
 					log.Fatal(err)
 				}
 			} else {
-				log.Debug("skipping domain checks, no DOMAIN=... configured")
+				log.Debug(gotext.Get("skipping domain checks, no DOMAIN=... configured"))
 			}
 		} else {
-			log.Debug("skipping domain checks")
+			log.Debug(gotext.Get("skipping domain checks"))
 		}
 
 		deployedVersion := config.NO_VERSION_DEFAULT
@@ -195,22 +200,40 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			log.Fatal(err)
 		}
 
-		log.Debugf("set waiting timeout to %d second(s)", stack.WaitTimeout)
+		log.Debug(gotext.Get("set waiting timeout to %d second(s)", stack.WaitTimeout))
 
-		if err := stack.RunDeploy(cl, deployOpts, compose, app.Name, internal.DontWaitConverge); err != nil {
+		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		f, err := app.Filters(true, false, serviceNames...)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		if err := stack.RunDeploy(
+			cl,
+			deployOpts,
+			compose,
+			app.Name,
+			app.Server,
+			internal.DontWaitConverge,
+			f,
+		); err != nil {
 			log.Fatal(err)
 		}
 
 		postDeployCmds, ok := app.Env["POST_DEPLOY_CMDS"]
 		if ok && !internal.DontWaitConverge {
-			log.Debugf("run the following post-deploy commands: %s", postDeployCmds)
+			log.Debug(gotext.Get("run the following post-deploy commands: %s", postDeployCmds))
 			if err := internal.PostCmds(cl, app, postDeployCmds); err != nil {
-				log.Fatalf("attempting to run post deploy commands, saw: %s", err)
+				log.Fatal(gotext.Get("attempting to run post deploy commands, saw: %s", err))
 			}
 		}
 
 		if err := app.WriteRecipeVersion(toDeployVersion, false); err != nil {
-			log.Fatalf("writing recipe version failed: %s", err)
+			log.Fatal(gotext.Get("writing recipe version failed: %s", err))
 		}
 	},
 }
@@ -236,7 +259,7 @@ func getLatestVersionOrCommit(app app.App) (string, error) {
 // validateArgsAndFlags ensures compatible args/flags.
 func validateArgsAndFlags(args []string) error {
 	if len(args) == 2 && args[1] != "" && internal.Chaos {
-		return fmt.Errorf("cannot use [version] and --chaos together")
+		return errors.New(gotext.Get("cannot use [version] and --chaos together"))
 	}
 
 	return nil
@@ -250,7 +273,7 @@ func validateSecrets(cl *dockerClient.Client, app app.App) error {
 
 	for _, secStat := range secStats {
 		if !secStat.CreatedOnRemote {
-			return fmt.Errorf("secret not generated: %s", secStat.LocalName)
+			return errors.New(gotext.Get("secret not generated: %s", secStat.LocalName))
 		}
 	}
 
@@ -264,33 +287,33 @@ func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App
 		if err != nil {
 			return "", err
 		}
-		log.Debugf("version: taking chaos version: %s", v)
+		log.Debug(gotext.Get("version: taking chaos version: %s", v))
 		return v, nil
 	}
 
 	// Check if the deploy version is set with a cli argument
 	if len(cliArgs) == 2 && cliArgs[1] != "" {
-		log.Debugf("version: taking version from cli arg: %s", cliArgs[1])
+		log.Debug(gotext.Get("version: taking version from cli arg: %s", cliArgs[1]))
 		return cliArgs[1], nil
 	}
 
 	// Check if the recipe has a version in the .env file
 	if app.Recipe.EnvVersion != "" && !internal.IgnoreEnvVersion {
 		if strings.HasSuffix(app.Recipe.EnvVersionRaw, "+U") {
-			return "", fmt.Errorf("version: can not redeploy chaos version %s", app.Recipe.EnvVersionRaw)
+			return "", errors.New(gotext.Get("version: can not redeploy chaos version %s", app.Recipe.EnvVersionRaw))
 		}
-		log.Debugf("version: taking version from .env file: %s", app.Recipe.EnvVersion)
+		log.Debug(gotext.Get("version: taking version from .env file: %s", app.Recipe.EnvVersion))
 		return app.Recipe.EnvVersion, nil
 	}
 
 	// Take deployed version
 	if deployMeta.IsDeployed {
-		log.Debugf("version: taking deployed version: %s", deployMeta.Version)
+		log.Debug(gotext.Get("version: taking deployed version: %s", deployMeta.Version))
 		return deployMeta.Version, nil
 	}
 
 	v, err := getLatestVersionOrCommit(app)
-	log.Debugf("version: taking new recipe version: %s", v)
+	log.Debug(gotext.Get("version: taking new recipe version: %s", v))
 	if err != nil {
 		return "", err
 	}
@@ -303,7 +326,7 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		"ignore uncommitted recipes changes",
+		gotext.Get("ignore uncommitted recipes changes"),
 	)
 
 	AppDeployCommand.Flags().BoolVarP(
@@ -311,7 +334,7 @@ func init() {
 		"force",
 		"f",
 		false,
-		"perform action without further prompt",
+		gotext.Get("perform action without further prompt"),
 	)
 
 	AppDeployCommand.Flags().BoolVarP(
@@ -319,7 +342,7 @@ func init() {
 		"no-domain-checks",
 		"D",
 		false,
-		"disable public DNS checks",
+		gotext.Get("disable public DNS checks"),
 	)
 
 	AppDeployCommand.Flags().BoolVarP(
@@ -327,6 +350,6 @@ func init() {
 		"no-converge-checks",
 		"c",
 		false,
-		"disable converge logic checks",
+		gotext.Get("disable converge logic checks"),
 	)
 }

cli/app/list.go

@@ -13,6 +13,7 @@ import (
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/tagcmp"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
@@ -39,20 +40,20 @@ type serverStatus struct {
 }
 
 var AppListCommand = &cobra.Command{
-	Use:     "list [flags]",
+	Use:     gotext.Get("list [flags]"),
 	Aliases: []string{"ls"},
-	Short:   "List all managed apps",
-	Long: `Generate a report of all managed apps.
+	Short:   gotext.Get("List all managed apps"),
+	Long: gotext.Get(`Generate a report of all managed apps.
 
-Use "--status/-S" flag to query all servers for the live deployment status.`,
-	Example: `  # list apps of all servers without live status
+Use "--status/-S" flag to query all servers for the live deployment status.`),
+	Example: gotext.Get(`  # list apps of all servers without live status
   abra app ls
 
   # list apps of a specific server with live status
   abra app ls -s 1312.net -S
 
   # list apps of all servers which match a specific recipe
-  abra app ls -r gitea`,
+  abra app ls -r gitea`),
 	Args: cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		appFiles, err := appPkg.LoadAppFiles(listAppServer)
@@ -142,10 +143,14 @@ Use "--status/-S" flag to query all servers for the live deployment status.`,
 					appStats.AutoUpdate = autoUpdate
 
 					var newUpdates []string
-					if version != "unknown" {
+					if version != "unknown" && chaos == "false" {
+						if err := app.Recipe.EnsureExists(); err != nil {
+							log.Fatal(gotext.Get("unable to clone %s: %s", app.Name, err))
+						}
+
 						updates, err := app.Recipe.Tags()
 						if err != nil {
-							log.Fatal(err)
+							log.Fatal(gotext.Get("unable to retrieve tags for %s: %s", app.Name, err))
 						}
 
 						parsedVersion, err := tagcmp.Parse(version)
@@ -211,11 +216,12 @@ Use "--status/-S" flag to query all servers for the live deployment status.`,
 			headers := []string{"RECIPE", "DOMAIN", "SERVER"}
 			if status {
 				headers = append(headers, []string{
-					"STATUS",
-					"CHAOS",
-					"VERSION",
-					"UPGRADE",
-					"AUTOUPDATE"}...,
+					gotext.Get("STATUS"),
+					gotext.Get("CHAOS"),
+					gotext.Get("VERSION"),
+					gotext.Get("UPGRADE"),
+					gotext.Get("AUTOUPDATE"),
+				}...,
 				)
 			}
 
@@ -282,7 +288,7 @@ func init() {
 		"status",
 		"S",
 		false,
-		"show app deployment status",
+		gotext.Get("show app deployment status"),
 	)
 
 	AppListCommand.Flags().StringVarP(
@@ -290,7 +296,7 @@ func init() {
 		"recipe",
 		"r",
 		"",
-		"show apps of a specific recipe",
+		gotext.Get("show apps of a specific recipe"),
 	)
 
 	AppListCommand.RegisterFlagCompletionFunc(
@@ -305,7 +311,7 @@ func init() {
 		"machine",
 		"m",
 		false,
-		"print machine-readable output",
+		gotext.Get("print machine-readable output"),
 	)
 
 	AppListCommand.Flags().StringVarP(
@@ -313,7 +319,7 @@ func init() {
 		"server",
 		"s",
 		"",
-		"show apps of a specific server",
+		gotext.Get("show apps of a specific server"),
 	)
 
 	AppListCommand.RegisterFlagCompletionFunc(

cli/app/logs.go

@@ -3,23 +3,14 @@ package app
 import (
 	"context"
 	"fmt"
-	"io"
-	"os"
-	"slices"
-	"sync"
-	"time"
 
 	"coopcloud.tech/abra/cli/internal"
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/logs"
 	"coopcloud.tech/abra/pkg/upstream/stack"
-	"github.com/docker/docker/api/types"
-	containerTypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	dockerClient "github.com/docker/docker/client"
 	"github.com/spf13/cobra"
 )
 
@@ -73,80 +64,25 @@ var AppLogsCommand = &cobra.Command{
 			serviceNames = []string{args[1]}
 		}
 
-		if err = tailLogs(cl, app, serviceNames); err != nil {
+		f, err := app.Filters(true, false, serviceNames...)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		opts := logs.TailOpts{
+			AppName:  app.Name,
+			Services: serviceNames,
+			StdErr:   stdErr,
+			Since:    sinceLogs,
+			Filters:  f,
+		}
+
+		if err := logs.TailLogs(cl, opts); err != nil {
 			log.Fatal(err)
 		}
 	},
 }
 
-// tailLogs prints logs for the given app with optional service names to be
-// filtered on. It also checks if the latest task is not runnning and then
-// prints the past tasks.
-func tailLogs(cl *dockerClient.Client, app appPkg.App, serviceNames []string) error {
-	f, err := app.Filters(true, false, serviceNames...)
-	if err != nil {
-		return err
-	}
-
-	services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: f})
-	if err != nil {
-		return err
-	}
-
-	var wg sync.WaitGroup
-	for _, service := range services {
-		filters := filters.NewArgs()
-		filters.Add("name", service.Spec.Name)
-		tasks, err := cl.TaskList(context.Background(), types.TaskListOptions{Filters: f})
-		if err != nil {
-			return err
-		}
-		if len(tasks) > 0 {
-			// Need to sort the tasks by the CreatedAt field in the inverse order.
-			// Otherwise they are in the reversed order and not sorted properly.
-			slices.SortFunc[[]swarm.Task](tasks, func(t1, t2 swarm.Task) int {
-				return int(t2.Meta.CreatedAt.Unix() - t1.Meta.CreatedAt.Unix())
-			})
-			lastTask := tasks[0].Status
-			if lastTask.State != swarm.TaskStateRunning {
-				for _, task := range tasks {
-					log.Errorf("[%s] %s State %s: %s", service.Spec.Name, task.Meta.CreatedAt.Format(time.RFC3339), task.Status.State, task.Status.Err)
-				}
-			}
-		}
-
-		// Collect the logs in a go routine, so the logs from all services are
-		// collected in parallel.
-		wg.Add(1)
-		go func(serviceID string) {
-			logs, err := cl.ServiceLogs(context.Background(), serviceID, containerTypes.LogsOptions{
-				ShowStderr: true,
-				ShowStdout: !stdErr,
-				Since:      sinceLogs,
-				Until:      "",
-				Timestamps: true,
-				Follow:     true,
-				Tail:       "20",
-				Details:    false,
-			})
-			if err != nil {
-				log.Fatal(err)
-			}
-			defer logs.Close()
-
-			_, err = io.Copy(os.Stdout, logs)
-			if err != nil && err != io.EOF {
-				log.Fatal(err)
-			}
-		}(service.ID)
-	}
-
-	// Wait for all log streams to be closed.
-	wg.Wait()
-
-	return nil
-}
-
 var (
 	stdErr    bool
 	sinceLogs string

cli/app/new.go

@@ -109,6 +109,15 @@ var AppNewCommand = &cobra.Command{
 				if err := recipe.EnsureLatest(); err != nil {
 					log.Fatal(err)
 				}
+
+				if recipeVersion == "" {
+					head, err := recipe.Head()
+					if err != nil {
+						log.Fatalf("failed to retrieve latest commit for %s: %s", recipe.Name, err)
+					}
+
+					recipeVersion = formatter.SmallSHA(head.String())
+				}
 			}
 		}
 
@@ -185,7 +194,7 @@ var AppNewCommand = &cobra.Command{
 			newAppServer = "local"
 		}
 
-		log.Infof("%s created successfully (version: %s, chaos: %s)", appDomain, recipeVersion, chaosVersion)
+		log.Infof("%s created (version: %s)", appDomain, recipeVersion)
 
 		if len(appSecrets) > 0 {
 			rows := [][]string{}
@@ -293,6 +302,12 @@ func ensureServerFlag() error {
 		return err
 	}
 
+	if len(servers) == 1 {
+		newAppServer = servers[0]
+		log.Infof("single server detected, choosing %s automatically", newAppServer)
+		return nil
+	}
+
 	if newAppServer == "" && !internal.NoInput {
 		prompt := &survey.Select{
 			Message: "Select app server:",

cli/app/ps.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"sort"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
@@ -91,9 +92,14 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao
 		return
 	}
 
+	services := compose.Services
+	sort.Slice(services, func(i, j int) bool {
+		return services[i].Name < services[j].Name
+	})
+
 	var rows [][]string
 	allContainerStats := make(map[string]map[string]string)
-	for _, service := range compose.Services {
+	for _, service := range services {
 		filters := filters.NewArgs()
 		filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service.Name))
 

cli/app/remove.go

@@ -9,7 +9,7 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
-	stack "coopcloud.tech/abra/pkg/upstream/stack"
+	"coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/docker/docker/api/types"
 	"github.com/spf13/cobra"
@@ -78,6 +78,22 @@ flag.`,
 			log.Fatal(err)
 		}
 
+		configs, err := client.GetConfigs(cl, context.Background(), app.Server, fs)
+		if err != nil {
+			log.Fatal(err)
+		}
+		configNames := client.GetConfigNames(configs)
+
+		if len(configNames) > 0 {
+			if err := client.RemoveConfigs(cl, context.Background(), configNames, internal.Force); err != nil {
+				log.Fatalf("removing configs failed: %s", err)
+			}
+
+			log.Infof("%d config(s) removed successfully", len(configNames))
+		} else {
+			log.Info("no configs to remove")
+		}
+
 		secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: fs})
 		if err != nil {
 			log.Fatal(err)
@@ -120,7 +136,7 @@ flag.`,
 				log.Fatalf("removing volumes failed: %s", err)
 			}
 
-			log.Infof("%d volumes removed successfully", len(volumeNames))
+			log.Infof("%d volume(s) removed successfully", len(volumeNames))
 		} else {
 			log.Info("no volumes to remove")
 		}

cli/app/restart.go

@@ -9,8 +9,10 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/ui"
 	upstream "coopcloud.tech/abra/pkg/upstream/service"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
+	"github.com/docker/docker/api/types"
 	"github.com/spf13/cobra"
 )
 
@@ -93,13 +95,36 @@ Pass "--all-services/-a" to restart all services.`,
 		for _, serviceName := range serviceNames {
 			stackServiceName := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
 
+			service, _, err := cl.ServiceInspectWithRaw(
+				context.Background(),
+				stackServiceName,
+				types.ServiceInspectOptions{},
+			)
+			if err != nil {
+				log.Fatal(err)
+			}
+
 			log.Debugf("attempting to scale %s to 0", stackServiceName)
 
 			if err := upstream.RunServiceScale(context.Background(), cl, stackServiceName, 0); err != nil {
 				log.Fatal(err)
 			}
 
-			if err := stack.WaitOnService(context.Background(), cl, stackServiceName, app.Name); err != nil {
+			f, err := app.Filters(true, false, serviceName)
+			if err != nil {
+				log.Fatal(err)
+			}
+
+			waitOpts := stack.WaitOpts{
+				Services:   []ui.ServiceMeta{{Name: stackServiceName, ID: service.ID}},
+				AppName:    app.Name,
+				ServerName: app.Server,
+				Filters:    f,
+				NoLog:      true,
+				Quiet:      true,
+			}
+
+			if err := stack.WaitOnServices(cmd.Context(), cl, waitOpts); err != nil {
 				log.Fatal(err)
 			}
 
@@ -110,7 +135,7 @@ Pass "--all-services/-a" to restart all services.`,
 				log.Fatal(err)
 			}
 
-			if err := stack.WaitOnService(context.Background(), cl, stackServiceName, app.Name); err != nil {
+			if err := stack.WaitOnServices(cmd.Context(), cl, waitOpts); err != nil {
 				log.Fatal(err)
 			}
 

cli/app/rollback.go

@@ -194,7 +194,32 @@ beforehand. See "abra app backup" for more.`,
 			log.Fatal(err)
 		}
 
-		if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
+		stack.WaitTimeout, err = appPkg.GetTimeoutFromLabel(compose, stackName)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		log.Debugf("set waiting timeout to %d second(s)", stack.WaitTimeout)
+
+		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		f, err := app.Filters(true, false, serviceNames...)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		if err := stack.RunDeploy(
+			cl,
+			deployOpts,
+			compose,
+			stackName,
+			app.Server,
+			internal.DontWaitConverge,
+			f,
+		); err != nil {
 			log.Fatal(err)
 		}
 

cli/app/secret.go

@@ -145,9 +145,17 @@ var AppSecretInsertCommand = &cobra.Command{
 	Short:   "Insert secret",
 	Long: `This command inserts a secret into an app environment.
 
+Arbitrary secret insertion is not supported. Secrets that are inserted must
+match those configured in the recipe beforehand.
+
 This can be useful when you want to manually generate secrets for an app
 environment. Typically, you can let Abra generate them for you on app creation
 (see "abra app new --secrets/-S" for more).`,
+	Example: `  # insert regular secret
+  abra app secret insert 1312.net my_secret v1 mySuperSecret
+
+  # insert secret as file
+  abra app secret insert 1312.net my_secret v1 secret.txt -f`,
 	Args: cobra.MinimumNArgs(4),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -183,6 +191,26 @@ environment. Typically, you can let Abra generate them for you on app creation
 		version := args[2]
 		data := args[3]
 
+		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		secrets, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.StackName())
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		var isRecipeSecret bool
+		for secretName := range secrets {
+			if secretName == name {
+				isRecipeSecret = true
+			}
+		}
+		if !isRecipeSecret {
+			log.Fatalf("no secret %s available for recipe %s?", name, app.Recipe.Name)
+		}
+
 		if insertFromFile {
 			raw, err := os.ReadFile(data)
 			if err != nil {
@@ -233,6 +261,11 @@ var AppSecretRmCommand = &cobra.Command{
 	Use:     "remove <domain> [[secret] | --all] [flags]",
 	Aliases: []string{"rm"},
 	Short:   "Remove a secret",
+	Long: `This command removes a secret from an app environment.
+
+Arbitrary secret removal is not supported. Secrets that are removed must
+match those configured in the recipe beforehand.`,
+	Example: "  abra app secret rm 1312.net oauth_key",
 	Args:    cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,

cli/app/undeploy.go

@@ -38,6 +38,10 @@ Passing "--prune/-p" does not remove those volumes.`,
 		app := internal.ValidateApp(args)
 		stackName := app.StackName()
 
+		if err := app.Recipe.EnsureExists(); err != nil {
+			log.Fatal(err)
+		}
+
 		cl, err := client.New(app.Server)
 		if err != nil {
 			log.Fatal(err)
@@ -64,6 +68,24 @@ Passing "--prune/-p" does not remove those volumes.`,
 			log.Fatal(err)
 		}
 
+		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		opts := stack.Deploy{Composefiles: composeFiles, Namespace: stackName}
+		compose, err := appPkg.GetAppComposeConfig(app.Name, opts, app.Env)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		stack.WaitTimeout, err = appPkg.GetTimeoutFromLabel(compose, stackName)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		log.Info("initialising undeploy")
+
 		rmOpts := stack.Remove{
 			Namespaces: []string{stackName},
 			Detach:     false,
@@ -78,6 +100,8 @@ Passing "--prune/-p" does not remove those volumes.`,
 			}
 		}
 
+		log.Info("undeploy succeeded 🟢")
+
 		if err := app.WriteRecipeVersion(deployMeta.Version, false); err != nil {
 			log.Fatalf("writing recipe version failed: %s", err)
 		}

cli/app/upgrade.go

@@ -3,6 +3,7 @@ package app
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/app"
@@ -14,6 +15,7 @@ import (
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/lint"
 	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/recipe"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"coopcloud.tech/tagcmp"
 	"github.com/AlecAivazis/survey/v2"
@@ -69,7 +71,13 @@ beforehand. See "abra app backup" for more.`,
 
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(recipe.EnsureContext{
+			Chaos:   internal.Chaos,
+			Offline: internal.Offline,
+			// Ignore the env version for now, to make sure we are at the latest commit.
+			// This enables us to get release notes, that were added after a release.
+			IgnoreEnvVersion: true,
+		}); err != nil {
 			log.Fatal(err)
 		}
 
@@ -109,7 +117,7 @@ beforehand. See "abra app backup" for more.`,
 		}
 
 		if deployMeta.Version != config.UNKNOWN_DEFAULT && chosenUpgrade == "" {
-			upgradeAvailable, err := ensureUpgradesAvailable(versions, &availableUpgrades, deployMeta)
+			upgradeAvailable, err := ensureUpgradesAvailable(app, versions, &availableUpgrades, deployMeta)
 			if err != nil {
 				log.Fatal(err)
 			}
@@ -142,10 +150,9 @@ beforehand. See "abra app backup" for more.`,
 
 		log.Debugf("choosing %s as version to upgrade", chosenUpgrade)
 
-		// NOTE(d1): if release notes written after git tag published, read them
-		// before we check out the tag and then they'll appear to be missing. this
-		// covers when we obviously will forget to write release notes before
-		// publishing
+		// Get the release notes before checking out the new version in the
+		// recipe. This enables us to get release notes, that were added after
+		// a release.
 		if err := getReleaseNotes(app, versions, chosenUpgrade, deployMeta, &upgradeReleaseNotes); err != nil {
 			log.Fatal(err)
 		}
@@ -207,9 +214,7 @@ beforehand. See "abra app backup" for more.`,
 			return
 		}
 
-		if upgradeReleaseNotes != "" && chosenUpgrade != "" {
-			fmt.Print(upgradeReleaseNotes)
-		} else {
+		if upgradeReleaseNotes == "" {
 			upgradeWarnMessages = append(
 				upgradeWarnMessages,
 				fmt.Sprintf("no release notes available for %s", chosenUpgrade),
@@ -233,7 +238,25 @@ beforehand. See "abra app backup" for more.`,
 
 		log.Debugf("set waiting timeout to %d second(s)", stack.WaitTimeout)
 
-		if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
+		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		f, err := app.Filters(true, false, serviceNames...)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		if err := stack.RunDeploy(
+			cl,
+			deployOpts,
+			compose,
+			stackName,
+			app.Server,
+			internal.DontWaitConverge,
+			f,
+		); err != nil {
 			log.Fatal(err)
 		}
 
@@ -291,18 +314,18 @@ func getReleaseNotes(
 ) error {
 	parsedChosenUpgrade, err := tagcmp.Parse(chosenUpgrade)
 	if err != nil {
-		return err
+		return fmt.Errorf("parsing chosen upgrade version failed: %s", err)
 	}
 
 	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
 	if err != nil {
-		return err
+		return fmt.Errorf("parsing deployment version failed: %s", err)
 	}
 
 	for _, version := range internal.SortVersionsDesc(versions) {
 		parsedVersion, err := tagcmp.Parse(version)
 		if err != nil {
-			return err
+			return fmt.Errorf("parsing recipe version failed: %s", err)
 		}
 
 		if parsedVersion.IsGreaterThan(parsedDeployedVersion) &&
@@ -313,6 +336,11 @@ func getReleaseNotes(
 			}
 
 			if note != "" {
+				// NOTE(d1): trim any final newline on the end of the note itself before
+				//           we manually handle newlines (for multiple release notes and
+				//           ensuring space between the warning messages)
+				note = strings.TrimSuffix(note, "\n")
+
 				*upgradeReleaseNotes += fmt.Sprintf("%s\n", note)
 			}
 		}
@@ -323,19 +351,20 @@ func getReleaseNotes(
 
 // ensureUpgradesAvailable ensures that there are available upgrades.
 func ensureUpgradesAvailable(
+	app app.App,
 	versions []string,
 	availableUpgrades *[]string,
 	deployMeta stack.DeployMeta,
 ) (bool, error) {
 	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
 	if err != nil {
-		return false, err
+		return false, fmt.Errorf("parsing deployed version failed: %s", err)
 	}
 
 	for _, version := range versions {
 		parsedVersion, err := tagcmp.Parse(version)
 		if err != nil {
-			return false, err
+			return false, fmt.Errorf("parsing recipe version failed: %s", err)
 		}
 
 		if parsedVersion.IsGreaterThan(parsedDeployedVersion) &&

cli/app/volume.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"context"
+	"fmt"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
@@ -71,7 +72,7 @@ var AppVolumeListCommand = &cobra.Command{
 }
 
 var AppVolumeRemoveCommand = &cobra.Command{
-	Use:   "remove <domain> [flags]",
+	Use:   "remove <domain> [volume] [flags]",
 	Short: "Remove volume(s) associated with an app",
 	Long: `Remove volumes associated with an app.
 
@@ -83,6 +84,11 @@ you to make a seclection. Use the "?" key to see more help on navigating this
 interface.
 
 Passing "--force/-f" will select all volumes for removal. Be careful.`,
+	Example: `  # delete volumes interactively
+  abra app volume rm 1312.net
+
+  # delete specific volume
+  abra app volume rm 1312.net my_volume`,
 	Aliases: []string{"rm"},
 	Args:    cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
@@ -94,6 +100,11 @@ Passing "--force/-f" will select all volumes for removal. Be careful.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
+		var volumeToDelete string
+		if len(args) == 2 {
+			volumeToDelete = args[1]
+		}
+
 		cl, err := client.New(app.Server)
 		if err != nil {
 			log.Fatal(err)
@@ -119,6 +130,30 @@ Passing "--force/-f" will select all volumes for removal. Be careful.`,
 		}
 		volumeNames := client.GetVolumeNames(volumeList)
 
+		if volumeToDelete != "" {
+			var exactMatch bool
+
+			fullVolumeToDeleteName := fmt.Sprintf("%s_%s", app.StackName(), volumeToDelete)
+			for _, volName := range volumeNames {
+				if volName == fullVolumeToDeleteName {
+					exactMatch = true
+				}
+			}
+
+			if !exactMatch {
+				log.Fatalf("unable to remove volume: no volume with name '%s'?", volumeToDelete)
+			}
+
+			err := client.RemoveVolumes(cl, context.Background(), []string{fullVolumeToDeleteName}, internal.Force, 5)
+			if err != nil {
+				log.Fatalf("removing volume %s failed: %s", volumeToDelete, err)
+			}
+
+			log.Infof("volume %s removed successfully", volumeToDelete)
+
+			return
+		}
+
 		var volumesToRemove []string
 		if !internal.Force && !internal.NoInput {
 			volumesPrompt := &survey.MultiSelect{

cli/catalogue/catalogue.go

@@ -16,14 +16,15 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
 	"github.com/go-git/go-git/v5"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var CatalogueGenerateCommand = &cobra.Command{
-	Use:     "generate [recipe] [flags]",
+	Use:     gotext.Get("generate [recipe] [flags]"),
 	Aliases: []string{"g"},
-	Short:   "Generate the recipe catalogue",
-	Long: `Generate a new copy of the recipe catalogue.
+	Short:   gotext.Get("Generate the recipe catalogue"),
+	Long: gotext.Get(`Generate a new copy of the recipe catalogue.
 
 N.B. this command **will** wipe local unstaged changes from your local recipes
 if present. "--chaos/-C" on this command refers to the catalogue repository
@@ -39,7 +40,7 @@ use those details.
 
 Push your new release to git.coopcloud.tech with "--publish/-p". This requires
 that you have permission to git push to these repositories and have your SSH
-keys configured on your account.`,
+keys configured on your account.`),
 	Args: cobra.RangeArgs(0, 1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -85,7 +86,7 @@ keys configured on your account.`,
 
 		var warnings []string
 		catl := make(recipe.RecipeCatalogue)
-		catlBar := formatter.CreateProgressbar(barLength, "collecting catalogue metadata")
+		catlBar := formatter.CreateProgressbar(barLength, gotext.Get("collecting catalogue metadata"))
 		for _, recipeMeta := range repos {
 			if recipeName != "" && recipeName != recipeMeta.Name {
 				if !internal.Debug {
@@ -171,7 +172,7 @@ keys configured on your account.`,
 			}
 		}
 
-		log.Infof("generated recipe catalogue: %s", config.RECIPES_JSON)
+		log.Info(gotext.Get("generated recipe catalogue: %s", config.RECIPES_JSON))
 
 		cataloguePath := path.Join(config.ABRA_DIR, "catalogue")
 		if publishChanges {
@@ -183,11 +184,11 @@ keys configured on your account.`,
 
 			if isClean {
 				if !internal.Dry {
-					log.Fatalf("no changes discovered in %s, nothing to publish?", cataloguePath)
+					log.Fatal(gotext.Get("no changes discovered in %s, nothing to publish?", cataloguePath))
 				}
 			}
 
-			msg := "chore: publish new catalogue release changes"
+			msg := gotext.Get("chore: publish new catalogue release changes")
 			if err := gitPkg.Commit(cataloguePath, msg, internal.Dry); err != nil {
 				log.Fatal(err)
 			}
@@ -219,19 +220,19 @@ keys configured on your account.`,
 
 		if !internal.Dry && publishChanges {
 			url := fmt.Sprintf("%s/%s/commit/%s", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME, head.Hash())
-			log.Infof("new changes published: %s", url)
+			log.Info(gotext.Get("new changes published: %s", url))
 		}
 
 		if internal.Dry {
-			log.Info("dry run: no changes published")
+			log.Info(gotext.Get("dry run: no changes published"))
 		}
 	},
 }
 
 // CatalogueCommand defines the `abra catalogue` command and sub-commands.
 var CatalogueCommand = &cobra.Command{
-	Use:     "catalogue [cmd] [args] [flags]",
-	Short:   "Manage the recipe catalogue",
+	Use:     gotext.Get("catalogue [cmd] [args] [flags]"),
+	Short:   gotext.Get("Manage the recipe catalogue"),
 	Aliases: []string{"c"},
 }
 
@@ -246,7 +247,7 @@ func init() {
 		"publish",
 		"p",
 		false,
-		"publish changes to git.coopcloud.tech",
+		gotext.Get("publish changes to git.coopcloud.tech"),
 	)
 
 	CatalogueGenerateCommand.Flags().BoolVarP(
@@ -254,7 +255,7 @@ func init() {
 		"dry-run",
 		"r",
 		false,
-		"report changes that would be made",
+		gotext.Get("report changes that would be made"),
 	)
 
 	CatalogueGenerateCommand.Flags().BoolVarP(
@@ -262,7 +263,7 @@ func init() {
 		"skip-updates",
 		"s",
 		false,
-		"skip updating recipe repositories",
+		gotext.Get("skip updating recipe repositories"),
 	)
 
 	CatalogueGenerateCommand.Flags().BoolVarP(
@@ -270,6 +271,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		"ignore uncommitted recipes changes",
+		gotext.Get("ignore uncommitted recipes changes"),
 	)
 }

cli/complete.go

@@ -3,13 +3,14 @@ package cli
 import (
 	"os"
 
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var AutocompleteCommand = &cobra.Command{
-	Use:   "autocomplete [bash|zsh|fish|powershell]",
-	Short: "Generate autocompletion script",
-	Long: `To load completions:
+	Use:   gotext.Get("autocomplete [bash|zsh|fish|powershell]"),
+	Short: gotext.Get("Generate autocompletion script"),
+	Long: gotext.Get(`To load completions:
 
 Bash:
   # Load autocompletion for the current Bash session
@@ -43,7 +44,7 @@ PowerShell:
 
   # To load autocompletions for every new session, run:
   PS> abra autocomplete powershell > abra.ps1
-  # and source this file from your PowerShell profile.`,
+  # and source this file from your PowerShell profile.`),
 	DisableFlagsInUseLine: true,
 	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
 	Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),

cli/internal/cli.go

@@ -6,6 +6,7 @@ var (
 	NoInput          bool
 	Offline          bool
 	IgnoreEnvVersion bool
+	Locale           string
 
 	// NOTE(d1): sub-command specific
 	Chaos            bool

cli/internal/command.go

@@ -24,7 +24,7 @@ import (
 func RunCmdRemote(
 	cl *dockerClient.Client,
 	app appPkg.App,
-	requestTTY bool,
+	disableTTY bool,
 	abraSh, serviceName, cmdName, cmdArgs, remoteUser string) error {
 	filters := filters.NewArgs()
 	filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName))
@@ -84,8 +84,10 @@ func RunCmdRemote(
 	}
 
 	execCreateOpts.Cmd = cmd
-	execCreateOpts.Tty = requestTTY
-	if !requestTTY {
+
+	execCreateOpts.Tty = true
+	if disableTTY {
+		execCreateOpts.Tty = false
 		log.Debugf("not requesting a remote TTY")
 	}
 

cli/internal/deploy.go

@@ -46,7 +46,7 @@ func DeployOverview(
 	app appPkg.App,
 	deployedVersion string,
 	toDeployVersion string,
-	info string,
+	releaseNotes string,
 	warnMessages []string,
 ) error {
 	deployConfig := "compose.yml"
@@ -85,8 +85,8 @@ func DeployOverview(
 
 	fmt.Println(overview)
 
-	if info != "" {
-		fmt.Println(info)
+	if releaseNotes != "" {
+		fmt.Print(releaseNotes)
 	}
 
 	for _, msg := range warnMessages {
@@ -146,7 +146,7 @@ func getDeployType(currentVersion, newVersion string) string {
 func PostCmds(cl *dockerClient.Client, app appPkg.App, commands string) error {
 	if _, err := os.Stat(app.Recipe.AbraShPath); err != nil {
 		if os.IsNotExist(err) {
-			return fmt.Errorf(fmt.Sprintf("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name))
+			return fmt.Errorf("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name)
 		}
 		return err
 	}
@@ -154,7 +154,7 @@ func PostCmds(cl *dockerClient.Client, app appPkg.App, commands string) error {
 	for _, command := range strings.Split(commands, "|") {
 		commandParts := strings.Split(command, " ")
 		if len(commandParts) < 2 {
-			return fmt.Errorf(fmt.Sprintf("not enough arguments: %s", command))
+			return fmt.Errorf("not enough arguments: %s", command)
 		}
 		targetServiceName := commandParts[0]
 		cmdName := commandParts[1]
@@ -181,7 +181,7 @@ func PostCmds(cl *dockerClient.Client, app appPkg.App, commands string) error {
 		}
 
 		if !matchingServiceName {
-			return fmt.Errorf(fmt.Sprintf("no service %s for %s?", targetServiceName, app.Name))
+			return fmt.Errorf("no service %s for %s?", targetServiceName, app.Name)
 		}
 
 		log.Debugf("running command %s %s within the context of %s_%s", cmdName, parsedCmdArgs, app.StackName(), targetServiceName)

cli/internal/validate.go

@@ -17,34 +17,34 @@ func ValidateRecipe(args []string, cmdName string) recipe.Recipe {
 		recipeName = args[0]
 	}
 
-	if recipeName == "" && !NoInput {
-		var recipes []string
+	var recipes []string
 
-		catl, err := recipe.ReadRecipeCatalogue(Offline)
-		if err != nil {
-			log.Fatal(err)
-		}
+	catl, err := recipe.ReadRecipeCatalogue(Offline)
+	if err != nil {
+		log.Fatal(err)
+	}
 
-		knownRecipes := make(map[string]bool)
-		for name := range catl {
-			knownRecipes[name] = true
-		}
-
-		localRecipes, err := recipe.GetRecipesLocal()
-		if err != nil {
-			log.Fatal(err)
-		}
+	knownRecipes := make(map[string]bool)
+	for name := range catl {
+		knownRecipes[name] = true
+	}
 
+	localRecipes, err := recipe.GetRecipesLocal()
+	if err != nil {
+		log.Debugf("can't read local recipes: %s", err)
+	} else {
 		for _, recipeLocal := range localRecipes {
 			if _, ok := knownRecipes[recipeLocal]; !ok {
 				knownRecipes[recipeLocal] = true
 			}
 		}
+	}
 
-		for recipeName := range knownRecipes {
-			recipes = append(recipes, recipeName)
-		}
+	for recipeName := range knownRecipes {
+		recipes = append(recipes, recipeName)
+	}
 
+	if recipeName == "" && !NoInput {
 		prompt := &survey.Select{
 			Message: "Select recipe",
 			Options: recipes,
@@ -58,11 +58,17 @@ func ValidateRecipe(args []string, cmdName string) recipe.Recipe {
 		log.Fatal("no recipe name provided")
 	}
 
+	if _, ok := knownRecipes[recipeName]; !ok {
+		if !strings.Contains(recipeName, "/") {
+			log.Fatalf("no recipe '%s' exists?", recipeName)
+		}
+	}
+
 	chosenRecipe := recipe.Get(recipeName)
-	err := chosenRecipe.EnsureExists()
-	if err != nil {
+	if err := chosenRecipe.EnsureExists(); err != nil {
 		log.Fatal(err)
 	}
+
 	_, err = chosenRecipe.GetComposeConfig(nil)
 	if err != nil {
 		if cmdName == "generate" {

cli/recipe/fetch.go

@@ -1,11 +1,15 @@
 package recipe
 
 import (
+	"os"
+
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
+	"github.com/go-git/go-git/v5"
+	gitCfg "github.com/go-git/go-git/v5/config"
 	"github.com/spf13/cobra"
 )
 
@@ -13,7 +17,16 @@ var RecipeFetchCommand = &cobra.Command{
 	Use:     "fetch [recipe | --all] [flags]",
 	Aliases: []string{"f"},
 	Short:   "Clone recipe(s) locally",
+	Long:    `Using "--force/-f" Git syncs an existing recipe. It does not erase unstaged changes.`,
 	Args:    cobra.RangeArgs(0, 1),
+	Example: `  # fetch from recipe catalogue
+  abra recipe fetch gitea
+
+  # fetch from remote recipe
+  abra recipe fetch git.foo.org/recipes/myrecipe
+
+  # fetch with ssh remote for hacking
+  abra recipe fetch gitea --ssh`,
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@@ -34,12 +47,40 @@ var RecipeFetchCommand = &cobra.Command{
 			log.Fatal("cannot use [recipe] and --all/-a together")
 		}
 
-		ensureCtx := internal.GetEnsureContext()
 		if recipeName != "" {
-			r := internal.ValidateRecipe(args, cmd.Name())
-			if err := r.Ensure(ensureCtx); err != nil {
-				log.Fatal(err)
+			r := recipe.Get(recipeName)
+			if _, err := os.Stat(r.Dir); !os.IsNotExist(err) {
+				if !force {
+					log.Warnf("%s is already fetched", r.Name)
+					return
+				}
 			}
+
+			r = internal.ValidateRecipe(args, cmd.Name())
+
+			if sshRemote {
+				if r.SSHURL == "" {
+					log.Warnf("unable to discover SSH remote for %s", r.Name)
+					return
+				}
+
+				repo, err := git.PlainOpen(r.Dir)
+				if err != nil {
+					log.Fatalf("unable to open %s: %s", r.Dir, err)
+				}
+
+				if err = repo.DeleteRemote("origin"); err != nil {
+					log.Fatalf("unable to remove default remote in %s: %s", r.Dir, err)
+				}
+
+				if _, err := repo.CreateRemote(&gitCfg.RemoteConfig{
+					Name: "origin",
+					URLs: []string{r.SSHURL},
+				}); err != nil {
+					log.Fatalf("unable to set SSH remote in %s: %s", r.Dir, err)
+				}
+			}
+
 			return
 		}
 
@@ -49,6 +90,7 @@ var RecipeFetchCommand = &cobra.Command{
 		}
 
 		catlBar := formatter.CreateProgressbar(len(catalogue), "fetching latest recipes...")
+		ensureCtx := internal.GetEnsureContext()
 		for recipeName := range catalogue {
 			r := recipe.Get(recipeName)
 			if err := r.Ensure(ensureCtx); err != nil {
@@ -61,6 +103,8 @@ var RecipeFetchCommand = &cobra.Command{
 
 var (
 	fetchAllRecipes bool
+	sshRemote       bool
+	force           bool
 )
 
 func init() {
@@ -71,4 +115,20 @@ func init() {
 		false,
 		"fetch all recipes",
 	)
+
+	RecipeFetchCommand.Flags().BoolVarP(
+		&sshRemote,
+		"ssh",
+		"s",
+		false,
+		"automatically set ssh remote",
+	)
+
+	RecipeFetchCommand.Flags().BoolVarP(
+		&force,
+		"force",
+		"f",
+		false,
+		"force re-fetch",
+	)
 }

cli/run.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"errors"
 	"fmt"
 	"os"
 
@@ -10,41 +11,46 @@ import (
 	"coopcloud.tech/abra/cli/recipe"
 	"coopcloud.tech/abra/cli/server"
 	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/formatter"
+	"coopcloud.tech/abra/pkg/lang"
 	"coopcloud.tech/abra/pkg/log"
 	charmLog "github.com/charmbracelet/log"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 )
 
 func Run(version, commit string) {
 	rootCmd := &cobra.Command{
-		Use:     "abra [cmd] [args] [flags]",
-		Short:   "The Co-op Cloud command-line utility belt 🎩🐇",
+		Use:     gotext.Get("abra [cmd] [args] [flags]"),
+		Short:   gotext.Get("The Co-op Cloud command-line utility belt 🎩🐇"),
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
 		ValidArgs: []string{
-			"app",
-			"autocomplete",
-			"catalogue",
-			"man",
-			"recipe",
-			"server",
-			"upgrade",
+			gotext.Get("app"),
+			gotext.Get("autocomplete"),
+			gotext.Get("catalogue"),
+			gotext.Get("man"),
+			gotext.Get("recipe"),
+			gotext.Get("server"),
+			gotext.Get("upgrade"),
 		},
-		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			paths := []string{
-				config.ABRA_DIR,
-				config.SERVERS_DIR,
-				config.RECIPES_DIR,
-				config.VENDOR_DIR, // TODO(d1): remove > 0.9.x
-				config.BACKUP_DIR, // TODO(d1): remove > 0.9.x
+
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			dirs := []map[string]os.FileMode{
+				{config.ABRA_DIR: 0764},
+				{config.SERVERS_DIR: 0700},
+				{config.RECIPES_DIR: 0764},
+				{config.LOGS_DIR: 0764},
 			}
 
-			for _, path := range paths {
-				if err := os.Mkdir(path, 0764); err != nil {
-					if !os.IsExist(err) {
-						log.Fatal(err)
+			for _, dir := range dirs {
+				for path, perm := range dir {
+					if err := os.Mkdir(path, perm); err != nil {
+						if !os.IsExist(err) {
+							return errors.New(gotext.Get("unable to create %s: %s", path, err))
+						}
+						continue
 					}
-					continue
 				}
 			}
 
@@ -61,23 +67,57 @@ func Run(version, commit string) {
 				log.SetReportCaller(true)
 			}
 
-			log.Debugf("abra version %s, commit %s", version, commit)
+			if internal.Locale != "" {
+				// FIXME(d1): get list of valid locales from pkg/locales/*
+				switch internal.Locale {
+				case "es":
+				default:
+					return errors.New(gotext.Get("unsupported --lang: %s (want: es)", internal.Locale))
+				}
+			}
+
+			systemLocale := lang.GetLocale()
+			if internal.Locale == "" && systemLocale != "" {
+				// FIXME(d1): validate system locale also (as above FIXME)
+				internal.Locale = systemLocale
+			}
+
+			if internal.Locale == "" {
+				// NOTE(d1): fallback when no --lang=<ll> / LANG=<ll_CC>
+				internal.Locale = "en"
+			}
+
+			// NOTE(d1): only required to load locale when not using en_<CC>
+			//           N.B we don't even bother with a _<CC> (country code) atm for en because fuck it
+			if internal.Locale != "en" {
+				if err := lang.LoadLocale(internal.Locale); err != nil {
+					return errors.New(gotext.Get("unable to load supported language %s: %s", internal.Locale, err))
+				}
+			}
+
+			log.Debug(gotext.Get(
+				"abra version: %s, commit: %s, lang: %s",
+				version, formatter.SmallSHA(commit), internal.Locale,
+			))
+
+			return nil
 		},
 	}
 
 	rootCmd.CompletionOptions.DisableDefaultCmd = true
 
 	manCommand := &cobra.Command{
-		Use:     "man [flags]",
+		Use:     gotext.Get("man [flags]"),
 		Aliases: []string{"m"},
-		Short:   "Generate manpage",
-		Example: `  # generate the man pages into /usr/local/share/man/man1
-  sudo abra man
+		Short:   gotext.Get("Generate manpage"),
+		Example: gotext.Get(`  # generate the man pages into /usr/local/share/man/man1
+  abra_path=$(which abra)  # pass abra absolute path to sudo below
+  sudo $abra_path man
   sudo mandb
 
   # read the man pages
   man abra
-  man abra-app-deploy`,
+  man abra-app-deploy`),
 		Run: func(cmd *cobra.Command, args []string) {
 			header := &doc.GenManHeader{
 				Title:   "ABRA",
@@ -86,7 +126,7 @@ func Run(version, commit string) {
 
 			manDir := "/usr/local/share/man/man1"
 			if _, err := os.Stat(manDir); os.IsNotExist(err) {
-				log.Fatalf("unable to proceed, '%s' does not exist?")
+				log.Fatal(gotext.Get("unable to proceed, %s does not exist?", manDir))
 			}
 
 			err := doc.GenManTree(rootCmd, header, manDir)
@@ -94,7 +134,7 @@ func Run(version, commit string) {
 				log.Fatal(err)
 			}
 
-			log.Info("don't forget to run 'sudo mandb'")
+			log.Info(gotext.Get("don't forget to run 'sudo mandb'"))
 		},
 	}
 
@@ -103,7 +143,7 @@ func Run(version, commit string) {
 		"debug",
 		"d",
 		false,
-		"show debug messages",
+		gotext.Get("show debug messages"),
 	)
 
 	rootCmd.PersistentFlags().BoolVarP(
@@ -111,7 +151,7 @@ func Run(version, commit string) {
 		"no-input",
 		"n",
 		false,
-		"toggle non-interactive mode",
+		gotext.Get("toggle non-interactive mode"),
 	)
 
 	rootCmd.PersistentFlags().BoolVarP(
@@ -119,7 +159,7 @@ func Run(version, commit string) {
 		"offline",
 		"o",
 		false,
-		"prefer offline & filesystem access",
+		gotext.Get("prefer offline & filesystem access"),
 	)
 
 	rootCmd.PersistentFlags().BoolVarP(
@@ -127,7 +167,16 @@ func Run(version, commit string) {
 		"ignore-env-version",
 		"i",
 		false,
-		"ignore .env version checkout",
+		gotext.Get("ignore .env version checkout"),
+	)
+
+	rootCmd.PersistentFlags().StringVarP(
+		&internal.Locale,
+		"lang",
+		"l",
+		"",
+		// FIXME(d1): provide supported list of language via *.po file listing
+		gotext.Get("force select language (supported: XXX)"),
 	)
 
 	catalogue.CatalogueCommand.AddCommand(

cli/server/add.go

@@ -13,14 +13,15 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/server"
 	sshPkg "coopcloud.tech/abra/pkg/ssh"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var ServerAddCommand = &cobra.Command{
-	Use:     "add [[server] | --local] [flags]",
+	Use:     gotext.Get("add [[server] | --local] [flags]"),
 	Aliases: []string{"a"},
-	Short:   "Add a new server",
-	Long: `Add a new server to your configuration so that it can be managed by Abra.
+	Short:   gotext.Get("Add a new server"),
+	Long: gotext.Get(`Add a new server to your configuration so that it can be managed by Abra.
 
 Abra relies on the standard SSH command-line and ~/.ssh/config for client
 connection details. You must configure an entry per-host in your ~/.ssh/config
@@ -35,8 +36,8 @@ for each server:
 If "--local" is passed, then Abra assumes that the current local server is
 intended as the target server. This is useful when you want to have your entire
 Co-op Cloud config located on the server itself, and not on your local
-developer machine. The domain is then set to "default".`,
-	Example: "  abra server add 1312.net",
+developer machine. The domain is then set to "default".`),
+	Example: gotext.Get("  abra server add 1312.net"),
 	Args:    cobra.RangeArgs(0, 1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -49,11 +50,11 @@ developer machine. The domain is then set to "default".`,
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 0 && local {
-			log.Fatal("cannot use [server] and --local together")
+			log.Fatal(gotext.Get("cannot use [server] and --local together"))
 		}
 
 		if len(args) == 0 && !local {
-			log.Fatal("missing argument or --local/-l flag")
+			log.Fatal(gotext.Get("missing argument or --local/-l flag"))
 		}
 
 		name := "default"
@@ -72,7 +73,7 @@ developer machine. The domain is then set to "default".`,
 				log.Fatal(err)
 			}
 
-			log.Debugf("attempting to create client for %s", name)
+			log.Debug(gotext.Get("attempting to create client for %s", name))
 
 			if _, err := client.New(name, timeout); err != nil {
 				cleanUp(name)
@@ -80,9 +81,9 @@ developer machine. The domain is then set to "default".`,
 			}
 
 			if created {
-				log.Info("local server successfully added")
+				log.Info(gotext.Get("local server successfully added"))
 			} else {
-				log.Warn("local server already exists")
+				log.Warn(gotext.Get("local server already exists"))
 			}
 
 			return
@@ -96,28 +97,27 @@ developer machine. The domain is then set to "default".`,
 		created, err := newContext(name)
 		if err != nil {
 			cleanUp(name)
-			log.Fatalf("unable to create local context: %s", err)
+			log.Fatal(gotext.Get("unable to create local context: %s", err))
 		}
 
-		log.Debugf("attempting to create client for %s", name)
+		log.Debug(gotext.Get("attempting to create client for %s", name))
 
 		if _, err := client.New(name, timeout); err != nil {
 			cleanUp(name)
-			log.Debugf("ssh %s error: %s", name, sshPkg.Fatal(name, err))
-			log.Fatalf("can't ssh to %s, make sure \"ssh %s\" works", name, name)
+			log.Fatal(gotext.Get("ssh %s error: %s", name, sshPkg.Fatal(name, err)))
 		}
 
 		if created {
-			log.Infof("%s successfully added", name)
+			log.Info(gotext.Get("%s successfully added", name))
 
 			if _, err := dns.EnsureIPv4(name); err != nil {
-				log.Warnf("unable to resolve IPv4 for %s", name)
+				log.Warn(gotext.Get("unable to resolve IPv4 for %s", name))
 			}
 
 			return
 		}
 
-		log.Warnf("%s already exists", name)
+		log.Warn(gotext.Get("%s already exists", name))
 	},
 }
 
@@ -125,7 +125,7 @@ developer machine. The domain is then set to "default".`,
 // "server add" attempt.
 func cleanUp(name string) {
 	if name != "default" {
-		log.Debugf("serverAdd: cleanUp: cleaning up context for %s", name)
+		log.Debug(gotext.Get("serverAdd: cleanUp: cleaning up context for %s", name))
 		if err := client.DeleteContext(name); err != nil {
 			log.Fatal(err)
 		}
@@ -134,16 +134,16 @@ func cleanUp(name string) {
 	serverDir := filepath.Join(config.SERVERS_DIR, name)
 	files, err := config.GetAllFilesInDirectory(serverDir)
 	if err != nil {
-		log.Fatalf("serverAdd: cleanUp: unable to list files in %s: %s", serverDir, err)
+		log.Fatal(gotext.Get("serverAdd: cleanUp: unable to list files in %s: %s", serverDir, err))
 	}
 
 	if len(files) > 0 {
-		log.Debugf("serverAdd: cleanUp: %s is not empty, aborting cleanup", serverDir)
+		log.Debug(gotext.Get("serverAdd: cleanUp: %s is not empty, aborting cleanup", serverDir))
 		return
 	}
 
 	if err := os.RemoveAll(serverDir); err != nil {
-		log.Fatalf("serverAdd: cleanUp: failed to remove %s: %s", serverDir, err)
+		log.Fatal(gotext.Get("serverAdd: cleanUp: failed to remove %s: %s", serverDir, err))
 	}
 }
 
@@ -160,12 +160,12 @@ func newContext(name string) (bool, error) {
 
 	for _, context := range contexts {
 		if context.Name == name {
-			log.Debugf("context for %s already exists", name)
+			log.Debug(gotext.Get("context for %s already exists", name))
 			return false, nil
 		}
 	}
 
-	log.Debugf("creating context with domain %s", name)
+	log.Debugf(gotext.Get("creating context with domain %s", name))
 
 	if err := client.CreateContext(name); err != nil {
 		return false, nil
@@ -181,7 +181,7 @@ func createServerDir(name string) (bool, error) {
 			return false, err
 		}
 
-		log.Debugf("server dir for %s already created", name)
+		log.Debug(gotext.Get("server dir for %s already created", name))
 
 		return false, nil
 	}
@@ -199,6 +199,6 @@ func init() {
 		"local",
 		"l",
 		false,
-		"use local server",
+		gotext.Get("use local server"),
 	)
 }

cli/server/list.go

@@ -10,13 +10,14 @@ import (
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/cli/cli/connhelper/ssh"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var ServerListCommand = &cobra.Command{
-	Use:     "list [flags]",
+	Use:     gotext.Get("list [flags]"),
 	Aliases: []string{"ls"},
-	Short:   "List managed servers",
+	Short:   gotext.Get("List managed servers"),
 	Args:    cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		dockerContextStore := contextPkg.NewDefaultDockerContextStore()
@@ -78,7 +79,7 @@ var ServerListCommand = &cobra.Command{
 		if internal.MachineReadable {
 			out, err := formatter.ToJSON(headers, rows)
 			if err != nil {
-				log.Fatal("unable to render to JSON: %s", err)
+				log.Fatal(gotext.Get("unable to render to JSON: %s", err))
 			}
 
 			fmt.Println(out)
@@ -98,6 +99,6 @@ func init() {
 		"machine",
 		"m",
 		false,
-		"print machine-readable output",
+		gotext.Get("print machine-readable output"),
 	)
 }

cli/server/prune.go

@@ -7,17 +7,18 @@ import (
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var ServerPruneCommand = &cobra.Command{
-	Use:     "prune <server> [flags]",
+	Use:     gotext.Get("prune <server> [flags]"),
 	Aliases: []string{"p"},
-	Short:   "Prune resources on a server",
-	Long: `Prunes unused containers, networks, and dangling images.
+	Short:   gotext.Get("Prune resources on a server"),
+	Long: gotext.Get(`Prunes unused containers, networks, and dangling images.
 
 Use "--volumes/-v" to remove volumes that are not associated with a deployed
-app. This can result in unwanted data loss if not used carefully.`,
+app. This can result in unwanted data loss if not used carefully.`),
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -41,18 +42,18 @@ app. This can result in unwanted data loss if not used carefully.`,
 		}
 
 		cntSpaceReclaimed := formatter.ByteCountSI(cr.SpaceReclaimed)
-		log.Infof("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed)
+		log.Info(gotext.Get("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed))
 
 		nr, err := cl.NetworksPrune(cmd.Context(), filterArgs)
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		log.Infof("networks pruned: %d", len(nr.NetworksDeleted))
+		log.Info(gotext.Get("networks pruned: %d", len(nr.NetworksDeleted)))
 
 		pruneFilters := filters.NewArgs()
 		if allFilter {
-			log.Debugf("removing all images, not only dangling ones")
+			log.Debug(gotext.Get("removing all images, not only dangling ones"))
 			pruneFilters.Add("dangling", "false")
 		}
 
@@ -62,7 +63,7 @@ app. This can result in unwanted data loss if not used carefully.`,
 		}
 
 		imgSpaceReclaimed := formatter.ByteCountSI(ir.SpaceReclaimed)
-		log.Infof("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed)
+		log.Info(gotext.Get("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed))
 
 		if volumesFilter {
 			vr, err := cl.VolumesPrune(cmd.Context(), filterArgs)
@@ -71,7 +72,7 @@ app. This can result in unwanted data loss if not used carefully.`,
 			}
 
 			volSpaceReclaimed := formatter.ByteCountSI(vr.SpaceReclaimed)
-			log.Infof("volumes pruned: %d; space reclaimed: %s", len(vr.VolumesDeleted), volSpaceReclaimed)
+			log.Info(gotext.Get("volumes pruned: %d; space reclaimed: %s", len(vr.VolumesDeleted), volSpaceReclaimed))
 		}
 
 		return
@@ -89,7 +90,7 @@ func init() {
 		"all",
 		"a",
 		false,
-		"remove all unused images",
+		gotext.Get("remove all unused images"),
 	)
 
 	ServerPruneCommand.Flags().BoolVarP(
@@ -97,6 +98,6 @@ func init() {
 		"volumes",
 		"v",
 		false,
-		"remove volumes",
+		gotext.Get("remove volumes"),
 	)
 }

cli/server/remove.go

@@ -9,18 +9,19 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 var ServerRemoveCommand = &cobra.Command{
-	Use:     "remove <server> [flags]",
+	Use:     gotext.Get("remove <server> [flags]"),
 	Aliases: []string{"rm"},
-	Short:   "Remove a managed server",
-	Long: `Remove a managed server.
+	Short:   gotext.Get("Remove a managed server"),
+	Long: gotext.Get(`Remove a managed server.
 
 Abra will remove the internal bookkeeping ($ABRA_DIR/servers/...) and
 underlying client connection context. This server will then be lost in time,
-like tears in rain.`,
+like tears in rain.`),
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -39,7 +40,7 @@ like tears in rain.`,
 			log.Fatal(err)
 		}
 
-		log.Infof("%s is now lost in time, like tears in rain", serverName)
+		log.Info(gotext.Get("%s is now lost in time, like tears in rain", serverName))
 
 		return
 	},

cli/server/server.go

@@ -1,10 +1,13 @@
 package server
 
-import "github.com/spf13/cobra"
+import (
+	"github.com/leonelquinteros/gotext"
+	"github.com/spf13/cobra"
+)
 
 // ServerCommand defines the `abra server` command and its subcommands
 var ServerCommand = &cobra.Command{
-	Use:     "server [cmd] [args] [flags]",
+	Use:     gotext.Get("server [cmd] [args] [flags]"),
 	Aliases: []string{"s"},
-	Short:   "Manage servers",
+	Short:   gotext.Get("Manage servers"),
 }

cli/updater/updater.go

@@ -2,6 +2,7 @@ package updater
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"strconv"
@@ -21,6 +22,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	dockerclient "github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 
 	"coopcloud.tech/abra/pkg/log"
@@ -30,14 +32,14 @@ const SERVER = "localhost"
 
 // NotifyCommand checks for available upgrades.
 var NotifyCommand = &cobra.Command{
-	Use:     "notify [flags]",
+	Use:     gotext.Get("notify [flags]"),
 	Aliases: []string{"n"},
-	Short:   "Check for available upgrades",
-	Long: `Notify on new versions for deployed apps.
+	Short:   gotext.Get("Check for available upgrades"),
+	Long: gotext.Get(`Notify on new versions for deployed apps.
 
 If a new patch/minor version is available, a notification is printed.
 
-Use "--major/-m" to include new major versions.`,
+Use "--major/-m" to include new major versions.`),
 	Args: cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		cl, err := client.New("default")
@@ -69,10 +71,10 @@ Use "--major/-m" to include new major versions.`,
 
 // UpgradeCommand upgrades apps.
 var UpgradeCommand = &cobra.Command{
-	Use:     "upgrade [[stack] [recipe] | --all] [flags]",
+	Use:     gotext.Get("upgrade [[stack] [recipe] | --all] [flags]"),
 	Aliases: []string{"u"},
-	Short:   "Upgrade apps",
-	Long: `Upgrade an app by specifying stack name and recipe. 
+	Short:   gotext.Get("Upgrade apps"),
+	Long: gotext.Get(`Upgrade an app by specifying stack name and recipe. 
 
 Use "--all" to upgrade every deployed app.
 
@@ -83,7 +85,7 @@ available, the app is upgraded.
 To include major versions use the "--major/-m" flag. You probably don't want
 that as it will break things. Only apps that are not deployed with "--chaos/-C"
 are upgraded, to update chaos deployments use the "--chaos/-C" flag. Use it
-with care.`,
+with care.`),
 	Args: cobra.RangeArgs(0, 2),
 	// TODO(d1): complete stack/recipe
 	// ValidArgsFunction: func(
@@ -98,7 +100,7 @@ with care.`,
 		}
 
 		if !updateAll && len(args) != 2 {
-			log.Fatal("missing arguments or --all/-a flag")
+			log.Fatal(gotext.Get("missing arguments or --all/-a flag"))
 		}
 
 		if !updateAll {
@@ -150,7 +152,7 @@ func getLabel(cl *dockerclient.Client, stackName string, label string) (string,
 		}
 	}
 
-	log.Debugf("no %s label found for %s", label, stackName)
+	log.Debug(gotext.Get("no %s label found for %s", label, stackName))
 
 	return "", nil
 }
@@ -171,7 +173,7 @@ func getBoolLabel(cl *dockerclient.Client, stackName string, label string) (bool
 		return value, nil
 	}
 
-	log.Debugf("boolean label %s could not be found for %s, set default to false.", label, stackName)
+	log.Debug(gotext.Get("boolean label %s could not be found for %s, set default to false.", label, stackName))
 
 	return false, nil
 }
@@ -192,12 +194,12 @@ func getEnv(cl *dockerclient.Client, stackName string) (envfile.AppEnv, error) {
 		for _, envString := range envList {
 			splitString := strings.SplitN(envString, "=", 2)
 			if len(splitString) != 2 {
-				log.Debugf("can't separate key from value: %s (this variable is probably unset)", envString)
+				log.Debug(gotext.Get("can't separate key from value: %s (this variable is probably unset)", envString))
 				continue
 			}
 			k := splitString[0]
 			v := splitString[1]
-			log.Debugf("for %s read env %s with value: %s from docker service", stackName, k, v)
+			log.Debugf(gotext.Get("for %s read env %s with value: %s from docker service", stackName, k, v))
 			envMap[k] = v
 		}
 	}
@@ -219,14 +221,14 @@ func getLatestUpgrade(cl *dockerclient.Client, stackName string, recipeName stri
 	}
 
 	if len(availableUpgrades) == 0 {
-		log.Debugf("no available upgrades for %s", stackName)
+		log.Debugf(gotext.Get("no available upgrades for %s", stackName))
 		return "", nil
 	}
 
 	var chosenUpgrade string
 	if len(availableUpgrades) > 0 {
 		chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
-		log.Infof("%s (%s) can be upgraded from version %s to %s", stackName, recipeName, deployedVersion, chosenUpgrade)
+		log.Info(gotext.Get("%s (%s) can be upgraded from version %s to %s", stackName, recipeName, deployedVersion, chosenUpgrade))
 	}
 
 	return chosenUpgrade, nil
@@ -234,7 +236,7 @@ func getLatestUpgrade(cl *dockerclient.Client, stackName string, recipeName stri
 
 // getDeployedVersion returns the currently deployed version of an app.
 func getDeployedVersion(cl *dockerclient.Client, stackName string, recipeName string) (string, error) {
-	log.Debugf("retrieve deployed version whether %s is already deployed", stackName)
+	log.Debug(gotext.Get("retrieve deployed version whether %s is already deployed", stackName))
 
 	deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
 	if err != nil {
@@ -242,11 +244,11 @@ func getDeployedVersion(cl *dockerclient.Client, stackName string, recipeName st
 	}
 
 	if !deployMeta.IsDeployed {
-		return "", fmt.Errorf("%s is not deployed?", stackName)
+		return "", errors.New(gotext.Get("%s is not deployed?", stackName))
 	}
 
 	if deployMeta.Version == "unknown" {
-		return "", fmt.Errorf("failed to determine deployed version of %s", stackName)
+		return "", errors.New(gotext.Get("failed to determine deployed version of %s", stackName))
 	}
 
 	return deployMeta.Version, nil
@@ -268,7 +270,7 @@ func getAvailableUpgrades(cl *dockerclient.Client, stackName string, recipeName
 	}
 
 	if len(versions) == 0 {
-		log.Warnf("no published releases for %s in the recipe catalogue?", recipeName)
+		log.Warn(gotext.Get("no published releases for %s in the recipe catalogue?", recipeName))
 		return nil, nil
 	}
 
@@ -294,7 +296,7 @@ func getAvailableUpgrades(cl *dockerclient.Client, stackName string, recipeName
 		}
 	}
 
-	log.Debugf("available updates for %s: %s", stackName, availableUpgrades)
+	log.Debug(gotext.Get("available updates for %s: %s", stackName, availableUpgrades))
 
 	return availableUpgrades, nil
 }
@@ -441,7 +443,25 @@ func upgrade(cl *dockerclient.Client, stackName, recipeName, upgradeVersion stri
 
 	log.Infof("upgrade %s (%s) to version %s", stackName, recipeName, upgradeVersion)
 
-	err = stack.RunDeploy(cl, deployOpts, compose, stackName, true)
+	serviceNames, err := appPkg.GetAppServiceNames(app.Name)
+	if err != nil {
+		return err
+	}
+
+	f, err := app.Filters(true, false, serviceNames...)
+	if err != nil {
+		return err
+	}
+
+	err = stack.RunDeploy(
+		cl,
+		deployOpts,
+		compose,
+		stackName,
+		app.Server,
+		true,
+		f,
+	)
 
 	return err
 }

cli/upgrade.go

@@ -7,22 +7,23 @@ import (
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
 // UpgradeCommand upgrades abra in-place.
 var UpgradeCommand = &cobra.Command{
-	Use:     "upgrade [flags]",
+	Use:     gotext.Get("upgrade [flags]"),
 	Aliases: []string{"u"},
-	Short:   "Upgrade abra",
-	Long: `Upgrade abra in-place with the latest stable or release candidate.
+	Short:   gotext.Get("Upgrade abra"),
+	Long: gotext.Get(`Upgrade abra in-place with the latest stable or release candidate.
 
 By default, the latest stable release is downloaded.
 
 Use "--rc/-r" to install the latest release candidate. Please bear in mind that
 it may contain absolutely catastrophic deal-breaker bugs. Thank you very much
-for the testing efforts 💗`,
-	Example: "  abra upgrade --rc",
+for the testing efforts 💗`),
+	Example: gotext.Get("  abra upgrade --rc"),
 	Args:    cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		mainURL := "https://install.abra.coopcloud.tech"
@@ -33,7 +34,7 @@ for the testing efforts 💗`,
 			c = exec.Command("bash", "-c", fmt.Sprintf("wget -q -O- %s | bash -s -- --rc", releaseCandidateURL))
 		}
 
-		log.Debugf("attempting to run %s", c)
+		log.Debugf(gotext.Get("attempting to run %s", c))
 
 		if err := internal.RunCmd(c); err != nil {
 			log.Fatal(err)
@@ -51,6 +52,6 @@ func init() {
 		"rc",
 		"r",
 		false,
-		"install release candidate (may contain bugs)",
+		gotext.Get("install release candidate (may contain bugs)"),
 	)
 }

go.mod

@@ -1,69 +1,73 @@
 module coopcloud.tech/abra
 
-go 1.23.0
+go 1.24.0
 
-toolchain go1.23.1
+toolchain go1.24.1
 
 require (
-	coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb
+	coopcloud.tech/tagcmp v0.0.0-20250818180036-0ec1b205b5ca
 	git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c
 	github.com/AlecAivazis/survey/v2 v2.3.7
+	github.com/charmbracelet/bubbletea v1.3.6
 	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/charmbracelet/log v0.4.1
+	github.com/charmbracelet/log v0.4.2
 	github.com/distribution/reference v0.6.0
-	github.com/docker/cli v28.0.1+incompatible
-	github.com/docker/docker v28.0.1+incompatible
+	github.com/docker/cli v28.3.3+incompatible
+	github.com/docker/docker v28.3.3+incompatible
 	github.com/docker/go-units v0.5.0
-	github.com/go-git/go-git/v5 v5.14.0
+	github.com/go-git/go-git/v5 v5.16.2
 	github.com/google/go-cmp v0.7.0
+	github.com/leonelquinteros/gotext v1.7.2
 	github.com/moby/sys/signal v0.7.1
 	github.com/moby/term v0.5.2
 	github.com/pkg/errors v0.9.1
 	github.com/schollz/progressbar/v3 v3.18.0
-	golang.org/x/term v0.30.0
+	golang.org/x/term v0.34.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.2
 )
 
 require (
-	dario.cat/mergo v1.0.1 // indirect
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
+	dario.cat/mergo v1.0.2 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
-	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/ProtonMail/go-crypto v1.3.0 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
-	github.com/charmbracelet/x/ansi v0.8.0 // indirect
+	github.com/charmbracelet/colorprofile v0.3.2 // indirect
+	github.com/charmbracelet/x/ansi v0.10.1 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
-	github.com/cloudflare/circl v1.6.0 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
+	github.com/containerd/platforms v0.2.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-connections v0.6.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.6.2 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -73,61 +77,60 @@ require (
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/mmcloughlin/avo v0.6.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/sys/mountinfo v0.6.2 // indirect
-	github.com/moby/sys/user v0.3.0 // indirect
+	github.com/moby/go-archive v0.1.0 // indirect
+	github.com/moby/sys/atomicwriter v0.1.0 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
 	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/runc v1.1.13 // indirect
 	github.com/opencontainers/runtime-spec v1.1.0 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pjbgf/sha1cd v0.3.2 // indirect
+	github.com/pjbgf/sha1cd v0.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.63.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.65.0 // indirect
+	github.com/prometheus/procfs v0.17.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.3.1 // indirect
-	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/spf13/pflag v1.0.7 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
-	go.opentelemetry.io/otel v1.35.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
+	go.opentelemetry.io/otel v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
-	go.opentelemetry.io/otel/metric v1.35.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
-	go.opentelemetry.io/otel/trace v1.35.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
-	golang.org/x/mod v0.24.0 // indirect
-	golang.org/x/net v0.37.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/time v0.11.0 // indirect
-	golang.org/x/tools v0.31.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
-	google.golang.org/grpc v1.71.0 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
+	go.opentelemetry.io/otel/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/trace v1.37.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
+	golang.org/x/crypto v0.41.0 // indirect
+	golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/time v0.12.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect
+	google.golang.org/grpc v1.74.2 // indirect
+	google.golang.org/protobuf v1.36.7 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
@@ -140,15 +143,15 @@ require (
 	github.com/fvbommel/sortorder v1.1.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.7
+	github.com/hashicorp/go-retryablehttp v0.7.8
 	github.com/moby/patternmatcher v0.6.0 // indirect
 	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
-	github.com/prometheus/client_golang v1.21.1 // indirect
-	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
+	github.com/prometheus/client_golang v1.23.0 // indirect
+	github.com/sergi/go-diff v1.4.0 // indirect
 	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.10.0
 	github.com/theupdateframework/notary v0.7.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	golang.org/x/sys v0.31.0
+	golang.org/x/sys v0.35.0
 )

go.sum

@@ -22,15 +22,15 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb h1:Ws6WEwKXeaYEkfdkX6AqX1XLPuaCeyStEtxbmEJPllk=
-coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb/go.mod h1:ESVm0wQKcbcFi06jItF3rI7enf4Jt2PvbkWpDDHk1DQ=
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+coopcloud.tech/tagcmp v0.0.0-20250818180036-0ec1b205b5ca h1:gSD53tBAsbIGq4SnFfq+mEep6foekQ2a5ea7b38qkm0=
+coopcloud.tech/tagcmp v0.0.0-20250818180036-0ec1b205b5ca/go.mod h1:ESVm0wQKcbcFi06jItF3rI7enf4Jt2PvbkWpDDHk1DQ=
+dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
+dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c h1:oeKnUB79PKYD8D0/unYuu7MRcWryQQWOns8+JL+acrs=
 git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c/go.mod h1:fQuhwrpg6qb9NlFXKYi/LysWu1wxjraS8sxyW12CUF0=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
 github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
@@ -49,8 +49,8 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
@@ -79,16 +79,13 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
-github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
-github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
-github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
+github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/logrus-bugsnag v0.0.0-20170309145241-6dbc35f2c30d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
-github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -123,35 +120,29 @@ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dR
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
 github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
-github.com/bugsnag/bugsnag-go v1.0.5-0.20150529004307-13fd6b8acda0 h1:s7+5BfS4WFJoVF9pnB8kBk03S7pZXRdKamnV0FOl5Sc=
 github.com/bugsnag/bugsnag-go v1.0.5-0.20150529004307-13fd6b8acda0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
-github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ=
 github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
-github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o=
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
+github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
-github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
-github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
+github.com/charmbracelet/bubbletea v1.3.6 h1:VkHIxPJQeDt0aFJIsVxw8BQdh/F/L2KKZGsK6et5taU=
+github.com/charmbracelet/bubbletea v1.3.6/go.mod h1:oQD9VCRQFF8KplacJLo28/jofOI2ToOfGYeFgBBxHOc=
+github.com/charmbracelet/colorprofile v0.3.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqITmrvb1uTIiI=
+github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI=
 github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
 github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
-github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
-github.com/charmbracelet/log v0.4.1 h1:6AYnoHKADkghm/vt4neaNEXkxcXLSV2g1rdyFDOpTyk=
-github.com/charmbracelet/log v0.4.1/go.mod h1:pXgyTsqsVu4N9hGdHmQ0xEA4RsXof402LX9ZgiITn2I=
-github.com/charmbracelet/x/ansi v0.6.0 h1:qOznutrb93gx9oMiGf7caF7bqqubh6YIM0SWKyA08pA=
-github.com/charmbracelet/x/ansi v0.6.0/go.mod h1:KBUFw1la39nl0dLl10l5ORDAqGXaeurTQmwyyVKse/Q=
-github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE=
-github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q=
+github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
+github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
+github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ=
+github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
 github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k=
 github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
 github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a h1:G99klV19u0QnhiizODirwVksQB91TJKV/UaTnACcG30=
@@ -173,12 +164,9 @@ github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJ
 github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e85keuznYcH5rqI438v41pKcBl4ZxQ=
 github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
-github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys=
-github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
-github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
-github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
@@ -224,6 +212,10 @@ github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cE
 github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
 github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
 github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
+github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
 github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
@@ -246,6 +238,8 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3
 github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
 github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
 github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
+github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
+github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
 github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM=
 github.com/containerd/stargz-snapshotter/estargz v0.11.0/go.mod h1:/KsZXsJRllMbTKFfG0miFQWViQKdI9+9aSXs+HN0+ac=
 github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
@@ -292,9 +286,9 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
+github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -302,8 +296,6 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-github.com/cyphar/filepath-securejoin v0.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM=
-github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
 github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
@@ -324,30 +316,24 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI=
-github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli v28.0.1+incompatible h1:g0h5NQNda3/CxIsaZfH4Tyf6vpxFth7PYl3hgCPOKzs=
-github.com/docker/cli v28.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v28.3.3+incompatible h1:fp9ZHAr1WWPGdIWBM1b3zLtgCF+83gRdVMTJsUeiyAo=
+github.com/docker/cli v28.3.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
-github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
-github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
+github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
-github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
-github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
 github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
-github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
+github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
+github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
 github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
 github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
 github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
@@ -365,9 +351,8 @@ github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:Htrtb
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dvsekhvalnov/jose2go v0.0.0-20170216131308-f21a8cedbbae/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/elazarl/goproxy v1.2.3 h1:xwIyKHbaP5yfT6O9KIeYJR5549MXRQkoQMRXGztz8YQ=
-github.com/elazarl/goproxy v1.2.3/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64=
 github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
+github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
@@ -378,6 +363,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -389,8 +376,6 @@ github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
 github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=
 github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
@@ -402,16 +387,12 @@ github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.6.1 h1:u+dcrgaguSSkbjzHwelEjc0Yj300NUevrrPphk/SoRA=
-github.com/go-git/go-billy/v5 v5.6.1/go.mod h1:0AsLr1z2+Uksi4NlElmMblP5rPcDZNRCD8ujZCRR2BE=
 github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
 github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.13.1 h1:DAQ9APonnlvSWpvolXWIuV6Q6zXy2wHbN4cVlNR5Q+M=
-github.com/go-git/go-git/v5 v5.13.1/go.mod h1:qryJB4cSBoq3FRoBRf5A77joojuBcmPJ0qu3XXXVixc=
-github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi60=
-github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k=
+github.com/go-git/go-git/v5 v5.16.2 h1:fT6ZIOjE5iEnkzKyxTHK1W4HGAsPhqEqiSAssSO77hM=
+github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -425,8 +406,8 @@ github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KE
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
@@ -440,11 +421,10 @@ github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-sql-driver/mysql v1.3.0 h1:pgwjLi/dvffoP9aabwkT3AKpXQM93QARkjFhDDqC1UE=
 github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
-github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
@@ -496,7 +476,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93 h1:jc2UWq7CbdszqeH6qu1ougXMIUBfSy8Pbh/anURYbGI=
 github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -508,8 +487,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
@@ -551,13 +528,9 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
-github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -568,11 +541,10 @@ github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVH
 github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
-github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
+github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=
+github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
@@ -589,9 +561,7 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jinzhu/gorm v0.0.0-20170222002820-5409931a1bb8 h1:CZkYfurY6KGhVtlalI4QwQ6T0Cu6iuY3e0x5RLu96WE=
 github.com/jinzhu/gorm v0.0.0-20170222002820-5409931a1bb8/go.mod h1:Vla75njaFJ8clLU1W44h34PjIkijhjHIYnZxMqCdxqo=
-github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d h1:jRQLvyVGL+iVtDElaEIDdKwpPqUIZJfzkNLV34htpEc=
 github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@@ -618,8 +588,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.14.2/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
@@ -639,12 +607,13 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/leonelquinteros/gotext v1.7.2 h1:bDPndU8nt+/kRo1m4l/1OXiiy2v7Z7dfPQ9+YP7G1Mc=
+github.com/leonelquinteros/gotext v1.7.2/go.mod h1:9/haCkm5P7Jay1sxKDGJ5WIg4zkz8oZKw4ekNpALob8=
 github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/magiconair/properties v1.5.3/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -653,15 +622,14 @@ github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7
 github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
+github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
@@ -685,33 +653,31 @@ github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
-github.com/mmcloughlin/avo v0.6.0 h1:QH6FU8SKoTLaVs80GA8TJuLNkUYl4VokHKlPhVDg4YY=
-github.com/mmcloughlin/avo v0.6.0/go.mod h1:8CoAGaCSYXtCPR+8y18Y9aB/kxb8JSS6FRI7mSkvD+8=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
+github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
+github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
 github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
+github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
 github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
-github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
-github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
+github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
+github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
 github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
 github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
 github.com/moby/sys/signal v0.7.1 h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0=
 github.com/moby/sys/signal v0.7.1/go.mod h1:Se1VGehYokAkrSQwL4tDzHvETwUZlnY7S5XtQ50mQp8=
 github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
-github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
-github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
+github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs=
+github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
 github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
 github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
 github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
-github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
-github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
 github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -722,8 +688,10 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
-github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
-github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
@@ -762,8 +730,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
-github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
@@ -788,17 +754,12 @@ github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqi
 github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
 github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
-github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/pjbgf/sha1cd v0.3.1 h1:Dh2GYdpJnO84lIw0LJwTFXjcNbasP/bklicSznyAaPI=
-github.com/pjbgf/sha1cd v0.3.1/go.mod h1:Y8t7jSB/dEI/lQE04A1HVKteqjj9bX5O4+Cex0TCu8s=
-github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
-github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
+github.com/pjbgf/sha1cd v0.4.0 h1:NXzbL1RvjTUi6kgYZCX3fPwwl27Q1LJndxtUDVfJGRY=
+github.com/pjbgf/sha1cd v0.4.0/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -814,27 +775,23 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
-github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
-github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
-github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
+github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
 github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
-github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
-github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
-github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
+github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
+github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
 github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -846,8 +803,8 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
+github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
@@ -855,25 +812,20 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
-github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/schollz/progressbar/v3 v3.17.1 h1:bI1MTaoQO+v5kzklBjYNRQLoVpe0zbyRZNK6DFkVC5U=
-github.com/schollz/progressbar/v3 v3.17.1/go.mod h1:RzqpnsPQNjUyIgdglUjRLgD7sVnxN1wpmBMV+UiEbL4=
 github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA=
 github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
 github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
+github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@@ -885,8 +837,6 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
-github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
 github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
 github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -894,33 +844,27 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:s
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cast v0.0.0-20150508191742-4d07383ffe94/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
-github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.1/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/jwalterweatherman v0.0.0-20141219030609-3d60171a6431/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
+github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v0.0.0-20150530192845-be5ff3e4840c/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
-github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
 github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -995,49 +939,29 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
-go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
-go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 h1:7F29RDmnlqk6B5d+sUqemt8TBfDqxryYW5gX6L74RFA=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0/go.mod h1:ZiGDq7xwDMKmWDrN1XsXAj0iC7hns+2DhxBFSncNHSE=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 h1:QcFwRrZLc82r8wODjvyCbP7Ifp3UANaBSmhDSFjnqSc=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0/go.mod h1:CXIWhUomyWBG/oY2/r/kLp6K/cmx9e/7DLpBuuGdLCA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 h1:1fTNlAIJZGWLP5FVu0fikVry1IsiUnXjf7QFvoNN3Xw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 h1:m639+BofXTvcY1q8CGs4ItwQarYtJPOWmVobfM1HpVI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0/go.mod h1:LjReUci/F4BUyv+y4dwnq3h/26iNOeC3wAIqgvTIZVo=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
+go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
+go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0 h1:zG8GlgXCJQd5BU98C0hZnBbElszTmUgCNCfYneaDL0A=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0/go.mod h1:hOfBCz8kv/wuq73Mx2H2QnWokh/kHZxkh6SNF2bdKtw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
-go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
-go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
-go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
-go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
-go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
-go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
-go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
-go.opentelemetry.io/otel/sdk/metric v1.33.0 h1:Gs5VK9/WUJhNXZgn8MR6ITatvAmKeIuCtNbsP3JkNqU=
-go.opentelemetry.io/otel/sdk/metric v1.33.0/go.mod h1:dL5ykHZmm1B1nVRk9dDjChwDmt81MjVp3gLkQRwKf/Q=
-go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
-go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
-go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
-go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
-go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
-go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
+go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
+go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
+go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
+go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
+go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
+go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
+go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
+go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
-go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
-go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
-go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
+go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
+go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -1062,12 +986,8 @@ golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
+golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1078,12 +998,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 h1:9kj3STMvgqy3YA4VQXBrN7925ICMxD5wzMRcgA30588=
-golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
-golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
-golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
+golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE=
+golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1106,10 +1022,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1151,12 +1063,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
-golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1174,10 +1082,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1247,6 +1153,7 @@ golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1254,24 +1161,14 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
-golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
+golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
+golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1281,22 +1178,16 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
-golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
-golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
-golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1342,12 +1233,6 @@ golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4X
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
-golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
-golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
-golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
-golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
-golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1396,18 +1281,10 @@ google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d h1:H8tOf8XM88HvKqLTxe755haY6r1fqqzLbEnfrmLXlSA=
-google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d/go.mod h1:2v7Z7gP2ZUOGsaFyxATQSRoBnKygqVq2Cwnvom7QiqY=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
-google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 h1:IFnXJq3UPB3oBREOodn1v1aGQeZYQclEmvWRMN0PSsY=
-google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:c8q6Z6OCqnfVIqUFJkCzKcrj8eCvUrz+K4KRzSTuANg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d h1:xJJRGY7TJcvIlpSrN3K6LAWgNFUILlO+OMAqtg9aqnw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 h1:iK2jbkWL86DXjEx0qiHcRE9dE4/Ahua5k6V8OWFb//c=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
+google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a h1:DMCgtIAIQGZqJXMVzJF4MV8BlWoJh2ZuFiRdAleyr58=
+google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.0.5/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -1427,10 +1304,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
-google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
-google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
+google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
+google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1444,15 +1319,10 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
-google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
+google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/cenkalti/backoff.v2 v2.2.1 h1:eJ9UAg01/HIHG987TwxvnzK2MgxXq97YY6rYDpY9aII=
 gopkg.in/cenkalti/backoff.v2 v2.2.1/go.mod h1:S0QdOvT2AlerfSBkp0O+dk+bbIMaNbEmVk876gPCthU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1468,7 +1338,6 @@ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKW
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.1 h1:d4KQkxAaAiRY2h5Zqis161Pv91A37uZyJOx73duwUwM=
 gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.1/go.mod h1:WbjuEoo1oadwzQ4apSDU+JTvmllEHtsNHS6y7vFc7iw=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
@@ -1489,12 +1358,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
-gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
-gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
 gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
 gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

pkg/app/app.go

@@ -426,7 +426,9 @@ func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]str
 	for server := range servers {
 		cl, err := client.New(server)
 		if err != nil {
-			return statuses, err
+			log.Warn(err)
+			ch <- stack.StackStatus{}
+			continue
 		}
 
 		go func(s string) {

pkg/autocomplete/autocomplete.go

@@ -1,12 +1,12 @@
 package autocomplete
 
 import (
-	"fmt"
 	"sort"
 
 	"coopcloud.tech/abra/pkg/app"
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/recipe"
+	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )
 
@@ -14,7 +14,7 @@ import (
 func AppNameComplete() ([]string, cobra.ShellCompDirective) {
 	appFiles, err := app.LoadAppFiles("")
 	if err != nil {
-		err := fmt.Sprintf("autocomplete failed: %s", err)
+		err := gotext.Get("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -29,7 +29,7 @@ func AppNameComplete() ([]string, cobra.ShellCompDirective) {
 func ServiceNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
 	serviceNames, err := app.GetAppServiceNames(appName)
 	if err != nil {
-		err := fmt.Sprintf("autocomplete failed: %s", err)
+		err := gotext.Get("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -40,7 +40,7 @@ func ServiceNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
 func RecipeNameComplete() ([]string, cobra.ShellCompDirective) {
 	catl, err := recipe.ReadRecipeCatalogue(false)
 	if err != nil {
-		err := fmt.Sprintf("autocomplete failed: %s", err)
+		err := gotext.Get("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -56,7 +56,7 @@ func RecipeNameComplete() ([]string, cobra.ShellCompDirective) {
 func RecipeVersionComplete(recipeName string) ([]string, cobra.ShellCompDirective) {
 	catl, err := recipe.ReadRecipeCatalogue(true)
 	if err != nil {
-		err := fmt.Sprintf("autocomplete failed: %s", err)
+		err := gotext.Get("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -74,7 +74,7 @@ func RecipeVersionComplete(recipeName string) ([]string, cobra.ShellCompDirectiv
 func ServerNameComplete() ([]string, cobra.ShellCompDirective) {
 	files, err := app.LoadAppFiles("")
 	if err != nil {
-		err := fmt.Sprintf("autocomplete failed: %s", err)
+		err := gotext.Get("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -90,13 +90,13 @@ func ServerNameComplete() ([]string, cobra.ShellCompDirective) {
 func CommandNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
 	app, err := app.Get(appName)
 	if err != nil {
-		err := fmt.Sprintf("autocomplete failed: %s", err)
+		err := gotext.Get("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
 	cmdNames, err := appPkg.ReadAbraShCmdNames(app.Recipe.AbraShPath)
 	if err != nil {
-		err := fmt.Sprintf("autocomplete failed: %s", err)
+		err := gotext.Get("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -111,7 +111,7 @@ func SecretComplete(recipeName string) ([]string, cobra.ShellCompDirective) {
 
 	config, err := r.GetComposeConfig(nil)
 	if err != nil {
-		err := fmt.Sprintf("autocomplete failed: %s", err)
+		err := gotext.Get("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 

pkg/catalogue/catalogue.go

@@ -1,6 +1,7 @@
 package catalogue
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path"
@@ -10,13 +11,14 @@ import (
 	gitPkg "coopcloud.tech/abra/pkg/git"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
+	"github.com/leonelquinteros/gotext"
 )
 
 // EnsureCatalogue ensures that the catalogue is cloned locally & present.
 func EnsureCatalogue() error {
 	catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
 	if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
-		log.Debugf("catalogue is missing, retrieving now")
+		log.Debug(gotext.Get("catalogue is missing, retrieving now"))
 
 		url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME)
 		if err := gitPkg.Clone(catalogueDir, url); err != nil {
@@ -35,8 +37,7 @@ func EnsureIsClean() error {
 	}
 
 	if !isClean {
-		msg := "%s has locally unstaged changes? please commit/remove your changes before proceeding"
-		return fmt.Errorf(msg, config.CATALOGUE_DIR)
+		return errors.New(gotext.Get("%s has locally unstaged changes? please commit/remove your changes before proceeding", config.CATALOGUE_DIR))
 	}
 
 	return nil
@@ -55,8 +56,7 @@ func EnsureUpToDate() error {
 	}
 
 	if len(remotes) == 0 {
-		msg := "cannot ensure %s is up-to-date, no git remotes configured"
-		log.Debugf(msg, config.CATALOGUE_DIR)
+		log.Debug(gotext.Get("cannot ensure %s is up-to-date, no git remotes configured", config.CATALOGUE_DIR))
 		return nil
 	}
 
@@ -81,7 +81,7 @@ func EnsureUpToDate() error {
 		}
 	}
 
-	log.Debugf("fetched latest git changes for %s", config.CATALOGUE_DIR)
+	log.Debug(gotext.Get("fetched latest git changes for %s", config.CATALOGUE_DIR))
 
 	return nil
 }

pkg/client/client.go

@@ -4,7 +4,6 @@ package client
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"os"
 	"time"
@@ -14,6 +13,7 @@ import (
 	sshPkg "coopcloud.tech/abra/pkg/ssh"
 	commandconnPkg "coopcloud.tech/abra/pkg/upstream/commandconn"
 	"github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 )
 
 // Conf is a Docker client configuration.
@@ -41,7 +41,7 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {
 	if serverName != "default" {
 		context, err := GetContext(serverName)
 		if err != nil {
-			return nil, fmt.Errorf("unknown server, run \"abra server add %s\"?", serverName)
+			return nil, errors.New(gotext.Get("unknown server, run \"abra server add %s\"?", serverName))
 		}
 
 		ctxEndpoint, err := contextPkg.GetContextEndpoint(context)
@@ -85,7 +85,7 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {
 		return nil, err
 	}
 
-	log.Debugf("created client for %s", serverName)
+	log.Debug(gotext.Get("created client for %s", serverName))
 
 	info, err := cl.Info(context.Background())
 	if err != nil {
@@ -94,10 +94,10 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {
 
 	if info.Swarm.LocalNodeState == "inactive" {
 		if serverName != "default" {
-			return cl, fmt.Errorf("swarm mode not enabled on %s?", serverName)
+			return cl, errors.New(gotext.Get("swarm mode not enabled on %s?", serverName))
 		}
 
-		return cl, errors.New("swarm mode not enabled on local server?")
+		return cl, errors.New(gotext.Get("swarm mode not enabled on local server?"))
 	}
 
 	return cl, nil

pkg/client/configs.go

@@ -0,0 +1,39 @@
+package client
+
+import (
+	"context"
+	"errors"
+
+	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
+)
+
+func GetConfigs(cl *client.Client, ctx context.Context, server string, fs filters.Args) ([]swarm.Config, error) {
+	configList, err := cl.ConfigList(ctx, swarm.ConfigListOptions{Filters: fs})
+	if err != nil {
+		return configList, err
+	}
+
+	return configList, nil
+}
+
+func GetConfigNames(configs []swarm.Config) []string {
+	var confNames []string
+
+	for _, conf := range configs {
+		confNames = append(confNames, conf.Spec.Name)
+	}
+
+	return confNames
+}
+
+func RemoveConfigs(cl *client.Client, ctx context.Context, configNames []string, force bool) error {
+	for _, confName := range configNames {
+		if err := cl.ConfigRemove(context.Background(), confName); err != nil {
+			return errors.New(gotext.Get("conf %s: %s", confName, err))
+		}
+	}
+	return nil
+}

pkg/client/context.go

@@ -10,6 +10,7 @@ import (
 	dConfig "github.com/docker/cli/cli/config"
 	"github.com/docker/cli/cli/context/docker"
 	contextStore "github.com/docker/cli/cli/context/store"
+	"github.com/leonelquinteros/gotext"
 )
 
 type Context = contextStore.Metadata
@@ -22,7 +23,7 @@ func CreateContext(contextName string) error {
 		return err
 	}
 
-	log.Debugf("created the %s context", contextName)
+	log.Debug(gotext.Get("created the %s context", contextName))
 
 	return nil
 }
@@ -62,7 +63,7 @@ func createContext(name string, host string) error {
 
 func DeleteContext(name string) error {
 	if name == "default" {
-		return errors.New("context 'default' cannot be removed")
+		return errors.New(gotext.Get("context 'default' cannot be removed"))
 	}
 
 	if _, err := GetContext(name); err != nil {

pkg/client/registry.go

@@ -2,11 +2,13 @@ package client
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/containers/image/docker"
 	"github.com/containers/image/types"
 	"github.com/distribution/reference"
+	"github.com/leonelquinteros/gotext"
 )
 
 // GetRegistryTags retrieves all tags of an image from a container registry.
@@ -15,7 +17,7 @@ func GetRegistryTags(img reference.Named) ([]string, error) {
 
 	ref, err := docker.ParseReference(fmt.Sprintf("//%s", img))
 	if err != nil {
-		return tags, fmt.Errorf("failed to parse image %s, saw: %s", img, err.Error())
+		return tags, errors.New(gotext.Get("failed to parse image %s, saw: %s", img, err.Error()))
 	}
 
 	ctx := context.Background()

pkg/client/volumes.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -9,6 +10,7 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 )
 
 func GetVolumes(cl *client.Client, ctx context.Context, server string, fs filters.Args) ([]*volume.Volume, error) {
@@ -54,9 +56,9 @@ func retryFunc(retries int, fn func() error) error {
 		}
 		if i+1 < retries {
 			sleep := time.Duration(i+1) * time.Duration(i+1)
-			log.Infof("%s: waiting %d seconds before next retry", err, sleep)
+			log.Infof(gotext.Get("%s: waiting %d seconds before next retry", err, sleep))
 			time.Sleep(sleep * time.Second)
 		}
 	}
-	return fmt.Errorf("%d retries failed", retries)
+	return errors.New(gotext.Get("%d retries failed", retries))
 }

pkg/config/abra.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 	"gopkg.in/yaml.v3"
 )
 
@@ -16,13 +17,13 @@ func LoadAbraConfig() Abra {
 	wd, _ := os.Getwd()
 	configFile := findAbraConfig(wd)
 	if configFile == "" {
-		log.Debugf("no config file found")
+		log.Debug(gotext.Get("no config file found"))
 		return Abra{}
 	}
 	data, err := os.ReadFile(configFile)
 	if err != nil {
 		// Do nothing, when an error occurs
-		log.Debugf("error reading config file: %s", err)
+		log.Debug(gotext.Get("error reading config file: %s", err))
 		return Abra{}
 	}
 
@@ -30,10 +31,10 @@ func LoadAbraConfig() Abra {
 	err = yaml.Unmarshal(data, &config)
 	if err != nil {
 		// Do nothing, when an error occurs
-		log.Debugf("error loading config file: %s", err)
+		log.Debug(gotext.Get("error loading config file: %s", err))
 		return Abra{}
 	}
-	log.Debugf("config file loaded from: %s", configFile)
+	log.Debug(gotext.Get("config file loaded from: %s", configFile))
 	config.configPath = filepath.Dir(configFile)
 	return config
 }
@@ -73,25 +74,24 @@ type Abra struct {
 // 3. use $HOME/.abra when above two options failed
 func (a Abra) GetAbraDir() string {
 	if dir, exists := os.LookupEnv("ABRA_DIR"); exists && dir != "" {
-		log.Debug("read abra dir from $ABRA_DIR")
+		log.Debug(gotext.Get("read abra dir from $ABRA_DIR"))
 		return dir
 	}
 	if a.AbraDir != "" {
-		log.Debug("read abra dir from config file")
+		log.Debug(gotext.Get("read abra dir from config file"))
 		if path.IsAbs(a.AbraDir) {
 			return a.AbraDir
 		}
 		// Make the path absolute
 		return path.Join(a.configPath, a.AbraDir)
 	}
-	log.Debug("using default abra dir")
+	log.Debug(gotext.Get("using default abra dir"))
 	return os.ExpandEnv("$HOME/.abra")
 }
 
 func (a Abra) GetServersDir() string   { return path.Join(a.GetAbraDir(), "servers") }
 func (a Abra) GetRecipesDir() string   { return path.Join(a.GetAbraDir(), "recipes") }
-func (a Abra) GetVendorDir() string    { return path.Join(a.GetAbraDir(), "vendor") }
-func (a Abra) GetBackupDir() string    { return path.Join(a.GetAbraDir(), "backups") }
+func (a Abra) GetLogsDir() string      { return path.Join(a.GetAbraDir(), "logs") }
 func (a Abra) GetCatalogueDir() string { return path.Join(a.GetAbraDir(), "catalogue") }
 
 var config = LoadAbraConfig()
@@ -100,8 +100,7 @@ var (
 	ABRA_DIR                  = config.GetAbraDir()
 	SERVERS_DIR               = config.GetServersDir()
 	RECIPES_DIR               = config.GetRecipesDir()
-	VENDOR_DIR                = config.GetVendorDir()
-	BACKUP_DIR                = config.GetBackupDir()
+	LOGS_DIR                  = config.GetLogsDir()
 	CATALOGUE_DIR             = config.GetCatalogueDir()
 	RECIPES_JSON              = path.Join(config.GetCatalogueDir(), "recipes.json")
 	REPOS_BASE_URL            = "https://git.coopcloud.tech/coop-cloud"

pkg/config/env.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"fmt"
+	"errors"
 	"io/fs"
 	"io/ioutil"
 	"os"
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 )
 
 const MAX_SANITISED_APP_NAME_LENGTH = 45
@@ -33,7 +34,7 @@ func GetServers() ([]string, error) {
 		}
 	}
 
-	log.Debugf("retrieved %v servers: %s", len(filtered), filtered)
+	log.Debug(gotext.Get("retrieved %v servers: %s", len(filtered), filtered))
 
 	return filtered, nil
 }
@@ -46,7 +47,7 @@ func ReadServerNames() ([]string, error) {
 		return nil, err
 	}
 
-	log.Debugf("read %s from %s", strings.Join(serverNames, ","), SERVERS_DIR)
+	log.Debug(gotext.Get("read %s from %s", strings.Join(serverNames, ","), SERVERS_DIR))
 
 	return serverNames, nil
 }
@@ -70,7 +71,7 @@ func GetAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
 
 		realPath, err := filepath.EvalSymlinks(filePath)
 		if err != nil {
-			log.Warnf("broken symlink in your abra config folders: %s", filePath)
+			log.Warnf(gotext.Get("broken symlink in your abra config folders: %s", filePath))
 		} else {
 			realFile, err := os.Stat(realPath)
 			if err != nil {
@@ -94,7 +95,7 @@ func GetAllFoldersInDirectory(directory string) ([]string, error) {
 		return nil, err
 	}
 	if len(files) == 0 {
-		return nil, fmt.Errorf("directory is empty: %s", directory)
+		return nil, errors.New(gotext.Get("directory is empty: %s", directory))
 	}
 
 	for _, file := range files {
@@ -103,7 +104,7 @@ func GetAllFoldersInDirectory(directory string) ([]string, error) {
 			filePath := path.Join(directory, file.Name())
 			realDir, err := filepath.EvalSymlinks(filePath)
 			if err != nil {
-				log.Warnf("broken symlink in your abra config folders: %s", filePath)
+				log.Warnf(gotext.Get("broken symlink in your abra config folders: %s", filePath))
 			} else if stat, err := os.Stat(realDir); err == nil && stat.IsDir() {
 				// path is a directory
 				folders = append(folders, file.Name())

pkg/container/container.go

@@ -2,6 +2,7 @@ package container
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -12,6 +13,7 @@ import (
 	containerTypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 )
 
 // GetContainer retrieves a container. If noInput is false and the retrievd
@@ -26,7 +28,7 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, no
 
 	if len(containers) == 0 {
 		filter := filters.Get("name")[0]
-		return types.Container{}, fmt.Errorf("no containers matching the %v filter found?", filter)
+		return types.Container{}, errors.New(gotext.Get("no containers matching the %v filter found?", filter))
 	}
 
 	if len(containers) > 1 {
@@ -35,19 +37,19 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, no
 			containerName := strings.Join(container.Names, " ")
 			trimmed := strings.TrimPrefix(containerName, "/")
 			created := formatter.HumanDuration(container.Created)
-			containersRaw = append(containersRaw, fmt.Sprintf("%s (created %v)", trimmed, created))
+			containersRaw = append(containersRaw, gotext.Get("%s (created %v)", trimmed, created))
 		}
 
 		if noInput {
-			err := fmt.Errorf("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " "))
+			err := errors.New(gotext.Get("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " ")))
 			return types.Container{}, err
 		}
 
-		log.Warnf("ambiguous container list received, prompting for input")
+		log.Warnf(gotext.Get("ambiguous container list received, prompting for input"))
 
 		var response string
 		prompt := &survey.Select{
-			Message: "which container are you looking for?",
+			Message: gotext.Get("which container are you looking for?"),
 			Options: containersRaw,
 		}
 
@@ -64,7 +66,7 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, no
 			}
 		}
 
-		log.Fatal("failed to match chosen container")
+		log.Fatal(gotext.Get("failed to match chosen container"))
 	}
 
 	return containers[0], nil
@@ -79,5 +81,6 @@ func GetContainerFromStackAndService(cl *client.Client, stack, service string) (
 	if err != nil {
 		return types.Container{}, err
 	}
+
 	return container, nil
 }

pkg/context/context.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/cli/cli/context"
 	contextStore "github.com/docker/cli/cli/context/store"
 	cliflags "github.com/docker/cli/cli/flags"
+	"github.com/leonelquinteros/gotext"
 )
 
 func NewDefaultDockerContextStore() *command.ContextStoreWithDefault {
@@ -30,7 +31,7 @@ func NewDefaultDockerContextStore() *command.ContextStoreWithDefault {
 func GetContextEndpoint(ctx contextStore.Metadata) (string, error) {
 	endpointmeta, ok := ctx.Endpoints["docker"].(context.EndpointMetaBase)
 	if !ok {
-		err := errors.New("context lacks Docker endpoint")
+		err := errors.New(gotext.Get("context lacks Docker endpoint"))
 		return "", err
 	}
 	return endpointmeta.Host, nil

pkg/dns/dns.go

@@ -1,19 +1,21 @@
 package dns
 
 import (
-	"fmt"
+	"errors"
 	"net"
+
+	"github.com/leonelquinteros/gotext"
 )
 
 // EnsureIPv4 ensures that an ipv4 address is set for a domain name
 func EnsureIPv4(domainName string) (string, error) {
 	ipv4, err := net.ResolveIPAddr("ip4", domainName)
 	if err != nil {
-		return "", fmt.Errorf("%s: unable to resolve IPv4 address: %s", domainName, err)
+		return "", errors.New(gotext.Get("%s: unable to resolve IPv4 address: %s", domainName, err))
 	}
 
 	if ipv4 == nil {
-		return "", fmt.Errorf("%s: no IPv4 available", domainName)
+		return "", errors.New(gotext.Get("%s: no IPv4 available", domainName))
 	}
 
 	return ipv4.String(), nil
@@ -33,7 +35,7 @@ func EnsureDomainsResolveSameIPv4(domainName, server string) (string, error) {
 	}
 
 	if domainIPv4 == "" {
-		return ipv4, fmt.Errorf("cannot resolve ipv4 for %s?", domainName)
+		return ipv4, errors.New(gotext.Get("cannot resolve ipv4 for %s?", domainName))
 	}
 
 	serverIPv4, err := EnsureIPv4(server)
@@ -42,12 +44,16 @@ func EnsureDomainsResolveSameIPv4(domainName, server string) (string, error) {
 	}
 
 	if serverIPv4 == "" {
-		return ipv4, fmt.Errorf("cannot resolve ipv4 for %s?", server)
+		return ipv4, errors.New(gotext.Get("cannot resolve ipv4 for %s?", server))
 	}
 
 	if domainIPv4 != serverIPv4 {
-		err := "app domain %s (%s) does not appear to resolve to app server %s (%s)?"
-		return ipv4, fmt.Errorf(err, domainName, domainIPv4, server, serverIPv4)
+		return ipv4, errors.New(
+			gotext.Get(
+				"app domain %s (%s) does not appear to resolve to app server %s (%s)?",
+				domainName, domainIPv4, server, serverIPv4,
+			),
+		)
 	}
 
 	return ipv4, nil

pkg/envfile/envfile.go

@@ -2,20 +2,16 @@ package envfile
 
 import (
 	"bufio"
-	"fmt"
+	"errors"
 	"os"
 	"regexp"
 	"strings"
 
 	"coopcloud.tech/abra/pkg/log"
 	"git.coopcloud.tech/toolshed/godotenv"
+	"github.com/leonelquinteros/gotext"
 )
 
-// envVarModifiers is a list of env var modifier strings. These are added to
-// env vars as comments and modify their processing by Abra, e.g. determining
-// how long secrets should be.
-var envVarModifiers = []string{"length"}
-
 // AppEnv is a map of the values in an apps env config
 type AppEnv = map[string]string
 
@@ -43,7 +39,7 @@ func ReadEnvWithModifiers(filePath string) (AppEnv, AppModifiers, error) {
 		return nil, mods, err
 	}
 
-	log.Debugf("read %s from %s", envVars, filePath)
+	log.Debug(gotext.Get("read %s from %s", envVars, filePath))
 
 	return envVars, mods, nil
 }
@@ -74,16 +70,16 @@ func ReadAbraShEnvVars(abraSh string) (map[string]string, error) {
 			envVarDef := splitVals[len(splitVals)-1]
 			keyVal := strings.Split(envVarDef, "=")
 			if len(keyVal) != 2 {
-				return envVars, fmt.Errorf("couldn't parse %s", txt)
+				return envVars, errors.New(gotext.Get("couldn't parse %s", txt))
 			}
 			envVars[keyVal[0]] = keyVal[1]
 		}
 	}
 
 	if len(envVars) > 0 {
-		log.Debugf("read %s from %s", envVars, abraSh)
+		log.Debug(gotext.Get("read %s from %s", envVars, abraSh))
 	} else {
-		log.Debugf("read 0 env var exports from %s", abraSh)
+		log.Debug(gotext.Get("read 0 env var exports from %s", abraSh))
 	}
 
 	return envVars, nil

pkg/formatter/formatter.go

@@ -11,6 +11,7 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/lipgloss/table"
 	"github.com/docker/go-units"
+	"github.com/leonelquinteros/gotext"
 	"golang.org/x/term"
 
 	"coopcloud.tech/abra/pkg/config"
@@ -42,7 +43,7 @@ func RemoveSha(str string) string {
 func HumanDuration(timestamp int64) string {
 	date := time.Unix(timestamp, 0)
 	now := time.Now().UTC()
-	return units.HumanDuration(now.Sub(date)) + " ago"
+	return units.HumanDuration(now.Sub(date)) + gotext.Get(" ago")
 }
 
 // CreateTable prepares a table layout for output.
@@ -76,7 +77,7 @@ func CreateTable() (*table.Table, error) {
 func PrintTable(t *table.Table) error {
 	if isAbraCI, ok := os.LookupEnv("ABRA_CI"); ok && isAbraCI == "1" {
 		// NOTE(d1): no width limits for CI testing since we test against outputs
-		log.Debug("detected ABRA_CI=1")
+		log.Debug(gotext.Get("detected ABRA_CI=1"))
 		fmt.Println(t)
 		return nil
 	}
@@ -130,7 +131,7 @@ func CreateOverview(header string, rows [][]string) string {
 		}
 
 		if len(row) > 2 {
-			panic("CreateOverview: only accepts rows of len == 2")
+			panic(gotext.Get("CreateOverview: only accepts rows of len == 2"))
 		}
 
 		lenOffset := 4
@@ -234,7 +235,7 @@ func StripTagMeta(image string) string {
 	}
 
 	if originalImage != image {
-		log.Debugf("stripped %s to %s for parsing", originalImage, image)
+		log.Debug(gotext.Get("stripped %s to %s for parsing", originalImage, image))
 	}
 
 	return image

pkg/git/add.go

@@ -3,6 +3,7 @@ package git
 import (
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
+	"github.com/leonelquinteros/gotext"
 )
 
 // Add adds a file to the git index.
@@ -18,7 +19,7 @@ func Add(repoPath, path string, dryRun bool) error {
 	}
 
 	if dryRun {
-		log.Debugf("dry run: adding %s", path)
+		log.Debug(gotext.Get("dry run: adding %s", path))
 	} else {
 		worktree.Add(path)
 	}

pkg/git/branch.go

@@ -1,11 +1,13 @@
 package git
 
 import (
+	"errors"
 	"fmt"
 
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/leonelquinteros/gotext"
 )
 
 // Check if a branch exists in a repo. Use this and not repository.Branch(),
@@ -63,7 +65,7 @@ func GetDefaultBranch(repo *git.Repository, repoPath string) (plumbing.Reference
 
 	if !HasBranch(repo, "master") {
 		if !HasBranch(repo, "main") {
-			return "", fmt.Errorf("failed to select default branch in %s", repoPath)
+			return "", errors.New(gotext.Get("failed to select default branch in %s", repoPath))
 		}
 		branch = "main"
 	}
@@ -90,11 +92,11 @@ func CheckoutDefaultBranch(repo *git.Repository, repoPath string) (plumbing.Refe
 	}
 
 	if err := worktree.Checkout(checkOutOpts); err != nil {
-		log.Debugf("failed to check out %s in %s", branch, repoPath)
+		log.Debug(gotext.Get("failed to check out %s in %s", branch, repoPath))
 		return branch, err
 	}
 
-	log.Debugf("successfully checked out %v in %s", branch, repoPath)
+	log.Debug(gotext.Get("successfully checked out %v in %s", branch, repoPath))
 
 	return branch, nil
 }

pkg/git/clone.go

@@ -1,12 +1,17 @@
 package git
 
 import (
+	"context"
+	"errors"
+	"fmt"
 	"os"
+	"os/signal"
 	"strings"
 
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/leonelquinteros/gotext"
 )
 
 // gitCloneIgnoreErr checks whether we can ignore a git clone error or not.
@@ -22,46 +27,81 @@ func gitCloneIgnoreErr(err error) bool {
 	return false
 }
 
-// Clone runs a git clone which accounts for different default branches.
+// Clone runs a git clone which accounts for different default branches. This
+// function respects Ctrl+C (SIGINT) calls from the user, cancelling the
+// context and deleting the (typically) half-baked clone of the repository.
+// This avoids broken state for future clone / recipe ops.
 func Clone(dir, url string) error {
-	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		log.Debugf("git clone: %s", dir, url)
+	ctx := context.Background()
+	ctx, cancelCtx := context.WithCancel(ctx)
 
-		_, err := git.PlainClone(dir, false, &git.CloneOptions{
-			URL:           url,
-			Tags:          git.AllTags,
-			ReferenceName: plumbing.ReferenceName("refs/heads/main"),
-			SingleBranch:  true,
-		})
+	sigIntCh := make(chan os.Signal, 1)
+	signal.Notify(sigIntCh, os.Interrupt)
+	defer func() {
+		signal.Stop(sigIntCh)
+		cancelCtx()
+	}()
 
-		if err != nil && gitCloneIgnoreErr(err) {
-			log.Debugf("git clone: %s cloned successfully", dir)
-			return nil
-		}
+	errCh := make(chan error)
 
-		if err != nil {
-			log.Debug("git clone: main branch failed, attempting master branch")
+	go func() {
+		if _, err := os.Stat(dir); os.IsNotExist(err) {
+			log.Debug(gotext.Get("git clone: %s", url))
 
-			_, err := git.PlainClone(dir, false, &git.CloneOptions{
+			_, err := git.PlainCloneContext(ctx, dir, false, &git.CloneOptions{
 				URL:           url,
 				Tags:          git.AllTags,
-				ReferenceName: plumbing.ReferenceName("refs/heads/master"),
+				ReferenceName: plumbing.ReferenceName("refs/heads/main"),
 				SingleBranch:  true,
 			})
 
 			if err != nil && gitCloneIgnoreErr(err) {
-				log.Debugf("git clone: %s cloned successfully", dir)
-				return nil
+				log.Debug(gotext.Get("git clone: %s cloned successfully", dir))
+				errCh <- nil
+			}
+
+			if err := ctx.Err(); err != nil {
+				errCh <- errors.New(gotext.Get("git clone %s: cancelled due to interrupt", dir))
 			}
 
 			if err != nil {
-				return err
+				log.Debug(gotext.Get("git clone: main branch failed, attempting master branch"))
+
+				_, err := git.PlainCloneContext(ctx, dir, false, &git.CloneOptions{
+					URL:           url,
+					Tags:          git.AllTags,
+					ReferenceName: plumbing.ReferenceName("refs/heads/master"),
+					SingleBranch:  true,
+				})
+
+				if err != nil && gitCloneIgnoreErr(err) {
+					log.Debug(gotext.Get("git clone: %s cloned successfully", dir))
+					errCh <- nil
+				}
+
+				if err != nil {
+					errCh <- err
+				}
 			}
+
+			log.Debug(gotext.Get("git clone: %s cloned successfully", dir))
+		} else {
+			log.Debug(gotext.Get("git clone: %s already exists", dir))
 		}
 
-		log.Debugf("git clone: %s cloned successfully", dir)
-	} else {
-		log.Debugf("git clone: %s already exists", dir)
+		errCh <- nil
+	}()
+
+	select {
+	case <-sigIntCh:
+		cancelCtx()
+		fmt.Println() // NOTE(d1): newline after ^C
+		if err := os.RemoveAll(dir); err != nil {
+			return errors.New(gotext.Get("unable to clean up git clone of %s: %s", dir, err))
+		}
+		return errors.New(gotext.Get("git clone %s: cancelled due to interrupt", dir))
+	case err := <-errCh:
+		return err
 	}
 
 	return nil

pkg/git/clone_test.go

@@ -0,0 +1,48 @@
+package git
+
+import (
+	"fmt"
+	"os"
+	"path"
+	"syscall"
+	"testing"
+
+	"coopcloud.tech/abra/pkg/config"
+)
+
+func TestClone(t *testing.T) {
+	dir := path.Join(config.RECIPES_DIR, "gitea")
+	os.RemoveAll(dir)
+
+	gitURL := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "gitea")
+	if err := Clone(dir, gitURL); err != nil {
+		t.Fatalf("unable to git clone gitea: %s", err)
+	}
+
+	if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) {
+		t.Fatal("gitea repo was not cloned successfully")
+	}
+}
+
+func TestCancelGitClone(t *testing.T) {
+	dir := path.Join(config.RECIPES_DIR, "gitea")
+	os.RemoveAll(dir)
+
+	go func() {
+		p, err := os.FindProcess(os.Getpid())
+		if err != nil {
+			t.Fatalf("unable to find current process: %s", err)
+		}
+
+		p.Signal(syscall.SIGINT)
+	}()
+
+	gitURL := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "gitea")
+	if err := Clone(dir, gitURL); err == nil {
+		t.Fatal("cloning should have been interrupted")
+	}
+
+	if _, err := os.Stat(dir); err != nil && !os.IsNotExist(err) {
+		t.Fatal("recipe repo was not deleted")
+	}
+}

pkg/git/commit.go

@@ -1,16 +1,17 @@
 package git
 
 import (
-	"fmt"
+	"errors"
 
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
+	"github.com/leonelquinteros/gotext"
 )
 
 // Commit runs a git commit
 func Commit(repoPath, commitMessage string, dryRun bool) error {
 	if commitMessage == "" {
-		return fmt.Errorf("no commit message specified?")
+		return errors.New(gotext.Get("no commit message specified?"))
 	}
 
 	commitRepo, err := git.PlainOpen(repoPath)
@@ -38,9 +39,9 @@ func Commit(repoPath, commitMessage string, dryRun bool) error {
 		if err != nil {
 			return err
 		}
-		log.Debug("git changes commited")
+		log.Debug(gotext.Get("git changes commited"))
 	} else {
-		log.Debug("dry run: no changes commited")
+		log.Debug(gotext.Get("dry run: no changes commited"))
 	}
 
 	return nil

pkg/git/common.go

@@ -1,14 +1,16 @@
 package git
 
 import (
-	"fmt"
+	"errors"
 	"os"
+
+	"github.com/leonelquinteros/gotext"
 )
 
 // EnsureGitRepo ensures a git repo .git folder exists
 func EnsureGitRepo(repoPath string) error {
 	if _, err := os.Stat(repoPath); os.IsNotExist(err) {
-		return fmt.Errorf("no .git directory in %s?", repoPath)
+		return errors.New(gotext.Get("no .git directory in %s?", repoPath))
 	}
 	return nil
 }

pkg/git/diff.go

@@ -5,6 +5,7 @@ import (
 	"os/exec"
 
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 )
 
 // getGitDiffArgs builds the `git diff` invocation args. It removes the usage
@@ -26,7 +27,7 @@ func getGitDiffArgs(repoPath string) []string {
 // skips if it cannot find the command on the system.
 func DiffUnstaged(path string) error {
 	if _, err := exec.LookPath("git"); err != nil {
-		log.Warnf("unable to locate git command, cannot output diff")
+		log.Warnf(gotext.Get("unable to locate git command, cannot output diff"))
 		return nil
 	}
 

pkg/git/init.go

@@ -1,40 +1,41 @@
 package git
 
 import (
-	"fmt"
+	"errors"
 
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
+	"github.com/leonelquinteros/gotext"
 )
 
 // Init inits a new repo and commits all the stuff if you want
 func Init(repoPath string, commit bool, gitName, gitEmail string) error {
 	repo, err := git.PlainInit(repoPath, false)
 	if err != nil {
-		return fmt.Errorf("git init: %s", err)
+		return errors.New(gotext.Get("git init: %s", err))
 	}
 
 	if err = SwitchToMain(repo); err != nil {
-		return fmt.Errorf("git branch rename: %s", err)
+		return errors.New(gotext.Get("git branch rename: %s", err))
 	}
 
-	log.Debugf("initialised new git repo in %s", repoPath)
+	log.Debug(gotext.Get("initialised new git repo in %s", repoPath))
 
 	if commit {
 		commitRepo, err := git.PlainOpen(repoPath)
 		if err != nil {
-			return fmt.Errorf("git open: %s", err)
+			return errors.New(gotext.Get("git open: %s", err))
 		}
 
 		commitWorktree, err := commitRepo.Worktree()
 		if err != nil {
-			return fmt.Errorf("git worktree: %s", err)
+			return errors.New(gotext.Get("git worktree: %s", err))
 		}
 
 		if err := commitWorktree.AddWithOptions(&git.AddOptions{All: true}); err != nil {
-			return fmt.Errorf("git add: %s", err)
+			return errors.New(gotext.Get("git add: %s", err))
 		}
 
 		var author *object.Signature
@@ -43,10 +44,10 @@ func Init(repoPath string, commit bool, gitName, gitEmail string) error {
 		}
 
 		if _, err = commitWorktree.Commit("init", &git.CommitOptions{Author: author}); err != nil {
-			return fmt.Errorf("git commit: %s", err)
+			return errors.New(gotext.Get("git commit: %s", err))
 		}
 
-		log.Debugf("init committed all files for new git repo in %s", repoPath)
+		log.Debug(gotext.Get("init committed all files for new git repo in %s", repoPath))
 	}
 
 	return nil
@@ -56,20 +57,20 @@ func Init(repoPath string, commit bool, gitName, gitEmail string) error {
 func SwitchToMain(repo *git.Repository) error {
 	ref := plumbing.NewSymbolicReference(plumbing.HEAD, plumbing.ReferenceName("refs/heads/main"))
 	if err := repo.Storer.SetReference(ref); err != nil {
-		return fmt.Errorf("set reference: %s", err)
+		return errors.New(gotext.Get("set reference: %s", err))
 	}
 
 	cfg, err := repo.Config()
 	if err != nil {
-		return fmt.Errorf("repo config: %s", err)
+		return errors.New(gotext.Get("repo config: %s", err))
 	}
 
 	cfg.Init.DefaultBranch = "main"
 	if err := repo.SetConfig(cfg); err != nil {
-		return fmt.Errorf("repo set config: %s", err)
+		return errors.New(gotext.Get("repo set config: %s", err))
 	}
 
-	log.Debug("set 'main' as the default branch")
+	log.Debug(gotext.Get("set 'main' as the default branch"))
 
 	return nil
 }

pkg/git/push.go

@@ -4,12 +4,13 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
+	"github.com/leonelquinteros/gotext"
 )
 
 // Push pushes the latest changes & optionally tags to the default remote
 func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 	if dryRun {
-		log.Debugf("dry run: no git changes pushed in %s", repoDir)
+		log.Debug(gotext.Get("dry run: no git changes pushed in %s", repoDir))
 		return nil
 	}
 
@@ -27,7 +28,7 @@ func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 		return err
 	}
 
-	log.Debugf("git changes pushed")
+	log.Debug(gotext.Get("git changes pushed"))
 
 	if tags {
 		opts.RefSpecs = append(opts.RefSpecs, config.RefSpec("+refs/tags/*:refs/tags/*"))
@@ -36,7 +37,7 @@ func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 			return err
 		}
 
-		log.Debugf("git tags pushed")
+		log.Debug(gotext.Get("git tags pushed"))
 	}
 
 	return nil

pkg/git/read.go

@@ -2,7 +2,6 @@ package git
 
 import (
 	"errors"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"os/user"
@@ -13,6 +12,7 @@ import (
 	"github.com/go-git/go-git/v5"
 	gitConfigPkg "github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing/format/gitignore"
+	"github.com/leonelquinteros/gotext"
 )
 
 // IsClean checks if a repo has unstaged changes
@@ -23,12 +23,12 @@ func IsClean(repoPath string) (bool, error) {
 			return false, git.ErrRepositoryNotExists
 		}
 
-		return false, fmt.Errorf("unable to open %s: %s", repoPath, err)
+		return false, errors.New(gotext.Get("unable to open %s: %s", repoPath, err))
 	}
 
 	worktree, err := repo.Worktree()
 	if err != nil {
-		return false, fmt.Errorf("unable to open worktree of %s: %s", repoPath, err)
+		return false, errors.New(gotext.Get("unable to open worktree of %s: %s", repoPath, err))
 	}
 
 	patterns, err := GetExcludesFiles()
@@ -42,14 +42,14 @@ func IsClean(repoPath string) (bool, error) {
 
 	status, err := worktree.Status()
 	if err != nil {
-		return false, fmt.Errorf("unable to query status of %s: %s", repoPath, err)
+		return false, errors.New(gotext.Get("unable to query status of %s: %s", repoPath, err))
 	}
 
 	if status.String() != "" {
 		noNewline := strings.TrimSuffix(status.String(), "\n")
-		log.Debugf("git status: %s: %s", repoPath, noNewline)
+		log.Debug(gotext.Get("git status: %s: %s", repoPath, noNewline))
 	} else {
-		log.Debugf("git status: %s: clean", repoPath)
+		log.Debug(gotext.Get("git status: %s: clean", repoPath))
 	}
 
 	return status.IsClean(), nil
@@ -85,7 +85,7 @@ func parseGitConfig() (*gitConfigPkg.Config, error) {
 	globalGitConfig := filepath.Join(usr.HomeDir, ".gitconfig")
 	if _, err := os.Stat(globalGitConfig); err != nil {
 		if os.IsNotExist(err) {
-			log.Debugf("no %s exists, not reading any global gitignore config", globalGitConfig)
+			log.Debug(gotext.Get("no %s exists, not reading any global gitignore config", globalGitConfig))
 			return cfg, nil
 		}
 		return cfg, err
@@ -127,7 +127,7 @@ func parseExcludesFile(excludesfile string) ([]gitignore.Pattern, error) {
 
 	if _, err := os.Stat(excludesfile); err != nil {
 		if os.IsNotExist(err) {
-			log.Debugf("no %s exists, skipping reading gitignore paths", excludesfile)
+			log.Debug(gotext.Get("no %s exists, skipping reading gitignore paths", excludesfile))
 			return ps, nil
 		}
 		return ps, err
@@ -146,7 +146,7 @@ func parseExcludesFile(excludesfile string) ([]gitignore.Pattern, error) {
 		}
 	}
 
-	log.Debugf("read global ignore paths: %s", strings.Join(pathsRaw, " "))
+	log.Debug(gotext.Get("read global ignore paths: %s", strings.Join(pathsRaw, " ")))
 
 	return ps, nil
 }

pkg/git/remote.go

@@ -6,12 +6,13 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
+	"github.com/leonelquinteros/gotext"
 )
 
 // CreateRemote creates a new git remote in a repository
 func CreateRemote(repo *git.Repository, name, url string, dryRun bool) error {
 	if dryRun {
-		log.Debugf("dry run: remote %s (%s) not created", name, url)
+		log.Debug(gotext.Get("dry run: remote %s (%s) not created", name, url))
 		return nil
 	}
 

pkg/lang/lang.go

@@ -0,0 +1,31 @@
+package lang
+
+import (
+	"embed"
+	"fmt"
+	"os"
+
+	"github.com/leonelquinteros/gotext"
+)
+
+//go:embed locales
+var assetFS embed.FS
+
+func GetLocale() string {
+	return os.Getenv("LANG")
+}
+
+func LoadLocale(locale string) error {
+	localePath := fmt.Sprintf("locales/%s/%s.po", locale)
+
+	b, err := assetFS.ReadFile(localePath)
+	if err != nil {
+		return fmt.Errorf("unable to load %s: %s", localePath, err)
+	}
+
+	po := gotext.NewPo()
+	po.Parse(b)
+	gotext.GetStorage().AddTranslator("abra", po)
+
+	return nil
+}

pkg/lang/locales/abra.pot

@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+"X-Generator: xgotext\n"
+
+#: volumes.go:63
+msgid "%d retries failed"
+msgstr ""
+
+#: volumes.go:59
+msgid "%s: waiting %d seconds before next retry"
+msgstr ""
+
+#: configs.go:35
+msgid "conf %s: %s"
+msgstr ""
+
+#: context.go:66
+msgid "context 'default' cannot be removed"
+msgstr ""
+
+#: client.go:88
+msgid "created client for %s"
+msgstr ""
+
+#: context.go:26
+msgid "created the %s context"
+msgstr ""
+
+#: registry.go:20
+msgid "failed to parse image %s, saw: %s"
+msgstr ""
+
+#: client.go:97
+msgid "swarm mode not enabled on %s?"
+msgstr ""
+
+#: client.go:100
+msgid "swarm mode not enabled on local server?"
+msgstr ""
+
+#: client.go:44
+msgid "unknown server, run 'abra server add %s'?"
+msgstr ""

pkg/lang/locales/es/LC_MESSAGES/es.po

@@ -0,0 +1,20 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-08-04 14:15+0000\n"
+"PO-Revision-Date: 2025-08-04 14:15+0000\n"
+"Last-Translator: 3wordchant <3wc.coopcloud@doesthisthing.work>\n"
+"Language-Team: Spanish <https://translate.coopcloud.tech/projects/"
+"co-op-cloud/abra/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.12.2\n"
+
+#: app.go:11
+msgid "Manage apps"
+msgstr "Gestionar aplicaciones"

pkg/lint/recipe.go

@@ -1,6 +1,7 @@
 package lint
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -13,10 +14,13 @@ import (
 	"github.com/distribution/reference"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/leonelquinteros/gotext"
 )
 
-var Warn = "warn"
-var Critical = "critical"
+var (
+	Warn     = gotext.Get("warn")
+	Critical = gotext.Get("critical")
+)
 
 type LintFunction func(recipe.Recipe) (bool, error)
 
@@ -45,10 +49,10 @@ func (l LintRule) Skip(recipe recipe.Recipe) bool {
 	if l.SkipCondition != nil {
 		ok, err := l.SkipCondition(recipe)
 		if err != nil {
-			log.Debugf("%s: skip condition: %s", l.Ref, err)
+			log.Debug(gotext.Get("%s: skip condition: %s", l.Ref, err))
 		}
 		if ok {
-			log.Debugf("skipping %s based on skip condition", l.Ref)
+			log.Debug(gotext.Get("skipping %s based on skip condition", l.Ref))
 			return true
 		}
 	}
@@ -60,117 +64,117 @@ var LintRules = map[string][]LintRule{
 	"warn": {
 		{
 			Ref:          "R001",
-			Level:        "warn",
-			Description:  "compose config has expected version",
-			HowToResolve: "ensure 'version: \"3.8\"' in compose configs",
+			Level:        gotext.Get("warn"),
+			Description:  gotext.Get("compose config has expected version"),
+			HowToResolve: gotext.Get("ensure 'version: \"3.8\"' in compose configs"),
 			Function:     LintComposeVersion,
 		},
 		{
 			Ref:          "R002",
-			Level:        "warn",
-			Description:  "healthcheck enabled for all services",
-			HowToResolve: "wire up healthchecks",
+			Level:        gotext.Get("warn"),
+			Description:  gotext.Get("healthcheck enabled for all services"),
+			HowToResolve: gotext.Get("wire up healthchecks"),
 			Function:     LintHealthchecks,
 		},
 		{
 			Ref:          "R003",
-			Level:        "warn",
-			Description:  "all images use a tag",
-			HowToResolve: "use a tag for all images",
+			Level:        gotext.Get("warn"),
+			Description:  gotext.Get("all images use a tag"),
+			HowToResolve: gotext.Get("use a tag for all images"),
 			Function:     LintAllImagesTagged,
 		},
 		{
 			Ref:          "R004",
-			Level:        "warn",
-			Description:  "no unstable tags",
-			HowToResolve: "tag all images with stable tags",
+			Level:        gotext.Get("warn"),
+			Description:  gotext.Get("no unstable tags"),
+			HowToResolve: gotext.Get("tag all images with stable tags"),
 			Function:     LintNoUnstableTags,
 		},
 		{
 			Ref:          "R005",
-			Level:        "warn",
-			Description:  "tags use semver-like format",
-			HowToResolve: "use semver-like tags",
+			Level:        gotext.Get("warn"),
+			Description:  gotext.Get("tags use semver-like format"),
+			HowToResolve: gotext.Get("use semver-like tags"),
 			Function:     LintSemverLikeTags,
 		},
 		{
 			Ref:          "R006",
-			Level:        "warn",
-			Description:  "has published catalogue version",
-			HowToResolve: "publish a recipe version to the catalogue",
+			Level:        gotext.Get("warn"),
+			Description:  gotext.Get("has published catalogue version"),
+			HowToResolve: gotext.Get("publish a recipe version to the catalogue"),
 			Function:     LintHasPublishedVersion,
 		},
 		{
 			Ref:          "R007",
-			Level:        "warn",
-			Description:  "README.md metadata filled in",
-			HowToResolve: "fill out all the metadata",
+			Level:        gotext.Get("warn"),
+			Description:  gotext.Get("README.md metadata filled in"),
+			HowToResolve: gotext.Get("fill out all the metadata"),
 			Function:     LintMetadataFilledIn,
 		},
 		{
 			Ref:          "R013",
-			Level:        "warn",
-			Description:  "git.coopcloud.tech repo exists",
-			HowToResolve: "upload your recipe to git.coopcloud.tech/coop-cloud/...",
+			Level:        gotext.Get("warn"),
+			Description:  gotext.Get("git.coopcloud.tech repo exists"),
+			HowToResolve: gotext.Get("upload your recipe to git.coopcloud.tech/coop-cloud/..."),
 			Function:     LintHasRecipeRepo,
 		},
 		{
 			Ref:          "R015",
-			Level:        "warn",
-			Description:  "long secret names",
-			HowToResolve: "reduce length of secret names to 12 chars",
+			Level:        gotext.Get("warn"),
+			Description:  gotext.Get("long secret names"),
+			HowToResolve: gotext.Get("reduce length of secret names to 12 chars"),
 			Function:     LintSecretLengths,
 		},
 	},
 	"error": {
 		{
 			Ref:          "R008",
-			Level:        "error",
-			Description:  ".env.sample provided",
-			HowToResolve: "create an example .env.sample",
+			Level:        gotext.Get("error"),
+			Description:  gotext.Get(".env.sample provided"),
+			HowToResolve: gotext.Get("create an example .env.sample"),
 			Function:     LintEnvConfigPresent,
 		},
 		{
 			Ref:          "R009",
-			Level:        "error",
-			Description:  "one service named 'app'",
-			HowToResolve: "name a servce 'app'",
+			Level:        gotext.Get("error"),
+			Description:  gotext.Get("one service named 'app'"),
+			HowToResolve: gotext.Get("name a servce 'app'"),
 			Function:     LintAppService,
 		},
 		{
 			Ref:          "R015",
-			Level:        "error",
-			Description:  "deploy labels stanza present",
-			HowToResolve: "include \"deploy: labels: ...\" stanza",
+			Level:        gotext.Get("error"),
+			Description:  gotext.Get("deploy labels stanza present"),
+			HowToResolve: gotext.Get("include \"deploy: labels: ...\" stanza"),
 			Function:     LintDeployLabelsPresent,
 		},
 		{
 			Ref:           "R010",
-			Level:         "error",
-			Description:   "traefik routing enabled",
-			HowToResolve:  "include \"traefik.enable=true\" deploy label",
+			Level:         gotext.Get("error"),
+			Description:   gotext.Get("traefik routing enabled"),
+			HowToResolve:  gotext.Get("include \"traefik.enable=true\" deploy label"),
 			Function:      LintTraefikEnabled,
 			SkipCondition: LintTraefikEnabledSkipCondition,
 		},
 		{
 			Ref:          "R011",
-			Level:        "error",
-			Description:  "all services have images",
-			HowToResolve: "ensure \"image: ...\" set on all services",
+			Level:        gotext.Get("error"),
+			Description:  gotext.Get("all services have images"),
+			HowToResolve: gotext.Get("ensure \"image: ...\" set on all services"),
 			Function:     LintImagePresent,
 		},
 		{
 			Ref:          "R012",
-			Level:        "error",
-			Description:  "config version are vendored",
-			HowToResolve: "vendor config versions in an abra.sh",
+			Level:        gotext.Get("error"),
+			Description:  gotext.Get("config version are vendored"),
+			HowToResolve: gotext.Get("vendor config versions in an abra.sh"),
 			Function:     LintAbraShVendors,
 		},
 		{
 			Ref:          "R014",
-			Level:        "error",
-			Description:  "only annotated tags used for recipe version",
-			HowToResolve: "replace lightweight tag with annotated tag",
+			Level:        gotext.Get("error"),
+			Description:  gotext.Get("only annotated tags used for recipe version"),
+			HowToResolve: gotext.Get("replace lightweight tag with annotated tag"),
 			Function:     LintValidTags,
 		},
 	},
@@ -180,7 +184,9 @@ var LintRules = map[string][]LintRule{
 // used in code paths such as "app deploy" to avoid nasty surprises but not for
 // the typical linting commands, which do handle other levels.
 func LintForErrors(recipe recipe.Recipe) error {
-	log.Debugf("linting for critical errors in %s configs", recipe.Name)
+	log.Debug(gotext.Get("linting for critical errors in %s configs", recipe.Name))
+
+	var errs string
 
 	for level := range LintRules {
 		if level != "error" {
@@ -194,15 +200,19 @@ func LintForErrors(recipe recipe.Recipe) error {
 
 			ok, err := rule.Function(recipe)
 			if err != nil {
-				return err
+				errs += gotext.Get("\nlint %s: %s", rule.Ref, err)
 			}
 			if !ok {
-				return fmt.Errorf("lint error in %s configs: \"%s\" failed lint checks (%s)", recipe.Name, rule.Description, rule.Ref)
+				errs += fmt.Sprintf("\n * %s (%s)", rule.Description, rule.Ref)
 			}
 		}
 	}
 
-	log.Debugf("linting successful, %s is well configured", recipe.Name)
+	if len(errs) > 0 {
+		return errors.New(gotext.Get("recipe '%s' failed lint checks:\n"+errs[1:], recipe.Name))
+	}
+
+	log.Debug(gotext.Get("linting successful, %s is well configured", recipe.Name))
 
 	return nil
 }
@@ -248,7 +258,7 @@ func LintAppService(recipe recipe.Recipe) (bool, error) {
 func LintTraefikEnabledSkipCondition(r recipe.Recipe) (bool, error) {
 	sampleEnv, err := r.SampleEnv()
 	if err != nil {
-		return false, fmt.Errorf("Unable to discover .env.sample for %s", r.Name)
+		return false, errors.New(gotext.Get("unable to discover .env.sample for %s", r.Name))
 	}
 
 	if _, ok := sampleEnv["DOMAIN"]; !ok {
@@ -468,7 +478,7 @@ func LintSecretLengths(recipe recipe.Recipe) (bool, error) {
 	}
 	for name := range config.Secrets {
 		if len(name) > 12 {
-			return false, fmt.Errorf("secret %s is longer than 12 characters", name)
+			return false, errors.New(gotext.Get("secret %s is longer than 12 characters", name))
 		}
 	}
 
@@ -478,12 +488,12 @@ func LintSecretLengths(recipe recipe.Recipe) (bool, error) {
 func LintValidTags(recipe recipe.Recipe) (bool, error) {
 	repo, err := git.PlainOpen(recipe.Dir)
 	if err != nil {
-		return false, fmt.Errorf("unable to open %s: %s", recipe.Dir, err)
+		return false, errors.New(gotext.Get("unable to open %s: %s", recipe.Dir, err))
 	}
 
 	iter, err := repo.Tags()
 	if err != nil {
-		log.Fatalf("unable to list local tags for %s", recipe.Name)
+		log.Fatal(gotext.Get("unable to list local tags for %s", recipe.Name))
 	}
 
 	if err := iter.ForEach(func(ref *plumbing.Reference) error {
@@ -491,7 +501,7 @@ func LintValidTags(recipe recipe.Recipe) (bool, error) {
 		if err != nil {
 			switch err {
 			case plumbing.ErrObjectNotFound:
-				return fmt.Errorf("invalid lightweight tag detected")
+				return errors.New(gotext.Get("invalid lightweight tag detected"))
 			default:
 				return err
 			}

pkg/log/log.go

@@ -2,8 +2,10 @@
 package log
 
 import (
+	"math"
 	"os"
 
+	tea "github.com/charmbracelet/bubbletea"
 	charmLog "github.com/charmbracelet/log"
 )
 
@@ -32,3 +34,13 @@ var SetLevel = Logger.SetLevel
 var DebugLevel = charmLog.DebugLevel
 var SetOutput = charmLog.SetOutput
 var SetReportCaller = charmLog.SetReportCaller
+
+type f func() (tea.Model, error)
+
+func Without(fn f) (tea.Model, error) {
+	l := Logger.GetLevel()
+	Logger.SetLevel(math.MaxInt)
+	m, err := fn()
+	Logger.SetLevel(l)
+	return m, err
+}

pkg/logs/logs.go

@@ -0,0 +1,106 @@
+package logs
+
+import (
+	"bufio"
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"os/signal"
+	"sync"
+
+	"github.com/docker/docker/api/types"
+	containerTypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/filters"
+	dockerClient "github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
+)
+
+type TailOpts struct {
+	AppName  string
+	Services []string
+	StdErr   bool
+	Since    string
+	Buffer   *[]string
+	ToBuffer bool
+	Filters  filters.Args
+}
+
+// TailLogs gathers logs for the given app with optional service names to be
+// filtered on. These logs can be printed to os.Stdout or gathered to a buffer.
+func TailLogs(
+	cl *dockerClient.Client,
+	opts TailOpts,
+) error {
+	sigIntCh := make(chan os.Signal, 1)
+	signal.Notify(sigIntCh, os.Interrupt)
+	defer signal.Stop(sigIntCh)
+
+	services, err := cl.ServiceList(
+		context.Background(),
+		types.ServiceListOptions{Filters: opts.Filters},
+	)
+	if err != nil {
+		return err
+	}
+
+	errCh := make(chan error)
+	waitCh := make(chan struct{})
+
+	go func() {
+		var wg sync.WaitGroup
+		for _, service := range services {
+			wg.Add(1)
+			go func(serviceID string) {
+				tail := "50"
+				if opts.ToBuffer {
+					// NOTE(d1): more logs from before deployment when analysing via file
+					tail = "150"
+				}
+
+				logs, err := cl.ServiceLogs(context.Background(), serviceID, containerTypes.LogsOptions{
+					ShowStderr: true,
+					ShowStdout: !opts.StdErr,
+					Since:      opts.Since,
+					Until:      "",
+					Timestamps: true,
+					Follow:     true,
+					Tail:       tail,
+					Details:    false,
+				})
+
+				if err == nil {
+					defer logs.Close()
+					if opts.ToBuffer {
+						buf := bufio.NewScanner(logs)
+						for buf.Scan() {
+							line := fmt.Sprintf("%s: %s", service.Spec.Name, buf.Text())
+							*opts.Buffer = append(*opts.Buffer, line)
+						}
+						logs.Close()
+						return
+					}
+
+					if _, err = io.Copy(os.Stdout, logs); err != nil && err != io.EOF {
+						errCh <- errors.New(gotext.Get("tailLogs: unable to copy buffer: %s", err))
+					}
+				}
+			}(service.ID)
+		}
+
+		wg.Wait()
+		close(waitCh)
+	}()
+
+	select {
+	case <-waitCh:
+		return nil
+	case <-sigIntCh:
+		return nil
+	case err := <-errCh:
+		return err
+	}
+
+	return nil
+}

pkg/recipe/compose.go

@@ -1,6 +1,7 @@
 package recipe
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -13,6 +14,7 @@ import (
 	loader "coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/distribution/reference"
 	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/leonelquinteros/gotext"
 )
 
 // GetComposeFiles gets the list of compose files for an app (or recipe if you
@@ -24,7 +26,7 @@ func (r Recipe) GetComposeFiles(appEnv map[string]string) ([]string, error) {
 		if err := ensurePathExists(r.ComposePath); err != nil {
 			return []string{}, err
 		}
-		log.Debugf("no COMPOSE_FILE detected, loading default: %s", r.ComposePath)
+		log.Debug(gotext.Get("no COMPOSE_FILE detected, loading default: %s", r.ComposePath))
 		return []string{r.ComposePath}, nil
 	}
 
@@ -33,7 +35,7 @@ func (r Recipe) GetComposeFiles(appEnv map[string]string) ([]string, error) {
 		if err := ensurePathExists(path); err != nil {
 			return []string{}, err
 		}
-		log.Debugf("COMPOSE_FILE detected, loading %s", path)
+		log.Debug(gotext.Get("COMPOSE_FILE detected, loading %s", path))
 		return []string{path}, nil
 	}
 
@@ -42,7 +44,7 @@ func (r Recipe) GetComposeFiles(appEnv map[string]string) ([]string, error) {
 	numComposeFiles := strings.Count(composeFileEnvVar, ":") + 1
 	envVars := strings.SplitN(composeFileEnvVar, ":", numComposeFiles)
 	if len(envVars) != numComposeFiles {
-		return composeFiles, fmt.Errorf("COMPOSE_FILE (=\"%s\") parsing failed?", composeFileEnvVar)
+		return composeFiles, errors.New(gotext.Get("COMPOSE_FILE (=\"%s\") parsing failed?", composeFileEnvVar))
 	}
 
 	for _, file := range envVars {
@@ -53,8 +55,8 @@ func (r Recipe) GetComposeFiles(appEnv map[string]string) ([]string, error) {
 		composeFiles = append(composeFiles, path)
 	}
 
-	log.Debugf("COMPOSE_FILE detected (%s), loading %s", composeFileEnvVar, strings.Join(envVars, ", "))
-	log.Debugf("retrieved %s configs for %s", strings.Join(composeFiles, ", "), r.Name)
+	log.Debug(gotext.Get("COMPOSE_FILE detected (%s), loading %s", composeFileEnvVar, strings.Join(envVars, ", ")))
+	log.Debug(gotext.Get("retrieved %s configs for %s", strings.Join(composeFiles, ", "), r.Name))
 
 	return composeFiles, nil
 }
@@ -67,7 +69,7 @@ func (r Recipe) GetComposeConfig(env map[string]string) (*composetypes.Config, e
 	}
 
 	if len(composeFiles) == 0 {
-		return nil, fmt.Errorf("%s is missing a compose.yml or compose.*.yml file?", r.Name)
+		return nil, errors.New(gotext.Get("%s is missing a compose.yml or compose.*.yml file?", r.Name))
 	}
 
 	if env == nil {
@@ -102,7 +104,7 @@ func (r Recipe) GetVersionLabelLocal() (string, error) {
 	}
 
 	if label == "" {
-		return label, fmt.Errorf("%s has no version label? try running \"abra recipe sync %s\" first?", r.Name, r.Name)
+		return label, errors.New(gotext.Get("%s has no version label? try running \"abra recipe sync %s\" first?", r.Name, r.Name))
 	}
 
 	return label, nil
@@ -118,7 +120,7 @@ func (r Recipe) UpdateTag(image, tag string) (bool, error) {
 		return false, err
 	}
 
-	log.Debugf("considering %s config(s) for tag update", strings.Join(composeFiles, ", "))
+	log.Debug(gotext.Get("considering %s config(s) for tag update", strings.Join(composeFiles, ", ")))
 
 	for _, composeFile := range composeFiles {
 		opts := stack.Deploy{Composefiles: []string{composeFile}}
@@ -148,13 +150,13 @@ func (r Recipe) UpdateTag(image, tag string) (bool, error) {
 			case reference.NamedTagged:
 				composeTag = img.(reference.NamedTagged).Tag()
 			default:
-				log.Debugf("unable to parse %s, skipping", img)
+				log.Debug(gotext.Get("unable to parse %s, skipping", img))
 				continue
 			}
 
 			composeImage := formatter.StripTagMeta(reference.Path(img))
 
-			log.Debugf("parsed %s from %s", composeTag, service.Image)
+			log.Debug(gotext.Get("parsed %s from %s", composeTag, service.Image))
 
 			if image == composeImage {
 				bytes, err := ioutil.ReadFile(composeFile)
@@ -166,7 +168,7 @@ func (r Recipe) UpdateTag(image, tag string) (bool, error) {
 				new := fmt.Sprintf("%s:%s", composeImage, tag)
 				replacedBytes := strings.Replace(string(bytes), old, new, -1)
 
-				log.Debugf("updating %s to %s in %s", old, new, compose.Filename)
+				log.Debug(gotext.Get("updating %s to %s in %s", old, new, compose.Filename))
 
 				if err := os.WriteFile(compose.Filename, []byte(replacedBytes), 0o764); err != nil {
 					return false, err
@@ -186,7 +188,7 @@ func (r Recipe) UpdateLabel(pattern, serviceName, label string) error {
 		return err
 	}
 
-	log.Debugf("considering %s config(s) for label update", strings.Join(composeFiles, ", "))
+	log.Debug(gotext.Get("considering %s config(s) for label update", strings.Join(composeFiles, ", ")))
 
 	for _, composeFile := range composeFiles {
 		opts := stack.Deploy{Composefiles: []string{composeFile}}
@@ -224,27 +226,27 @@ func (r Recipe) UpdateLabel(pattern, serviceName, label string) error {
 					return err
 				}
 
-				old := fmt.Sprintf("coop-cloud.${STACK_NAME}.version=%s", value)
+				old := gotext.Get("coop-cloud.${STACK_NAME}.version=%s", value)
 				replacedBytes := strings.Replace(string(bytes), old, label, -1)
 
 				if old == label {
-					log.Warnf("%s is already set, nothing to do?", label)
+					log.Warnf(gotext.Get("%s is already set, nothing to do?", label))
 					return nil
 				}
 
-				log.Debugf("updating %s to %s in %s", old, label, compose.Filename)
+				log.Debug(gotext.Get("updating %s to %s in %s", old, label, compose.Filename))
 
 				if err := ioutil.WriteFile(compose.Filename, []byte(replacedBytes), 0o764); err != nil {
 					return err
 				}
 
-				log.Infof("synced label %s to service %s", label, serviceName)
+				log.Infof(gotext.Get("synced label %s to service %s", label, serviceName))
 			}
 		}
 
 		if !discovered {
-			log.Warn("no existing label found, automagic insertion not supported yet")
-			log.Fatalf("add '- \"%s\"' manually to the 'app' service in %s", label, composeFile)
+			log.Warn(gotext.Get("no existing label found, automagic insertion not supported yet"))
+			log.Fatal(gotext.Get("add '- \"%s\"' manually to the 'app' service in %s", label, composeFile))
 		}
 	}
 

pkg/recipe/files.go

@@ -1,18 +1,20 @@
 package recipe
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path"
 
 	"coopcloud.tech/abra/pkg/envfile"
 	"coopcloud.tech/abra/pkg/formatter"
+	"github.com/leonelquinteros/gotext"
 )
 
 func (r Recipe) SampleEnv() (map[string]string, error) {
 	sampleEnv, err := envfile.ReadEnv(r.SampleEnvPath)
 	if err != nil {
-		return sampleEnv, fmt.Errorf("unable to discover .env.sample for %s", r.Name)
+		return sampleEnv, errors.New(gotext.Get("unable to discover .env.sample for %s", r.Name))
 	}
 	return sampleEnv, nil
 }
@@ -31,7 +33,7 @@ func (r Recipe) GetReleaseNotes(version string) (string, error) {
 			return "", err
 		}
 
-		title := formatter.BoldStyle.Render(fmt.Sprintf("%s release notes:", version))
+		title := formatter.BoldStyle.Render(gotext.Get("%s release notes:", version))
 		withTitle := fmt.Sprintf("%s\n%s\n", title, releaseNotes)
 
 		return withTitle, nil

pkg/recipe/git.go

@@ -1,6 +1,7 @@
 package recipe
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"slices"
@@ -15,6 +16,7 @@ import (
 	"github.com/distribution/reference"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/leonelquinteros/gotext"
 )
 
 type EnsureContext struct {
@@ -40,14 +42,14 @@ func (r Recipe) Ensure(ctx EnsureContext) error {
 
 	if !ctx.Offline {
 		if err := r.EnsureUpToDate(); err != nil {
-			log.Fatal(err)
+			return err
 		}
 	}
 
 	if r.EnvVersion != "" && !ctx.IgnoreEnvVersion {
-		log.Debugf("ensuring env version %s", r.EnvVersion)
+		log.Debug(gotext.Get("ensuring env version %s", r.EnvVersion))
 		if strings.Contains(r.EnvVersion, "+U") {
-			log.Fatalf("can not redeploy chaos version (%s) without --chaos", r.EnvVersion)
+			return errors.New(gotext.Get("can not redeploy chaos version (%s) without --chaos", r.EnvVersion))
 		}
 
 		if _, err := r.EnsureVersion(r.EnvVersion); err != nil {
@@ -146,16 +148,16 @@ func (r Recipe) EnsureVersion(version string) (bool, error) {
 
 	joinedTags := strings.Join(parsedTags, ", ")
 	if joinedTags != "" {
-		log.Debugf("read %s as tags for recipe %s", joinedTags, r.Name)
+		log.Debug(gotext.Get("read %s as tags for recipe %s", joinedTags, r.Name))
 	}
 
 	var opts *git.CheckoutOptions
 	if tagRef.String() == "" {
-		log.Debugf("attempting to checkout '%s' as chaos commit", version)
+		log.Debug(gotext.Get("attempting to checkout '%s' as chaos commit", version))
 
 		hash, err := repo.ResolveRevision(plumbing.Revision(version))
 		if err != nil {
-			log.Fatalf("unable to resolve '%s': %s", version, err)
+			log.Fatal(gotext.Get("unable to resolve '%s': %s", version, err))
 		}
 
 		opts = &git.CheckoutOptions{Hash: *hash, Create: false, Force: true}
@@ -173,7 +175,7 @@ func (r Recipe) EnsureVersion(version string) (bool, error) {
 		return isChaosCommit, nil
 	}
 
-	log.Debugf("successfully checked %s out to %s in %s", r.Name, tagRef.Short(), r.Dir)
+	log.Debug(gotext.Get("successfully checked %s out to %s in %s", r.Name, tagRef.Short(), r.Dir))
 
 	return isChaosCommit, nil
 }
@@ -182,11 +184,11 @@ func (r Recipe) EnsureVersion(version string) (bool, error) {
 func (r Recipe) EnsureIsClean() error {
 	isClean, err := gitPkg.IsClean(r.Dir)
 	if err != nil {
-		return fmt.Errorf("unable to check git clean status in %s: %s", r.Dir, err)
+		return errors.New(gotext.Get("unable to check git clean status in %s: %s", r.Dir, err))
 	}
 
 	if !isClean {
-		return fmt.Errorf("%s (%s) has locally unstaged changes?", r.Name, r.Dir)
+		return errors.New(gotext.Get("%s (%s) has locally unstaged changes?", r.Name, r.Dir))
 	}
 
 	return nil
@@ -220,7 +222,7 @@ func (r Recipe) EnsureLatest() error {
 	}
 
 	if err := worktree.Checkout(checkOutOpts); err != nil {
-		log.Debugf("failed to check out %s in %s", branch, r.Dir)
+		log.Debug(gotext.Get("failed to check out %s in %s", branch, r.Dir))
 		return err
 	}
 
@@ -231,33 +233,33 @@ func (r Recipe) EnsureLatest() error {
 func (r Recipe) EnsureUpToDate() error {
 	repo, err := git.PlainOpen(r.Dir)
 	if err != nil {
-		return fmt.Errorf("unable to open %s: %s", r.Dir, err)
+		return errors.New(gotext.Get("unable to open %s: %s", r.Dir, err))
 	}
 
 	remotes, err := repo.Remotes()
 	if err != nil {
-		return fmt.Errorf("unable to read remotes in %s: %s", r.Dir, err)
+		return errors.New(gotext.Get("unable to read remotes in %s: %s", r.Dir, err))
 	}
 
 	if len(remotes) == 0 {
-		log.Debugf("cannot ensure %s is up-to-date, no git remotes configured", r.Name)
+		log.Debug(gotext.Get("cannot ensure %s is up-to-date, no git remotes configured", r.Name))
 		return nil
 	}
 
 	worktree, err := repo.Worktree()
 	if err != nil {
-		return fmt.Errorf("unable to open git work tree in %s: %s", r.Dir, err)
+		return errors.New(gotext.Get("unable to open git work tree in %s: %s", r.Dir, err))
 	}
 
 	branch, err := gitPkg.CheckoutDefaultBranch(repo, r.Dir)
 	if err != nil {
-		return fmt.Errorf("unable to check out default branch in %s: %s", r.Dir, err)
+		return errors.New(gotext.Get("unable to check out default branch in %s: %s", r.Dir, err))
 	}
 
 	fetchOpts := &git.FetchOptions{Tags: git.AllTags}
 	if err := repo.Fetch(fetchOpts); err != nil {
 		if !strings.Contains(err.Error(), "already up-to-date") {
-			return fmt.Errorf("unable to fetch tags in %s: %s", r.Dir, err)
+			return errors.New(gotext.Get("unable to fetch tags in %s: %s", r.Dir, err))
 		}
 	}
 
@@ -269,11 +271,11 @@ func (r Recipe) EnsureUpToDate() error {
 
 	if err := worktree.Pull(opts); err != nil {
 		if !strings.Contains(err.Error(), "already up-to-date") {
-			return fmt.Errorf("unable to git pull in %s: %s", r.Dir, err)
+			return errors.New(gotext.Get("unable to git pull in %s: %s", r.Dir, err))
 		}
 	}
 
-	log.Debugf("fetched latest git changes for %s", r.Name)
+	log.Debug(gotext.Get("fetched latest git changes for %s", r.Name))
 
 	return nil
 }
@@ -362,7 +364,7 @@ func (r Recipe) Tags() ([]string, error) {
 		return version1.IsLessThan(version2)
 	})
 
-	log.Debugf("detected %s as tags for recipe %s", strings.Join(tags, ", "), r.Name)
+	log.Debug(gotext.Get("detected %s as tags for recipe %s", strings.Join(tags, ", "), r.Name))
 
 	return tags, nil
 }
@@ -373,7 +375,7 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, []string, error) {
 
 	versions := RecipeVersions{}
 
-	log.Debugf("git: opening repository in %s", r.Dir)
+	log.Debug(gotext.Get("git: opening repository in %s", r.Dir))
 
 	repo, err := git.PlainOpen(r.Dir)
 	if err != nil {
@@ -393,7 +395,7 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, []string, error) {
 	if err := gitTags.ForEach(func(ref *plumbing.Reference) (err error) {
 		tag := strings.TrimPrefix(string(ref.Name()), "refs/tags/")
 
-		log.Debugf("processing %s for %s", tag, r.Name)
+		log.Debug(gotext.Get("processing %s for %s", tag, r.Name))
 
 		checkOutOpts := &git.CheckoutOptions{
 			Create: false,
@@ -401,11 +403,11 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, []string, error) {
 			Branch: plumbing.ReferenceName(ref.Name()),
 		}
 		if err := worktree.Checkout(checkOutOpts); err != nil {
-			log.Debugf("failed to check out %s in %s", tag, r.Dir)
+			log.Debug(gotext.Get("failed to check out %s in %s", tag, r.Dir))
 			return err
 		}
 
-		log.Debugf("git checkout: %s in %s", ref.Name(), r.Dir)
+		log.Debug(gotext.Get("git checkout: %s in %s", ref.Name(), r.Dir))
 
 		config, err := r.GetComposeConfig(nil)
 		if err != nil {
@@ -429,7 +431,7 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, []string, error) {
 			case reference.NamedTagged:
 				tag = img.(reference.NamedTagged).Tag()
 			case reference.Named:
-				warnMsg = append(warnMsg, fmt.Sprintf("%s service is missing image tag?", path))
+				warnMsg = append(warnMsg, gotext.Get("%s service is missing image tag?", path))
 				continue
 			}
 
@@ -453,7 +455,7 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, []string, error) {
 
 	sortRecipeVersions(versions)
 
-	log.Debugf("collected %s for %s", versions, r.Dir)
+	log.Debug(gotext.Get("collected %s for %s", versions, r.Dir))
 
 	var uniqueWarnings []string
 	for _, w := range warnMsg {

pkg/recipe/recipe.go

@@ -13,6 +13,7 @@ import (
 	"strings"
 
 	"github.com/go-git/go-git/v5"
+	"github.com/leonelquinteros/gotext"
 
 	"coopcloud.tech/abra/pkg/catalogue"
 	"coopcloud.tech/abra/pkg/config"
@@ -70,7 +71,7 @@ func (r RecipeMeta) LatestVersion() string {
 		version = tag
 	}
 
-	log.Debugf("choosing %s as latest version of %s", version, r.Name)
+	log.Debug(gotext.Get("choosing %s as latest version of %s", version, r.Name))
 
 	return version
 }
@@ -126,7 +127,7 @@ func Get(name string) Recipe {
 	if strings.Contains(name, ":") {
 		split := strings.Split(name, ":")
 		if len(split) > 2 {
-			log.Fatalf("version seems invalid: %s", name)
+			log.Fatal(gotext.Get("version seems invalid: %s", name))
 		}
 		name = split[0]
 
@@ -134,7 +135,7 @@ func Get(name string) Recipe {
 		versionRaw = version
 		if strings.HasSuffix(version, config.DIRTY_DEFAULT) {
 			version = strings.Replace(split[1], config.DIRTY_DEFAULT, "", 1)
-			log.Debugf("removed dirty suffix from .env version: %s -> %s", split[1], version)
+			log.Debug(gotext.Get("removed dirty suffix from .env version: %s -> %s", split[1], version))
 		}
 	}
 
@@ -143,7 +144,7 @@ func Get(name string) Recipe {
 	if strings.Contains(name, "/") {
 		u, err := url.Parse(name)
 		if err != nil {
-			log.Fatalf("invalid recipe: %s", err)
+			log.Fatal(gotext.Get("invalid recipe: %s", err))
 		}
 		u.Scheme = "https"
 		gitURL = u.String() + ".git"
@@ -171,7 +172,7 @@ func Get(name string) Recipe {
 
 	dirty, err := r.IsDirty()
 	if err != nil && !errors.Is(err, git.ErrRepositoryNotExists) {
-		log.Fatalf("failed to check git status of %s: %s", r.Name, err)
+		log.Fatal(gotext.Get("failed to check git status of %s: %s", r.Name, err))
 	}
 	r.Dirty = dirty
 
@@ -195,16 +196,16 @@ type Recipe struct {
 
 // String outputs a human-friendly string representation.
 func (r Recipe) String() string {
-	out := fmt.Sprintf("{name: %s, ", r.Name)
-	out += fmt.Sprintf("version : %s, ", r.EnvVersion)
-	out += fmt.Sprintf("dirty: %v, ", r.Dirty)
-	out += fmt.Sprintf("dir: %s, ", r.Dir)
-	out += fmt.Sprintf("git url: %s, ", r.GitURL)
-	out += fmt.Sprintf("ssh url: %s, ", r.SSHURL)
-	out += fmt.Sprintf("compose: %s, ", r.ComposePath)
-	out += fmt.Sprintf("readme: %s, ", r.ReadmePath)
-	out += fmt.Sprintf("sample env: %s, ", r.SampleEnvPath)
-	out += fmt.Sprintf("abra.sh: %s}", r.AbraShPath)
+	out := gotext.Get("{name: %s, ", r.Name)
+	out += gotext.Get("version : %s, ", r.EnvVersion)
+	out += gotext.Get("dirty: %v, ", r.Dirty)
+	out += gotext.Get("dir: %s, ", r.Dir)
+	out += gotext.Get("git url: %s, ", r.GitURL)
+	out += gotext.Get("ssh url: %s, ", r.SSHURL)
+	out += gotext.Get("compose: %s, ", r.ComposePath)
+	out += gotext.Get("readme: %s, ", r.ReadmePath)
+	out += gotext.Get("sample env: %s, ", r.SampleEnvPath)
+	out += gotext.Get("abra.sh: %s}", r.AbraShPath)
 	return out
 }
 
@@ -233,7 +234,7 @@ func GetRecipeFeaturesAndCategory(r Recipe) (Features, string, []string, error)
 		feat     = Features{}
 	)
 
-	log.Debugf("%s: attempt recipe metadata parse", r.ReadmePath)
+	log.Debug(gotext.Get("%s: attempt recipe metadata parse", r.ReadmePath))
 
 	readmeFS, err := ioutil.ReadFile(r.ReadmePath)
 	if err != nil {
@@ -321,12 +322,12 @@ func GetImageMetadata(imageRowString, recipeName string) (Image, []string, error
 		if imageRowString != "" {
 			warnMsgs = append(
 				warnMsgs,
-				fmt.Sprintf("%s: image meta has incorrect format: %s", recipeName, imageRowString),
+				gotext.Get("%s: image meta has incorrect format: %s", recipeName, imageRowString),
 			)
 		} else {
 			warnMsgs = append(
 				warnMsgs,
-				fmt.Sprintf("%s: image meta is empty?", recipeName),
+				gotext.Get("%s: image meta is empty?", recipeName),
 			)
 		}
 
@@ -357,14 +358,14 @@ func GetImageMetadata(imageRowString, recipeName string) (Image, []string, error
 func GetStringInBetween(recipeName, str, start, end string) (result string, err error) {
 	s := strings.Index(str, start)
 	if s == -1 {
-		return "", fmt.Errorf("%s: marker string %s not found", recipeName, start)
+		return "", errors.New(gotext.Get("%s: marker string %s not found", recipeName, start))
 	}
 
 	s += len(start)
 	e := strings.Index(str[s:], end)
 
 	if e == -1 {
-		return "", fmt.Errorf("%s: end marker %s not found", recipeName, end)
+		return "", errors.New(gotext.Get("%s: end marker %s not found", recipeName, end))
 	}
 
 	return str[s : s+e], nil
@@ -402,7 +403,7 @@ func readRecipeCatalogueFS(target interface{}) error {
 		return err
 	}
 
-	log.Debugf("read recipe catalogue from file system cache in %s", config.RECIPES_JSON)
+	log.Debug(gotext.Get("read recipe catalogue from file system cache in %s", config.RECIPES_JSON))
 
 	return nil
 }
@@ -431,7 +432,7 @@ func VersionsOfService(recipe, serviceName string, offline bool) ([]string, erro
 		}
 	}
 
-	log.Debugf("detected versions %s for %s", strings.Join(versions, ", "), recipe)
+	log.Debug(gotext.Get("detected versions %s for %s", strings.Join(versions, ", "), recipe))
 
 	return versions, nil
 }
@@ -454,11 +455,11 @@ func GetRecipeMeta(recipeName string, offline bool) (RecipeMeta, error) {
 	recipeMeta, ok := catl[recipeName]
 	if !ok {
 		return RecipeMeta{}, RecipeMissingFromCatalogue{
-			err: fmt.Sprintf("recipe %s does not exist?", recipeName),
+			err: gotext.Get("recipe %s does not exist?", recipeName),
 		}
 	}
 
-	log.Debugf("recipe metadata retrieved for %s", recipeName)
+	log.Debug(gotext.Get("recipe metadata retrieved for %s", recipeName))
 
 	return recipeMeta, nil
 }
@@ -545,13 +546,13 @@ func ReadReposMetadata(debug bool) (RepoCatalogue, error) {
 	reposMeta := make(RepoCatalogue)
 
 	pageIdx := 1
-	bar := formatter.CreateProgressbar(-1, "collecting recipe listing")
+	bar := formatter.CreateProgressbar(-1, gotext.Get("collecting recipe listing"))
 	for {
 		var reposList []RepoMeta
 
 		pagedURL := fmt.Sprintf("%s?page=%v", ReposMetadataURL, pageIdx)
 
-		log.Debugf("fetching repo metadata from %s", pagedURL)
+		log.Debug(gotext.Get("fetching repo metadata from %s", pagedURL))
 
 		if err := web.ReadJSON(pagedURL, &reposList); err != nil {
 			return reposMeta, err
@@ -655,7 +656,7 @@ func UpdateRepositories(repos RepoCatalogue, recipeName string, debug bool) erro
 
 	cloneLimiter := limit.New(3)
 
-	retrieveBar := formatter.CreateProgressbar(barLength, "retrieving recipes")
+	retrieveBar := formatter.CreateProgressbar(barLength, gotext.Get("retrieving recipes"))
 	ch := make(chan string, barLength)
 	for _, repoMeta := range repos {
 		go func(rm RepoMeta) {

pkg/secret/pass.go

@@ -6,12 +6,13 @@ import (
 	"os/exec"
 
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 )
 
 // PassInsertSecret inserts a secret into a pass store.
 func PassInsertSecret(secretValue, secretName, appName, server string) error {
 	if _, err := exec.LookPath("pass"); err != nil {
-		return errors.New("pass command not found on $PATH, is it installed?")
+		return errors.New(gotext.Get("pass command not found on $PATH, is it installed?"))
 	}
 
 	cmd := fmt.Sprintf(
@@ -19,13 +20,13 @@ func PassInsertSecret(secretValue, secretName, appName, server string) error {
 		secretValue, server, appName, secretName,
 	)
 
-	log.Debugf("attempting to run %s", cmd)
+	log.Debug(gotext.Get("attempting to run %s", cmd))
 
 	if err := exec.Command("bash", "-c", cmd).Run(); err != nil {
 		return err
 	}
 
-	log.Infof("%s inserted into pass store", secretName)
+	log.Infof(gotext.Get("%s inserted into pass store", secretName))
 
 	return nil
 }
@@ -33,7 +34,7 @@ func PassInsertSecret(secretValue, secretName, appName, server string) error {
 // PassRmSecret deletes a secret from a pass store.
 func PassRmSecret(secretName, appName, server string) error {
 	if _, err := exec.LookPath("pass"); err != nil {
-		return errors.New("pass command not found on $PATH, is it installed?")
+		return errors.New(gotext.Get("pass command not found on $PATH, is it installed?"))
 	}
 
 	cmd := fmt.Sprintf(
@@ -41,13 +42,13 @@ func PassRmSecret(secretName, appName, server string) error {
 		server, appName, secretName,
 	)
 
-	log.Debugf("attempting to run %s", cmd)
+	log.Debug(gotext.Get("attempting to run %s", cmd))
 
 	if err := exec.Command("bash", "-c", cmd).Run(); err != nil {
 		return err
 	}
 
-	log.Infof("%s removed from pass store", secretName)
+	log.Infof(gotext.Get("%s removed from pass store", secretName))
 
 	return nil
 }

pkg/secret/secret.go

@@ -5,6 +5,7 @@ package secret
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"slices"
 	"strconv"
@@ -21,6 +22,7 @@ import (
 	"github.com/decentral1se/passgen"
 	"github.com/docker/docker/api/types"
 	dockerClient "github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 )
 
 // Secret represents a secret.
@@ -33,6 +35,13 @@ type Secret struct {
 	// variable. For Example:
 	//   SECRET_FOO=v1 # length=12
 	Length int
+	// Charset comes from the charset modifier at the secret version environment
+	// variable. For Example:
+	//   SECRET_FOO=v1 # charset=default,special
+	Charset string
+	// Whether or not to skip generation of the secret or not
+	// For example: SECRET_FOO=v1 # generate=false
+	SkipGenerate bool
 	// RemoteName is the name of the secret on the server. For example:
 	//   name: ${STACK_NAME}_test_pass_two_${SECRET_TEST_PASS_TWO_VERSION}
 	// With the following:
@@ -43,38 +52,34 @@ type Secret struct {
 	RemoteName string
 }
 
-// GeneratePasswords generates passwords.
-func GeneratePasswords(count, length uint) ([]string, error) {
-	passwords, err := passgen.GeneratePasswords(
-		count,
-		length,
-		passgen.AlphabetDefault,
-	)
+// GeneratePassword generates passwords.
+func GeneratePassword(length uint, charset string) (string, error) {
+	passwords, err := passgen.GeneratePasswords(1, length, charset)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
-	log.Debugf("generated %s", strings.Join(passwords, ", "))
+	log.Debug(gotext.Get("generated %s", strings.Join(passwords, ", ")))
 
-	return passwords, nil
+	return passwords[0], nil
 }
 
-// GeneratePassphrases generates human readable and rememberable passphrases.
-func GeneratePassphrases(count uint) ([]string, error) {
+// GeneratePassphrase generates human readable and rememberable passphrases.
+func GeneratePassphrase() (string, error) {
 	passphrases, err := passgen.GeneratePassphrases(
-		count,
+		1,
 		passgen.PassphraseWordCountDefault,
 		rune('-'),
 		passgen.PassphraseCasingDefault,
 		passgen.WordListDefault,
 	)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
-	log.Debugf("generated %s", strings.Join(passphrases, ", "))
+	log.Debug(gotext.Get("generated %s", strings.Join(passphrases, ", ")))
 
-	return passphrases, nil
+	return passphrases[0], nil
 }
 
 // ReadSecretsConfig reads secret names/versions from the recipe config. The
@@ -87,6 +92,7 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 	if err != nil {
 		return nil, err
 	}
+
 	// Set the STACK_NAME to be able to generate the remote name correctly.
 	appEnv["STACK_NAME"] = stackName
 
@@ -95,6 +101,7 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 	if err != nil {
 		return nil, err
 	}
+
 	// Read the compose files without injecting environment variables.
 	configWithoutEnv, err := loader.LoadComposefile(opts, map[string]string{}, loader.SkipInterpolation)
 	if err != nil {
@@ -109,18 +116,18 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 	}
 
 	if len(enabledSecrets) == 0 {
-		log.Debugf("not generating app secrets, none enabled in recipe config")
+		log.Debug(gotext.Get("not generating app secrets, none enabled in recipe config"))
 		return nil, nil
 	}
 
 	secretValues := map[string]Secret{}
 	for secretId, secretConfig := range composeConfig.Secrets {
 		if string(secretConfig.Name[len(secretConfig.Name)-1]) == "_" {
-			return nil, fmt.Errorf("missing version for secret? (%s)", secretId)
+			return nil, errors.New(gotext.Get("missing version for secret? (%s)", secretId))
 		}
 
 		if !(slices.Contains(enabledSecrets, secretId)) {
-			log.Warnf("%s not enabled in recipe config, skipping", secretId)
+			log.Warnf(gotext.Get("%s not enabled in recipe config, skipping", secretId))
 			continue
 		}
 
@@ -129,7 +136,7 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 		value := Secret{Version: secretVersion, RemoteName: secretConfig.Name}
 
 		if len(value.RemoteName) > config.MAX_DOCKER_SECRET_LENGTH {
-			return nil, fmt.Errorf("secret %s is > %d chars when combined with %s", secretId, config.MAX_DOCKER_SECRET_LENGTH, stackName)
+			return nil, errors.New(gotext.Get("secret %s is > %d chars when combined with %s", secretId, config.MAX_DOCKER_SECRET_LENGTH, stackName))
 		}
 
 		// Check if the length modifier is set for this secret.
@@ -142,6 +149,7 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 			if !strings.Contains(configWithoutEnv.Secrets[secretId].Name, envName) {
 				continue
 			}
+
 			lengthRaw, ok := modifierValues["length"]
 			if ok {
 				length, err := strconv.Atoi(lengthRaw)
@@ -150,6 +158,15 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 				}
 				value.Length = length
 			}
+
+			generateRaw, ok := modifierValues["generate"]
+			if ok {
+				if generateRaw == "false" {
+					value.SkipGenerate = true
+				}
+			}
+
+			value.Charset = resolveCharset(modifierValues["charset"])
 			break
 		}
 		secretValues[secretId] = value
@@ -158,6 +175,22 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 	return secretValues, nil
 }
 
+// resolveCharset sets the passgen Alphabet required for a secret
+func resolveCharset(input string) string {
+	switch strings.ToLower(input) {
+	case "special":
+		return passgen.AlphabetSpecial
+	case "safespecial":
+		return "!@#%^&*_-+="
+	case "default,special", "special,default":
+		return passgen.AlphabetDefault + passgen.AlphabetSpecial
+	case "default,safespecial", "safespecial,default":
+		return passgen.AlphabetDefault + "!@#%^&*_-+="
+	default:
+		return passgen.AlphabetDefault // Fallback to default
+	}
+}
+
 // GenerateSecrets generates secrets locally and sends them to a remote server for storage.
 func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server string) (map[string]string, error) {
 	secretsGenerated := map[string]string{}
@@ -170,18 +203,24 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 		go func(secretName string, secret Secret) {
 			defer wg.Done()
 
-			log.Debugf("attempting to generate and store %s on %s", secret.RemoteName, server)
+			if secret.SkipGenerate {
+				log.Debug(gotext.Get("skipping generation of %s (generate=false)", secretName))
+				ch <- nil
+				return
+			}
+
+			log.Debug(gotext.Get("attempting to generate and store %s on %s", secret.RemoteName, server))
 
 			if secret.Length > 0 {
-				passwords, err := GeneratePasswords(1, uint(secret.Length))
+				password, err := GeneratePassword(uint(secret.Length), secret.Charset)
 				if err != nil {
 					ch <- err
 					return
 				}
 
-				if err := client.StoreSecret(cl, secret.RemoteName, passwords[0], server); err != nil {
+				if err := client.StoreSecret(cl, secret.RemoteName, password, server); err != nil {
 					if strings.Contains(err.Error(), "AlreadyExists") {
-						log.Warnf("%s already exists", secret.RemoteName)
+						log.Warnf(gotext.Get("%s already exists", secret.RemoteName))
 						ch <- nil
 					} else {
 						ch <- err
@@ -191,17 +230,17 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 
 				mutex.Lock()
 				defer mutex.Unlock()
-				secretsGenerated[secretName] = passwords[0]
+				secretsGenerated[secretName] = password
 			} else {
-				passphrases, err := GeneratePassphrases(1)
+				passphrase, err := GeneratePassphrase()
 				if err != nil {
 					ch <- err
 					return
 				}
 
-				if err := client.StoreSecret(cl, secret.RemoteName, passphrases[0], server); err != nil {
+				if err := client.StoreSecret(cl, secret.RemoteName, passphrase, server); err != nil {
 					if strings.Contains(err.Error(), "AlreadyExists") {
-						log.Warnf("%s already exists", secret.RemoteName)
+						log.Warnf(gotext.Get("%s already exists", secret.RemoteName))
 						ch <- nil
 					} else {
 						ch <- err
@@ -211,7 +250,7 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 
 				mutex.Lock()
 				defer mutex.Unlock()
-				secretsGenerated[secretName] = passphrases[0]
+				secretsGenerated[secretName] = passphrase
 			}
 			ch <- nil
 		}(n, v)
@@ -226,7 +265,7 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 		}
 	}
 
-	log.Debugf("generated and stored %v on %s", secrets, server)
+	log.Debug(gotext.Get("generated and stored %v on %s", secrets, server))
 
 	return secretsGenerated, nil
 }

pkg/secret/secret_test.go

@@ -17,16 +17,37 @@ func TestReadSecretsConfig(t *testing.T) {
 	assert.Equal(t, "test_example_com_test_pass_one_v2", secretsFromConfig["test_pass_one"].RemoteName)
 	assert.Equal(t, "v2", secretsFromConfig["test_pass_one"].Version)
 	assert.Equal(t, 0, secretsFromConfig["test_pass_one"].Length)
+	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789", secretsFromConfig["test_pass_one"].Charset)
 
 	// Has a length modifier
 	assert.Equal(t, "test_example_com_test_pass_two_v1", secretsFromConfig["test_pass_two"].RemoteName)
 	assert.Equal(t, "v1", secretsFromConfig["test_pass_two"].Version)
 	assert.Equal(t, 10, secretsFromConfig["test_pass_two"].Length)
+	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789", secretsFromConfig["test_pass_two"].Charset)
 
 	// Secret name does not include the secret id
 	assert.Equal(t, "test_example_com_pass_three_v2", secretsFromConfig["test_pass_three"].RemoteName)
 	assert.Equal(t, "v2", secretsFromConfig["test_pass_three"].Version)
 	assert.Equal(t, 0, secretsFromConfig["test_pass_three"].Length)
+	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789", secretsFromConfig["test_pass_three"].Charset)
+
+	// Has a length modifier and a charset=default,safespecial modifier
+	assert.Equal(t, "test_example_com_test_pass_four_v1", secretsFromConfig["test_pass_four"].RemoteName)
+	assert.Equal(t, "v1", secretsFromConfig["test_pass_four"].Version)
+	assert.Equal(t, 12, secretsFromConfig["test_pass_four"].Length)
+	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789!@#%^&*_-+=", secretsFromConfig["test_pass_four"].Charset)
+
+	// Has a length modifier and a charset=default,special modifier
+	assert.Equal(t, "test_example_com_test_pass_five_v1", secretsFromConfig["test_pass_five"].RemoteName)
+	assert.Equal(t, "v1", secretsFromConfig["test_pass_five"].Version)
+	assert.Equal(t, 12, secretsFromConfig["test_pass_five"].Length)
+	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789!@#$%^&*_-+=", secretsFromConfig["test_pass_five"].Charset)
+
+	// Has only a charset=default,special modifier, which gets setted but ignored in the generation
+	assert.Equal(t, "test_example_com_test_pass_six_v1", secretsFromConfig["test_pass_six"].RemoteName)
+	assert.Equal(t, "v1", secretsFromConfig["test_pass_six"].Version)
+	assert.Equal(t, 0, secretsFromConfig["test_pass_six"].Length)
+	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789!@#$%^&*_-+=", secretsFromConfig["test_pass_six"].Charset)
 }
 
 func TestReadSecretsConfigWithLongDomain(t *testing.T) {

pkg/secret/testdir/.env.sample

@@ -1,3 +1,6 @@
 SECRET_TEST_PASS_ONE_VERSION=v2
 SECRET_TEST_PASS_TWO_VERSION=v1 # length=10
 SECRET_TEST_PASS_THREE_VERSION=v2
+SECRET_TEST_PASS_FOUR_VERSION=v1 # length=12 charset=default,safespecial
+SECRET_TEST_PASS_FIVE_VERSION=v1 # length=12 charset=default,special
+SECRET_TEST_PASS_SIX_VERSION=v1 # charset=default,special

pkg/secret/testdir/compose.yaml

@@ -8,6 +8,9 @@ services:
       - test_pass_one
       - test_pass_two
       - test_pass_three
+      - test_pass_four
+      - test_pass_five
+      - test_pass_six
 
 secrets:
   test_pass_one:
@@ -19,3 +22,12 @@ secrets:
   test_pass_three:
     external: true
     name: ${STACK_NAME}_pass_three_${SECRET_TEST_PASS_THREE_VERSION} # secretId and name don't match
+  test_pass_four:
+    external: true
+    name: ${STACK_NAME}_test_pass_four_${SECRET_TEST_PASS_FOUR_VERSION}
+  test_pass_five:
+    external: true
+    name: ${STACK_NAME}_test_pass_five_${SECRET_TEST_PASS_FIVE_VERSION}
+  test_pass_six:
+    external: true
+    name: ${STACK_NAME}_test_pass_six_${SECRET_TEST_PASS_SIX_VERSION}

pkg/server/server.go

@@ -6,22 +6,23 @@ import (
 
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 )
 
 // CreateServerDir creates a server directory under ~/.abra.
 func CreateServerDir(serverName string) error {
 	serverPath := path.Join(config.ABRA_DIR, "servers", serverName)
 
-	if err := os.Mkdir(serverPath, 0764); err != nil {
+	if err := os.Mkdir(serverPath, 0700); err != nil {
 		if !os.IsExist(err) {
 			return err
 		}
 
-		log.Debugf("%s already exists", serverPath)
+		log.Debug(gotext.Get("%s already exists", serverPath))
 		return nil
 	}
 
-	log.Debugf("successfully created %s", serverPath)
+	log.Debug(gotext.Get("successfully created %s", serverPath))
 
 	return nil
 }

pkg/service/service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -12,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 )
 
 // GetService retrieves a service container based on a label. If prompt is true
@@ -25,7 +27,7 @@ func GetServiceByLabel(c context.Context, cl *client.Client, label string, promp
 	}
 
 	if len(services) == 0 {
-		return swarm.Service{}, fmt.Errorf("no services deployed?")
+		return swarm.Service{}, errors.New(gotext.Get("no services deployed?"))
 	}
 
 	var matchingServices []swarm.Service
@@ -36,7 +38,7 @@ func GetServiceByLabel(c context.Context, cl *client.Client, label string, promp
 	}
 
 	if len(matchingServices) == 0 {
-		return swarm.Service{}, fmt.Errorf("no services deployed matching label '%s'?", label)
+		return swarm.Service{}, errors.New(gotext.Get("no services deployed matching label '%s'?", label))
 	}
 
 	if len(matchingServices) > 1 {
@@ -48,15 +50,15 @@ func GetServiceByLabel(c context.Context, cl *client.Client, label string, promp
 		}
 
 		if !prompt {
-			err := fmt.Errorf("expected 1 service but found %v: %s", len(matchingServices), strings.Join(servicesRaw, " "))
+			err := errors.New(gotext.Get("expected 1 service but found %v: %s", len(matchingServices), strings.Join(servicesRaw, " ")))
 			return swarm.Service{}, err
 		}
 
-		log.Warnf("ambiguous service list received, prompting for input")
+		log.Warnf(gotext.Get("ambiguous service list received, prompting for input"))
 
 		var response string
 		prompt := &survey.Select{
-			Message: "which service are you looking for?",
+			Message: gotext.Get("which service are you looking for?"),
 			Options: servicesRaw,
 		}
 
@@ -72,7 +74,7 @@ func GetServiceByLabel(c context.Context, cl *client.Client, label string, promp
 			}
 		}
 
-		log.Fatal("failed to match chosen service")
+		log.Fatal(gotext.Get("failed to match chosen service"))
 	}
 
 	return matchingServices[0], nil
@@ -90,7 +92,7 @@ func GetService(c context.Context, cl *client.Client, filters filters.Args, prom
 
 	if len(services) == 0 {
 		filter := filters.Get("name")[0]
-		return swarm.Service{}, fmt.Errorf("no services matching the %v filter found?", filter)
+		return swarm.Service{}, errors.New(gotext.Get("no services matching the %v filter found?", filter))
 	}
 
 	if len(services) != 1 {
@@ -98,19 +100,19 @@ func GetService(c context.Context, cl *client.Client, filters filters.Args, prom
 		for _, service := range services {
 			serviceName := service.Spec.Name
 			created := formatter.HumanDuration(service.CreatedAt.Unix())
-			servicesRaw = append(servicesRaw, fmt.Sprintf("%s (created %v)", serviceName, created))
+			servicesRaw = append(servicesRaw, gotext.Get("%s (created %v)", serviceName, created))
 		}
 
 		if !prompt {
-			err := fmt.Errorf("expected 1 service but found %v: %s", len(services), strings.Join(servicesRaw, " "))
+			err := errors.New(gotext.Get("expected 1 service but found %v: %s", len(services), strings.Join(servicesRaw, " ")))
 			return swarm.Service{}, err
 		}
 
-		log.Warnf("ambiguous service list received, prompting for input")
+		log.Warnf(gotext.Get("ambiguous service list received, prompting for input"))
 
 		var response string
 		prompt := &survey.Select{
-			Message: "which service are you looking for?",
+			Message: gotext.Get("which service are you looking for?"),
 			Options: servicesRaw,
 		}
 
@@ -126,7 +128,7 @@ func GetService(c context.Context, cl *client.Client, filters filters.Args, prom
 			}
 		}
 
-		log.Fatal("failed to match chosen service")
+		log.Fatal(gotext.Get("failed to match chosen service"))
 	}
 
 	return services[0], nil

pkg/ssh/ssh.go

@@ -1,8 +1,10 @@
 package ssh
 
 import (
-	"fmt"
+	"errors"
 	"strings"
+
+	"github.com/leonelquinteros/gotext"
 )
 
 // Fatal is a error output wrapper which aims to make SSH failures easier to
@@ -11,15 +13,17 @@ func Fatal(hostname string, err error) error {
 	out := err.Error()
 
 	if strings.Contains(out, "Host key verification failed.") {
-		return fmt.Errorf("SSH host key verification failed for %s", hostname)
+		return errors.New(gotext.Get("SSH host key verification failed for %s", hostname))
 	} else if strings.Contains(out, "Could not resolve hostname") {
-		return fmt.Errorf("could not resolve hostname for %s", hostname)
+		return errors.New(gotext.Get("could not resolve hostname for %s", hostname))
 	} else if strings.Contains(out, "Connection timed out") {
-		return fmt.Errorf("connection timed out for %s", hostname)
+		return errors.New(gotext.Get("connection timed out for %s", hostname))
 	} else if strings.Contains(out, "Permission denied") {
-		return fmt.Errorf("ssh auth: permission denied for %s", hostname)
+		return errors.New(gotext.Get("ssh auth: permission denied for %s", hostname))
 	} else if strings.Contains(out, "Network is unreachable") {
-		return fmt.Errorf("unable to connect to %s, please check your SSH config", hostname)
+		return errors.New(gotext.Get("unable to connect to %s, please check your SSH config", hostname))
+	} else if strings.Contains(out, "Is the docker daemon running") {
+		return errors.New(gotext.Get("docker: is the daemon running / your user has docker permissions?"))
 	}
 
 	return err

pkg/ui/deploy.go

@@ -0,0 +1,353 @@
+package ui
+
+import (
+	"context"
+	"encoding/json"
+	"io"
+	"sort"
+	"strings"
+	"time"
+
+	"coopcloud.tech/abra/pkg/formatter"
+	"coopcloud.tech/abra/pkg/logs"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/docker/cli/cli/command/service/progress"
+	containerTypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/filters"
+	dockerClient "github.com/docker/docker/client"
+	"github.com/docker/docker/pkg/jsonmessage"
+	"github.com/leonelquinteros/gotext"
+)
+
+var IsRunning bool
+
+type statusMsg struct {
+	stream  stream
+	jsonMsg jsonmessage.JSONMessage
+}
+
+type progressCompleteMsg struct {
+	stream stream
+	failed bool
+}
+
+type healthcheckMsg struct {
+	stream stream
+	health string
+}
+
+type ServiceMeta struct {
+	Name string
+	ID   string
+}
+
+type Model struct {
+	appName string
+	cl      *dockerClient.Client
+	count   int
+	ctx     context.Context
+	timeout time.Duration
+	width   int
+	filters filters.Args
+
+	Streams  *[]stream
+	Logs     *[]string
+	Failed   bool
+	TimedOut bool
+	Quit     bool
+}
+
+func (m Model) complete() bool {
+	if m.count == len(*m.Streams) {
+		return true
+	}
+	return false
+}
+
+type stream struct {
+	Name string
+	Err  error
+
+	decoder  *json.Decoder
+	id       string
+	reader   *io.PipeReader
+	writer   *io.PipeWriter
+	status   string
+	retries  int
+	health   string
+	rollback bool
+}
+
+func (s stream) String() string {
+	out := gotext.Get("{decoder: %v, ", s.decoder)
+	out += gotext.Get("err: %v, ", s.Err)
+	out += gotext.Get("id: %s, ", s.id)
+	out += gotext.Get("name: %s, ", s.Name)
+	out += gotext.Get("reader: %v, ", s.reader)
+	out += gotext.Get("writer: %v, ", s.writer)
+	out += gotext.Get("status: %s, ", s.status)
+	return out
+}
+
+func (s stream) progress(m Model) tea.Msg {
+	if err := progress.ServiceProgress(m.ctx, m.cl, s.id, s.writer); err != nil {
+		return progressCompleteMsg{
+			stream: s,
+			failed: true,
+		}
+	}
+
+	return progressCompleteMsg{stream: s}
+}
+
+func (s stream) process() tea.Msg {
+	var jsonMsg jsonmessage.JSONMessage
+
+	if err := s.decoder.Decode(&jsonMsg); err != nil {
+		if err == io.EOF {
+			// NOTE(d1): end processing messages
+			return nil
+		}
+	}
+
+	return statusMsg{
+		stream:  s,
+		jsonMsg: jsonMsg,
+	}
+}
+
+func (s stream) healthcheck(m Model) tea.Msg {
+	filters := filters.NewArgs()
+	filters.Add("name", gotext.Get("^%s", s.Name))
+
+	containers, err := m.cl.ContainerList(m.ctx, containerTypes.ListOptions{Filters: filters})
+	if err != nil {
+		s.Err = err
+		return healthcheckMsg{stream: s}
+	}
+
+	if len(containers) == 0 {
+		return healthcheckMsg{stream: s}
+	}
+
+	container := containers[0]
+	containerState, err := m.cl.ContainerInspect(m.ctx, container.ID)
+	if err != nil {
+		s.Err = err
+		return healthcheckMsg{stream: s}
+	}
+
+	var health string
+	if containerState.State.Health != nil {
+		health = containerState.State.Health.Status
+	}
+
+	return healthcheckMsg{stream: s, health: health}
+}
+
+func DeployInitialModel(
+	ctx context.Context,
+	cl *dockerClient.Client,
+	services []ServiceMeta,
+	appName string,
+	timeout time.Duration,
+	filters filters.Args,
+) Model {
+	var streams []stream
+	for _, service := range services {
+		r, w := io.Pipe()
+		d := json.NewDecoder(r)
+		streams = append(streams, stream{
+			Name:    service.Name,
+			id:      service.ID,
+			reader:  r,
+			writer:  w,
+			decoder: d,
+			retries: -1, // NOTE(d1): skip first attempt
+			health:  "?",
+		})
+	}
+
+	sort.Slice(streams, func(i, j int) bool {
+		return streams[i].Name < streams[j].Name
+	})
+
+	return Model{
+		ctx:     ctx,
+		cl:      cl,
+		appName: appName,
+		timeout: timeout,
+		filters: filters,
+		Streams: &streams,
+		Logs:    &[]string{},
+	}
+}
+
+func (m Model) Init() tea.Cmd {
+	var cmds []tea.Cmd
+
+	for _, stream := range *m.Streams {
+		cmds = append(
+			cmds,
+			[]tea.Cmd{
+				func() tea.Msg { return stream.progress(m) },
+				func() tea.Msg { return stream.process() },
+				func() tea.Msg { return stream.healthcheck(m) },
+			}...,
+		)
+	}
+
+	cmds = append(cmds, func() tea.Msg { return deployTimeout(m) })
+	cmds = append(cmds, func() tea.Msg { return m.gatherLogs() })
+
+	return tea.Batch(cmds...)
+}
+
+func (m Model) gatherLogs() tea.Msg {
+	var services []string
+	for _, s := range *m.Streams {
+		services = append(services, s.Name)
+	}
+
+	opts := logs.TailOpts{
+		AppName:  m.appName,
+		Services: services,
+		StdErr:   true,
+		Buffer:   m.Logs,
+		ToBuffer: true,
+		Filters:  m.filters,
+	}
+
+	// NOTE(d1): not interested in log polling errors. if we don't see logs it
+	// will hopefully be self-evident based on what happened in the deployment
+	logs.TailLogs(m.cl, opts)
+
+	return nil
+}
+
+type timeoutMsg struct{}
+
+func deployTimeout(m Model) tea.Msg {
+	<-time.After(m.timeout)
+	return timeoutMsg{}
+}
+
+func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "ctrl+c", "q":
+			m.Quit = true
+			return m, tea.Quit
+		}
+
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+
+	case progressCompleteMsg:
+		if msg.failed {
+			m.Failed = true
+		}
+
+		m.count += 1
+
+		if m.complete() {
+			return m, tea.Quit
+		}
+
+	case timeoutMsg:
+		m.TimedOut = true
+		return m, tea.Quit
+
+	case healthcheckMsg:
+		for idx, s := range *m.Streams {
+			if s.id == msg.stream.id {
+				h := "?"
+				if s.health != "" {
+					h = s.health
+				}
+				if msg.health != "" {
+					h = msg.health
+				}
+				(*m.Streams)[idx].health = h
+			}
+		}
+
+		cmds = append(
+			cmds,
+			func() tea.Msg { return msg.stream.healthcheck(m) },
+		)
+
+	case statusMsg:
+		for idx, s := range *m.Streams {
+			if s.id == msg.stream.id {
+
+				if msg.jsonMsg.ID == "rollback" {
+					m.Failed = true
+					(*m.Streams)[idx].rollback = true
+				}
+
+				if msg.jsonMsg.ID != "overall progress" {
+					newStatus := strings.ToLower(msg.jsonMsg.Status)
+					currentStatus := (*m.Streams)[idx].status
+
+					if !strings.Contains(currentStatus, "starting") &&
+						strings.Contains(newStatus, "starting") {
+						(*m.Streams)[idx].retries += 1
+					}
+
+					if (*m.Streams)[idx].rollback {
+						if msg.jsonMsg.ID == "rollback" {
+							(*m.Streams)[idx].status = newStatus
+						}
+					} else {
+						(*m.Streams)[idx].status = newStatus
+					}
+				}
+			}
+		}
+
+		cmds = append(
+			cmds,
+			func() tea.Msg { return msg.stream.process() },
+		)
+	}
+
+	return m, tea.Batch(cmds...)
+}
+
+func (m Model) View() string {
+	body := strings.Builder{}
+
+	for _, stream := range *m.Streams {
+		split := strings.Split(stream.Name, "_")
+		short := split[len(split)-1]
+
+		status := stream.status
+		if strings.Contains(stream.status, "converged") && !stream.rollback {
+			status = gotext.Get("succeeded")
+		}
+		if strings.Contains(stream.status, "rolled back") {
+			status = gotext.Get("rolled back")
+		}
+
+		retries := 0
+		if stream.retries > 0 {
+			retries = stream.retries
+		}
+
+		output := gotext.Get("%s: %s (retries: %v, healthcheck: %s)",
+			formatter.BoldStyle.Render(short),
+			status,
+			retries,
+			stream.health,
+		)
+
+		body.WriteString(output)
+		body.WriteString("\n")
+	}
+
+	return body.String()
+}

pkg/upstream/commandconn/commandconn.go

@@ -17,7 +17,6 @@ package commandconn
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"io"
 	"net"
 	"os"
@@ -28,6 +27,7 @@ import (
 	"time"
 
 	"coopcloud.tech/abra/pkg/log"
+	"github.com/leonelquinteros/gotext"
 	"github.com/pkg/errors"
 	exec "golang.org/x/sys/execabs"
 )
@@ -46,7 +46,7 @@ func New(ctx context.Context, cmd string, args ...string) (net.Conn, error) {
 	)
 	c.cmd = exec.CommandContext(ctx, cmd, args...)
 	// we assume that args never contains sensitive information
-	log.Debugf("commandconn: starting %s with %v", cmd, args)
+	log.Debug(gotext.Get("commandconn: starting %s with %v", cmd, args))
 	c.cmd.Env = os.Environ()
 	c.cmd.SysProcAttr = &syscall.SysProcAttr{}
 	setPdeathsig(c.cmd)
@@ -62,7 +62,7 @@ func New(ctx context.Context, cmd string, args ...string) (net.Conn, error) {
 	c.cmd.Stderr = &stderrWriter{
 		stderrMu:    &c.stderrMu,
 		stderr:      &c.stderr,
-		debugPrefix: fmt.Sprintf("commandconn (%s):", cmd),
+		debugPrefix: gotext.Get("commandconn (%s):", cmd),
 	}
 	c.localAddr = dummyAddr{network: "dummy", s: "dummy-0"}
 	c.remoteAddr = dummyAddr{network: "dummy", s: "dummy-1"}
@@ -138,7 +138,7 @@ func (c *commandConn) kill() error {
 			return nil
 		}
 	}
-	return errors.Wrapf(werr, "commandconn: failed to wait")
+	return errors.Wrap(werr, gotext.Get("commandconn: failed to wait"))
 }
 
 func (c *commandConn) onEOF(eof error) error {
@@ -159,7 +159,7 @@ func (c *commandConn) onEOF(eof error) error {
 			c.stderrMu.Lock()
 			stderr := c.stderr.String()
 			c.stderrMu.Unlock()
-			return errors.Errorf("command %v did not exit after %v: stderr=%q", c.cmd.Args, eof, stderr)
+			return errors.New(gotext.Get("command %v did not exit after %v: stderr=%q", c.cmd.Args, eof, stderr))
 		}
 	}
 	c.cmdMutex.Unlock()
@@ -169,7 +169,7 @@ func (c *commandConn) onEOF(eof error) error {
 	c.stderrMu.Lock()
 	stderr := c.stderr.String()
 	c.stderrMu.Unlock()
-	return errors.Errorf("command %v has exited with %v, please make sure the URL is valid, and Docker 18.09 or later is installed on the remote host: stderr=%s", c.cmd.Args, werr, stderr)
+	return errors.New(gotext.Get("command %v has exited with %v, please make sure the URL is valid, and Docker 18.09 or later is installed on the remote host: stderr=%s", c.cmd.Args, werr, stderr))
 }
 
 func ignorableCloseError(err error) bool {
@@ -236,7 +236,7 @@ func (c *commandConn) Write(p []byte) (int, error) {
 func (c *commandConn) Close() error {
 	var err error
 	if err = c.CloseRead(); err != nil {
-		log.Warnf("commandConn.Close: CloseRead: %v", err)
+		log.Warnf(gotext.Get("commandConn.Close: CloseRead: %v", err))
 	}
 	if err = c.CloseWrite(); err != nil {
 		// muted because https://github.com/docker/compose/issues/8544
@@ -252,15 +252,15 @@ func (c *commandConn) RemoteAddr() net.Addr {
 	return c.remoteAddr
 }
 func (c *commandConn) SetDeadline(t time.Time) error {
-	log.Debugf("unimplemented call: SetDeadline(%v)", t)
+	log.Debug(gotext.Get("unimplemented call: SetDeadline(%v)", t))
 	return nil
 }
 func (c *commandConn) SetReadDeadline(t time.Time) error {
-	log.Debugf("unimplemented call: SetReadDeadline(%v)", t)
+	log.Debug(gotext.Get("unimplemented call: SetReadDeadline(%v)", t))
 	return nil
 }
 func (c *commandConn) SetWriteDeadline(t time.Time) error {
-	log.Debugf("unimplemented call: SetWriteDeadline(%v)", t)
+	log.Debug(gotext.Get("unimplemented call: SetWriteDeadline(%v)", t))
 	return nil
 }
 

pkg/upstream/commandconn/connection.go

@@ -11,6 +11,7 @@ import (
 	"github.com/docker/cli/cli/context/docker"
 	dCliContextStore "github.com/docker/cli/cli/context/store"
 	dClient "github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 	"github.com/pkg/errors"
 )
 
@@ -34,7 +35,7 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*connhelper.Conne
 	case "ssh":
 		ctxConnDetails, err := ssh.ParseURL(daemonURL)
 		if err != nil {
-			return nil, errors.Wrap(err, "ssh host connection is not valid")
+			return nil, errors.Wrap(err, gotext.Get("ssh host connection is not valid"))
 		}
 
 		return &connhelper.ConnectionHelper{

pkg/upstream/container/exec.go

@@ -11,6 +11,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types/container"
 	apiclient "github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 )
 
 // RunExec runs a command on a remote container. io.Writer corresponds to the
@@ -39,7 +40,7 @@ func RunExec(dockerCli command.Cli, client *apiclient.Client, containerID string
 
 	execID := response.ID
 	if execID == "" {
-		return nil, errors.New("exec ID empty")
+		return nil, errors.New(gotext.Get("exec ID empty"))
 	}
 
 	if execOptions.Detach {
@@ -104,12 +105,12 @@ func interactiveExec(ctx context.Context, dockerCli command.Cli, client *apiclie
 
 	if execOpts.Tty && dockerCli.In().IsTerminal() {
 		if err := MonitorTtySize(ctx, client, dockerCli, execID, true); err != nil {
-			fmt.Fprintln(dockerCli.Err(), "Error monitoring TTY size:", err)
+			fmt.Fprintln(dockerCli.Err(), gotext.Get("Error monitoring TTY size:"), err)
 		}
 	}
 
 	if err := <-errCh; err != nil {
-		log.Debugf("Error hijack: %s", err)
+		log.Debug(gotext.Get("Error hijack: %s", err))
 		return out, err
 	}
 

pkg/upstream/container/hijack.go

@@ -2,7 +2,7 @@ package container // https://github.com/docker/cli/blob/master/cli/command/conta
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"io"
 	"runtime"
 	"sync"
@@ -12,6 +12,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/stdcopy"
+	"github.com/leonelquinteros/gotext"
 	"github.com/moby/term"
 )
 
@@ -39,7 +40,7 @@ type hijackedIOStreamer struct {
 func (h *hijackedIOStreamer) stream(ctx context.Context) error {
 	restoreInput, err := h.setupInput()
 	if err != nil {
-		return fmt.Errorf("unable to setup input stream: %s", err)
+		return errors.New(gotext.Get("unable to setup input stream: %s", err))
 	}
 
 	defer restoreInput()
@@ -78,7 +79,7 @@ func (h *hijackedIOStreamer) setupInput() (restore func(), err error) {
 	}
 
 	if err := setRawTerminal(h.streams); err != nil {
-		return nil, fmt.Errorf("unable to set IO streams as raw terminal: %s", err)
+		return nil, errors.New(gotext.Get("unable to set IO streams as raw terminal: %s", err))
 	}
 
 	// Use sync.Once so we may call restore multiple times but ensure we
@@ -96,7 +97,7 @@ func (h *hijackedIOStreamer) setupInput() (restore func(), err error) {
 	if h.detachKeys != "" {
 		customEscapeKeys, err := term.ToBytes(h.detachKeys)
 		if err != nil {
-			log.Warnf("invalid detach escape keys, using default: %s", err)
+			log.Warnf(gotext.Get("invalid detach escape keys, using default: %s", err))
 		} else {
 			escapeKeys = customEscapeKeys
 		}
@@ -128,10 +129,10 @@ func (h *hijackedIOStreamer) beginOutputStream(restoreInput func()) <-chan error
 			_, err = stdcopy.StdCopy(h.outputStream, h.errorStream, h.resp.Reader)
 		}
 
-		log.Debug("[hijack] End of stdout")
+		log.Debug(gotext.Get("[hijack] end of stdout"))
 
 		if err != nil {
-			log.Debugf("Error receiveStdout: %s", err)
+			log.Debug(gotext.Get("error receiveStdout: %s", err))
 		}
 
 		outputDone <- err
@@ -152,7 +153,7 @@ func (h *hijackedIOStreamer) beginInputStream(restoreInput func()) (doneC <-chan
 			// messages will be in normal type.
 			restoreInput()
 
-			log.Debug("[hijack] End of stdin")
+			log.Debug(gotext.Get("[hijack] End of stdin"))
 
 			if _, ok := err.(term.EscapeError); ok {
 				detached <- err
@@ -163,12 +164,12 @@ func (h *hijackedIOStreamer) beginInputStream(restoreInput func()) (doneC <-chan
 				// This error will also occur on the receive
 				// side (from stdout) where it will be
 				// propagated back to the caller.
-				log.Debugf("Error sendStdin: %s", err)
+				log.Debug(gotext.Get("error sendStdin: %s", err))
 			}
 		}
 
 		if err := h.resp.CloseWrite(); err != nil {
-			log.Debugf("Couldn't send EOF: %s", err)
+			log.Debug(gotext.Get("couldn't send EOF: %s", err))
 		}
 
 		close(inputDone)

pkg/upstream/container/tty.go

@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
 	apiclient "github.com/docker/docker/client"
+	"github.com/leonelquinteros/gotext"
 	"github.com/moby/sys/signal"
 )
 
@@ -35,7 +36,7 @@ func resizeTtyTo(ctx context.Context, client client.ContainerAPIClient, id strin
 	}
 
 	if err != nil {
-		log.Debugf("Error resize: %s\r", err)
+		log.Debug(gotext.Get("error resize: %s\r", err))
 	}
 	return err
 }
@@ -62,7 +63,7 @@ func initTtySize(ctx context.Context, client *apiclient.Client, cli command.Cli,
 				}
 			}
 			if err != nil {
-				fmt.Fprintln(cli.Err(), "failed to resize tty, using default size")
+				fmt.Fprintln(cli.Err(), gotext.Get("failed to resize tty, using default size"))
 			}
 		}()
 	}

pkg/upstream/convert/service.go

@@ -18,6 +18,7 @@ import (
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/client"
 	"github.com/docker/go-units"
+	"github.com/leonelquinteros/gotext"
 	"github.com/pkg/errors"
 )
 
@@ -39,7 +40,7 @@ func ParseSecrets(client client.SecretAPIClient, requestedSecrets []*swarmtypes.
 
 	for _, secret := range requestedSecrets {
 		if _, exists := secretRefs[secret.File.Name]; exists {
-			return nil, errors.Errorf("duplicate secret target for %s not allowed", secret.SecretName)
+			return nil, errors.New(gotext.Get("duplicate secret target for %s not allowed", secret.SecretName))
 		}
 		secretRef := new(swarmtypes.SecretReference)
 		*secretRef = *secret
@@ -68,7 +69,7 @@ func ParseSecrets(client client.SecretAPIClient, requestedSecrets []*swarmtypes.
 	for _, ref := range secretRefs {
 		id, ok := foundSecrets[ref.SecretName]
 		if !ok {
-			return nil, errors.Errorf("secret not found: %s", ref.SecretName)
+			return nil, errors.New(gotext.Get("secret not found: %s", ref.SecretName))
 		}
 
 		// set the id for the ref to properly assign in swarm
@@ -118,7 +119,7 @@ func ParseConfigs(client client.ConfigAPIClient, requestedConfigs []*swarmtypes.
 		}
 
 		if _, exists := configRefs[config.File.Name]; exists {
-			return nil, errors.Errorf("duplicate config target for %s not allowed", config.ConfigName)
+			return nil, errors.New(gotext.Get("duplicate config target for %s not allowed", config.ConfigName))
 		}
 
 		configRefs[config.File.Name] = configRef
@@ -149,7 +150,7 @@ func ParseConfigs(client client.ConfigAPIClient, requestedConfigs []*swarmtypes.
 	for _, ref := range configRefs {
 		id, ok := foundConfigs[ref.ConfigName]
 		if !ok {
-			return nil, errors.Errorf("config not found: %s", ref.ConfigName)
+			return nil, errors.New(gotext.Get("config not found: %s", ref.ConfigName))
 		}
 
 		// set the id for the ref to properly assign in swarm
@@ -164,7 +165,7 @@ func ParseConfigs(client client.ConfigAPIClient, requestedConfigs []*swarmtypes.
 	for _, ref := range runtimeRefs {
 		id, ok := foundConfigs[ref.ConfigName]
 		if !ok {
-			return nil, errors.Errorf("config not found: %s", ref.ConfigName)
+			return nil, errors.New(gotext.Get("config not found: %s", ref.ConfigName))
 		}
 
 		ref.ConfigID = id
@@ -371,7 +372,7 @@ func convertServiceNetworks(
 	for networkName, network := range networks {
 		networkConfig, ok := networkConfigs[networkName]
 		if !ok && networkName != defaultNetwork {
-			return nil, errors.Errorf("undefined network %q", networkName)
+			return nil, errors.New(gotext.Get("undefined network %q", networkName))
 		}
 		var aliases []string
 		if network != nil {
@@ -410,7 +411,7 @@ func convertServiceSecrets(
 	lookup := func(key string) (composetypes.FileObjectConfig, error) {
 		secretSpec, exists := secretSpecs[key]
 		if !exists {
-			return composetypes.FileObjectConfig{}, errors.Errorf("undefined secret %q", key)
+			return composetypes.FileObjectConfig{}, errors.New(gotext.Get("undefined secret %q", key))
 		}
 		return composetypes.FileObjectConfig(secretSpec), nil
 	}
@@ -458,7 +459,7 @@ func convertServiceConfigObjs(
 	lookup := func(key string) (composetypes.FileObjectConfig, error) {
 		configSpec, exists := configSpecs[key]
 		if !exists {
-			return composetypes.FileObjectConfig{}, errors.Errorf("undefined config %q", key)
+			return composetypes.FileObjectConfig{}, errors.New(gotext.Get("undefined config %q", key))
 		}
 		return composetypes.FileObjectConfig(configSpec), nil
 	}
@@ -600,7 +601,7 @@ func convertHealthcheck(healthcheck *composetypes.HealthCheckConfig) (*container
 	)
 	if healthcheck.Disable {
 		if len(healthcheck.Test) != 0 {
-			return nil, errors.Errorf("test and disable can't be set at the same time")
+			return nil, errors.New(gotext.Get("test and disable can't be set at the same time"))
 		}
 		return &container.HealthConfig{
 			Test: []string{"NONE"},
@@ -648,7 +649,7 @@ func convertRestartPolicy(restart string, source *composetypes.RestartPolicy) (*
 				MaxAttempts: &attempts,
 			}, nil
 		default:
-			return nil, errors.Errorf("unknown restart policy: %s", restart)
+			return nil, errors.New(gotext.Get("unknown restart policy: %s", restart))
 		}
 	}
 
@@ -770,13 +771,13 @@ func convertDeployMode(mode string, replicas *uint64) (swarm.ServiceMode, error)
 	switch mode {
 	case "global":
 		if replicas != nil {
-			return serviceMode, errors.Errorf("replicas can only be used with replicated mode")
+			return serviceMode, errors.New(gotext.Get("replicas can only be used with replicated mode"))
 		}
 		serviceMode.Global = &swarm.GlobalService{}
 	case "replicated", "":
 		serviceMode.Replicated = &swarm.ReplicatedService{Replicas: replicas}
 	default:
-		return serviceMode, errors.Errorf("Unknown mode: %s", mode)
+		return serviceMode, errors.New(gotext.Get("unknown mode: %s", mode))
 	}
 	return serviceMode, nil
 }
@@ -809,9 +810,9 @@ func convertCredentialSpec(namespace Namespace, spec composetypes.CredentialSpec
 	case l == 0:
 		return nil, nil
 	case l == 2:
-		return nil, errors.Errorf("invalid credential spec: cannot specify both %s and %s", o[0], o[1])
+		return nil, errors.New(gotext.Get("invalid credential spec: cannot specify both %s and %s", o[0], o[1]))
 	case l > 2:
-		return nil, errors.Errorf("invalid credential spec: cannot specify both %s, and %s", strings.Join(o[:l-1], ", "), o[l-1])
+		return nil, errors.New(gotext.Get("invalid credential spec: cannot specify both %s, and %s", strings.Join(o[:l-1], ", "), o[l-1]))
 	}
 	swarmCredSpec := swarm.CredentialSpec(spec)
 	// if we're using a swarm Config for the credential spec, over-write it
@@ -830,7 +831,7 @@ func convertCredentialSpec(namespace Namespace, spec composetypes.CredentialSpec
 				return &swarmCredSpec, nil
 			}
 		}
-		return nil, errors.Errorf("invalid credential spec: spec specifies config %v, but no such config can be found", swarmCredSpec.Config)
+		return nil, errors.New(gotext.Get("invalid credential spec: spec specifies config %v, but no such config can be found", swarmCredSpec.Config))
 	}
 	return &swarmCredSpec, nil
 }

pkg/upstream/convert/volume.go

@@ -3,6 +3,7 @@ package convert // https://github.com/docker/cli/blob/master/cli/compose/convert
 import (
 	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/api/types/mount"
+	"github.com/leonelquinteros/gotext"
 	"github.com/pkg/errors"
 )
 
@@ -40,10 +41,10 @@ func handleVolumeToMount(
 	result := createMountFromVolume(volume)
 
 	if volume.Tmpfs != nil {
-		return mount.Mount{}, errors.New("tmpfs options are incompatible with type volume")
+		return mount.Mount{}, errors.New(gotext.Get("tmpfs options are incompatible with type volume"))
 	}
 	if volume.Bind != nil {
-		return mount.Mount{}, errors.New("bind options are incompatible with type volume")
+		return mount.Mount{}, errors.New(gotext.Get("bind options are incompatible with type volume"))
 	}
 	// Anonymous volumes
 	if volume.Source == "" {
@@ -52,7 +53,7 @@ func handleVolumeToMount(
 
 	stackVolume, exists := stackVolumes[volume.Source]
 	if !exists {
-		return mount.Mount{}, errors.Errorf("undefined volume %q", volume.Source)
+		return mount.Mount{}, errors.New(gotext.Get("undefined volume %q", volume.Source))
 	}
 
 	result.Source = namespace.Scope(volume.Source)
@@ -86,13 +87,13 @@ func handleBindToMount(volume composetypes.ServiceVolumeConfig) (mount.Mount, er
 	result := createMountFromVolume(volume)
 
 	if volume.Source == "" {
-		return mount.Mount{}, errors.New("invalid bind source, source cannot be empty")
+		return mount.Mount{}, errors.New(gotext.Get("invalid bind source, source cannot be empty"))
 	}
 	if volume.Volume != nil {
-		return mount.Mount{}, errors.New("volume options are incompatible with type bind")
+		return mount.Mount{}, errors.New(gotext.Get("volume options are incompatible with type bind"))
 	}
 	if volume.Tmpfs != nil {
-		return mount.Mount{}, errors.New("tmpfs options are incompatible with type bind")
+		return mount.Mount{}, errors.New(gotext.Get("tmpfs options are incompatible with type bind"))
 	}
 	if volume.Bind != nil {
 		result.BindOptions = &mount.BindOptions{
@@ -106,13 +107,13 @@ func handleTmpfsToMount(volume composetypes.ServiceVolumeConfig) (mount.Mount, e
 	result := createMountFromVolume(volume)
 
 	if volume.Source != "" {
-		return mount.Mount{}, errors.New("invalid tmpfs source, source must be empty")
+		return mount.Mount{}, errors.New(gotext.Get("invalid tmpfs source, source must be empty"))
 	}
 	if volume.Bind != nil {
-		return mount.Mount{}, errors.New("bind options are incompatible with type tmpfs")
+		return mount.Mount{}, errors.New(gotext.Get("bind options are incompatible with type tmpfs"))
 	}
 	if volume.Volume != nil {
-		return mount.Mount{}, errors.New("volume options are incompatible with type tmpfs")
+		return mount.Mount{}, errors.New(gotext.Get("volume options are incompatible with type tmpfs"))
 	}
 	if volume.Tmpfs != nil {
 		result.TmpfsOptions = &mount.TmpfsOptions{
@@ -126,13 +127,13 @@ func handleNpipeToMount(volume composetypes.ServiceVolumeConfig) (mount.Mount, e
 	result := createMountFromVolume(volume)
 
 	if volume.Source == "" {
-		return mount.Mount{}, errors.New("invalid npipe source, source cannot be empty")
+		return mount.Mount{}, errors.New(gotext.Get("invalid npipe source, source cannot be empty"))
 	}
 	if volume.Volume != nil {
-		return mount.Mount{}, errors.New("volume options are incompatible with type npipe")
+		return mount.Mount{}, errors.New(gotext.Get("volume options are incompatible with type npipe"))
 	}
 	if volume.Tmpfs != nil {
-		return mount.Mount{}, errors.New("tmpfs options are incompatible with type npipe")
+		return mount.Mount{}, errors.New(gotext.Get("tmpfs options are incompatible with type npipe"))
 	}
 	if volume.Bind != nil {
 		result.BindOptions = &mount.BindOptions{
@@ -158,5 +159,5 @@ func convertVolumeToMount(
 	case "npipe":
 		return handleNpipeToMount(volume)
 	}
-	return mount.Mount{}, errors.New("volume type must be volume, bind, tmpfs or npipe")
+	return mount.Mount{}, errors.New(gotext.Get("volume type must be volume, bind, tmpfs or npipe"))
 }

pkg/upstream/stack/remove.go

@@ -3,8 +3,11 @@ package stack // https://github.com/docker/cli/blob/master/cli/command/stack/rem
 import (
 	"context"
 	"fmt"
+	"os"
+	"os/signal"
 	"sort"
 	"strings"
+	"time"
 
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/docker/api/types"
@@ -18,57 +21,87 @@ import (
 
 // RunRemove is the swarm implementation of docker stack remove
 func RunRemove(ctx context.Context, client *apiclient.Client, opts Remove) error {
-	var errs []string
-	for _, namespace := range opts.Namespaces {
-		services, err := GetStackServices(ctx, client, namespace)
-		if err != nil {
-			return err
-		}
+	sigIntCh := make(chan os.Signal, 1)
+	signal.Notify(sigIntCh, os.Interrupt)
+	defer signal.Stop(sigIntCh)
 
-		networks, err := getStackNetworks(ctx, client, namespace)
-		if err != nil {
-			return err
-		}
+	waitCh := make(chan struct{})
+	errCh := make(chan error)
 
-		var secrets []swarm.Secret
-		if versions.GreaterThanOrEqualTo(client.ClientVersion(), "1.25") {
-			secrets, err = getStackSecrets(ctx, client, namespace)
+	go func() {
+		var errs []string
+		for _, namespace := range opts.Namespaces {
+			services, err := GetStackServices(ctx, client, namespace)
 			if err != nil {
-				return err
+				errCh <- err
+				return
+			}
+
+			networks, err := getStackNetworks(ctx, client, namespace)
+			if err != nil {
+				errCh <- err
+				return
+			}
+
+			var secrets []swarm.Secret
+			if versions.GreaterThanOrEqualTo(client.ClientVersion(), "1.25") {
+				secrets, err = getStackSecrets(ctx, client, namespace)
+				if err != nil {
+					errCh <- err
+					return
+				}
+			}
+
+			var configs []swarm.Config
+			if versions.GreaterThanOrEqualTo(client.ClientVersion(), "1.30") {
+				configs, err = getStackConfigs(ctx, client, namespace)
+				if err != nil {
+					errCh <- err
+					return
+				}
+			}
+
+			if len(services)+len(networks)+len(secrets)+len(configs) == 0 {
+				log.Warnf("nothing found in stack: %s", namespace)
+				continue
+			}
+
+			hasError := removeServices(ctx, client, services)
+			hasError = removeSecrets(ctx, client, secrets) || hasError
+			hasError = removeConfigs(ctx, client, configs) || hasError
+			hasError = removeNetworks(ctx, client, networks) || hasError
+
+			if hasError {
+				errs = append(errs, fmt.Sprintf("failed to remove some resources from stack: %s", namespace))
+				continue
+			}
+
+			log.Info("polling undeploy status")
+			timeout, err := waitOnTasks(ctx, client, namespace)
+			if timeout {
+				errs = append(errs, err.Error())
+			} else {
+				if err != nil {
+					errs = append(errs, fmt.Sprintf("failed to wait on tasks of stack: %s: %s", namespace, err))
+				}
 			}
 		}
 
-		var configs []swarm.Config
-		if versions.GreaterThanOrEqualTo(client.ClientVersion(), "1.30") {
-			configs, err = getStackConfigs(ctx, client, namespace)
-			if err != nil {
-				return err
-			}
+		if len(errs) > 0 {
+			errCh <- errors.New(strings.Join(errs, "\n"))
+			return
 		}
 
-		if len(services)+len(networks)+len(secrets)+len(configs) == 0 {
-			log.Warnf("nothing found in stack: %s", namespace)
-			continue
-		}
+		close(waitCh)
+	}()
 
-		hasError := removeServices(ctx, client, services)
-		hasError = removeSecrets(ctx, client, secrets) || hasError
-		hasError = removeConfigs(ctx, client, configs) || hasError
-		hasError = removeNetworks(ctx, client, networks) || hasError
-
-		if hasError {
-			errs = append(errs, fmt.Sprintf("failed to remove some resources from stack: %s", namespace))
-			continue
-		}
-
-		err = waitOnTasks(ctx, client, namespace)
-		if err != nil {
-			errs = append(errs, fmt.Sprintf("failed to wait on tasks of stack: %s: %s", namespace, err))
-		}
-	}
-
-	if len(errs) > 0 {
-		return errors.Errorf(strings.Join(errs, "\n"))
+	select {
+	case <-waitCh:
+		return nil
+	case <-sigIntCh:
+		return fmt.Errorf("skipping as requested, undeploy still in progress 🟠")
+	case err := <-errCh:
+		return err
 	}
 
 	return nil
@@ -88,7 +121,7 @@ func removeServices(
 	var hasError bool
 	sort.Slice(services, sortServiceByName(services))
 	for _, service := range services {
-		log.Infof("removing service %s", service.Spec.Name)
+		log.Debugf("removing service %s", service.Spec.Name)
 		if err := client.ServiceRemove(ctx, service.ID); err != nil {
 			hasError = true
 			log.Fatalf("failed to remove service %s: %s", service.ID, err)
@@ -104,7 +137,7 @@ func removeNetworks(
 ) bool {
 	var hasError bool
 	for _, network := range networks {
-		log.Infof("removing network %s", network.Name)
+		log.Debugf("removing network %s", network.Name)
 		if err := client.NetworkRemove(ctx, network.ID); err != nil {
 			hasError = true
 			log.Fatalf("failed to remove network %s: %s", network.ID, err)
@@ -120,7 +153,7 @@ func removeSecrets(
 ) bool {
 	var hasError bool
 	for _, secret := range secrets {
-		log.Infof("removing secret %s", secret.Spec.Name)
+		log.Debugf("removing secret %s", secret.Spec.Name)
 		if err := client.SecretRemove(ctx, secret.ID); err != nil {
 			hasError = true
 			log.Fatalf("Failed to remove secret %s: %s", secret.ID, err)
@@ -136,7 +169,7 @@ func removeConfigs(
 ) bool {
 	var hasError bool
 	for _, config := range configs {
-		log.Infof("removing config %s", config.Spec.Name)
+		log.Debugf("removing config %s", config.Spec.Name)
 		if err := client.ConfigRemove(ctx, config.ID); err != nil {
 			hasError = true
 			log.Fatalf("failed to remove config %s: %s", config.ID, err)
@@ -170,12 +203,23 @@ func terminalState(state swarm.TaskState) bool {
 	return numberedStates[state] > numberedStates[swarm.TaskStateRunning]
 }
 
-func waitOnTasks(ctx context.Context, client apiclient.APIClient, namespace string) error {
+func waitOnTasks(ctx context.Context, client apiclient.APIClient, namespace string) (bool, error) {
+	var timedOut bool
+
+	log.Debugf("waiting on undeploy tasks (timeout=%v secs)", WaitTimeout)
+
+	go func() {
+		t := time.Duration(WaitTimeout) * time.Second
+		<-time.After(t)
+		log.Debug("timed out on undeploy")
+		timedOut = true
+	}()
+
 	terminalStatesReached := 0
 	for {
 		tasks, err := getStackTasks(ctx, client, namespace)
 		if err != nil {
-			return fmt.Errorf("failed to get tasks: %w", err)
+			return false, fmt.Errorf("failed to get tasks: %w", err)
 		}
 
 		for _, task := range tasks {
@@ -188,6 +232,11 @@ func waitOnTasks(ctx context.Context, client apiclient.APIClient, namespace stri
 		if terminalStatesReached == len(tasks) {
 			break
 		}
+
+		if timedOut {
+			return true, fmt.Errorf("deployment timed out 🟠")
+		}
 	}
-	return nil
+
+	return false, nil
 }

pkg/upstream/stack/stack.go

@@ -3,20 +3,21 @@ package stack // https://github.com/docker/cli/blob/master/cli/command/stack/swa
 import (
 	"context"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"os"
-	"os/signal"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 
 	stdlibErr "errors"
 
+	tea "github.com/charmbracelet/bubbletea"
+
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/ui"
 	"coopcloud.tech/abra/pkg/upstream/convert"
-	"github.com/docker/cli/cli/command/service/progress"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/stack/formatter"
 	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/api/types"
@@ -177,7 +178,7 @@ func IsDeployed(ctx context.Context, cl *dockerClient.Client, stackName string)
 func pruneServices(ctx context.Context, cl *dockerClient.Client, namespace convert.Namespace, services map[string]struct{}) {
 	oldServices, err := GetStackServices(ctx, cl, namespace.Name())
 	if err != nil {
-		log.Infof("failed to list services: %s", err)
+		log.Warnf("failed to list services: %s", err)
 	}
 
 	pruneServices := []swarm.Service{}
@@ -191,7 +192,17 @@ func pruneServices(ctx context.Context, cl *dockerClient.Client, namespace conve
 }
 
 // RunDeploy is the swarm implementation of docker stack deploy
-func RunDeploy(cl *dockerClient.Client, opts Deploy, cfg *composetypes.Config, appName string, dontWait bool) error {
+func RunDeploy(
+	cl *dockerClient.Client,
+	opts Deploy,
+	cfg *composetypes.Config,
+	appName string,
+	serverName string,
+	dontWait bool,
+	filters filters.Args,
+) error {
+	log.Info("initialising deployment")
+
 	if err := validateResolveImageFlag(&opts); err != nil {
 		return err
 	}
@@ -201,7 +212,16 @@ func RunDeploy(cl *dockerClient.Client, opts Deploy, cfg *composetypes.Config, a
 		opts.ResolveImage = ResolveImageNever
 	}
 
-	return deployCompose(context.Background(), cl, opts, cfg, appName, dontWait)
+	return deployCompose(
+		context.Background(),
+		cl,
+		opts,
+		cfg,
+		appName,
+		serverName,
+		dontWait,
+		filters,
+	)
 }
 
 // validateResolveImageFlag validates the opts.resolveImage command line option
@@ -214,7 +234,16 @@ func validateResolveImageFlag(opts *Deploy) error {
 	}
 }
 
-func deployCompose(ctx context.Context, cl *dockerClient.Client, opts Deploy, config *composetypes.Config, appName string, dontWait bool) error {
+func deployCompose(
+	ctx context.Context,
+	cl *dockerClient.Client,
+	opts Deploy,
+	config *composetypes.Config,
+	appName string,
+	serverName string,
+	dontWait bool,
+	filters filters.Args,
+) error {
 	namespace := convert.NewNamespace(opts.Namespace)
 
 	if opts.Prune {
@@ -255,7 +284,14 @@ func deployCompose(ctx context.Context, cl *dockerClient.Client, opts Deploy, co
 		return err
 	}
 
-	serviceIDs, err := deployServices(ctx, cl, services, namespace, opts.SendRegistryAuth, opts.ResolveImage)
+	serviceIDs, err := deployServices(
+		ctx,
+		cl,
+		services,
+		namespace,
+		opts.SendRegistryAuth,
+		opts.ResolveImage,
+	)
 	if err != nil {
 		return err
 	}
@@ -265,13 +301,16 @@ func deployCompose(ctx context.Context, cl *dockerClient.Client, opts Deploy, co
 		return nil
 	}
 
-	log.Infof("waiting for %s to deploy... please hold 🤚", appName)
-
-	if err := waitOnServices(ctx, cl, serviceIDs, appName); err != nil {
-		return err
+	waitOpts := WaitOpts{
+		Services:   serviceIDs,
+		AppName:    appName,
+		ServerName: serverName,
+		Filters:    filters,
 	}
 
-	log.Infof("successfully deployed %s", appName)
+	if err := WaitOnServices(ctx, cl, waitOpts); err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -343,7 +382,7 @@ func createConfigs(ctx context.Context, cl *dockerClient.Client, configs []swarm
 			}
 		case dockerClient.IsErrNotFound(err):
 			// config does not exist, then we create a new one.
-			log.Infof("creating config %s", configSpec.Name)
+			log.Debugf("creating config %s", configSpec.Name)
 			if _, err := cl.ConfigCreate(ctx, configSpec); err != nil {
 				return errors.Wrapf(err, "failed to create config %s", configSpec.Name)
 			}
@@ -374,7 +413,7 @@ func createNetworks(ctx context.Context, cl *dockerClient.Client, namespace conv
 			createOpts.Driver = defaultNetworkDriver
 		}
 
-		log.Infof("creating network %s", name)
+		log.Debugf("creating network %s", name)
 		if _, err := cl.NetworkCreate(ctx, name, createOpts); err != nil {
 			return errors.Wrapf(err, "failed to create network %s", name)
 		}
@@ -388,10 +427,13 @@ func deployServices(
 	services map[string]swarm.ServiceSpec,
 	namespace convert.Namespace,
 	sendAuth bool,
-	resolveImage string) ([]string, error) {
+	resolveImage string,
+) ([]ui.ServiceMeta, error) {
+	var servicesMeta []ui.ServiceMeta
+
 	existingServices, err := GetStackServices(ctx, cl, namespace.Name())
 	if err != nil {
-		return nil, err
+		return servicesMeta, err
 	}
 
 	existingServiceMap := make(map[string]swarm.Service)
@@ -399,8 +441,6 @@ func deployServices(
 		existingServiceMap[service.Spec.Name] = service
 	}
 
-	var serviceIDs []string
-
 	for internalName, serviceSpec := range services {
 		var (
 			name        = namespace.Scope(internalName)
@@ -408,8 +448,23 @@ func deployServices(
 			encodedAuth string
 		)
 
+		// When sendAuth is set, use the docker cli to retrieve the auth token
+		// for the image we are deploying.
+		// This enables using a private registry by running docker login on the
+		// machine, that abra is executed.
+		if sendAuth {
+			dockerCLI, err := command.NewDockerCli()
+			if err != nil {
+				log.Errorf("retrieving docker auth token: failed create docker cli: %s", err)
+			}
+			encodedAuth, err = command.RetrieveAuthTokenFromImage(dockerCLI.ConfigFile(), image)
+			if err != nil {
+				log.Errorf("failed to retrieve registry auth for image %s: %s", image, err)
+			}
+		}
+
 		if service, exists := existingServiceMap[name]; exists {
-			log.Infof("updating %s", name)
+			log.Debugf("updating %s", name)
 
 			updateOpts := types.ServiceUpdateOptions{EncodedRegistryAuth: encodedAuth}
 
@@ -451,9 +506,12 @@ func deployServices(
 				log.Warn(warning)
 			}
 
-			serviceIDs = append(serviceIDs, service.ID)
+			servicesMeta = append(servicesMeta, ui.ServiceMeta{
+				Name: name,
+				ID:   service.ID,
+			})
 		} else {
-			log.Infof("creating %s", name)
+			log.Debugf("creating %s", name)
 
 			createOpts := types.ServiceCreateOptions{EncodedRegistryAuth: encodedAuth}
 
@@ -467,11 +525,14 @@ func deployServices(
 				return nil, errors.Wrapf(err, "failed to create %s", name)
 			}
 
-			serviceIDs = append(serviceIDs, serviceCreateResponse.ID)
+			servicesMeta = append(servicesMeta, ui.ServiceMeta{
+				Name: name,
+				ID:   serviceCreateResponse.ID,
+			})
 		}
 	}
 
-	return serviceIDs, nil
+	return servicesMeta, nil
 }
 
 func getStackNetworks(ctx context.Context, dockerclient client.APIClient, namespace string) ([]networktypes.Inspect, error) {
@@ -486,67 +547,89 @@ func getStackConfigs(ctx context.Context, dockerclient client.APIClient, namespa
 	return dockerclient.ConfigList(ctx, types.ConfigListOptions{Filters: getStackFilter(namespace)})
 }
 
-func waitOnServices(ctx context.Context, cl *dockerClient.Client, serviceIDs []string, appName string) error {
-	var errs []error
+func timestamp() string {
+	ts := time.Now().UTC().Format(time.RFC3339)
+	return strings.Replace(ts, ":", "", -1) // get rid of offensive colons
+}
 
-	for _, serviceID := range serviceIDs {
-		if err := WaitOnService(ctx, cl, serviceID, appName); err != nil {
-			errs = append(errs, fmt.Errorf("%s: %w", serviceID, err))
-		}
+type WaitOpts struct {
+	AppName    string
+	Filters    filters.Args
+	NoLog      bool
+	Quiet      bool
+	ServerName string
+	Services   []ui.ServiceMeta
+}
+
+func WaitOnServices(ctx context.Context, cl *dockerClient.Client, opts WaitOpts) error {
+	timeout := time.Duration(WaitTimeout) * time.Second
+	model := ui.DeployInitialModel(ctx, cl, opts.Services, opts.AppName, timeout, opts.Filters)
+	tui := tea.NewProgram(model)
+
+	if !opts.Quiet {
+		log.Info("polling deployment status")
 	}
 
-	if len(errs) > 0 {
+	m, err := log.Without(
+		func() (tea.Model, error) {
+			return tui.Run()
+		},
+	)
+	if err != nil {
+		return fmt.Errorf("waitOnServices: error running TUI: %s", err)
+	}
+
+	deployModel := m.(ui.Model)
+	if deployModel.TimedOut || deployModel.Failed || deployModel.Quit {
+		var errs []error
+
+		if deployModel.Failed {
+			errs = append(errs, fmt.Errorf("deploy failed 🛑"))
+		} else if deployModel.TimedOut {
+			errs = append(errs, fmt.Errorf("deploy timed out 🟠"))
+		} else {
+			errs = append(errs, fmt.Errorf("deploy in progress 🟠"))
+		}
+
+		for _, s := range *deployModel.Streams {
+			if s.Err != nil {
+				errs = append(errs, fmt.Errorf("%s: %s", s.Name, s.Err))
+			}
+		}
+
+		if len(*deployModel.Logs) > 0 && !opts.NoLog {
+			logsPath := filepath.Join(
+				config.LOGS_DIR,
+				opts.ServerName,
+				fmt.Sprintf("%s_%s", opts.AppName, timestamp()),
+			)
+
+			if err := os.MkdirAll(filepath.Join(config.LOGS_DIR, opts.ServerName), 0o764); err != nil {
+				return fmt.Errorf("waitOnServices: error creating log dir: %s", err)
+			}
+
+			file, err := os.Create(logsPath)
+			if err != nil {
+				return fmt.Errorf("waitOnServices: error opening file: %s", err)
+			}
+			defer file.Close()
+
+			s := strings.Join(*deployModel.Logs, "\n")
+			if _, err := file.WriteString(s); err != nil {
+				return fmt.Errorf("waitOnServices: writeFile: %s", err)
+			}
+
+			errs = append(errs, fmt.Errorf("logs: %s", logsPath))
+		}
+
 		return stdlibErr.Join(errs...)
 	}
 
-	return nil
-}
-
-// https://github.com/docker/cli/blob/master/cli/command/service/helpers.go
-// https://github.com/docker/cli/blob/master/cli/command/service/progress/progress.go
-func WaitOnService(ctx context.Context, cl *dockerClient.Client, serviceID, appName string) error {
-	errChan := make(chan error, 1)
-	pipeReader, pipeWriter := io.Pipe()
-
-	sigintChannel := make(chan os.Signal, 1)
-	signal.Notify(sigintChannel, os.Interrupt)
-	defer signal.Stop(sigintChannel)
-
-	go func() {
-		errChan <- progress.ServiceProgress(ctx, cl, serviceID, pipeWriter)
-	}()
-
-	go io.Copy(ioutil.Discard, pipeReader)
-
-	timeout := time.Duration(WaitTimeout) * time.Second
-
-	select {
-	case err := <-errChan:
-		return err
-	case <-sigintChannel:
-		return fmt.Errorf(`
-Not waiting for %s to deploy. The deployment is ongoing...
-
-If you want to stop the deployment, try:
-
-    abra app undeploy %s`, appName, appName)
-	case <-time.After(timeout):
-		return fmt.Errorf(`
-%s has not converged (%s second timeout reached).
-
-This does not necessarily mean your deployment has failed, it may just be that
-the app is taking longer to deploy based on your server resources or network
-latency.
-
-You can track latest deployment status with:
-
-    abra app ps %s
-
-And inspect the logs with:
-
-    abra app logs %s
-`, appName, timeout, appName, appName)
+	if !opts.Quiet {
+		log.Info("deploy succeeded 🟢")
 	}
+
+	return nil
 }
 
 // Copypasta from https://github.com/docker/cli/blob/master/cli/command/stack/swarm/list.go

pkg/web/web.go

@@ -3,11 +3,13 @@ package web
 
 import (
 	"encoding/json"
-	"fmt"
+	"errors"
 	"io"
 	"net/http"
 	"os"
 	"time"
+
+	"github.com/leonelquinteros/gotext"
 )
 
 // Timeout is the time it takes before a web request bails out waiting for a
@@ -40,7 +42,7 @@ func GetFile(filepath string, url string) (err error) {
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("bad status: %s", resp.Status)
+		return errors.New(gotext.Get("bad status: %s", resp.Status))
 	}
 
 	_, err = io.Copy(out, resp.Body)

scripts/installer/installer

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-ABRA_VERSION="0.9.0-beta"
+ABRA_VERSION="0.10.1-beta"
 ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/toolshed/abra/releases/tags/$ABRA_VERSION"
-RC_VERSION="0.10.0-rc1-beta"
+RC_VERSION="0.10.1-beta"
 RC_VERSION_URL="https://git.coopcloud.tech/api/v1/repos/toolshed/abra/releases/tags/$RC_VERSION"
 
 for arg in "$@"; do

scripts/installer/makefile

@@ -3,5 +3,5 @@ STACK := abra_installer_script
 default: deploy
 
 deploy:
-	@DOCKER_CONTEXT=swarm.autonomic.zone docker stack rm $(STACK) && \
-		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml $(STACK)
+	@DOCKER_CONTEXT=swarm-0.coopcloud.tech docker stack rm $(STACK) && \
+		DOCKER_CONTEXT=swarm-0.coopcloud.tech docker stack deploy -c compose.yml $(STACK)

tests/integration/app_deploy.bats

@@ -75,6 +75,45 @@ teardown(){
   assert_success
 }
 
+# bats test_tags=slow
+@test "bail if recipe lint errors and no --chaos" {
+  # Break the recipe
+  run sed -i '/traefik.enable=.*/d' "$ABRA_DIR/recipes/$TEST_RECIPE/compose.yml"
+  assert_success
+
+  # Commit the breakage (so we can test without --chaos)
+  _set_git_author
+
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" commit -a -m 'Break recipe'
+  assert_success
+
+  # Make a broken release
+  run $ABRA recipe sync --patch "$TEST_RECIPE"
+  run $ABRA recipe release --patch -n "$TEST_RECIPE"
+
+  # Make sure we deploy latest
+  _wipe_env_version
+  
+  run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input
+  assert_failure
+  assert_output --partial 'failed lint checks'
+
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" reset --hard HEAD~1
+  latestRelease=$(_latest_release)
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" tag -d "$latestRelease"
+}
+
+# bats test_tags=slow
+@test "warn on recipe lint errors with --chaos" {
+  # Break the recipe
+  run sed -i '/traefik.enable=.*/d' "$ABRA_DIR/recipes/$TEST_RECIPE/compose.yml"
+  assert_success
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks --chaos
+  assert_success
+  assert_output --partial 'failed lint checks'
+}
+
 # bats test_tags=slow
 @test "ensure recipe up to date if no --offline" {
   wantHash=$(_get_n_hash 3)
@@ -108,8 +147,6 @@ teardown(){
 
 # bats test_tags=slow
 @test "deploy latest commit if no published versions and no --chaos" {
-  latestCommit="$(git -C "$ABRA_DIR/recipes/$TEST_RECIPE" rev-parse --short HEAD)"
-
   _remove_tags
   _wipe_env_version
 
@@ -117,7 +154,7 @@ teardown(){
   run $ABRA app deploy "$TEST_APP_DOMAIN" \
     --no-input --no-converge-checks --offline
   assert_success
-  assert_output --partial "$latestCommit"
+  assert_output --partial "${_get_head_hash:0:8}"
 }
 
 # bats test_tags=slow
@@ -149,16 +186,6 @@ teardown(){
   assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE"
 }
 
-@test "no deploy if lint error" {
-  run sed -i '/traefik.enable=.*/d' "$ABRA_DIR/recipes/$TEST_RECIPE/compose.yml"
-  assert_success
-
-  run $ABRA app deploy "$TEST_APP_DOMAIN" \
-    --no-input --no-converge-checks --chaos
-  assert_failure
-  assert_output --partial 'failed lint checks'
-}
-
 # bats test_tags=slow
 @test "error if already deployed and no --force/--chaos" {
   _deploy_app
@@ -403,8 +430,6 @@ teardown(){
 
 # bats test_tags=slow
 @test "ignore env version on new deploy" {
-  tagHash=$(_get_tag_hash "0.1.0+1.20.0")
-
   run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
     --no-input --no-converge-checks
   assert_success

tests/integration/app_list.bats

@@ -8,8 +8,19 @@ setup_file(){
 }
 
 teardown_file(){
+  if [[ ! -f "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" ]]; then
+    _new_app
+  fi
+
+  _undeploy_app
   _rm_app
   _rm_server
+
+  if [[ -d "$ABRA_DIR/servers/foo" ]]; then
+    run rm -rf "$ABRA_DIR/servers/foo"
+    assert_success
+    assert_not_exists "$ABRA_DIR/servers/foo"
+  fi
 }
 
 setup(){
@@ -18,7 +29,19 @@ setup(){
 }
 
 teardown(){
+  if [[ ! -f "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" ]]; then
+    _new_app
+  fi
+
   _undeploy_app
+  _wipe_env_version
+  _reset_recipe
+
+  if [[ -d "$ABRA_DIR/servers/foo" ]]; then
+    run rm -rf "$ABRA_DIR/servers/foo"
+    assert_success
+    assert_not_exists "$ABRA_DIR/servers/foo"
+  fi
 }
 
 @test "list without status" {
@@ -87,6 +110,10 @@ teardown(){
   assert_success
   refute_output --partial "$TEST_RECIPE"
   assert_output --partial "foo-recipe"
+
+  run rm -rf "$ABRA_DIR/servers/foo.com"
+  assert_success
+  assert_not_exists "$ABRA_DIR/servers/foo.com"
 }
 
 @test "output is machine readable" {
@@ -98,3 +125,71 @@ teardown(){
 
   assert_output --partial "$expectedOutput"
 }
+
+# bats test_tags=slow
+@test "list with status fetches recipe" {
+  _deploy_app
+
+  run $ABRA app ls --status
+  assert_success
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE"
+  assert_success
+
+  run $ABRA app ls --status
+  assert_success
+}
+
+# bats test_tags=slow
+@test "list with chaos version" {
+  run bash -c "echo foo >> $ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  run $ABRA app ls --status
+  assert_success
+  assert_output --partial "+U"
+
+  run rm -rf "$ABRA_DIR/servers/foo.com"
+  assert_success
+  assert_not_exists "$ABRA_DIR/servers/foo.com"
+}
+
+@test "list with status skips unknown servers" {
+  if [[ ! -d "$ABRA_DIR/servers/foo" ]]; then
+    run mkdir -p "$ABRA_DIR/servers/foo"
+    assert_success
+    assert_exists "$ABRA_DIR/servers/foo"
+
+    run cp "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" \
+           "$ABRA_DIR/servers/foo/$TEST_APP_DOMAIN.env"
+    assert_success
+    assert_exists "$ABRA_DIR/servers/foo/$TEST_APP_DOMAIN.env"
+  fi
+
+  run $ABRA app ls --status
+  assert_success
+  assert_output --partial "unknown server"
+}
+
+# bats test_tags=slow
+@test "list does not fail if missing .env" {
+  _deploy_app
+
+  run $ABRA app ls --status
+  assert_success
+
+  run rm -rf "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+  assert_not_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+
+  output=$("$ABRA" app ls --server "$TEST_SERVER" --status --machine)
+  run diff \
+    <(jq -S "." <(echo "$output")) \
+    <(jq -S "." <(echo '{}'))
+  assert_success
+}

tests/integration/app_new.bats

@@ -214,8 +214,7 @@ teardown(){
     --chaos
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
-  assert_output --partial "version: ${currentHash:0:8}"
-  assert_output --partial "chaos: ${currentHash:0:8}"
+  assert_output --partial "version: ${currentHash:0:8}+U"
 
   assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_equal "$(_git_status)" "?? foo"
@@ -242,8 +241,7 @@ teardown(){
     --chaos
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
-  assert_output --partial "version: ${currentHash:0:8}"
-  assert_output --partial "chaos: ${currentHash:0:8}"
+  assert_output --partial "version: ${currentHash:0:8}+U"
 
   assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_equal "$(_git_status)" "?? foo"
@@ -252,3 +250,10 @@ teardown(){
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 }
+
+@test "automatically select single server" {
+  # NOTE(d1): no --no-input required, single server available
+  run $ABRA app new "$TEST_RECIPE" --domain "$TEST_APP_DOMAIN"
+  assert_success
+  assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+}

tests/integration/app_remove.bats

@@ -124,6 +124,33 @@ teardown(){
   assert_output --partial 'removed'
 }
 
+# bats test_tags=slow
+@test "detect no configs to remove" {
+  _deploy_app
+  _undeploy_app
+
+  run $ABRA app rm "$TEST_APP_DOMAIN" --no-input
+  assert_success
+  assert_output --partial 'no configs to remove'
+}
+
+# bats test_tags=slow
+@test "remove old app configs" {
+  _deploy_app
+  _undeploy_app
+
+  sanitisedDomainName="${TEST_APP_DOMAIN//./_}"
+  run docker config create "${sanitisedDomainName}_test_conf_v99" "$ABRA_DIR/recipes/abra-test-recipe/abra.sh"
+  assert_success
+
+  assert bash -c "docker config ls | grep -q test_conf_v99"
+
+  run $ABRA app rm "$TEST_APP_DOMAIN" --no-input
+  assert_success
+
+  refute bash -c "docker config ls | grep -q test_conf_v99"
+}
+
 @test "remove .env file" {
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
 

tests/integration/app_secret.bats

@@ -4,6 +4,7 @@ setup_file(){
   load "$PWD/tests/integration/helpers/common"
   _common_setup
   _add_server
+  _fetch_recipe
 
   # NOTE(d1): create new app without secrets
   run $ABRA app new "$TEST_RECIPE" \
@@ -181,6 +182,20 @@ teardown(){
   assert_output --partial '10'  # NOTE(d1): hardcoded # length=10 in recipe config
 }
 
+@test "generate: skip if generate=false" {
+  run sed -i 's/COMPOSE_FILE="compose.yml"/COMPOSE_FILE="compose.yml:compose.skip_pass.yml"/g' \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+
+  run sed -i 's/#SECRET_TEST_SKIP_PASS_VERSION=v1/SECRET_TEST_SKIP_PASS_VERSION=v1/g' \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+
+  run $ABRA app secret generate "$TEST_APP_DOMAIN" --all
+  assert_success
+  refute_output --partial 'test_skip_pass'
+}
+
 @test "insert: validate arguments" {
   run $ABRA app secret insert
   assert_failure
@@ -195,6 +210,12 @@ teardown(){
   assert_failure
 }
 
+@test "insert: cannot insert unknown secret" {
+  run $ABRA app secret insert "$TEST_APP_DOMAIN" DOESNTEXIST v1 foo
+  assert_failure
+  assert_output --partial 'no secret'
+}
+
 @test "insert: create secret" {
   run $ABRA app secret ls "$TEST_APP_DOMAIN"
   assert_success

tests/integration/app_undeploy.bats

@@ -30,6 +30,20 @@ teardown(){
   assert_failure
 }
 
+# bats test_tags=slow
+@test "retrieve recipe if missing" {
+  _deploy_app
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE"
+  assert_success
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE"
+
+  run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
+  assert_success
+
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE"
+}
+
 # bats test_tags=slow
 @test "ensure recipe up to date if no --offline" {
   _deploy_app