test: on-demand integration tests

.drone.yml

@@ -77,9 +77,9 @@ steps:
           wget https://git.coopcloud.tech/toolshed/abra/raw/branch/main/scripts/tests/run-ci-int -O run-ci-int
           chmod +x run-ci-int
           sh run-ci-int
-    when:
+      when:
-      ref:
+        ref:
-        - refs/heads/int-*
+          - int-*
     depends_on:
       - make check
       - make test

.envrc.sample

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

Makefile

@@ -6,10 +6,6 @@ GOVERSION    := 1.24
 LDFLAGS      := "-X 'main.Commit=$(COMMIT)'"
 DIST_LDFLAGS := $(LDFLAGS)" -s -w"
 GCFLAGS      := "all=-l -B"
-DOMAIN       := abra
-POFILES      := $(wildcard pkg/i18n/locales/*.po)
-MOFILES      := $(patsubst %.po,%.mo,$(POFILES))
-LINGUAS      := $(basename $(POFILES))
 
 export GOPRIVATE=coopcloud.tech
 
@@ -63,32 +59,3 @@ loc:
 
 deps:
 	@go get -t -u ./...
-
-.PHONY: i18n
-i18n: update-pot update-pot-po-metadata update-po build-mo
-
-.PHONY: update-po
-update-po:
-	@set -eu; \
-	for lang in $(LINGUAS); do \
-		msgmerge --backup=none -U $$lang.po pkg/i18n/locales/$(DOMAIN).pot; \
-	done
-
-.PHONY: update-pot
-update-pot:
-	@xgettext-go \
-		-o pkg/i18n/locales/$(DOMAIN).pot \
-		--keyword=i18n.G \
-		--sort-output \
-		$$(find . -name "*.go" -not -path "*vendor*")
-
-.PHONY: update-pot-po-metadata
-update-pot-po-metadata:
-	@sed -i "s/charset=CHARSET/charset=UTF-8/g" pkg/i18n/locales/*.po*
-
-.PHONY: build-mo
-build-mo:
-	@set -eu; \
-	for lang in $(POFILES); do \
-		msgfmt $$lang -o $$(echo $$lang | sed 's/.po/.mo/g') --statistics; \
-	done

README.md

@@ -3,7 +3,6 @@
 [![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,12 +1,11 @@
 package app
 
 import (
-	"coopcloud.tech/abra/pkg/i18n"
 	"github.com/spf13/cobra"
 )
 
 var AppCommand = &cobra.Command{
-	Use:     i18n.G("app [cmd] [args] [flags]"),
+	Use:     "app [cmd] [args] [flags]",
-	Aliases: []string{i18n.G("a")},
+	Aliases: []string{"a"},
-	Short:   i18n.G("Manage apps"),
+	Short:   "Manage apps",
 }

cli/app/backup.go

@@ -6,15 +6,14 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/spf13/cobra"
 )
 
 var AppBackupListCommand = &cobra.Command{
-	Use:     i18n.G("list <domain> [flags]"),
+	Use:     "list <domain> [flags]",
-	Aliases: []string{i18n.G("ls")},
+	Aliases: []string{"ls"},
-	Short:   i18n.G("List the contents of a snapshot"),
+	Short:   "List the contents of a snapshot",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -41,17 +40,17 @@ var AppBackupListCommand = &cobra.Command{
 		}
 
 		if snapshot != "" {
-			log.Debug(i18n.G("including SNAPSHOT=%s in backupbot exec invocation", snapshot))
+			log.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
 			execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
 		}
 
 		if showAllPaths {
-			log.Debug(i18n.G("including SHOW_ALL=%v in backupbot exec invocation", showAllPaths))
+			log.Debugf("including SHOW_ALL=%v in backupbot exec invocation", showAllPaths)
 			execEnv = append(execEnv, fmt.Sprintf("SHOW_ALL=%v", showAllPaths))
 		}
 
 		if timestamps {
-			log.Debug(i18n.G("including TIMESTAMPS=%v in backupbot exec invocation", timestamps))
+			log.Debugf("including TIMESTAMPS=%v in backupbot exec invocation", timestamps)
 			execEnv = append(execEnv, fmt.Sprintf("TIMESTAMPS=%v", timestamps))
 		}
 
@@ -62,13 +61,13 @@ var AppBackupListCommand = &cobra.Command{
 }
 
 var AppBackupDownloadCommand = &cobra.Command{
-	Use:     i18n.G("download <domain> [flags]"),
+	Use:     "download <domain> [flags]",
-	Aliases: []string{i18n.G("d")},
+	Aliases: []string{"d"},
-	Short:   i18n.G("Download a snapshot"),
+	Short:   "Download a snapshot",
-	Long: i18n.G(`Downloads a backup.tar.gz to the current working directory.
+	Long: `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,
@@ -99,22 +98,22 @@ var AppBackupDownloadCommand = &cobra.Command{
 		}
 
 		if snapshot != "" {
-			log.Debug(i18n.G("including SNAPSHOT=%s in backupbot exec invocation", snapshot))
+			log.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
 			execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
 		}
 
 		if includePath != "" {
-			log.Debug(i18n.G("including INCLUDE_PATH=%s in backupbot exec invocation", includePath))
+			log.Debugf("including INCLUDE_PATH=%s in backupbot exec invocation", includePath)
 			execEnv = append(execEnv, fmt.Sprintf("INCLUDE_PATH=%s", includePath))
 		}
 
 		if includeSecrets {
-			log.Debug(i18n.G("including SECRETS=%v in backupbot exec invocation", includeSecrets))
+			log.Debugf("including SECRETS=%v in backupbot exec invocation", includeSecrets)
 			execEnv = append(execEnv, fmt.Sprintf("SECRETS=%v", includeSecrets))
 		}
 
 		if includeVolumes {
-			log.Debug(i18n.G("including VOLUMES=%v in backupbot exec invocation", includeVolumes))
+			log.Debugf("including VOLUMES=%v in backupbot exec invocation", includeVolumes)
 			execEnv = append(execEnv, fmt.Sprintf("VOLUMES=%v", includeVolumes))
 		}
 
@@ -131,9 +130,9 @@ var AppBackupDownloadCommand = &cobra.Command{
 }
 
 var AppBackupCreateCommand = &cobra.Command{
-	Use:     i18n.G("create <domain> [flags]"),
+	Use:     "create <domain> [flags]",
-	Aliases: []string{i18n.G("c")},
+	Aliases: []string{"c"},
-	Short:   i18n.G("Create a new snapshot"),
+	Short:   "Create a new snapshot",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -164,7 +163,7 @@ var AppBackupCreateCommand = &cobra.Command{
 		}
 
 		if retries != "" {
-			log.Debug(i18n.G("including RETRIES=%s in backupbot exec invocation", retries))
+			log.Debugf("including RETRIES=%s in backupbot exec invocation", retries)
 			execEnv = append(execEnv, fmt.Sprintf("RETRIES=%s", retries))
 		}
 
@@ -175,9 +174,9 @@ var AppBackupCreateCommand = &cobra.Command{
 }
 
 var AppBackupSnapshotsCommand = &cobra.Command{
-	Use:     i18n.G("snapshots <domain> [flags]"),
+	Use:     "snapshots <domain> [flags]",
-	Aliases: []string{i18n.G("s")},
+	Aliases: []string{"s"},
-	Short:   i18n.G("List all snapshots"),
+	Short:   "List all snapshots",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -210,9 +209,9 @@ var AppBackupSnapshotsCommand = &cobra.Command{
 }
 
 var AppBackupCommand = &cobra.Command{
-	Use:     i18n.G("backup [cmd] [args] [flags]"),
+	Use:     "backup [cmd] [args] [flags]",
-	Aliases: []string{i18n.G("b")},
+	Aliases: []string{"b"},
-	Short:   i18n.G("Manage app backups"),
+	Short:   "Manage app backups",
 }
 
 var (
@@ -228,81 +227,81 @@ var (
 func init() {
 	AppBackupListCommand.Flags().StringVarP(
 		&snapshot,
-		i18n.G("snapshot"),
+		"snapshot",
-		i18n.G("s"),
+		"s",
 		"",
-		i18n.G("list specific snapshot"),
+		"list specific snapshot",
 	)
 
 	AppBackupListCommand.Flags().BoolVarP(
 		&showAllPaths,
-		i18n.G("all"),
+		"all",
-		i18n.G("a"),
+		"a",
 		false,
-		i18n.G("show all paths"),
+		"show all paths",
 	)
 
 	AppBackupListCommand.Flags().BoolVarP(
 		&timestamps,
-		i18n.G("timestamps"),
+		"timestamps",
-		i18n.G("t"),
+		"t",
 		false,
-		i18n.G("include timestamps"),
+		"include timestamps",
 	)
 
 	AppBackupDownloadCommand.Flags().StringVarP(
 		&snapshot,
-		i18n.G("snapshot"),
+		"snapshot",
-		i18n.G("s"),
+		"s",
 		"",
-		i18n.G("list specific snapshot"),
+		"list specific snapshot",
 	)
 
 	AppBackupDownloadCommand.Flags().StringVarP(
 		&includePath,
-		i18n.G("path"),
+		"path",
-		i18n.G("p"),
+		"p",
 		"",
-		i18n.G("volumes path"),
+		"volumes path",
 	)
 
 	AppBackupDownloadCommand.Flags().BoolVarP(
 		&includeSecrets,
-		i18n.G("secrets"),
+		"secrets",
-		i18n.G("S"),
+		"S",
 		false,
-		i18n.G("include secrets"),
+		"include secrets",
 	)
 
 	AppBackupDownloadCommand.Flags().BoolVarP(
 		&includeVolumes,
-		i18n.G("volumes"),
+		"volumes",
-		i18n.G("v"),
+		"v",
 		false,
-		i18n.G("include volumes"),
+		"include volumes",
 	)
 
 	AppBackupDownloadCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 
 	AppBackupCreateCommand.Flags().StringVarP(
 		&retries,
-		i18n.G("retries"),
+		"retries",
-		i18n.G("r"),
+		"r",
 		"1",
-		i18n.G("number of retry attempts"),
+		"number of retry attempts",
 	)
 
 	AppBackupCreateCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }

cli/app/check.go

@@ -7,17 +7,16 @@ import (
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/spf13/cobra"
 )
 
 var AppCheckCommand = &cobra.Command{
-	Use:     i18n.G("check <domain> [flags]"),
+	Use:     "check <domain> [flags]",
-	Aliases: []string{i18n.G("chk")},
+	Aliases: []string{"chk"},
-	Short:   i18n.G("Ensure an app is well configured"),
+	Short:   "Ensure an app is well configured",
-	Long: i18n.G(`Compare env vars in both the app ".env" and recipe ".env.sample" file.
+	Long: `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
@@ -26,7 +25,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,
@@ -84,9 +83,9 @@ ${FOO:<default>} syntax). "check" does not confirm or deny this for you.`),
 func init() {
 	AppCheckCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }

cli/app/cmd.go

@@ -13,16 +13,15 @@ import (
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/spf13/cobra"
 )
 
 var AppCmdCommand = &cobra.Command{
-	Use:     i18n.G("command <domain> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]"),
+	Use:     "command <domain> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]",
-	Aliases: []string{i18n.G("cmd")},
+	Aliases: []string{"cmd"},
-	Short:   i18n.G("Run app commands"),
+	Short:   "Run app commands",
-	Long: i18n.G(`Run an app specific command.
+	Long: `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
@@ -31,24 +30,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).`),
+does not).`,
-	Example: i18n.G(`  # pass <cmd> args/flags without "--"
+	Example: `  # 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(i18n.G("requires at least 2 arguments with --local/-l"))
+				return errors.New("requires at least 2 arguments with --local/-l")
 			}
 
 			if slices.Contains(os.Args, "--") {
 				if cmd.ArgsLenAtDash() > 2 {
-					return errors.New(i18n.G("accepts at most 2 args with --local/-l"))
+					return errors.New("accepts at most 2 args with --local/-l")
 				}
 			}
 
@@ -64,7 +63,7 @@ does not).`),
 		}
 
 		if !(len(args) >= 3) {
-			return errors.New(i18n.G("requires at least 3 arguments"))
+			return errors.New("requires at least 3 arguments")
 		}
 
 		return nil
@@ -98,14 +97,14 @@ does not).`),
 		}
 
 		if local && remoteUser != "" {
-			log.Fatal(i18n.G("cannot use --local & --user together"))
+			log.Fatal("cannot use --local & --user together")
 		}
 
 		hasCmdArgs, parsedCmdArgs := parseCmdArgs(args, local)
 
 		if _, err := os.Stat(app.Recipe.AbraShPath); err != nil {
 			if os.IsNotExist(err) {
-				log.Fatal(i18n.G("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name))
+				log.Fatalf("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name)
 			}
 			log.Fatal(err)
 		}
@@ -116,7 +115,7 @@ does not).`),
 				log.Fatal(err)
 			}
 
-			log.Debug(i18n.G("--local detected, running %s on local work station", cmdName))
+			log.Debugf("--local detected, running %s on local work station", cmdName)
 
 			var exportEnv string
 			for k, v := range app.Env {
@@ -125,16 +124,16 @@ does not).`),
 
 			var sourceAndExec string
 			if hasCmdArgs {
-				log.Debug(i18n.G("parsed following command arguments: %s", parsedCmdArgs))
+				log.Debugf("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(i18n.G("did not detect any command arguments"))
+				log.Debug("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.Debug(i18n.G("%s does not exist locally, use /bin/sh as fallback", shell))
+				log.Debugf("%s does not exist locally, use /bin/sh as fallback", shell)
 				shell = "/bin/sh"
 			}
 			cmd := exec.Command(shell, "-c", sourceAndExec)
@@ -165,15 +164,15 @@ does not).`),
 		}
 
 		if !matchingServiceName {
-			log.Fatal(i18n.G("no service %s for %s?", targetServiceName, app.Name))
+			log.Fatalf("no service %s for %s?", targetServiceName, app.Name)
 		}
 
-		log.Debug(i18n.G("running command %s within the context of %s_%s", cmdName, app.StackName(), targetServiceName))
+		log.Debugf("running command %s within the context of %s_%s", cmdName, app.StackName(), targetServiceName)
 
 		if hasCmdArgs {
-			log.Debug(i18n.G("parsed following command arguments: %s", parsedCmdArgs))
+			log.Debugf("parsed following command arguments: %s", parsedCmdArgs)
 		} else {
-			log.Debug(i18n.G("did not detect any command arguments"))
+			log.Debug("did not detect any command arguments")
 		}
 
 		cl, err := client.New(app.Server)
@@ -184,7 +183,7 @@ does not).`),
 		if err := internal.RunCmdRemote(
 			cl,
 			app,
-			disableTTY,
+			requestTTY,
 			app.Recipe.AbraShPath,
 			targetServiceName, cmdName, parsedCmdArgs, remoteUser); err != nil {
 			log.Fatal(err)
@@ -193,9 +192,9 @@ does not).`),
 }
 
 var AppCmdListCommand = &cobra.Command{
-	Use:     i18n.G("list <domain> [flags]"),
+	Use:     "list <domain> [flags]",
-	Aliases: []string{i18n.G("ls")},
+	Aliases: []string{"ls"},
-	Short:   i18n.G("List all available commands"),
+	Short:   "List all available commands",
 	Args:    cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
@@ -239,39 +238,39 @@ func parseCmdArgs(args []string, isLocal bool) (bool, string) {
 var (
 	local      bool
 	remoteUser string
-	disableTTY bool
+	requestTTY bool
 )
 
 func init() {
 	AppCmdCommand.Flags().BoolVarP(
 		&local,
-		i18n.G("local"),
+		"local",
-		i18n.G("l"),
+		"l",
 		false,
-		i18n.G("run command locally"),
+		"run command locally",
 	)
 
 	AppCmdCommand.Flags().StringVarP(
 		&remoteUser,
-		i18n.G("user"),
+		"user",
-		i18n.G("u"),
+		"u",
 		"",
-		i18n.G("request remote user"),
+		"request remote user",
 	)
 
 	AppCmdCommand.Flags().BoolVarP(
-		&disableTTY,
+		&requestTTY,
-		i18n.G("tty"),
+		"tty",
-		i18n.G("T"),
+		"T",
 		false,
-		i18n.G("disable remote TTY"),
+		"request remote TTY",
 	)
 
 	AppCmdCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }

cli/app/config.go

@@ -6,17 +6,16 @@ import (
 
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/spf13/cobra"
 )
 
 var AppConfigCommand = &cobra.Command{
-	Use:     i18n.G("config <domain> [flags]"),
+	Use:     "config <domain> [flags]",
-	Aliases: []string{i18n.G("cfg")},
+	Aliases: []string{"cfg"},
-	Short:   i18n.G("Edit app config"),
+	Short:   "Edit app config",
-	Example: i18n.G("  abra config 1312.net"),
+	Example: "  abra config 1312.net",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -33,13 +32,13 @@ var AppConfigCommand = &cobra.Command{
 		appName := args[0]
 		appFile, exists := files[appName]
 		if !exists {
-			log.Fatal(i18n.G("cannot find app with name %s", appName))
+			log.Fatalf("cannot find app with name %s", appName)
 		}
 
 		ed, ok := os.LookupEnv("EDITOR")
 		if !ok {
 			edPrompt := &survey.Select{
-				Message: i18n.G("which editor do you wish to use?"),
+				Message: "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,6 +3,7 @@ package app
 import (
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"os"
 	"path"
@@ -14,7 +15,6 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	containerPkg "coopcloud.tech/abra/pkg/container"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/container"
 	"github.com/docker/cli/cli/command"
@@ -26,14 +26,14 @@ import (
 )
 
 var AppCpCommand = &cobra.Command{
-	Use:     i18n.G("cp <domain> <src> <dst> [flags]"),
+	Use:     "cp <domain> <src> <dst> [flags]",
-	Aliases: []string{i18n.G("c")},
+	Aliases: []string{"c"},
-	Short:   i18n.G("Copy files to/from a deployed app service"),
+	Short:   "Copy files to/from a deployed app service",
-	Example: i18n.G(`  # copy myfile.txt to the root of the app service
+	Example: `  # 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.Debug(i18n.G("retrieved %s as target container on %s", formatter.ShortenID(container.ID), app.Server))
+		log.Debugf("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(i18n.G("one of <src>/<dest> arguments must take $SERVICE:$PATH form"))
+var errServiceMissing = errors.New("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 errors.New(i18n.G("local %s ", err))
+		return fmt.Errorf("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 errors.New(i18n.G("remote path: %s", err))
+			return fmt.Errorf("remote path: %s", err)
 		}
 	}
 
@@ -142,7 +142,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 			Detach:       false,
 			Tty:          true,
 		}); err != nil {
-			return errors.New(i18n.G("create remote directory: %s", err))
+			return fmt.Errorf("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.Debug(i18n.G("copy %s from local to %s on container", srcPath, dstPath))
+	log.Debugf("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 errors.New(i18n.G("create remote directory: %s", err))
+			return fmt.Errorf("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 errors.New(i18n.G("remote: %s does not exist", srcPath))
+			return fmt.Errorf("remote: %s does not exist", srcPath)
 		} else {
-			return errors.New(i18n.G("remote path: %s", err))
+			return fmt.Errorf("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 errors.New(i18n.G("remote path: %s", err))
+			return fmt.Errorf("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 errors.New(i18n.G("copy: %s", err))
+		return fmt.Errorf("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 errors.New(i18n.G("untar: %s", err))
+		return fmt.Errorf("untar: %s", err)
 	}
 
 	if moveDstFile != "" {
@@ -269,8 +269,8 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 }
 
 var (
-	ErrCopyDirToFile  = errors.New(i18n.G("can't copy dir to file"))
+	ErrCopyDirToFile  = fmt.Errorf("can't copy dir to file")
-	ErrDstDirNotExist = errors.New(i18n.G("destination directory does not exist"))
+	ErrDstDirNotExist = fmt.Errorf("destination directory does not exist")
 )
 
 type CopyMode int
@@ -375,9 +375,9 @@ func moveFile(sourcePath, destPath string) error {
 func init() {
 	AppCpCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }

cli/app/deploy.go

@@ -2,7 +2,7 @@ package app
 
 import (
 	"context"
-	"errors"
+	"fmt"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
@@ -16,7 +16,6 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/dns"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/lint"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/stack"
@@ -25,15 +24,15 @@ import (
 )
 
 var AppDeployCommand = &cobra.Command{
-	Use:     i18n.G("deploy <domain> [version] [flags]"),
+	Use:     "deploy <domain> [version] [flags]",
-	Aliases: []string{i18n.G("d")},
+	Aliases: []string{"d"},
-	Short:   i18n.G("Deploy an app"),
+	Short:   "Deploy an app",
-	Long: i18n.G(`Deploy an app.
+	Long: `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.`),
+"[version]". Please note, "upgrade"/"rollback" do not support chaos operations.`,
-	Example: i18n.G(`  # standard deployment
+	Example: `  # standard deployment
   abra app deploy 1312.net
 
   # chaos deployment
@@ -43,7 +42,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,
@@ -56,7 +55,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 := i18n.G("autocomplete failed: %s", err)
+				errMsg := fmt.Sprintf("autocomplete failed: %s", err)
 				return []string{errMsg}, cobra.ShellCompDirectiveError
 			}
 			return autocomplete.RecipeVersionComplete(app.Recipe.Name)
@@ -85,7 +84,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			log.Fatal(err)
 		}
 
-		log.Debug(i18n.G("checking whether %s is already deployed", app.StackName()))
+		log.Debugf("checking whether %s is already deployed", app.StackName())
 
 		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
 		if err != nil {
@@ -93,27 +92,23 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		}
 
 		if deployMeta.IsDeployed && !(internal.Force || internal.Chaos) {
-			log.Fatal(i18n.G("%s is already deployed", app.Name))
+			log.Fatalf("%s is already deployed", app.Name)
 		}
 
 		toDeployVersion, err = getDeployVersion(args, deployMeta, app)
 		if err != nil {
-			log.Fatal(i18n.G("get deploy version: %s", err))
+			log.Fatal(fmt.Errorf("get deploy version: %s", err))
 		}
 
 		if !internal.Chaos {
 			_, err = app.Recipe.EnsureVersion(toDeployVersion)
 			if err != nil {
-				log.Fatal(i18n.G("ensure recipe: %s", err))
+				log.Fatalf("ensure recipe: %s", err)
 			}
 		}
 
 		if err := lint.LintForErrors(app.Recipe); err != nil {
-			if internal.Chaos {
+			log.Fatal(err)
-				log.Warn(err)
-			} else {
-				log.Fatal(err)
-			}
 		}
 
 		if err := validateSecrets(cl, app); err != nil {
@@ -163,7 +158,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		for _, envVar := range envVars {
 			if !envVar.Present {
 				deployWarnMessages = append(deployWarnMessages,
-					i18n.G("%s missing from %s.env", envVar.Name, app.Domain),
+					fmt.Sprintf("%s missing from %s.env", envVar.Name, app.Domain),
 				)
 			}
 		}
@@ -174,10 +169,10 @@ checkout as-is. Recipe commit hashes are also supported as values for
 					log.Fatal(err)
 				}
 			} else {
-				log.Debug(i18n.G("skipping domain checks, no DOMAIN=... configured"))
+				log.Debug("skipping domain checks, no DOMAIN=... configured")
 			}
 		} else {
-			log.Debug(i18n.G("skipping domain checks"))
+			log.Debug("skipping domain checks")
 		}
 
 		deployedVersion := config.NO_VERSION_DEFAULT
@@ -200,40 +195,22 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			log.Fatal(err)
 		}
 
-		log.Debug(i18n.G("set waiting timeout to %d second(s)", stack.WaitTimeout))
+		log.Debugf("set waiting timeout to %d second(s)", stack.WaitTimeout)
 
-		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
+		if err := stack.RunDeploy(cl, deployOpts, compose, app.Name, internal.DontWaitConverge); err != nil {
-		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.Debug(i18n.G("run the following post-deploy commands: %s", postDeployCmds))
+			log.Debugf("run the following post-deploy commands: %s", postDeployCmds)
 			if err := internal.PostCmds(cl, app, postDeployCmds); err != nil {
-				log.Fatal(i18n.G("attempting to run post deploy commands, saw: %s", err))
+				log.Fatalf("attempting to run post deploy commands, saw: %s", err)
 			}
 		}
 
 		if err := app.WriteRecipeVersion(toDeployVersion, false); err != nil {
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }
@@ -259,7 +236,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 errors.New(i18n.G("cannot use [version] and --chaos together"))
+		return fmt.Errorf("cannot use [version] and --chaos together")
 	}
 
 	return nil
@@ -273,7 +250,7 @@ func validateSecrets(cl *dockerClient.Client, app app.App) error {
 
 	for _, secStat := range secStats {
 		if !secStat.CreatedOnRemote {
-			return errors.New(i18n.G("secret not generated: %s", secStat.LocalName))
+			return fmt.Errorf("secret not generated: %s", secStat.LocalName)
 		}
 	}
 
@@ -287,33 +264,33 @@ func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App
 		if err != nil {
 			return "", err
 		}
-		log.Debug(i18n.G("version: taking chaos version: %s", v))
+		log.Debugf("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.Debug(i18n.G("version: taking version from cli arg: %s", cliArgs[1]))
+		log.Debugf("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 "", errors.New(i18n.G("version: can not redeploy chaos version %s", app.Recipe.EnvVersionRaw))
+			return "", fmt.Errorf("version: can not redeploy chaos version %s", app.Recipe.EnvVersionRaw)
 		}
-		log.Debug(i18n.G("version: taking version from .env file: %s", app.Recipe.EnvVersion))
+		log.Debugf("version: taking version from .env file: %s", app.Recipe.EnvVersion)
 		return app.Recipe.EnvVersion, nil
 	}
 
 	// Take deployed version
 	if deployMeta.IsDeployed {
-		log.Debug(i18n.G("version: taking deployed version: %s", deployMeta.Version))
+		log.Debugf("version: taking deployed version: %s", deployMeta.Version)
 		return deployMeta.Version, nil
 	}
 
 	v, err := getLatestVersionOrCommit(app)
-	log.Debug(i18n.G("version: taking new recipe version: %s", v))
+	log.Debugf("version: taking new recipe version: %s", v)
 	if err != nil {
 		return "", err
 	}
@@ -323,33 +300,33 @@ func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App
 func init() {
 	AppDeployCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 
 	AppDeployCommand.Flags().BoolVarP(
 		&internal.Force,
-		i18n.G("force"),
+		"force",
-		i18n.G("f"),
+		"f",
 		false,
-		i18n.G("perform action without further prompt"),
+		"perform action without further prompt",
 	)
 
 	AppDeployCommand.Flags().BoolVarP(
 		&internal.NoDomainChecks,
-		i18n.G("no-domain-checks"),
+		"no-domain-checks",
-		i18n.G("D"),
+		"D",
 		false,
-		i18n.G("disable public DNS checks"),
+		"disable public DNS checks",
 	)
 
 	AppDeployCommand.Flags().BoolVarP(
 		&internal.DontWaitConverge,
-		i18n.G("no-converge-checks"),
+		"no-converge-checks",
-		i18n.G("c"),
+		"c",
 		false,
-		i18n.G("disable converge logic checks"),
+		"disable converge logic checks",
 	)
 }

cli/app/env.go

@@ -7,15 +7,14 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"github.com/spf13/cobra"
 )
 
 var AppEnvCommand = &cobra.Command{
-	Use:     i18n.G("env <domain> [flags]"),
+	Use:     "env <domain> [flags]",
-	Aliases: []string{i18n.G("e")},
+	Aliases: []string{"e"},
-	Short:   i18n.G("Show app .env values"),
+	Short:   "Show app .env values",
-	Example: i18n.G("  abra app env 1312.net"),
+	Example: "  abra app env 1312.net",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -38,7 +37,7 @@ var AppEnvCommand = &cobra.Command{
 			rows = append(rows, []string{k, app.Env[k]})
 		}
 
-		overview := formatter.CreateOverview(i18n.G("ENV OVERVIEW"), rows)
+		overview := formatter.CreateOverview("ENV OVERVIEW", rows)
 		fmt.Println(overview)
 	},
 }

cli/app/labels.go

@@ -9,7 +9,6 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/convert"
 	composetypes "github.com/docker/cli/cli/compose/types"
@@ -20,11 +19,11 @@ import (
 )
 
 var AppLabelsCommand = &cobra.Command{
-	Use:     i18n.G("labels <domain> [flags]"),
+	Use:     "labels <domain> [flags]",
-	Aliases: []string{i18n.G("lb")},
+	Aliases: []string{"lb"},
-	Short:   i18n.G("Show deployment labels"),
+	Short:   "Show deployment labels",
-	Long:    i18n.G("Both local recipe and live deployment labels are shown."),
+	Long:    "Both local recipe and live deployment labels are shown.",
-	Example: i18n.G("  abra app labels 1312.net"),
+	Example: "  abra app labels 1312.net",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -50,7 +49,7 @@ var AppLabelsCommand = &cobra.Command{
 		}
 
 		rows := [][]string{
-			{i18n.G("DEPLOYED LABELS"), "---"},
+			{"DEPLOYED LABELS", "---"},
 		}
 
 		remoteLabelKeys := make([]string, 0, len(remoteLabels))
@@ -68,10 +67,10 @@ var AppLabelsCommand = &cobra.Command{
 		}
 
 		if len(remoteLabelKeys) == 0 {
-			rows = append(rows, []string{i18n.G("unknown")})
+			rows = append(rows, []string{"unknown"})
 		}
 
-		rows = append(rows, []string{i18n.G("RECIPE LABELS"), "---"})
+		rows = append(rows, []string{"RECIPE LABELS", "---"})
 
 		config, err := app.Recipe.GetComposeConfig(app.Env)
 		if err != nil {
@@ -99,7 +98,7 @@ var AppLabelsCommand = &cobra.Command{
 			})
 		}
 
-		overview := formatter.CreateOverview(i18n.G("LABELS OVERVIEW"), rows)
+		overview := formatter.CreateOverview("LABELS OVERVIEW", rows)
 		fmt.Println(overview)
 	},
 }
@@ -132,9 +131,9 @@ func getLabels(cl *dockerClient.Client, stackName string) (map[string]string, er
 func init() {
 	AppLabelsCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }

cli/app/list.go

@@ -11,7 +11,6 @@ import (
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/tagcmp"
 	"github.com/spf13/cobra"
@@ -40,20 +39,20 @@ type serverStatus struct {
 }
 
 var AppListCommand = &cobra.Command{
-	Use:     i18n.G("list [flags]"),
+	Use:     "list [flags]",
-	Aliases: []string{i18n.G("ls")},
+	Aliases: []string{"ls"},
-	Short:   i18n.G("List all managed apps"),
+	Short:   "List all managed apps",
-	Long: i18n.G(`Generate a report of all managed apps.
+	Long: `Generate a report of all managed apps.
 
-Use "--status/-S" flag to query all servers for the live deployment status.`),
+Use "--status/-S" flag to query all servers for the live deployment status.`,
-	Example: i18n.G(`  # list apps of all servers without live status
+	Example: `  # 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)
@@ -108,11 +107,11 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 				totalAppsCount++
 
 				if status {
-					status := i18n.G("unknown")
+					status := "unknown"
-					version := i18n.G("unknown")
+					version := "unknown"
-					chaos := i18n.G("unknown")
+					chaos := "unknown"
-					chaosVersion := i18n.G("unknown")
+					chaosVersion := "unknown"
-					autoUpdate := i18n.G("unknown")
+					autoUpdate := "unknown"
 					if statusMeta, ok := statuses[app.StackName()]; ok {
 						if currentVersion, exists := statusMeta["version"]; exists {
 							if currentVersion != "" {
@@ -143,14 +142,10 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 					appStats.AutoUpdate = autoUpdate
 
 					var newUpdates []string
-					if version != "unknown" && chaos == "false" {
+					if version != "unknown" {
-						if err := app.Recipe.EnsureExists(); err != nil {
-							log.Fatal(i18n.G("unable to clone %s: %s", app.Name, err))
-						}
-
 						updates, err := app.Recipe.Tags()
 						if err != nil {
-							log.Fatal(i18n.G("unable to retrieve tags for %s: %s", app.Name, err))
+							log.Fatal(err)
 						}
 
 						parsedVersion, err := tagcmp.Parse(version)
@@ -172,9 +167,9 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 
 					if len(newUpdates) == 0 {
 						if version == "unknown" {
-							appStats.Upgrade = i18n.G("unknown")
+							appStats.Upgrade = "unknown"
 						} else {
-							appStats.Upgrade = i18n.G("latest")
+							appStats.Upgrade = "latest"
 							stats.LatestCount++
 						}
 					} else {
@@ -213,15 +208,14 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 
 			serverStat := allStats[app.Server]
 
-			headers := []string{i18n.G("RECIPE"), i18n.G("DOMAIN"), i18n.G("SERVER")}
+			headers := []string{"RECIPE", "DOMAIN", "SERVER"}
 			if status {
 				headers = append(headers, []string{
-					i18n.G("STATUS"),
+					"STATUS",
-					i18n.G("CHAOS"),
+					"CHAOS",
-					i18n.G("VERSION"),
+					"VERSION",
-					i18n.G("UPGRADE"),
+					"UPGRADE",
-					i18n.G("AUTOUPDATE"),
+					"AUTOUPDATE"}...,
-				}...,
 				)
 			}
 
@@ -285,22 +279,22 @@ var (
 func init() {
 	AppListCommand.Flags().BoolVarP(
 		&status,
-		i18n.G("status"),
+		"status",
-		i18n.G("S"),
+		"S",
 		false,
-		i18n.G("show app deployment status"),
+		"show app deployment status",
 	)
 
 	AppListCommand.Flags().StringVarP(
 		&recipeFilter,
-		i18n.G("recipe"),
+		"recipe",
-		i18n.G("r"),
+		"r",
 		"",
-		i18n.G("show apps of a specific recipe"),
+		"show apps of a specific recipe",
 	)
 
 	AppListCommand.RegisterFlagCompletionFunc(
-		i18n.G("recipe"),
+		"recipe",
 		func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			return autocomplete.RecipeNameComplete()
 		},
@@ -308,22 +302,22 @@ func init() {
 
 	AppListCommand.Flags().BoolVarP(
 		&internal.MachineReadable,
-		i18n.G("machine"),
+		"machine",
-		i18n.G("m"),
+		"m",
 		false,
-		i18n.G("print machine-readable output"),
+		"print machine-readable output",
 	)
 
 	AppListCommand.Flags().StringVarP(
 		&listAppServer,
-		i18n.G("server"),
+		"server",
-		i18n.G("s"),
+		"s",
 		"",
-		i18n.G("show apps of a specific server"),
+		"show apps of a specific server",
 	)
 
 	AppListCommand.RegisterFlagCompletionFunc(
-		i18n.G("server"),
+		"server",
 		func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			return autocomplete.ServerNameComplete()
 		},

cli/app/logs.go

@@ -2,22 +2,31 @@ 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/i18n"
 	"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"
 )
 
 var AppLogsCommand = &cobra.Command{
-	Use:     i18n.G("logs <domain> [service] [flags]"),
+	Use:     "logs <domain> [service] [flags]",
-	Aliases: []string{i18n.G("l")},
+	Aliases: []string{"l"},
-	Short:   i18n.G("Tail app logs"),
+	Short:   "Tail app logs",
 	Args:    cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -29,7 +38,8 @@ var AppLogsCommand = &cobra.Command{
 		case 1:
 			app, err := appPkg.Get(args[0])
 			if err != nil {
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
+				errMsg := fmt.Sprintf("autocomplete failed: %s", err)
+				return []string{errMsg}, cobra.ShellCompDirectiveError
 			}
 			return autocomplete.ServiceNameComplete(app.Name)
 		default:
@@ -55,7 +65,7 @@ var AppLogsCommand = &cobra.Command{
 		}
 
 		if !deployMeta.IsDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
+			log.Fatalf("%s is not deployed?", app.Name)
 		}
 
 		var serviceNames []string
@@ -63,25 +73,80 @@ var AppLogsCommand = &cobra.Command{
 			serviceNames = []string{args[1]}
 		}
 
-		f, err := app.Filters(true, false, serviceNames...)
+		if err = tailLogs(cl, app, serviceNames); err != nil {
-		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
@@ -90,17 +155,17 @@ var (
 func init() {
 	AppLogsCommand.Flags().BoolVarP(
 		&stdErr,
-		i18n.G("stderr"),
+		"stderr",
-		i18n.G("s"),
+		"s",
 		false,
-		i18n.G("only tail stderr"),
+		"only tail stderr",
 	)
 
 	AppLogsCommand.Flags().StringVarP(
 		&sinceLogs,
-		i18n.G("since"),
+		"since",
-		i18n.G("S"),
+		"S",
 		"",
-		i18n.G("tail logs since YYYY-MM-DDTHH:MM:SSZ"),
+		"tail logs since YYYY-MM-DDTHH:MM:SSZ",
 	)
 }

cli/app/new.go

@@ -1,7 +1,6 @@
 package app
 
 import (
-	"errors"
 	"fmt"
 
 	"coopcloud.tech/abra/cli/internal"
@@ -11,7 +10,6 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	recipePkg "coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/abra/pkg/secret"
@@ -21,7 +19,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var appNewDescription = i18n.G(`Creates a new app from a default recipe.
+var appNewDescription = `Creates a new app from a default recipe.
 
 This new app configuration is stored in your $ABRA_DIR directory under the
 appropriate server.
@@ -41,12 +39,12 @@ store them somewhere safe.
 
 You can use the "--pass/-P" to store these generated passwords locally in a
 pass store (see passwordstore.org for more). The pass command must be available
-on your $PATH.`)
+on your $PATH.`
 
 var AppNewCommand = &cobra.Command{
-	Use:     i18n.G("new [recipe] [version] [flags]"),
+	Use:     "new [recipe] [version] [flags]",
-	Aliases: []string{i18n.G("n")},
+	Aliases: []string{"n"},
-	Short:   i18n.G("Create a new app"),
+	Short:   "Create a new app",
 	Long:    appNewDescription,
 	Args:    cobra.RangeArgs(0, 2),
 	ValidArgsFunction: func(
@@ -67,7 +65,7 @@ var AppNewCommand = &cobra.Command{
 		recipe := internal.ValidateRecipe(args, cmd.Name())
 
 		if len(args) == 2 && internal.Chaos {
-			log.Fatal(i18n.G("cannot use [version] and --chaos together"))
+			log.Fatal("cannot use [version] and --chaos together")
 		}
 
 		var recipeVersion string
@@ -111,15 +109,6 @@ var AppNewCommand = &cobra.Command{
 				if err := recipe.EnsureLatest(); err != nil {
 					log.Fatal(err)
 				}
-
-				if recipeVersion == "" {
-					head, err := recipe.Head()
-					if err != nil {
-						log.Fatal(i18n.G("failed to retrieve latest commit for %s: %s", recipe.Name, err))
-					}
-
-					recipeVersion = formatter.SmallSHA(head.String())
-				}
 			}
 		}
 
@@ -132,7 +121,7 @@ var AppNewCommand = &cobra.Command{
 		}
 
 		sanitisedAppName := appPkg.SanitiseAppName(appDomain)
-		log.Debug(i18n.G("%s sanitised as %s for new app", appDomain, sanitisedAppName))
+		log.Debugf("%s sanitised as %s for new app", appDomain, sanitisedAppName)
 
 		if err := appPkg.TemplateAppEnvSample(
 			recipe,
@@ -184,7 +173,7 @@ var AppNewCommand = &cobra.Command{
 				log.Fatal(err)
 			}
 
-			headers := []string{i18n.G("NAME"), i18n.G("VALUE")}
+			headers := []string{"NAME", "VALUE"}
 			secretsTable.Headers(headers...)
 
 			for name, val := range appSecrets {
@@ -196,7 +185,7 @@ var AppNewCommand = &cobra.Command{
 			newAppServer = "local"
 		}
 
-		log.Info(i18n.G("%s created (version: %s)", appDomain, recipeVersion))
+		log.Infof("%s created successfully (version: %s, chaos: %s)", appDomain, recipeVersion, chaosVersion)
 
 		if len(appSecrets) > 0 {
 			rows := [][]string{}
@@ -204,15 +193,15 @@ var AppNewCommand = &cobra.Command{
 				rows = append(rows, []string{k, v})
 			}
 
-			overview := formatter.CreateOverview(i18n.G("SECRETS OVERVIEW"), rows)
+			overview := formatter.CreateOverview("SECRETS OVERVIEW", rows)
 
 			fmt.Println(overview)
 
-			log.Warn(i18n.G(
+			log.Warnf(
 				"secrets are %s shown again, please save them %s",
 				formatter.BoldUnderlineStyle.Render("NOT"),
 				formatter.BoldUnderlineStyle.Render("NOW"),
-			))
+			)
 		}
 
 		app, err := app.Get(appDomain)
@@ -221,7 +210,7 @@ var AppNewCommand = &cobra.Command{
 		}
 
 		if err := app.WriteRecipeVersion(recipeVersion, false); err != nil {
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }
@@ -233,7 +222,7 @@ type AppSecrets map[string]string
 func createSecrets(cl *dockerClient.Client, secretsConfig map[string]secret.Secret, sanitisedAppName string) (AppSecrets, error) {
 	// NOTE(d1): trim to match app.StackName() implementation
 	if len(sanitisedAppName) > config.MAX_SANITISED_APP_NAME_LENGTH {
-		log.Debug(i18n.G("trimming %s to %s to avoid runtime limits", sanitisedAppName, sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]))
+		log.Debugf("trimming %s to %s to avoid runtime limits", sanitisedAppName, sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH])
 		sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]
 	}
 
@@ -263,7 +252,7 @@ func createSecrets(cl *dockerClient.Client, secretsConfig map[string]secret.Secr
 func ensureDomainFlag(recipe recipePkg.Recipe, server string) error {
 	if appDomain == "" && !internal.NoInput {
 		prompt := &survey.Input{
-			Message: i18n.G("Specify app domain"),
+			Message: "Specify app domain",
 			Default: fmt.Sprintf("%s.%s", recipe.Name, server),
 		}
 		if err := survey.AskOne(prompt, &appDomain); err != nil {
@@ -272,7 +261,7 @@ func ensureDomainFlag(recipe recipePkg.Recipe, server string) error {
 	}
 
 	if appDomain == "" {
-		return errors.New(i18n.G("no domain provided"))
+		return fmt.Errorf("no domain provided")
 	}
 
 	return nil
@@ -281,13 +270,13 @@ func ensureDomainFlag(recipe recipePkg.Recipe, server string) error {
 // promptForSecrets asks if we should generate secrets for a new app.
 func promptForSecrets(recipeName string, secretsConfig map[string]secret.Secret) error {
 	if len(secretsConfig) == 0 {
-		log.Debug(i18n.G("%s has no secrets to generate, skipping...", recipeName))
+		log.Debugf("%s has no secrets to generate, skipping...", recipeName)
 		return nil
 	}
 
 	if !generateSecrets && !internal.NoInput {
 		prompt := &survey.Confirm{
-			Message: i18n.G("Generate app secrets?"),
+			Message: "Generate app secrets?",
 		}
 		if err := survey.AskOne(prompt, &generateSecrets); err != nil {
 			return err
@@ -304,15 +293,9 @@ func ensureServerFlag() error {
 		return err
 	}
 
-	if len(servers) == 1 {
-		newAppServer = servers[0]
-		log.Info(i18n.G("single server detected, choosing %s automatically", newAppServer))
-		return nil
-	}
-
 	if newAppServer == "" && !internal.NoInput {
 		prompt := &survey.Select{
-			Message: i18n.G("Select app server:"),
+			Message: "Select app server:",
 			Options: servers,
 		}
 		if err := survey.AskOne(prompt, &newAppServer); err != nil {
@@ -321,7 +304,7 @@ func ensureServerFlag() error {
 	}
 
 	if newAppServer == "" {
-		return errors.New(i18n.G("no server provided"))
+		return fmt.Errorf("no server provided")
 	}
 
 	return nil
@@ -337,14 +320,14 @@ var (
 func init() {
 	AppNewCommand.Flags().StringVarP(
 		&newAppServer,
-		i18n.G("server"),
+		"server",
-		i18n.G("s"),
+		"s",
 		"",
-		i18n.G("specify server for new app"),
+		"specify server for new app",
 	)
 
 	AppNewCommand.RegisterFlagCompletionFunc(
-		i18n.G("server"),
+		"server",
 		func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			return autocomplete.ServerNameComplete()
 		},
@@ -352,34 +335,34 @@ func init() {
 
 	AppNewCommand.Flags().StringVarP(
 		&appDomain,
-		i18n.G("domain"),
+		"domain",
-		i18n.G("D"),
+		"D",
 		"",
-		i18n.G("domain name for app"),
+		"domain name for app",
 	)
 
 	AppNewCommand.Flags().BoolVarP(
 		&saveInPass,
-		i18n.G("pass"),
+		"pass",
-		i18n.G("p"),
+		"p",
 		false,
-		i18n.G("store secrets in a local pass store"),
+		"store secrets in a local pass store",
 	)
 
 	AppNewCommand.Flags().BoolVarP(
 		&generateSecrets,
-		i18n.G("secrets"),
+		"secrets",
-		i18n.G("S"),
+		"S",
 		false,
-		i18n.G("automatically generate secrets"),
+		"automatically generate secrets",
 	)
 
 	AppNewCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 
 }

cli/app/ps.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"sort"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
@@ -13,7 +12,6 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	abraService "coopcloud.tech/abra/pkg/service"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
@@ -25,9 +23,9 @@ import (
 )
 
 var AppPsCommand = &cobra.Command{
-	Use:     i18n.G("ps <domain> [flags]"),
+	Use:     "ps <domain> [flags]",
-	Aliases: []string{i18n.G("p")},
+	Aliases: []string{"p"},
-	Short:   i18n.G("Check app deployment status"),
+	Short:   "Check app deployment status",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -53,7 +51,7 @@ var AppPsCommand = &cobra.Command{
 		}
 
 		if !deployMeta.IsDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
+			log.Fatalf("%s is not deployed?", app.Name)
 		}
 
 		chaosVersion := config.CHAOS_DEFAULT
@@ -93,14 +91,9 @@ 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 services {
+	for _, service := range compose.Services {
 		filters := filters.NewArgs()
 		filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service.Name))
 
@@ -116,11 +109,11 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao
 				"version": deployedVersion,
 				"chaos":   chaosVersion,
 				"service": service.Name,
-				"image":   i18n.G("unknown"),
+				"image":   "unknown",
-				"created": i18n.G("unknown"),
+				"created": "unknown",
-				"status":  i18n.G("unknown"),
+				"status":  "unknown",
-				"state":   i18n.G("unknown"),
+				"state":   "unknown",
-				"ports":   i18n.G("unknown"),
+				"ports":   "unknown",
 			}
 		} else {
 			container := containers[0]
@@ -162,7 +155,7 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao
 	if internal.MachineReadable {
 		rendered, err := json.Marshal(allContainerStats)
 		if err != nil {
-			log.Fatal(i18n.G("unable to convert to JSON: %s", err))
+			log.Fatal("unable to convert to JSON: %s", err)
 		}
 
 		fmt.Println(string(rendered))
@@ -176,11 +169,11 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao
 	}
 
 	headers := []string{
-		i18n.G("SERVICE"),
+		"SERVICE",
-		i18n.G("STATUS"),
+		"STATUS",
-		i18n.G("IMAGE"),
+		"IMAGE",
-		i18n.G("VERSION"),
+		"VERSION",
-		i18n.G("CHAOS"),
+		"CHAOS",
 	}
 
 	table.
@@ -195,17 +188,17 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao
 func init() {
 	AppPsCommand.Flags().BoolVarP(
 		&internal.MachineReadable,
-		i18n.G("machine"),
+		"machine",
-		i18n.G("m"),
+		"m",
 		false,
-		i18n.G("print machine-readable output"),
+		"print machine-readable output",
 	)
 
 	AppPsCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }

cli/app/remove.go

@@ -2,24 +2,24 @@ package app
 
 import (
 	"context"
+	"fmt"
 	"os"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
-	"coopcloud.tech/abra/pkg/upstream/stack"
+	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/docker/docker/api/types"
 	"github.com/spf13/cobra"
 )
 
 var AppRemoveCommand = &cobra.Command{
-	Use:     i18n.G("remove <domain> [flags]"),
+	Use:     "remove <domain> [flags]",
-	Aliases: []string{i18n.G("rm")},
+	Aliases: []string{"rm"},
-	Short:   i18n.G("Remove all app data, locally and remotely"),
+	Short:   "Remove all app data, locally and remotely",
-	Long: i18n.G(`Remove everything related to an app which is already undeployed.
+	Long: `Remove everything related to an app which is already undeployed.
 
 By default, it will prompt for confirmation before proceeding. All secrets,
 volumes and the local app env file will be deleted.
@@ -34,8 +34,8 @@ Please note, if you delete the local app env file without removing volumes and
 secrets first, Abra will *not* be able to help you remove them afterwards.
 
 To delete everything without prompt, use the "--force/-f" or the "--no-input/n"
-flag.`),
+flag.`,
-	Example: i18n.G("  abra app remove 1312.net"),
+	Example: "  abra app remove 1312.net",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -47,16 +47,16 @@ flag.`),
 		app := internal.ValidateApp(args)
 
 		if !internal.Force && !internal.NoInput {
-			log.Warn(i18n.G("ALERTA ALERTA: deleting %s data and config (local/remote)", app.Name))
+			log.Warnf("ALERTA ALERTA: deleting %s data and config (local/remote)", app.Name)
 
 			response := false
-			prompt := &survey.Confirm{Message: i18n.G("are you sure?")}
+			prompt := &survey.Confirm{Message: "are you sure?"}
 			if err := survey.AskOne(prompt, &response); err != nil {
 				log.Fatal(err)
 			}
 
 			if !response {
-				log.Fatal(i18n.G("aborting as requested"))
+				log.Fatal("aborting as requested")
 			}
 		}
 
@@ -70,7 +70,7 @@ flag.`),
 			log.Fatal(err)
 		}
 		if deployMeta.IsDeployed {
-			log.Fatal(i18n.G("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name))
+			log.Fatalf("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
 		}
 
 		fs, err := app.Filters(false, false)
@@ -78,22 +78,6 @@ 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.Fatal(i18n.G("removing configs failed: %s", err))
-			}
-
-			log.Info(i18n.G("%d config(s) removed successfully", len(configNames)))
-		} else {
-			log.Info(i18n.G("no configs to remove"))
-		}
-
 		secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: fs})
 		if err != nil {
 			log.Fatal(err)
@@ -113,10 +97,10 @@ flag.`),
 				if err != nil {
 					log.Fatal(err)
 				}
-				log.Info(i18n.G("secret: %s removed", name))
+				log.Info(fmt.Sprintf("secret: %s removed", name))
 			}
 		} else {
-			log.Info(i18n.G("no secrets to remove"))
+			log.Info("no secrets to remove")
 		}
 
 		fs, err = app.Filters(false, true)
@@ -133,28 +117,28 @@ flag.`),
 		if len(volumeNames) > 0 {
 			err := client.RemoveVolumes(cl, context.Background(), volumeNames, internal.Force, 5)
 			if err != nil {
-				log.Fatal(i18n.G("removing volumes failed: %s", err))
+				log.Fatalf("removing volumes failed: %s", err)
 			}
 
-			log.Info(i18n.G("%d volume(s) removed successfully", len(volumeNames)))
+			log.Infof("%d volumes removed successfully", len(volumeNames))
 		} else {
-			log.Info(i18n.G("no volumes to remove"))
+			log.Info("no volumes to remove")
 		}
 
 		if err = os.Remove(app.Path); err != nil {
 			log.Fatal(err)
 		}
 
-		log.Info(i18n.G("file: %s removed", app.Path))
+		log.Info(fmt.Sprintf("file: %s removed", app.Path))
 	},
 }
 
 func init() {
 	AppRemoveCommand.Flags().BoolVarP(
 		&internal.Force,
-		i18n.G("force"),
+		"force",
-		i18n.G("f"),
+		"f",
 		false,
-		i18n.G("perform action without further prompt"),
+		"perform action without further prompt",
 	)
 }

cli/app/restart.go

@@ -8,29 +8,26 @@ import (
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/i18n"
 	"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"
 )
 
 var AppRestartCommand = &cobra.Command{
-	Use:     i18n.G("restart <domain> [[service] | --all-services] [flags]"),
+	Use:     "restart <domain> [[service] | --all-services] [flags]",
-	Aliases: []string{i18n.G("re")},
+	Aliases: []string{"re"},
-	Short:   i18n.G("Restart an app"),
+	Short:   "Restart an app",
-	Long: i18n.G(`This command restarts services within a deployed app.
+	Long: `This command restarts services within a deployed app.
 
 Run "abra app ps <domain>" to see a list of service names.
 
-Pass "--all-services/-a" to restart all services.`),
+Pass "--all-services/-a" to restart all services.`,
-	Example: i18n.G(`  # restart a single app service
+	Example: `  # restart a single app service
   abra app restart 1312.net app
 
   # restart all app services
-  abra app restart 1312.net -a`),
+  abra app restart 1312.net -a`,
 	Args: cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -61,11 +58,11 @@ Pass "--all-services/-a" to restart all services.`),
 		}
 
 		if serviceName == "" && !allServices {
-			log.Fatal(i18n.G("missing [service]"))
+			log.Fatal("missing [service]")
 		}
 
 		if serviceName != "" && allServices {
-			log.Fatal(i18n.G("cannot use [service] and --all-services/-a together"))
+			log.Fatal("cannot use [service] and --all-services/-a together")
 		}
 
 		var serviceNames []string
@@ -90,58 +87,35 @@ Pass "--all-services/-a" to restart all services.`),
 		}
 
 		if !deployMeta.IsDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
+			log.Fatalf("%s is not deployed?", app.Name)
 		}
 
 		for _, serviceName := range serviceNames {
 			stackServiceName := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
 
-			service, _, err := cl.ServiceInspectWithRaw(
+			log.Debugf("attempting to scale %s to 0", stackServiceName)
-				context.Background(),
-				stackServiceName,
-				types.ServiceInspectOptions{},
-			)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			log.Debug(i18n.G("attempting to scale %s to 0", stackServiceName))
 
 			if err := upstream.RunServiceScale(context.Background(), cl, stackServiceName, 0); err != nil {
 				log.Fatal(err)
 			}
 
-			f, err := app.Filters(true, false, serviceName)
+			if err := stack.WaitOnService(context.Background(), cl, stackServiceName, app.Name); err != nil {
-			if err != nil {
 				log.Fatal(err)
 			}
 
-			waitOpts := stack.WaitOpts{
+			log.Debugf("%s has been scaled to 0", stackServiceName)
-				Services:   []ui.ServiceMeta{{Name: stackServiceName, ID: service.ID}},
+			log.Debugf("attempting to scale %s to 1", stackServiceName)
-				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)
-			}
-
-			log.Debug(i18n.G("%s has been scaled to 0", stackServiceName))
-			log.Debug(i18n.G("attempting to scale %s to 1", stackServiceName))
 
 			if err := upstream.RunServiceScale(context.Background(), cl, stackServiceName, 1); err != nil {
 				log.Fatal(err)
 			}
 
-			if err := stack.WaitOnServices(cmd.Context(), cl, waitOpts); err != nil {
+			if err := stack.WaitOnService(context.Background(), cl, stackServiceName, app.Name); err != nil {
 				log.Fatal(err)
 			}
 
-			log.Debug(i18n.G("%s has been scaled to 1", stackServiceName))
+			log.Debugf("%s has been scaled to 1", stackServiceName)
-			log.Info(i18n.G("%s service successfully restarted", serviceName))
+			log.Infof("%s service successfully restarted", serviceName)
 		}
 	},
 }
@@ -151,16 +125,16 @@ var allServices bool
 func init() {
 	AppRestartCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 	AppRestartCommand.Flags().BoolVarP(
 		&allServices,
-		i18n.G("all-services"),
+		"all-services",
-		i18n.G("a"),
+		"a",
 		false,
-		i18n.G("restart all services"),
+		"restart all services",
 	)
 }

cli/app/restore.go

@@ -7,18 +7,17 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/spf13/cobra"
 )
 
 var AppRestoreCommand = &cobra.Command{
-	Use:     i18n.G("restore <domain> [flags]"),
+	Use:     "restore <domain> [flags]",
-	Aliases: []string{i18n.G("rs")},
+	Aliases: []string{"rs"},
-	Short:   i18n.G("Restore a snapshot"),
+	Short:   "Restore a snapshot",
-	Long: i18n.G(`Snapshots are restored while apps are deployed.
+	Long: `Snapshots are restored while apps are deployed.
 
-Some restore scenarios may require service / app restarts.`),
+Some restore scenarios may require service / app restarts.`,
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -49,34 +48,34 @@ Some restore scenarios may require service / app restarts.`),
 		}
 
 		if snapshot != "" {
-			log.Debug(i18n.G("including SNAPSHOT=%s in backupbot exec invocation", snapshot))
+			log.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
 			execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
 		}
 
 		if targetPath != "" {
-			log.Debug(i18n.G("including TARGET=%s in backupbot exec invocation", targetPath))
+			log.Debugf("including TARGET=%s in backupbot exec invocation", targetPath)
 			execEnv = append(execEnv, fmt.Sprintf("TARGET=%s", targetPath))
 		}
 
 		if internal.NoInput {
-			log.Debug(i18n.G("including NONINTERACTIVE=%v in backupbot exec invocation", internal.NoInput))
+			log.Debugf("including NONINTERACTIVE=%v in backupbot exec invocation", internal.NoInput)
 			execEnv = append(execEnv, fmt.Sprintf("NONINTERACTIVE=%v", internal.NoInput))
 		}
 
 		if len(volumes) > 0 {
 			allVolumes := strings.Join(volumes, ",")
-			log.Debug(i18n.G("including VOLUMES=%s in backupbot exec invocation", allVolumes))
+			log.Debugf("including VOLUMES=%s in backupbot exec invocation", allVolumes)
 			execEnv = append(execEnv, fmt.Sprintf("VOLUMES=%s", allVolumes))
 		}
 
 		if len(services) > 0 {
 			allServices := strings.Join(services, ",")
-			log.Debug(i18n.G("including CONTAINER=%s in backupbot exec invocation", allServices))
+			log.Debugf("including CONTAINER=%s in backupbot exec invocation", allServices)
 			execEnv = append(execEnv, fmt.Sprintf("CONTAINER=%s", allServices))
 		}
 
 		if hooks {
-			log.Debug(i18n.G("including NO_COMMANDS=%v in backupbot exec invocation", false))
+			log.Debugf("including NO_COMMANDS=%v in backupbot exec invocation", false)
 			execEnv = append(execEnv, fmt.Sprintf("NO_COMMANDS=%v", false))
 		}
 
@@ -96,41 +95,41 @@ var (
 func init() {
 	AppRestoreCommand.Flags().StringVarP(
 		&targetPath,
-		i18n.G("target"),
+		"target",
-		i18n.G("t"),
+		"t",
 		"/",
-		i18n.G("target path"),
+		"target path",
 	)
 
 	AppRestoreCommand.Flags().StringArrayVarP(
 		&services,
-		i18n.G("services"),
+		"services",
-		i18n.G("s"),
+		"s",
 		[]string{},
-		i18n.G("restore specific services"),
+		"restore specific services",
 	)
 
 	AppRestoreCommand.Flags().StringArrayVarP(
 		&volumes,
-		i18n.G("volumes"),
+		"volumes",
-		i18n.G("v"),
+		"v",
 		[]string{},
-		i18n.G("restore specific volumes"),
+		"restore specific volumes",
 	)
 
 	AppRestoreCommand.Flags().BoolVarP(
 		&hooks,
-		i18n.G("hooks"),
+		"hooks",
-		i18n.G("H"),
+		"H",
 		false,
-		i18n.G("enable pre/post-hook command execution"),
+		"enable pre/post-hook command execution",
 	)
 
 	AppRestoreCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }

cli/app/rollback.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"errors"
+	"fmt"
 
 	"coopcloud.tech/abra/pkg/app"
 	appPkg "coopcloud.tech/abra/pkg/app"
@@ -9,7 +9,6 @@ import (
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/envfile"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/lint"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"coopcloud.tech/tagcmp"
@@ -22,10 +21,10 @@ import (
 )
 
 var AppRollbackCommand = &cobra.Command{
-	Use:     i18n.G("rollback <domain> [version] [flags]"),
+	Use:     "rollback <domain> [version] [flags]",
-	Aliases: []string{i18n.G("rl")},
+	Aliases: []string{"rl"},
-	Short:   i18n.G("Roll an app back to a previous version"),
+	Short:   "Roll an app back to a previous version",
-	Long: i18n.G(`This command rolls an app back to a previous version.
+	Long: `This command rolls an app back to a previous version.
 
 Unlike "abra app deploy", chaos operations are not supported here. Only recipe
 versions are supported values for "[version]".
@@ -38,12 +37,12 @@ are available. The live deployment version is the "source of truth" in this
 case. The stored .env version is not consulted.
 
 A downgrade can be destructive, please ensure you have a copy of your app data
-beforehand. See "abra app backup" for more.`),
+beforehand. See "abra app backup" for more.`,
-	Example: i18n.G(` # standard rollback
+	Example: ` # standard rollback
   abra app rollback 1312.net
 
   # rollback to specific version
-  abra app rollback 1312.net 2.0.0+1.2.3`),
+  abra app rollback 1312.net 2.0.0+1.2.3`,
 	Args: cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -55,7 +54,8 @@ beforehand. See "abra app backup" for more.`),
 		case 1:
 			app, err := appPkg.Get(args[0])
 			if err != nil {
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
+				errMsg := fmt.Sprintf("autocomplete failed: %s", err)
+				return []string{errMsg}, cobra.ShellCompDirectiveError
 			}
 			return autocomplete.RecipeVersionComplete(app.Recipe.Name)
 		default:
@@ -117,7 +117,7 @@ beforehand. See "abra app backup" for more.`),
 			}
 
 			if !downgradeAvailable {
-				log.Info(i18n.G("no available downgrades"))
+				log.Info("no available downgrades")
 				return
 			}
 		}
@@ -139,10 +139,10 @@ beforehand. See "abra app backup" for more.`),
 		}
 
 		if chosenDowngrade == "" {
-			log.Fatal(i18n.G("unknown deployed version, unable to downgrade"))
+			log.Fatal("unknown deployed version, unable to downgrade")
 		}
 
-		log.Debug(i18n.G("choosing %s as version to rollback", chosenDowngrade))
+		log.Debugf("choosing %s as version to rollback", chosenDowngrade)
 
 		if _, err := app.Recipe.EnsureVersion(chosenDowngrade); err != nil {
 			log.Fatal(err)
@@ -194,37 +194,12 @@ beforehand. See "abra app backup" for more.`),
 			log.Fatal(err)
 		}
 
-		stack.WaitTimeout, err = appPkg.GetTimeoutFromLabel(compose, stackName)
+		if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		log.Debug(i18n.G("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)
 		}
 
 		if err := app.WriteRecipeVersion(chosenDowngrade, false); err != nil {
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }
@@ -235,12 +210,12 @@ func chooseDowngrade(
 	deployMeta stack.DeployMeta,
 	chosenDowngrade *string,
 ) error {
-	msg := i18n.G("please select a downgrade (version: %s):", deployMeta.Version)
+	msg := fmt.Sprintf("please select a downgrade (version: %s):", deployMeta.Version)
 
 	if deployMeta.IsChaos {
 		chaosVersion := formatter.BoldDirtyDefault(deployMeta.ChaosVersion)
 
-		msg = i18n.G(
+		msg = fmt.Sprintf(
 			"please select a downgrade (version: %s, chaos: %s):",
 			deployMeta.Version,
 			chaosVersion,
@@ -267,21 +242,21 @@ func validateDowngradeVersionArg(
 ) error {
 	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
 	if err != nil {
-		return errors.New(i18n.G("current deployment '%s' is not a known version for %s", deployMeta.Version, app.Recipe.Name))
+		return fmt.Errorf("current deployment '%s' is not a known version for %s", deployMeta.Version, app.Recipe.Name)
 	}
 
 	parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
 	if err != nil {
-		return errors.New(i18n.G("'%s' is not a known version for %s", specificVersion, app.Recipe.Name))
+		return fmt.Errorf("'%s' is not a known version for %s", specificVersion, app.Recipe.Name)
 	}
 
 	if parsedSpecificVersion.IsGreaterThan(parsedDeployedVersion) &&
 		!parsedSpecificVersion.Equals(parsedDeployedVersion) {
-		return errors.New(i18n.G("%s is not a downgrade for %s?", deployMeta.Version, specificVersion))
+		return fmt.Errorf("%s is not a downgrade for %s?", deployMeta.Version, specificVersion)
 	}
 
 	if parsedSpecificVersion.Equals(parsedDeployedVersion) && !internal.Force {
-		return errors.New(i18n.G("%s is not a downgrade for %s?", deployMeta.Version, specificVersion))
+		return fmt.Errorf("%s is not a downgrade for %s?", deployMeta.Version, specificVersion)
 	}
 
 	return nil
@@ -320,25 +295,24 @@ func ensureDowngradesAvailable(
 func init() {
 	AppRollbackCommand.Flags().BoolVarP(
 		&internal.Force,
-		i18n.G("force"),
+		"force",
-		i18n.G("f"),
+		"f",
 		false,
-		i18n.G("perform action without further prompt"),
+		"perform action without further prompt",
 	)
 
 	AppRollbackCommand.Flags().BoolVarP(
 		&internal.NoDomainChecks,
-		i18n.G("no-domain-checks"),
+		"no-domain-checks",
-		i18n.G("D"),
+		"D",
 		false,
-		i18n.G("disable public DNS checks"),
+		"disable public DNS checks",
 	)
 
 	AppRollbackCommand.Flags().BoolVarP(
-		&internal.DontWaitConverge,
+		&internal.DontWaitConverge, "no-converge-checks",
-		i18n.G("no-converge-checks"),
+		"c",
-		i18n.G("c"),
 		false,
-		i18n.G("disable converge logic checks"),
+		"disable converge logic checks",
 	)
 }

cli/app/run.go

@@ -8,7 +8,6 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	containerPkg "coopcloud.tech/abra/pkg/container"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/container"
 	"github.com/docker/cli/cli/command"
@@ -18,17 +17,17 @@ import (
 )
 
 var AppRunCommand = &cobra.Command{
-	Use:     i18n.G("run <domain> <service> <cmd> [[args] [flags] | [flags] -- [args]]"),
+	Use:     "run <domain> <service> <cmd> [[args] [flags] | [flags] -- [args]]",
-	Aliases: []string{i18n.G("r")},
+	Aliases: []string{"r"},
-	Short:   i18n.G("Run a command inside a service container"),
+	Short:   "Run a command inside a service container",
-	Example: i18n.G(`  # run <cmd> with args/flags
+	Example: `  # run <cmd> with args/flags
   abra app run 1312.net app -- ls -lha
 
   # run <cmd> without args/flags
   abra app run 1312.net app bash --user nobody
 
   # run <cmd> with both kinds of args/flags 
-  abra app run 1312.net app --user nobody -- ls -lha`),
+  abra app run 1312.net app --user nobody -- ls -lha`,
 	Args: cobra.MinimumNArgs(3),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -99,17 +98,17 @@ var (
 
 func init() {
 	AppRunCommand.Flags().BoolVarP(&noTTY,
-		i18n.G("no-tty"),
+		"no-tty",
-		i18n.G("t"),
+		"t",
 		false,
-		i18n.G("do not request a TTY"),
+		"do not request a TTY",
 	)
 
 	AppRunCommand.Flags().StringVarP(
 		&runAsUser,
-		i18n.G("user"),
+		"user",
-		i18n.G("u"),
+		"u",
 		"",
-		i18n.G("run command as user"),
+		"run command as user",
 	)
 }

cli/app/secret.go

@@ -12,7 +12,6 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/secret"
 	"github.com/docker/docker/api/types"
@@ -21,9 +20,9 @@ import (
 )
 
 var AppSecretGenerateCommand = &cobra.Command{
-	Use:     i18n.G("generate <domain> [[secret] [version] | --all] [flags]"),
+	Use:     "generate <domain> [[secret] [version] | --all] [flags]",
-	Aliases: []string{i18n.G("g")},
+	Aliases: []string{"g"},
-	Short:   i18n.G("Generate secrets"),
+	Short:   "Generate secrets",
 	Args:    cobra.RangeArgs(1, 3),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -35,7 +34,8 @@ var AppSecretGenerateCommand = &cobra.Command{
 		case 1:
 			app, err := appPkg.Get(args[0])
 			if err != nil {
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
+				errMsg := fmt.Sprintf("autocomplete failed: %s", err)
+				return []string{errMsg}, cobra.ShellCompDirectiveError
 			}
 			return autocomplete.SecretComplete(app.Recipe.Name)
 		default:
@@ -50,11 +50,11 @@ var AppSecretGenerateCommand = &cobra.Command{
 		}
 
 		if len(args) <= 2 && !generateAllSecrets {
-			log.Fatal(i18n.G("missing arguments [secret]/[version] or '--all'"))
+			log.Fatal("missing arguments [secret]/[version] or '--all'")
 		}
 
 		if len(args) > 2 && generateAllSecrets {
-			log.Fatal(i18n.G("cannot use '[secret] [version]' and '--all' together"))
+			log.Fatal("cannot use '[secret] [version]' and '--all' together")
 		}
 
 		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
@@ -72,7 +72,7 @@ var AppSecretGenerateCommand = &cobra.Command{
 			secretVersion := args[2]
 			s, ok := secrets[secretName]
 			if !ok {
-				log.Fatal(i18n.G("%s doesn't exist in the env config?", secretName))
+				log.Fatalf("%s doesn't exist in the env config?", secretName)
 			}
 			s.Version = secretVersion
 			secrets = map[string]secret.Secret{
@@ -99,11 +99,11 @@ var AppSecretGenerateCommand = &cobra.Command{
 		}
 
 		if len(secretVals) == 0 {
-			log.Warn(i18n.G("no secrets generated"))
+			log.Warn("no secrets generated")
 			os.Exit(1)
 		}
 
-		headers := []string{i18n.G("NAME"), i18n.G("VALUE")}
+		headers := []string{"NAME", "VALUE"}
 		table, err := formatter.CreateTable()
 		if err != nil {
 			log.Fatal(err)
@@ -121,7 +121,7 @@ var AppSecretGenerateCommand = &cobra.Command{
 		if internal.MachineReadable {
 			out, err := formatter.ToJSON(headers, rows)
 			if err != nil {
-				log.Fatal(i18n.G("unable to render to JSON: %s", err))
+				log.Fatal("unable to render to JSON: %s", err)
 			}
 			fmt.Println(out)
 			return
@@ -131,31 +131,23 @@ var AppSecretGenerateCommand = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		log.Warn(i18n.G(
+		log.Warnf(
 			"generated secrets %s shown again, please take note of them %s",
-			formatter.BoldStyle.Render(i18n.G("NOT")),
+			formatter.BoldStyle.Render("NOT"),
-			formatter.BoldStyle.Render(i18n.G("NOW")),
+			formatter.BoldStyle.Render("NOW"),
-		))
+		)
 	},
 }
 
 var AppSecretInsertCommand = &cobra.Command{
-	Use:     i18n.G("insert <domain> <secret> <version> <data> [flags]"),
+	Use:     "insert <domain> <secret> <version> <data> [flags]",
-	Aliases: []string{i18n.G("i")},
+	Aliases: []string{"i"},
-	Short:   i18n.G("Insert secret"),
+	Short:   "Insert secret",
-	Long: i18n.G(`This command inserts a secret into an app environment.
+	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).`),
+(see "abra app new --secrets/-S" for more).`,
-	Example: i18n.G(`  # 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,
@@ -167,7 +159,8 @@ environment. Typically, you can let Abra generate them for you on app creation
 		case 1:
 			app, err := appPkg.Get(args[0])
 			if err != nil {
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
+				errMsg := fmt.Sprintf("autocomplete failed: %s", err)
+				return []string{errMsg}, cobra.ShellCompDirectiveError
 			}
 			return autocomplete.SecretComplete(app.Recipe.Name)
 		default:
@@ -190,30 +183,10 @@ 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.Fatal(i18n.G("no secret %s available for recipe %s?", name, app.Recipe.Name))
-		}
-
 		if insertFromFile {
 			raw, err := os.ReadFile(data)
 			if err != nil {
-				log.Fatal(i18n.G("reading secret from file: %s", err))
+				log.Fatalf("reading secret from file: %s", err)
 			}
 			data = string(raw)
 		}
@@ -227,7 +200,7 @@ environment. Typically, you can let Abra generate them for you on app creation
 			log.Fatal(err)
 		}
 
-		log.Info(i18n.G("%s successfully stored on server", secretName))
+		log.Infof("%s successfully stored on server", secretName)
 
 		if storeInPass {
 			if err := secret.PassInsertSecret(data, name, app.Name, app.Server); err != nil {
@@ -243,28 +216,23 @@ func secretRm(cl *dockerClient.Client, app appPkg.App, secretName, parsed string
 		return err
 	}
 
-	log.Info(i18n.G("deleted %s successfully from server", secretName))
+	log.Infof("deleted %s successfully from server", secretName)
 
 	if removeFromPass {
 		if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
 			return err
 		}
 
-		log.Info(i18n.G("deleted %s successfully from local pass store", secretName))
+		log.Infof("deleted %s successfully from local pass store", secretName)
 	}
 
 	return nil
 }
 
 var AppSecretRmCommand = &cobra.Command{
-	Use:     i18n.G("remove <domain> [[secret] | --all] [flags]"),
+	Use:     "remove <domain> [[secret] | --all] [flags]",
-	Aliases: []string{i18n.G("rm")},
+	Aliases: []string{"rm"},
-	Short:   i18n.G("Remove a secret"),
+	Short:   "Remove a secret",
-	Long: i18n.G(`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: i18n.G("  abra app secret rm 1312.net oauth_key"),
 	Args:    cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -277,7 +245,8 @@ match those configured in the recipe beforehand.`),
 			if !rmAllSecrets {
 				app, err := appPkg.Get(args[0])
 				if err != nil {
-					return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
+					errMsg := fmt.Sprintf("autocomplete failed: %s", err)
+					return []string{errMsg}, cobra.ShellCompDirectiveError
 				}
 				return autocomplete.SecretComplete(app.Recipe.Name)
 			}
@@ -304,11 +273,11 @@ match those configured in the recipe beforehand.`),
 		}
 
 		if len(args) == 2 && rmAllSecrets {
-			log.Fatal(i18n.G("cannot use [secret] and --all/-a together"))
+			log.Fatal("cannot use [secret] and --all/-a together")
 		}
 
 		if len(args) != 2 && !rmAllSecrets {
-			log.Fatal(i18n.G("no secret(s) specified?"))
+			log.Fatal("no secret(s) specified?")
 		}
 
 		cl, err := client.New(app.Server)
@@ -359,19 +328,19 @@ match those configured in the recipe beforehand.`),
 		}
 
 		if !match && secretToRm != "" {
-			log.Fatal(i18n.G("%s doesn't exist on server?", secretToRm))
+			log.Fatalf("%s doesn't exist on server?", secretToRm)
 		}
 
 		if !match {
-			log.Fatal(i18n.G("no secrets to remove?"))
+			log.Fatal("no secrets to remove?")
 		}
 	},
 }
 
 var AppSecretLsCommand = &cobra.Command{
-	Use:     i18n.G("list <domain>"),
+	Use:     "list <domain>",
-	Aliases: []string{i18n.G("ls")},
+	Aliases: []string{"ls"},
-	Short:   i18n.G("List all secrets"),
+	Short:   "List all secrets",
 	Args:    cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -391,7 +360,7 @@ var AppSecretLsCommand = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		headers := []string{i18n.G("NAME"), i18n.G("VERSION"), i18n.G("GENERATED NAME"), i18n.G("CREATED ON SERVER")}
+		headers := []string{"NAME", "VERSION", "GENERATED NAME", "CREATED ON SERVER"}
 		table, err := formatter.CreateTable()
 		if err != nil {
 			log.Fatal(err)
@@ -421,7 +390,7 @@ var AppSecretLsCommand = &cobra.Command{
 			if internal.MachineReadable {
 				out, err := formatter.ToJSON(headers, rows)
 				if err != nil {
-					log.Fatal(i18n.G("unable to render to JSON: %s", err))
+					log.Fatal("unable to render to JSON: %s", err)
 				}
 				fmt.Println(out)
 				return
@@ -434,14 +403,14 @@ var AppSecretLsCommand = &cobra.Command{
 			return
 		}
 
-		log.Warn(i18n.G("no secrets stored for %s", app.Name))
+		log.Warnf("no secrets stored for %s", app.Name)
 	},
 }
 
 var AppSecretCommand = &cobra.Command{
-	Use:     i18n.G("secret [cmd] [args] [flags]"),
+	Use:     "secret [cmd] [args] [flags]",
-	Aliases: []string{i18n.G("s")},
+	Aliases: []string{"s"},
-	Short:   i18n.G("Manage app secrets"),
+	Short:   "Manage app secrets",
 }
 
 var (
@@ -456,105 +425,105 @@ var (
 func init() {
 	AppSecretGenerateCommand.Flags().BoolVarP(
 		&internal.MachineReadable,
-		i18n.G("machine"),
+		"machine",
-		i18n.G("m"),
+		"m",
 		false,
-		i18n.G("print machine-readable output"),
+		"print machine-readable output",
 	)
 
 	AppSecretGenerateCommand.Flags().BoolVarP(
 		&storeInPass,
-		i18n.G("pass"),
+		"pass",
-		i18n.G("p"),
+		"p",
 		false,
-		i18n.G("store generated secrets in a local pass store"),
+		"store generated secrets in a local pass store",
 	)
 
 	AppSecretGenerateCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 
 	AppSecretGenerateCommand.Flags().BoolVarP(
 		&generateAllSecrets,
-		i18n.G("all"),
+		"all",
-		i18n.G("a"),
+		"a",
 		false,
-		i18n.G("generate all secrets"),
+		"generate all secrets",
 	)
 
 	AppSecretInsertCommand.Flags().BoolVarP(
 		&storeInPass,
-		i18n.G("pass"),
+		"pass",
-		i18n.G("p"),
+		"p",
 		false,
-		i18n.G("store generated secrets in a local pass store"),
+		"store generated secrets in a local pass store",
 	)
 
 	AppSecretInsertCommand.Flags().BoolVarP(
 		&insertFromFile,
-		i18n.G("file"),
+		"file",
-		i18n.G("f"),
+		"f",
 		false,
-		i18n.G("treat input as a file"),
+		"treat input as a file",
 	)
 
 	AppSecretInsertCommand.Flags().BoolVarP(
 		&trimInput,
-		i18n.G("trim"),
+		"trim",
-		i18n.G("t"),
+		"t",
 		false,
-		i18n.G("trim input"),
+		"trim input",
 	)
 
 	AppSecretInsertCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 
 	AppSecretRmCommand.Flags().BoolVarP(
 		&rmAllSecrets,
-		i18n.G("all"),
+		"all",
-		i18n.G("a"),
+		"a",
 		false,
-		i18n.G("remove all secrets"),
+		"remove all secrets",
 	)
 
 	AppSecretRmCommand.Flags().BoolVarP(
 		&removeFromPass,
-		i18n.G("pass"),
+		"pass",
-		i18n.G("p"),
+		"p",
 		false,
-		i18n.G("remove generated secrets from a local pass store"),
+		"remove generated secrets from a local pass store",
 	)
 
 	AppSecretRmCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 
 	AppSecretLsCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 
 	AppSecretLsCommand.Flags().BoolVarP(
 		&internal.MachineReadable,
-		i18n.G("machine"),
+		"machine",
-		i18n.G("m"),
+		"m",
 		false,
-		i18n.G("print machine-readable output"),
+		"print machine-readable output",
 	)
 }

cli/app/services.go

@@ -9,7 +9,6 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/service"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
@@ -18,9 +17,9 @@ import (
 )
 
 var AppServicesCommand = &cobra.Command{
-	Use:     i18n.G("services <domain> [flags]"),
+	Use:     "services <domain> [flags]",
-	Aliases: []string{i18n.G("sr")},
+	Aliases: []string{"sr"},
-	Short:   i18n.G("Display all services of an app"),
+	Short:   "Display all services of an app",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -46,7 +45,7 @@ var AppServicesCommand = &cobra.Command{
 		}
 
 		if !deployMeta.IsDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
+			log.Fatalf("%s is not deployed?", app.Name)
 		}
 
 		filters, err := app.Filters(true, true)
@@ -64,7 +63,7 @@ var AppServicesCommand = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		headers := []string{i18n.G("SERVICE (SHORT)"), i18n.G("SERVICE (LONG)")}
+		headers := []string{"SERVICE (SHORT)", "SERVICE (LONG)"}
 		table.Headers(headers...)
 
 		var rows [][]string

cli/app/undeploy.go

@@ -10,7 +10,6 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/docker/docker/api/types/filters"
@@ -19,15 +18,15 @@ import (
 )
 
 var AppUndeployCommand = &cobra.Command{
-	Use:     i18n.G("undeploy <domain> [flags]"),
+	Use:     "undeploy <domain> [flags]",
-	Aliases: []string{i18n.G("un")},
+	Aliases: []string{"un"},
-	Short:   i18n.G("Undeploy an app"),
+	Short:   "Undeploy an app",
-	Long: i18n.G(`This does not destroy any application data.
+	Long: `This does not destroy any application data.
 
 However, you should remain vigilant, as your swarm installation will consider
 any previously attached volumes as eligible for pruning once undeployed.
 
-Passing "--prune/-p" does not remove those volumes.`),
+Passing "--prune/-p" does not remove those volumes.`,
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -39,16 +38,12 @@ 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)
 		}
 
-		log.Debug(i18n.G("checking whether %s is already deployed", stackName))
+		log.Debugf("checking whether %s is already deployed", stackName)
 
 		deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
 		if err != nil {
@@ -56,7 +51,7 @@ Passing "--prune/-p" does not remove those volumes.`),
 		}
 
 		if !deployMeta.IsDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
+			log.Fatalf("%s is not deployed?", app.Name)
 		}
 
 		if err := internal.DeployOverview(
@@ -69,24 +64,6 @@ 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(i18n.G("initialising undeploy"))
-
 		rmOpts := stack.Remove{
 			Namespaces: []string{stackName},
 			Detach:     false,
@@ -101,10 +78,8 @@ Passing "--prune/-p" does not remove those volumes.`),
 			}
 		}
 
-		log.Info(i18n.G("undeploy succeeded 🟢"))
-
 		if err := app.WriteRecipeVersion(deployMeta.Version, false); err != nil {
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }
@@ -125,14 +100,14 @@ func pruneApp(cl *dockerClient.Client, app appPkg.App) error {
 	}
 
 	cntSpaceReclaimed := formatter.ByteCountSI(cr.SpaceReclaimed)
-	log.Info(i18n.G("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed))
+	log.Infof("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed)
 
 	nr, err := cl.NetworksPrune(ctx, pruneFilters)
 	if err != nil {
 		return err
 	}
 
-	log.Info(i18n.G("networks pruned: %d", len(nr.NetworksDeleted)))
+	log.Infof("networks pruned: %d", len(nr.NetworksDeleted))
 
 	ir, err := cl.ImagesPrune(ctx, pruneFilters)
 	if err != nil {
@@ -140,7 +115,7 @@ func pruneApp(cl *dockerClient.Client, app appPkg.App) error {
 	}
 
 	imgSpaceReclaimed := formatter.ByteCountSI(ir.SpaceReclaimed)
-	log.Info(i18n.G("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed))
+	log.Infof("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed)
 
 	return nil
 }
@@ -152,9 +127,9 @@ var (
 func init() {
 	AppUndeployCommand.Flags().BoolVarP(
 		&prune,
-		i18n.G("prune"),
+		"prune",
-		i18n.G("p"),
+		"p",
 		false,
-		i18n.G("prune unused containers, networks, and dangling images"),
+		"prune unused containers, networks, and dangling images",
 	)
 }

cli/app/upgrade.go

@@ -2,9 +2,7 @@ package app
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/app"
@@ -14,10 +12,8 @@ import (
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/envfile"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"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"
@@ -26,10 +22,10 @@ import (
 )
 
 var AppUpgradeCommand = &cobra.Command{
-	Use:     i18n.G("upgrade <domain> [version] [flags]"),
+	Use:     "upgrade <domain> [version] [flags]",
-	Aliases: []string{i18n.G("up")},
+	Aliases: []string{"up"},
-	Short:   i18n.G("Upgrade an app"),
+	Short:   "Upgrade an app",
-	Long: i18n.G(`Upgrade an app.
+	Long: `Upgrade an app.
 
 Unlike "abra app deploy", chaos operations are not supported here. Only recipe
 versions are supported values for "[version]".
@@ -42,7 +38,7 @@ are available. The live deployment version is the "source of truth" in this
 case. The stored .env version is not consulted.
 
 An upgrade can be destructive, please ensure you have a copy of your app data
-beforehand. See "abra app backup" for more.`),
+beforehand. See "abra app backup" for more.`,
 	Args: cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -55,7 +51,8 @@ beforehand. See "abra app backup" for more.`),
 		case 1:
 			app, err := appPkg.Get(args[0])
 			if err != nil {
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
+				errMsg := fmt.Sprintf("autocomplete failed: %s", err)
+				return []string{errMsg}, cobra.ShellCompDirectiveError
 			}
 			return autocomplete.RecipeVersionComplete(app.Recipe.Name)
 		default:
@@ -72,13 +69,7 @@ beforehand. See "abra app backup" for more.`),
 
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(recipe.EnsureContext{
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
-			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)
 		}
 
@@ -118,13 +109,13 @@ beforehand. See "abra app backup" for more.`),
 		}
 
 		if deployMeta.Version != config.UNKNOWN_DEFAULT && chosenUpgrade == "" {
-			upgradeAvailable, err := ensureUpgradesAvailable(app, versions, &availableUpgrades, deployMeta)
+			upgradeAvailable, err := ensureUpgradesAvailable(versions, &availableUpgrades, deployMeta)
 			if err != nil {
 				log.Fatal(err)
 			}
 
 			if !upgradeAvailable {
-				log.Info(i18n.G("no available upgrades"))
+				log.Info("no available upgrades")
 				return
 			}
 		}
@@ -146,14 +137,15 @@ beforehand. See "abra app backup" for more.`),
 		}
 
 		if chosenUpgrade == "" {
-			log.Fatal(i18n.G("unknown deployed version, unable to upgrade"))
+			log.Fatal("unknown deployed version, unable to upgrade")
 		}
 
-		log.Debug(i18n.G("choosing %s as version to upgrade", chosenUpgrade))
+		log.Debugf("choosing %s as version to upgrade", chosenUpgrade)
 
-		// Get the release notes before checking out the new version in the
+		// NOTE(d1): if release notes written after git tag published, read them
-		// recipe. This enables us to get release notes, that were added after
+		// before we check out the tag and then they'll appear to be missing. this
-		// a release.
+		// covers when we obviously will forget to write release notes before
+		// publishing
 		if err := getReleaseNotes(app, versions, chosenUpgrade, deployMeta, &upgradeReleaseNotes); err != nil {
 			log.Fatal(err)
 		}
@@ -205,7 +197,7 @@ beforehand. See "abra app backup" for more.`),
 		for _, envVar := range envVars {
 			if !envVar.Present {
 				upgradeWarnMessages = append(upgradeWarnMessages,
-					i18n.G("%s missing from %s.env", envVar.Name, app.Domain),
+					fmt.Sprintf("%s missing from %s.env", envVar.Name, app.Domain),
 				)
 			}
 		}
@@ -215,7 +207,9 @@ beforehand. See "abra app backup" for more.`),
 			return
 		}
 
-		if upgradeReleaseNotes == "" {
+		if upgradeReleaseNotes != "" && chosenUpgrade != "" {
+			fmt.Print(upgradeReleaseNotes)
+		} else {
 			upgradeWarnMessages = append(
 				upgradeWarnMessages,
 				fmt.Sprintf("no release notes available for %s", chosenUpgrade),
@@ -237,41 +231,23 @@ beforehand. See "abra app backup" for more.`),
 			log.Fatal(err)
 		}
 
-		log.Debug(i18n.G("set waiting timeout to %d second(s)", stack.WaitTimeout))
+		log.Debugf("set waiting timeout to %d second(s)", stack.WaitTimeout)
 
-		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
+		if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
-		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)
 		}
 
 		postDeployCmds, ok := app.Env["POST_UPGRADE_CMDS"]
 		if ok && !internal.DontWaitConverge {
-			log.Debug(i18n.G("run the following post-deploy commands: %s", postDeployCmds))
+			log.Debugf("run the following post-deploy commands: %s", postDeployCmds)
 
 			if err := internal.PostCmds(cl, app, postDeployCmds); err != nil {
-				log.Fatal(i18n.G("attempting to run post deploy commands, saw: %s", err))
+				log.Fatalf("attempting to run post deploy commands, saw: %s", err)
 			}
 		}
 
 		if err := app.WriteRecipeVersion(chosenUpgrade, false); err != nil {
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }
@@ -282,12 +258,12 @@ func chooseUpgrade(
 	deployMeta stack.DeployMeta,
 	chosenUpgrade *string,
 ) error {
-	msg := i18n.G("please select an upgrade (version: %s):", deployMeta.Version)
+	msg := fmt.Sprintf("please select an upgrade (version: %s):", deployMeta.Version)
 
 	if deployMeta.IsChaos {
 		chaosVersion := formatter.BoldDirtyDefault(deployMeta.ChaosVersion)
 
-		msg = i18n.G(
+		msg = fmt.Sprintf(
 			"please select an upgrade (version: %s, chaos: %s):",
 			deployMeta.Version,
 			chaosVersion,
@@ -315,18 +291,18 @@ func getReleaseNotes(
 ) error {
 	parsedChosenUpgrade, err := tagcmp.Parse(chosenUpgrade)
 	if err != nil {
-		return errors.New(i18n.G("parsing chosen upgrade version failed: %s", err))
+		return err
 	}
 
 	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
 	if err != nil {
-		return errors.New(i18n.G("parsing deployment version failed: %s", err))
+		return err
 	}
 
 	for _, version := range internal.SortVersionsDesc(versions) {
 		parsedVersion, err := tagcmp.Parse(version)
 		if err != nil {
-			return errors.New(i18n.G("parsing recipe version failed: %s", err))
+			return err
 		}
 
 		if parsedVersion.IsGreaterThan(parsedDeployedVersion) &&
@@ -337,11 +313,6 @@ 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)
 			}
 		}
@@ -352,20 +323,19 @@ 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, errors.New(i18n.G("parsing deployed version failed: %s", err))
+		return false, err
 	}
 
 	for _, version := range versions {
 		parsedVersion, err := tagcmp.Parse(version)
 		if err != nil {
-			return false, errors.New(i18n.G("parsing recipe version failed: %s", err))
+			return false, err
 		}
 
 		if parsedVersion.IsGreaterThan(parsedDeployedVersion) &&
@@ -389,21 +359,21 @@ func validateUpgradeVersionArg(
 ) error {
 	parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
 	if err != nil {
-		return errors.New(i18n.G("'%s' is not a known version for %s", specificVersion, app.Recipe.Name))
+		return fmt.Errorf("'%s' is not a known version for %s", specificVersion, app.Recipe.Name)
 	}
 
 	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
 	if err != nil {
-		return errors.New(i18n.G("'%s' is not a known version", deployMeta.Version))
+		return fmt.Errorf("'%s' is not a known version", deployMeta.Version)
 	}
 
 	if parsedSpecificVersion.IsLessThan(parsedDeployedVersion) &&
 		!parsedSpecificVersion.Equals(parsedDeployedVersion) {
-		return errors.New(i18n.G("%s is not an upgrade for %s?", deployMeta.Version, specificVersion))
+		return fmt.Errorf("%s is not an upgrade for %s?", deployMeta.Version, specificVersion)
 	}
 
 	if parsedSpecificVersion.Equals(parsedDeployedVersion) && !internal.Force {
-		return errors.New(i18n.G("%s is not an upgrade for %s?", deployMeta.Version, specificVersion))
+		return fmt.Errorf("%s is not an upgrade for %s?", deployMeta.Version, specificVersion)
 	}
 
 	return nil
@@ -412,7 +382,7 @@ func validateUpgradeVersionArg(
 // ensureDeployed ensures the app is deployed and if so, returns deployment
 // meta info.
 func ensureDeployed(cl *dockerClient.Client, app app.App) (stack.DeployMeta, error) {
-	log.Debug(i18n.G("checking whether %s is already deployed", app.StackName()))
+	log.Debugf("checking whether %s is already deployed", app.StackName())
 
 	deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
 	if err != nil {
@@ -420,7 +390,7 @@ func ensureDeployed(cl *dockerClient.Client, app app.App) (stack.DeployMeta, err
 	}
 
 	if !deployMeta.IsDeployed {
-		return stack.DeployMeta{}, errors.New(i18n.G("%s is not deployed?", app.Name))
+		return stack.DeployMeta{}, fmt.Errorf("%s is not deployed?", app.Name)
 	}
 
 	return deployMeta, nil
@@ -431,33 +401,32 @@ var showReleaseNotes bool
 func init() {
 	AppUpgradeCommand.Flags().BoolVarP(
 		&internal.Force,
-		i18n.G("force"),
+		"force",
-		i18n.G("f"),
+		"f",
 		false,
-		i18n.G("perform action without further prompt"),
+		"perform action without further prompt",
 	)
 
 	AppUpgradeCommand.Flags().BoolVarP(
 		&internal.NoDomainChecks,
-		i18n.G("no-domain-checks"),
+		"no-domain-checks",
-		i18n.G("D"),
+		"D",
 		false,
-		i18n.G("disable public DNS checks"),
+		"disable public DNS checks",
 	)
 
 	AppUpgradeCommand.Flags().BoolVarP(
-		&internal.DontWaitConverge,
+		&internal.DontWaitConverge, "no-converge-checks",
-		i18n.G("no-converge-checks"),
+		"c",
-		i18n.G("c"),
 		false,
-		i18n.G("disable converge logic checks"),
+		"disable converge logic checks",
 	)
 
 	AppUpgradeCommand.Flags().BoolVarP(
 		&showReleaseNotes,
-		i18n.G("releasenotes"),
+		"releasenotes",
-		i18n.G("r"),
+		"r",
 		false,
-		i18n.G("only show release notes"),
+		"only show release notes",
 	)
 }

cli/app/volume.go

@@ -2,13 +2,11 @@ package app
 
 import (
 	"context"
-	"fmt"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/AlecAivazis/survey/v2"
@@ -16,9 +14,9 @@ import (
 )
 
 var AppVolumeListCommand = &cobra.Command{
-	Use:     i18n.G("list <domain> [flags]"),
+	Use:     "list <domain> [flags]",
-	Aliases: []string{i18n.G("ls")},
+	Aliases: []string{"ls"},
-	Short:   i18n.G("List volumes associated with an app"),
+	Short:   "List volumes associated with an app",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -44,7 +42,7 @@ var AppVolumeListCommand = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		headers := []string{i18n.G("NAME"), i18n.G("ON SERVER")}
+		headers := []string{"NAME", "ON SERVER"}
 
 		table, err := formatter.CreateTable()
 		if err != nil {
@@ -68,14 +66,14 @@ var AppVolumeListCommand = &cobra.Command{
 			return
 		}
 
-		log.Warn(i18n.G("no volumes created for %s", app.Name))
+		log.Warnf("no volumes created for %s", app.Name)
 	},
 }
 
 var AppVolumeRemoveCommand = &cobra.Command{
-	Use:   i18n.G("remove <domain> [volume] [flags]"),
+	Use:   "remove <domain> [flags]",
-	Short: i18n.G("Remove volume(s) associated with an app"),
+	Short: "Remove volume(s) associated with an app",
-	Long: i18n.G(`Remove volumes associated with an app.
+	Long: `Remove volumes associated with an app.
 
 The app in question must be undeployed before you try to remove volumes. See
 "abra app undeploy <domain>" for more.
@@ -84,13 +82,8 @@ The command is interactive and will show a multiple select input which allows
 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.`),
+Passing "--force/-f" will select all volumes for removal. Be careful.`,
-	Example: i18n.G(`  # delete volumes interactively
+	Aliases: []string{"rm"},
-  abra app volume rm 1312.net
-
-  # delete specific volume
-  abra app volume rm 1312.net my_volume`),
-	Aliases: []string{i18n.G("rm")},
 	Args:    cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -101,11 +94,6 @@ 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)
@@ -117,7 +105,7 @@ Passing "--force/-f" will select all volumes for removal. Be careful.`),
 		}
 
 		if deployMeta.IsDeployed {
-			log.Fatal(i18n.G("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name))
+			log.Fatalf("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
 		}
 
 		filters, err := app.Filters(false, true)
@@ -131,35 +119,11 @@ 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.Fatal(i18n.G("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.Fatal(i18n.G("removing volume %s failed: %s", volumeToDelete, err))
-			}
-
-			log.Info(i18n.G("volume %s removed successfully", volumeToDelete))
-
-			return
-		}
-
 		var volumesToRemove []string
 		if !internal.Force && !internal.NoInput {
 			volumesPrompt := &survey.MultiSelect{
-				Message: i18n.G("which volumes do you want to remove?"),
+				Message: "which volumes do you want to remove?",
-				Help:    i18n.G("'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled"),
+				Help:    "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
 				VimMode: true,
 				Options: volumeNames,
 				Default: volumeNames,
@@ -176,28 +140,28 @@ Passing "--force/-f" will select all volumes for removal. Be careful.`),
 		if len(volumesToRemove) > 0 {
 			err := client.RemoveVolumes(cl, context.Background(), volumesToRemove, internal.Force, 5)
 			if err != nil {
-				log.Fatal(i18n.G("removing volumes failed: %s", err))
+				log.Fatalf("removing volumes failed: %s", err)
 			}
 
-			log.Info(i18n.G("%d volumes removed successfully", len(volumesToRemove)))
+			log.Infof("%d volumes removed successfully", len(volumesToRemove))
 		} else {
-			log.Info(i18n.G("no volumes removed"))
+			log.Info("no volumes removed")
 		}
 	},
 }
 
 var AppVolumeCommand = &cobra.Command{
-	Use:     i18n.G("volume [cmd] [args] [flags]"),
+	Use:     "volume [cmd] [args] [flags]",
-	Aliases: []string{i18n.G("vl")},
+	Aliases: []string{"vl"},
-	Short:   i18n.G("Manage app volumes"),
+	Short:   "Manage app volumes",
 }
 
 func init() {
 	AppVolumeRemoveCommand.Flags().BoolVarP(
 		&internal.Force,
-		i18n.G("force"),
+		"force",
-		i18n.G("f"),
+		"f",
 		false,
-		i18n.G("perform action without further prompt"),
+		"perform action without further prompt",
 	)
 }

cli/catalogue/catalogue.go

@@ -13,36 +13,17 @@ import (
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
 	gitPkg "coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
 	"github.com/go-git/go-git/v5"
 	"github.com/spf13/cobra"
 )
 
-var CatalogueSyncCommand = &cobra.Command{
-	Use:     i18n.G("sync [flags]"),
-	Aliases: []string{i18n.G("g")},
-	Short:   i18n.G("Sync recipe catalogue for latest changes"),
-	Args:    cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := catalogue.EnsureCatalogue(); err != nil {
-			log.Fatal(err)
-		}
-
-		if err := catalogue.EnsureUpToDate(); err != nil {
-			log.Fatal(err)
-		}
-
-		log.Info(i18n.G("catalogue successfully synced"))
-	},
-}
-
 var CatalogueGenerateCommand = &cobra.Command{
-	Use:     i18n.G("generate [recipe] [flags]"),
+	Use:     "generate [recipe] [flags]",
-	Aliases: []string{i18n.G("g")},
+	Aliases: []string{"g"},
-	Short:   i18n.G("Generate the recipe catalogue"),
+	Short:   "Generate the recipe catalogue",
-	Long: i18n.G(`Generate a new copy of the recipe catalogue.
+	Long: `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
@@ -58,7 +39,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,
@@ -104,7 +85,7 @@ keys configured on your account.`),
 
 		var warnings []string
 		catl := make(recipe.RecipeCatalogue)
-		catlBar := formatter.CreateProgressbar(barLength, i18n.G("collecting catalogue metadata"))
+		catlBar := formatter.CreateProgressbar(barLength, "collecting catalogue metadata")
 		for _, recipeMeta := range repos {
 			if recipeName != "" && recipeName != recipeMeta.Name {
 				if !internal.Debug {
@@ -190,7 +171,7 @@ keys configured on your account.`),
 			}
 		}
 
-		log.Info(i18n.G("generated recipe catalogue: %s", config.RECIPES_JSON))
+		log.Infof("generated recipe catalogue: %s", config.RECIPES_JSON)
 
 		cataloguePath := path.Join(config.ABRA_DIR, "catalogue")
 		if publishChanges {
@@ -202,11 +183,11 @@ keys configured on your account.`),
 
 			if isClean {
 				if !internal.Dry {
-					log.Fatal(i18n.G("no changes discovered in %s, nothing to publish?", cataloguePath))
+					log.Fatalf("no changes discovered in %s, nothing to publish?", cataloguePath)
 				}
 			}
 
-			msg := i18n.G("chore: publish new catalogue release changes")
+			msg := "chore: publish new catalogue release changes"
 			if err := gitPkg.Commit(cataloguePath, msg, internal.Dry); err != nil {
 				log.Fatal(err)
 			}
@@ -238,19 +219,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.Info(i18n.G("new changes published: %s", url))
+			log.Infof("new changes published: %s", url)
 		}
 
 		if internal.Dry {
-			log.Info(i18n.G("dry run: no changes published"))
+			log.Info("dry run: no changes published")
 		}
 	},
 }
 
 // CatalogueCommand defines the `abra catalogue` command and sub-commands.
 var CatalogueCommand = &cobra.Command{
-	Use:     i18n.G("catalogue [cmd] [args] [flags]"),
+	Use:     "catalogue [cmd] [args] [flags]",
-	Short:   i18n.G("Manage the recipe catalogue"),
+	Short:   "Manage the recipe catalogue",
 	Aliases: []string{"c"},
 }
 
@@ -262,33 +243,33 @@ var (
 func init() {
 	CatalogueGenerateCommand.Flags().BoolVarP(
 		&publishChanges,
-		i18n.G("publish"),
+		"publish",
-		i18n.G("p"),
+		"p",
 		false,
-		i18n.G("publish changes to git.coopcloud.tech"),
+		"publish changes to git.coopcloud.tech",
 	)
 
 	CatalogueGenerateCommand.Flags().BoolVarP(
 		&internal.Dry,
-		i18n.G("dry-run"),
+		"dry-run",
-		i18n.G("r"),
+		"r",
 		false,
-		i18n.G("report changes that would be made"),
+		"report changes that would be made",
 	)
 
 	CatalogueGenerateCommand.Flags().BoolVarP(
 		&skipUpdates,
-		i18n.G("skip-updates"),
+		"skip-updates",
-		i18n.G("s"),
+		"s",
 		false,
-		i18n.G("skip updating recipe repositories"),
+		"skip updating recipe repositories",
 	)
 
 	CatalogueGenerateCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }

cli/complete.go

@@ -3,14 +3,13 @@ package cli
 import (
 	"os"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"github.com/spf13/cobra"
 )
 
 var AutocompleteCommand = &cobra.Command{
-	Use:   i18n.G("autocomplete [bash|zsh|fish|powershell]"),
+	Use:   "autocomplete [bash|zsh|fish|powershell]",
-	Short: i18n.G("Generate autocompletion script"),
+	Short: "Generate autocompletion script",
-	Long: i18n.G(`To load completions:
+	Long: `To load completions:
 
 Bash:
   # Load autocompletion for the current Bash session
@@ -44,7 +43,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/backup.go

@@ -2,12 +2,11 @@ package internal
 
 import (
 	"context"
-	"errors"
+	"fmt"
 	"io"
 
 	"coopcloud.tech/abra/pkg/config"
 	containerPkg "coopcloud.tech/abra/pkg/container"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/service"
 	"coopcloud.tech/abra/pkg/upstream/container"
@@ -23,10 +22,10 @@ func RetrieveBackupBotContainer(cl *dockerClient.Client) (types.Container, error
 	ctx := context.Background()
 	chosenService, err := service.GetServiceByLabel(ctx, cl, config.BackupbotLabel, NoInput)
 	if err != nil {
-		return types.Container{}, errors.New(i18n.G("no backupbot discovered, is it deployed?"))
+		return types.Container{}, fmt.Errorf("no backupbot discovered, is it deployed?")
 	}
 
-	log.Debug(i18n.G("retrieved %s as backup enabled service", chosenService.Spec.Name))
+	log.Debugf("retrieved %s as backup enabled service", chosenService.Spec.Name)
 
 	filters := filters.NewArgs()
 	filters.Add("name", chosenService.Spec.Name)
@@ -59,7 +58,7 @@ func RunBackupCmdRemote(
 		Tty:          true,
 	}
 
-	log.Debug(i18n.G("running backup %s on %s with exec config %v", backupCmd, containerID, execBackupListOpts))
+	log.Debugf("running backup %s on %s with exec config %v", backupCmd, containerID, execBackupListOpts)
 
 	// FIXME: avoid instantiating a new CLI
 	dcli, err := command.NewDockerCli()

cli/internal/command.go

@@ -3,7 +3,6 @@ package internal
 import (
 	"bufio"
 	"context"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os/exec"
@@ -12,7 +11,6 @@ import (
 	appPkg "coopcloud.tech/abra/pkg/app"
 	containerPkg "coopcloud.tech/abra/pkg/container"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/container"
 	"github.com/docker/cli/cli/command"
@@ -26,7 +24,7 @@ import (
 func RunCmdRemote(
 	cl *dockerClient.Client,
 	app appPkg.App,
-	disableTTY bool,
+	requestTTY bool,
 	abraSh, serviceName, cmdName, cmdArgs, remoteUser string) error {
 	filters := filters.NewArgs()
 	filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName))
@@ -36,7 +34,7 @@ func RunCmdRemote(
 		return err
 	}
 
-	log.Debug(i18n.G("retrieved %s as target container on %s", formatter.ShortenID(targetContainer.ID), app.Server))
+	log.Debugf("retrieved %s as target container on %s", formatter.ShortenID(targetContainer.ID), app.Server)
 
 	toTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
 	content, err := archive.TarWithOptions(abraSh, toTarOpts)
@@ -67,7 +65,7 @@ func RunCmdRemote(
 	}
 
 	if _, err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
-		log.Info(i18n.G("%s does not exist for %s, use /bin/sh as fallback", shell, app.Name))
+		log.Infof("%s does not exist for %s, use /bin/sh as fallback", shell, app.Name)
 		shell = "/bin/sh"
 	}
 
@@ -78,19 +76,17 @@ func RunCmdRemote(
 		cmd = []string{shell, "-c", fmt.Sprintf("TARGET=%s; APP_NAME=%s; STACK_NAME=%s; . /tmp/abra.sh; %s", serviceName, app.Name, app.StackName(), cmdName)}
 	}
 
-	log.Debug(i18n.G("running command: %s", strings.Join(cmd, " ")))
+	log.Debugf("running command: %s", strings.Join(cmd, " "))
 
 	if remoteUser != "" {
-		log.Debug(i18n.G("running command with user %s", remoteUser))
+		log.Debugf("running command with user %s", remoteUser)
 		execCreateOpts.User = remoteUser
 	}
 
 	execCreateOpts.Cmd = cmd
-
+	execCreateOpts.Tty = requestTTY
-	execCreateOpts.Tty = true
+	if !requestTTY {
-	if disableTTY {
+		log.Debugf("not requesting a remote TTY")
-		execCreateOpts.Tty = false
-		log.Debug(i18n.G("not requesting a remote TTY"))
 	}
 
 	if _, err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
@@ -107,7 +103,7 @@ func EnsureCommand(abraSh, recipeName, execCmd string) error {
 	}
 
 	if !strings.Contains(string(bytes), execCmd) {
-		return errors.New(i18n.G("%s doesn't have a %s function", recipeName, execCmd))
+		return fmt.Errorf("%s doesn't have a %s function", recipeName, execCmd)
 	}
 
 	return nil

cli/internal/deploy.go

@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"sort"
@@ -10,7 +9,6 @@ import (
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/tagcmp"
 	"github.com/AlecAivazis/survey/v2"
@@ -48,7 +46,7 @@ func DeployOverview(
 	app appPkg.App,
 	deployedVersion string,
 	toDeployVersion string,
-	releaseNotes string,
+	info string,
 	warnMessages []string,
 ) error {
 	deployConfig := "compose.yml"
@@ -72,23 +70,23 @@ func DeployOverview(
 	}
 
 	rows := [][]string{
-		{i18n.G("DOMAIN"), domain},
+		{"DOMAIN", domain},
-		{i18n.G("RECIPE"), app.Recipe.Name},
+		{"RECIPE", app.Recipe.Name},
-		{i18n.G("SERVER"), server},
+		{"SERVER", server},
-		{i18n.G("CONFIG"), deployConfig},
+		{"CONFIG", deployConfig},
 		{"", ""},
-		{i18n.G("CURRENT DEPLOYMENT"), formatter.BoldDirtyDefault(deployedVersion)},
+		{"CURRENT DEPLOYMENT", formatter.BoldDirtyDefault(deployedVersion)},
-		{i18n.G("ENV VERSION"), formatter.BoldDirtyDefault(envVersion)},
+		{"ENV VERSION", formatter.BoldDirtyDefault(envVersion)},
-		{i18n.G("NEW DEPLOYMENT"), formatter.BoldDirtyDefault(toDeployVersion)},
+		{"NEW DEPLOYMENT", formatter.BoldDirtyDefault(toDeployVersion)},
 	}
 
 	deployType := getDeployType(deployedVersion, toDeployVersion)
-	overview := formatter.CreateOverview(i18n.G("%s OVERVIEW", deployType), rows)
+	overview := formatter.CreateOverview(fmt.Sprintf("%s OVERVIEW", deployType), rows)
 
 	fmt.Println(overview)
 
-	if releaseNotes != "" {
+	if info != "" {
-		fmt.Print(releaseNotes)
+		fmt.Println(info)
 	}
 
 	for _, msg := range warnMessages {
@@ -106,7 +104,7 @@ func DeployOverview(
 	}
 
 	if !response {
-		log.Fatal(i18n.G("deployment cancelled"))
+		log.Fatal("deployment cancelled")
 	}
 
 	return nil
@@ -114,32 +112,32 @@ func DeployOverview(
 
 func getDeployType(currentVersion, newVersion string) string {
 	if newVersion == config.NO_DOMAIN_DEFAULT {
-		return i18n.G("UNDEPLOY")
+		return "UNDEPLOY"
 	}
 	if strings.Contains(newVersion, "+U") {
-		return i18n.G("CHAOS DEPLOY")
+		return "CHAOS DEPLOY"
 	}
 	if strings.Contains(currentVersion, "+U") {
-		return i18n.G("UNCHAOS DEPLOY")
+		return "UNCHAOS DEPLOY"
 	}
 	if currentVersion == newVersion {
-		return ("REDEPLOY")
+		return "REDEPLOY"
 	}
 	if currentVersion == config.NO_VERSION_DEFAULT {
-		return i18n.G("NEW DEPLOY")
+		return "NEW DEPLOY"
 	}
 	currentParsed, err := tagcmp.Parse(currentVersion)
 	if err != nil {
-		return i18n.G("DEPLOY")
+		return "DEPLOY"
 	}
 	newParsed, err := tagcmp.Parse(newVersion)
 	if err != nil {
-		return i18n.G("DEPLOY")
+		return "DEPLOY"
 	}
 	if currentParsed.IsLessThan(newParsed) {
-		return i18n.G("UPGRADE")
+		return "UPGRADE"
 	}
-	return i18n.G("DOWNGRADE")
+	return "DOWNGRADE"
 }
 
 // PostCmds parses a string of commands and executes them inside of the respective services
@@ -148,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 errors.New(i18n.G("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name))
+			return fmt.Errorf(fmt.Sprintf("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name))
 		}
 		return err
 	}
@@ -156,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 errors.New(i18n.G("not enough arguments: %s", command))
+			return fmt.Errorf(fmt.Sprintf("not enough arguments: %s", command))
 		}
 		targetServiceName := commandParts[0]
 		cmdName := commandParts[1]
@@ -164,7 +162,7 @@ func PostCmds(cl *dockerClient.Client, app appPkg.App, commands string) error {
 		if len(commandParts) > 2 {
 			parsedCmdArgs = fmt.Sprintf("%s ", strings.Join(commandParts[2:], " "))
 		}
-		log.Info(i18n.G("running post-command '%s %s' in container %s", cmdName, parsedCmdArgs, targetServiceName))
+		log.Infof("running post-command '%s %s' in container %s", cmdName, parsedCmdArgs, targetServiceName)
 
 		if err := EnsureCommand(app.Recipe.AbraShPath, app.Recipe.Name, cmdName); err != nil {
 			return err
@@ -183,10 +181,10 @@ func PostCmds(cl *dockerClient.Client, app appPkg.App, commands string) error {
 		}
 
 		if !matchingServiceName {
-			return fmt.Errorf("no service %s for %s?", targetServiceName, app.Name)
+			return fmt.Errorf(fmt.Sprintf("no service %s for %s?", targetServiceName, app.Name))
 		}
 
-		log.Debug(i18n.G("running command %s %s within the context of %s_%s", cmdName, parsedCmdArgs, app.StackName(), targetServiceName))
+		log.Debugf("running command %s %s within the context of %s_%s", cmdName, parsedCmdArgs, app.StackName(), targetServiceName)
 
 		requestTTY := true
 		if err := RunCmdRemote(

cli/internal/recipe.go

@@ -1,11 +1,9 @@
 package internal
 
 import (
-	"errors"
 	"fmt"
 
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
 	"github.com/AlecAivazis/survey/v2"
@@ -15,7 +13,7 @@ import (
 // PromptBumpType prompts for version bump type
 func PromptBumpType(tagString, latestRelease string) error {
 	if (!Major && !Minor && !Patch) && tagString == "" {
-		fmt.Print(i18n.G(`
+		fmt.Printf(`
 You need to make a decision about what kind of an update this new recipe
 version is. If someone else performs this upgrade, do they have to do some
 migration work or take care of some breaking changes? This can be signaled in
@@ -38,12 +36,12 @@ Here is a semver cheat sheet (more on https://semver.org):
            should also Just Work and is mostly to do with minor bug fixes
            and/or security patches. "nothing to worry about".
 
-`, latestRelease))
+`, latestRelease)
 
 		var chosenBumpType string
 		prompt := &survey.Select{
 			Message: fmt.Sprintf("select recipe version increment type"),
-			Options: []string{i18n.G("major"), i18n.G("minor"), i18n.G("patch")},
+			Options: []string{"major", "minor", "patch"},
 		}
 
 		if err := survey.AskOne(prompt, &chosenBumpType); err != nil {
@@ -61,13 +59,13 @@ func GetBumpType() string {
 	var bumpType string
 
 	if Major {
-		bumpType = i18n.G("major")
+		bumpType = "major"
 	} else if Minor {
-		bumpType = i18n.G("minor")
+		bumpType = "minor"
 	} else if Patch {
-		bumpType = i18n.G("patch")
+		bumpType = "patch"
 	} else {
-		log.Fatal(i18n.G("no version bump type specififed?"))
+		log.Fatal("no version bump type specififed?")
 	}
 
 	return bumpType
@@ -75,14 +73,14 @@ func GetBumpType() string {
 
 // SetBumpType figures out which bump type is specified
 func SetBumpType(bumpType string) {
-	if bumpType == i18n.G("major") {
+	if bumpType == "major" {
 		Major = true
-	} else if bumpType == i18n.G("minor") {
+	} else if bumpType == "minor" {
 		Minor = true
-	} else if bumpType == i18n.G("patch") {
+	} else if bumpType == "patch" {
 		Patch = true
 	} else {
-		log.Fatal(i18n.G("no version bump type specififed?"))
+		log.Fatal("no version bump type specififed?")
 	}
 }
 
@@ -109,7 +107,7 @@ func GetMainAppImage(recipe recipe.Recipe) (string, error) {
 	}
 
 	if path == "" {
-		return path, errors.New(i18n.G("%s has no main 'app' service?", recipe.Name))
+		return path, fmt.Errorf("%s has no main 'app' service?", recipe.Name)
 	}
 
 	return path, nil

cli/internal/validate.go

@@ -5,7 +5,6 @@ import (
 
 	"coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
 	"github.com/AlecAivazis/survey/v2"
@@ -18,36 +17,36 @@ func ValidateRecipe(args []string, cmdName string) recipe.Recipe {
 		recipeName = args[0]
 	}
 
-	var recipes []string
+	if recipeName == "" && !NoInput {
+		var recipes []string
 
-	catl, err := recipe.ReadRecipeCatalogue(Offline)
+		catl, err := recipe.ReadRecipeCatalogue(Offline)
-	if err != nil {
+		if err != nil {
-		log.Fatal(err)
+			log.Fatal(err)
-	}
+		}
 
-	knownRecipes := make(map[string]bool)
+		knownRecipes := make(map[string]bool)
-	for name := range catl {
+		for name := range catl {
-		knownRecipes[name] = true
+			knownRecipes[name] = true
-	}
+		}
+
+		localRecipes, err := recipe.GetRecipesLocal()
+		if err != nil {
+			log.Fatal(err)
+		}
 
-	localRecipes, err := recipe.GetRecipesLocal()
-	if err != nil {
-		log.Debug(i18n.G("can't read local recipes: %s", err))
-	} else {
 		for _, recipeLocal := range localRecipes {
 			if _, ok := knownRecipes[recipeLocal]; !ok {
 				knownRecipes[recipeLocal] = true
 			}
 		}
-	}
 
-	for recipeName := range knownRecipes {
+		for recipeName := range knownRecipes {
-		recipes = append(recipes, recipeName)
+			recipes = append(recipes, recipeName)
-	}
+		}
 
-	if recipeName == "" && !NoInput {
 		prompt := &survey.Select{
-			Message: i18n.G("Select recipe"),
+			Message: "Select recipe",
 			Options: recipes,
 		}
 		if err := survey.AskOne(prompt, &recipeName); err != nil {
@@ -56,36 +55,30 @@ func ValidateRecipe(args []string, cmdName string) recipe.Recipe {
 	}
 
 	if recipeName == "" {
-		log.Fatal(i18n.G("no recipe name provided"))
+		log.Fatal("no recipe name provided")
-	}
-
-	if _, ok := knownRecipes[recipeName]; !ok {
-		if !strings.Contains(recipeName, "/") {
-			log.Fatal(i18n.G("no recipe '%s' exists?", recipeName))
-		}
 	}
 
 	chosenRecipe := recipe.Get(recipeName)
-	if err := chosenRecipe.EnsureExists(); err != nil {
+	err := chosenRecipe.EnsureExists()
+	if err != nil {
 		log.Fatal(err)
 	}
-
 	_, err = chosenRecipe.GetComposeConfig(nil)
 	if err != nil {
-		if cmdName == i18n.G("generate") {
+		if cmdName == "generate" {
 			if strings.Contains(err.Error(), "missing a compose") {
 				log.Fatal(err)
 			}
 			log.Warn(err)
 		} else {
 			if strings.Contains(err.Error(), "template_driver is not allowed") {
-				log.Warn(i18n.G("ensure %s recipe compose.* files include \"version: '3.8'\"", recipeName))
+				log.Warnf("ensure %s recipe compose.* files include \"version: '3.8'\"", recipeName)
 			}
-			log.Fatal(i18n.G("unable to validate recipe: %s", err))
+			log.Fatalf("unable to validate recipe: %s", err)
 		}
 	}
 
-	log.Debug(i18n.G("validated %s as recipe argument", recipeName))
+	log.Debugf("validated %s as recipe argument", recipeName)
 
 	return chosenRecipe
 }
@@ -93,7 +86,7 @@ func ValidateRecipe(args []string, cmdName string) recipe.Recipe {
 // ValidateApp ensures the app name arg is valid.
 func ValidateApp(args []string) app.App {
 	if len(args) == 0 {
-		log.Fatal(i18n.G("no app provided"))
+		log.Fatal("no app provided")
 	}
 
 	appName := args[0]
@@ -103,7 +96,7 @@ func ValidateApp(args []string) app.App {
 		log.Fatal(err)
 	}
 
-	log.Debug(i18n.G("validated %s as app argument", appName))
+	log.Debugf("validated %s as app argument", appName)
 
 	return app
 }
@@ -117,8 +110,8 @@ func ValidateDomain(args []string) string {
 
 	if domainName == "" && !NoInput {
 		prompt := &survey.Input{
-			Message: i18n.G("Specify a domain name"),
+			Message: "Specify a domain name",
-			Default: "1312.net",
+			Default: "example.com",
 		}
 		if err := survey.AskOne(prompt, &domainName); err != nil {
 			log.Fatal(err)
@@ -126,10 +119,10 @@ func ValidateDomain(args []string) string {
 	}
 
 	if domainName == "" {
-		log.Fatal(i18n.G("no domain provided"))
+		log.Fatal("no domain provided")
 	}
 
-	log.Debug(i18n.G("validated %s as domain argument", domainName))
+	log.Debugf("validated %s as domain argument", domainName)
 
 	return domainName
 }
@@ -148,7 +141,7 @@ func ValidateServer(args []string) string {
 
 	if serverName == "" && !NoInput {
 		prompt := &survey.Select{
-			Message: i18n.G("Specify a server name"),
+			Message: "Specify a server name",
 			Options: serverNames,
 		}
 		if err := survey.AskOne(prompt, &serverName); err != nil {
@@ -164,14 +157,14 @@ func ValidateServer(args []string) string {
 	}
 
 	if serverName == "" {
-		log.Fatal(i18n.G("no server provided"))
+		log.Fatal("no server provided")
 	}
 
 	if !matched {
-		log.Fatal(i18n.G("server doesn't exist?"))
+		log.Fatal("server doesn't exist?")
 	}
 
-	log.Debug(i18n.G("validated %s as server argument", serverName))
+	log.Debugf("validated %s as server argument", serverName)
 
 	return serverName
 }

cli/recipe/diff.go

@@ -4,16 +4,15 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	gitPkg "coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/spf13/cobra"
 )
 
 var RecipeDiffCommand = &cobra.Command{
-	Use:     i18n.G("diff <recipe> [flags]"),
+	Use:     "diff <recipe> [flags]",
-	Aliases: []string{i18n.G("d")},
+	Aliases: []string{"d"},
-	Short:   i18n.G("Show unstaged changes in recipe config"),
+	Short:   "Show unstaged changes in recipe config",
-	Long:    i18n.G("This command requires /usr/bin/git."),
+	Long:    "This command requires /usr/bin/git.",
 	Args:    cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,

cli/recipe/fetch.go

@@ -1,33 +1,19 @@
 package recipe
 
 import (
-	"os"
-
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"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"
 )
 
 var RecipeFetchCommand = &cobra.Command{
-	Use:     i18n.G("fetch [recipe | --all] [flags]"),
+	Use:     "fetch [recipe | --all] [flags]",
-	Aliases: []string{i18n.G("f")},
+	Aliases: []string{"f"},
-	Short:   i18n.G("Clone recipe(s) locally"),
+	Short:   "Clone recipe(s) locally",
-	Long:    i18n.G(`Using "--force/-f" Git syncs an existing recipe. It does not erase unstaged changes.`),
 	Args:    cobra.RangeArgs(0, 1),
-	Example: i18n.G(`  # 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,
@@ -41,47 +27,19 @@ var RecipeFetchCommand = &cobra.Command{
 		}
 
 		if recipeName == "" && !fetchAllRecipes {
-			log.Fatal(i18n.G("missing [recipe] or --all/-a"))
+			log.Fatal("missing [recipe] or --all/-a")
 		}
 
 		if recipeName != "" && fetchAllRecipes {
-			log.Fatal(i18n.G("cannot use [recipe] and --all/-a together"))
+			log.Fatal("cannot use [recipe] and --all/-a together")
 		}
 
+		ensureCtx := internal.GetEnsureContext()
 		if recipeName != "" {
-			r := recipe.Get(recipeName)
+			r := internal.ValidateRecipe(args, cmd.Name())
-			if _, err := os.Stat(r.Dir); !os.IsNotExist(err) {
+			if err := r.Ensure(ensureCtx); err != nil {
-				if !force {
+				log.Fatal(err)
-					log.Warn(i18n.G("%s is already fetched", r.Name))
-					return
-				}
 			}
-
-			r = internal.ValidateRecipe(args, cmd.Name())
-
-			if sshRemote {
-				if r.SSHURL == "" {
-					log.Warn(i18n.G("unable to discover SSH remote for %s", r.Name))
-					return
-				}
-
-				repo, err := git.PlainOpen(r.Dir)
-				if err != nil {
-					log.Fatal(i18n.G("unable to open %s: %s", r.Dir, err))
-				}
-
-				if err = repo.DeleteRemote("origin"); err != nil {
-					log.Fatal(i18n.G("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.Fatal(i18n.G("unable to set SSH remote in %s: %s", r.Dir, err))
-				}
-			}
-
 			return
 		}
 
@@ -90,8 +48,7 @@ var RecipeFetchCommand = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		catlBar := formatter.CreateProgressbar(len(catalogue), i18n.G("fetching latest recipes..."))
+		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 {
@@ -104,32 +61,14 @@ var RecipeFetchCommand = &cobra.Command{
 
 var (
 	fetchAllRecipes bool
-	sshRemote       bool
-	force           bool
 )
 
 func init() {
 	RecipeFetchCommand.Flags().BoolVarP(
 		&fetchAllRecipes,
-		i18n.G("all"),
+		"all",
-		i18n.G("a"),
+		"a",
 		false,
-		i18n.G("fetch all recipes"),
+		"fetch all recipes",
-	)
-
-	RecipeFetchCommand.Flags().BoolVarP(
-		&sshRemote,
-		i18n.G("ssh"),
-		i18n.G("s"),
-		false,
-		i18n.G("automatically set ssh remote"),
-	)
-
-	RecipeFetchCommand.Flags().BoolVarP(
-		&force,
-		i18n.G("force"),
-		i18n.G("f"),
-		false,
-		i18n.G("force re-fetch"),
 	)
 }

cli/recipe/lint.go

@@ -4,16 +4,15 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/lint"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/spf13/cobra"
 )
 
 var RecipeLintCommand = &cobra.Command{
-	Use:     i18n.G("lint <recipe> [flags]"),
+	Use:     "lint <recipe> [flags]",
-	Short:   i18n.G("Lint a recipe"),
+	Short:   "Lint a recipe",
-	Aliases: []string{i18n.G("l")},
+	Aliases: []string{"l"},
 	Args:    cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -29,12 +28,12 @@ var RecipeLintCommand = &cobra.Command{
 		}
 
 		headers := []string{
-			i18n.G("ref"),
+			"ref",
-			i18n.G("rule"),
+			"rule",
-			i18n.G("severity"),
+			"severity",
-			i18n.G("satisfied"),
+			"satisfied",
-			i18n.G("skipped"),
+			"skipped",
-			i18n.G("resolve"),
+			"resolve",
 		}
 
 		table, err := formatter.CreateTable()
@@ -50,7 +49,7 @@ var RecipeLintCommand = &cobra.Command{
 		for level := range lint.LintRules {
 			for _, rule := range lint.LintRules[level] {
 				if onlyError && rule.Level != "error" {
-					log.Debug(i18n.G("skipping %s, does not have level \"error\"", rule.Ref))
+					log.Debugf("skipping %s, does not have level \"error\"", rule.Ref)
 					continue
 				}
 
@@ -71,7 +70,7 @@ var RecipeLintCommand = &cobra.Command{
 						warnMessages = append(warnMessages, err.Error())
 					}
 
-					if !ok && rule.Level == i18n.G("error") {
+					if !ok && rule.Level == "error" {
 						hasError = true
 					}
 
@@ -112,7 +111,7 @@ var RecipeLintCommand = &cobra.Command{
 			}
 
 			if hasError {
-				log.Warn(i18n.G("critical errors present in %s config", recipe.Name))
+				log.Warnf("critical errors present in %s config", recipe.Name)
 			}
 		}
 	},
@@ -125,17 +124,17 @@ var (
 func init() {
 	RecipeLintCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 
 	RecipeLintCommand.Flags().BoolVarP(
 		&onlyError,
-		i18n.G("error"),
+		"error",
-		i18n.G("e"),
+		"e",
 		false,
-		i18n.G("only show errors"),
+		"only show errors",
 	)
 }

cli/recipe/list.go

@@ -8,16 +8,15 @@ import (
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
 	"github.com/spf13/cobra"
 )
 
 var RecipeListCommand = &cobra.Command{
-	Use:     i18n.G("list"),
+	Use:     "list",
-	Short:   i18n.G("List recipes"),
+	Short:   "List recipes",
-	Aliases: []string{i18n.G("ls")},
+	Aliases: []string{"ls"},
 	Args:    cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		catl, err := recipe.ReadRecipeCatalogue(internal.Offline)
@@ -34,14 +33,14 @@ var RecipeListCommand = &cobra.Command{
 		}
 
 		headers := []string{
-			i18n.G("name"),
+			"name",
-			i18n.G("category"),
+			"category",
-			i18n.G("status"),
+			"status",
-			i18n.G("healthcheck"),
+			"healthcheck",
-			i18n.G("backups"),
+			"backups",
-			i18n.G("email"),
+			"email",
-			i18n.G("tests"),
+			"tests",
-			i18n.G("SSO"),
+			"SSO",
 		}
 
 		table.Headers(headers...)
@@ -74,7 +73,7 @@ var RecipeListCommand = &cobra.Command{
 			if internal.MachineReadable {
 				out, err := formatter.ToJSON(headers, rows)
 				if err != nil {
-					log.Fatal(i18n.G("unable to render to JSON: %s", err))
+					log.Fatal("unable to render to JSON: %s", err)
 				}
 				fmt.Println(out)
 				return
@@ -94,17 +93,17 @@ var (
 func init() {
 	RecipeListCommand.Flags().BoolVarP(
 		&internal.MachineReadable,
-		i18n.G("machine"),
+		"machine",
-		i18n.G("m"),
+		"m",
 		false,
-		i18n.G("print machine-readable output"),
+		"print machine-readable output",
 	)
 
 	RecipeListCommand.Flags().StringVarP(
 		&pattern,
-		i18n.G("pattern"),
+		"pattern",
-		i18n.G("p"),
+		"p",
 		"",
-		i18n.G("filter by recipe"),
+		"filter by recipe",
 	)
 }

cli/recipe/new.go

@@ -10,7 +10,6 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
 	"github.com/spf13/cobra"
@@ -31,10 +30,10 @@ type recipeMetadata struct {
 }
 
 var RecipeNewCommand = &cobra.Command{
-	Use:     i18n.G("new <recipe> [flags]"),
+	Use:     "new <recipe> [flags]",
-	Aliases: []string{i18n.G("n")},
+	Aliases: []string{"n"},
-	Short:   i18n.G("Create a new recipe"),
+	Short:   "Create a new recipe",
-	Long:    i18n.G(`A community managed recipe template is used.`),
+	Long:    `A community managed recipe template is used.`,
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -47,10 +46,10 @@ var RecipeNewCommand = &cobra.Command{
 
 		r := recipe.Get(recipeName)
 		if _, err := os.Stat(r.Dir); !os.IsNotExist(err) {
-			log.Fatal(i18n.G("%s recipe directory already exists?", r.Dir))
+			log.Fatalf("%s recipe directory already exists?", r.Dir)
 		}
 
-		url := i18n.G("%s/example.git", config.REPOS_BASE_URL)
+		url := fmt.Sprintf("%s/example.git", config.REPOS_BASE_URL)
 		if err := git.Clone(r.Dir, url); err != nil {
 			log.Fatal(err)
 		}
@@ -59,7 +58,7 @@ var RecipeNewCommand = &cobra.Command{
 		if err := os.RemoveAll(gitRepo); err != nil {
 			log.Fatal(err)
 		}
-		log.Debug(i18n.G("removed .git repo in %s", gitRepo))
+		log.Debugf("removed .git repo in %s", gitRepo)
 
 		meta := newRecipeMeta(recipeName)
 
@@ -83,8 +82,8 @@ var RecipeNewCommand = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		log.Info(i18n.G("new recipe '%s' created: %s", recipeName, path.Join(r.Dir)))
+		log.Infof("new recipe '%s' created: %s", recipeName, path.Join(r.Dir))
-		log.Info(i18n.G("happy hacking 🎉"))
+		log.Info("happy hacking 🎉")
 	},
 }
 
@@ -112,17 +111,17 @@ var (
 func init() {
 	RecipeNewCommand.Flags().StringVarP(
 		&gitName,
-		i18n.G("git-name"),
+		"git-name",
-		i18n.G("N"),
+		"N",
 		"",
-		i18n.G("Git (user) name to do commits with"),
+		"Git (user) name to do commits with",
 	)
 
 	RecipeNewCommand.Flags().StringVarP(
 		&gitEmail,
-		i18n.G("git-email"),
+		"git-email",
-		i18n.G("e"),
+		"e",
 		"",
-		i18n.G("Git email name to do commits with"),
+		"Git email name to do commits with",
 	)
 }

cli/recipe/recipe.go

@@ -1,16 +1,13 @@
 package recipe
 
-import (
+import "github.com/spf13/cobra"
-	"coopcloud.tech/abra/pkg/i18n"
-	"github.com/spf13/cobra"
-)
 
 // RecipeCommand defines all recipe related sub-commands.
 var RecipeCommand = &cobra.Command{
-	Use:     i18n.G("recipe [cmd] [args] [flags]"),
+	Use:     "recipe [cmd] [args] [flags]",
-	Aliases: []string{i18n.G("r")},
+	Aliases: []string{"r"},
-	Short:   i18n.G("Manage recipes"),
+	Short:   "Manage recipes",
-	Long: i18n.G(`A recipe is a blueprint for an app.
+	Long: `A recipe is a blueprint for an app.
 
 It is a bunch of config files which describe how to deploy and maintain an app.
 Recipes are maintained by the Co-op Cloud community and you can use Abra to
@@ -18,5 +15,5 @@ read them, deploy them and create apps for you.
 
 Anyone who uses a recipe can become a maintainer. Maintainers typically make
 sure the recipe is in good working order and the config upgraded in a timely
-manner.`),
+manner.`,
 }

cli/recipe/release.go

@@ -12,7 +12,6 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
 	gitPkg "coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/tagcmp"
@@ -23,10 +22,10 @@ import (
 )
 
 var RecipeReleaseCommand = &cobra.Command{
-	Use:     i18n.G("release <recipe> [version] [flags]"),
+	Use:     "release <recipe> [version] [flags]",
-	Aliases: []string{i18n.G("rl")},
+	Aliases: []string{"rl"},
-	Short:   i18n.G("Release a new recipe version"),
+	Short:   "Release a new recipe version",
-	Long: i18n.G(`Create a new version of a recipe.
+	Long: `Create a new version of a recipe.
 
 These versions are then published on the Co-op Cloud recipe catalogue. These
 versions take the following form:
@@ -45,7 +44,7 @@ major and therefore require intervention while doing the upgrade work.
 
 Publish 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.`),
+your SSH keys configured on your account.`,
 	Args: cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -75,7 +74,7 @@ your SSH keys configured on your account.`),
 
 		mainAppVersion := imagesTmp[mainApp]
 		if mainAppVersion == "" {
-			log.Fatal(i18n.G("main app service version for %s is empty?", recipe.Name))
+			log.Fatalf("main app service version for %s is empty?", recipe.Name)
 		}
 
 		var tagString string
@@ -85,12 +84,12 @@ your SSH keys configured on your account.`),
 
 		if tagString != "" {
 			if _, err := tagcmp.Parse(tagString); err != nil {
-				log.Fatal(i18n.G("cannot parse %s, invalid tag specified?", tagString))
+				log.Fatalf("cannot parse %s, invalid tag specified?", tagString)
 			}
 		}
 
 		if (internal.Major || internal.Minor || internal.Patch) && tagString != "" {
-			log.Fatal(i18n.G("cannot specify tag and bump type at the same time"))
+			log.Fatal("cannot specify tag and bump type at the same time")
 		}
 
 		if tagString != "" {
@@ -118,19 +117,19 @@ your SSH keys configured on your account.`),
 		}
 
 		if !isClean {
-			log.Info(i18n.G("%s currently has these unstaged changes 👇", recipe.Name))
+			log.Infof("%s currently has these unstaged changes 👇", recipe.Name)
 			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
 				log.Fatal(err)
 			}
 		}
 
 		if len(tags) > 0 {
-			log.Warn(i18n.G("previous git tags detected, assuming this is a new semver release"))
+			log.Warnf("previous git tags detected, assuming this is a new semver release")
 			if err := createReleaseFromPreviousTag(tagString, mainAppVersion, recipe, tags); err != nil {
 				log.Fatal(err)
 			}
 		} else {
-			log.Warn(i18n.G("no tag specified and no previous tag available for %s, assuming this is the initial release", recipe.Name))
+			log.Warnf("no tag specified and no previous tag available for %s, assuming this is the initial release", recipe.Name)
 
 			if err := createReleaseFromTag(recipe, tagString, mainAppVersion); err != nil {
 				if cleanUpErr := cleanUpTag(recipe, tagString); err != nil {
@@ -182,7 +181,7 @@ func getImageVersions(recipe recipe.Recipe) (map[string]string, error) {
 	}
 
 	if missingTag {
-		return services, errors.New(i18n.G("app service is missing image tag?"))
+		return services, fmt.Errorf("app service is missing image tag?")
 	}
 
 	return services, nil
@@ -246,7 +245,7 @@ func btoi(b bool) int {
 
 // getTagCreateOptions constructs git tag create options
 func getTagCreateOptions(tag string) (git.CreateTagOptions, error) {
-	msg := i18n.G("chore: publish %s release", tag)
+	msg := fmt.Sprintf("chore: publish %s release", tag)
 	return git.CreateTagOptions{Message: msg}, nil
 }
 
@@ -274,13 +273,13 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 	if _, err := os.Stat(nextReleaseNotePath); err == nil {
 		// release/next note exists. Move it to release/<tag>
 		if internal.Dry {
-			log.Debug(i18n.G("dry run: move release note from 'next' to %s", tag))
+			log.Debugf("dry run: move release note from 'next' to %s", tag)
 			return nil
 		}
 
 		if !internal.NoInput {
 			prompt := &survey.Confirm{
-				Message: i18n.G("Use release note in release/next?"),
+				Message: "Use release note in release/next?",
 			}
 
 			if err := survey.AskOne(prompt, &addNextAsReleaseNotes); err != nil {
@@ -314,7 +313,7 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 	}
 
 	prompt := &survey.Input{
-		Message: i18n.G("Release Note (leave empty for no release note)"),
+		Message: "Release Note (leave empty for no release note)",
 	}
 
 	var releaseNote string
@@ -339,7 +338,7 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 
 func commitRelease(recipe recipe.Recipe, tag string) error {
 	if internal.Dry {
-		log.Debug(i18n.G("dry run: no changes committed"))
+		log.Debugf("dry run: no changes committed")
 		return nil
 	}
 
@@ -350,7 +349,7 @@ func commitRelease(recipe recipe.Recipe, tag string) error {
 
 	if isClean {
 		if !internal.Dry {
-			return errors.New(i18n.G("no changes discovered in %s, nothing to publish?", recipe.Dir))
+			return fmt.Errorf("no changes discovered in %s, nothing to publish?", recipe.Dir)
 		}
 	}
 
@@ -364,7 +363,7 @@ func commitRelease(recipe recipe.Recipe, tag string) error {
 
 func tagRelease(tagString string, repo *git.Repository) error {
 	if internal.Dry {
-		log.Debug(i18n.G("dry run: no git tag created (%s)", tagString))
+		log.Debugf("dry run: no git tag created (%s)", tagString)
 		return nil
 	}
 
@@ -384,20 +383,20 @@ func tagRelease(tagString string, repo *git.Repository) error {
 	}
 
 	hash := formatter.SmallSHA(head.Hash().String())
-	log.Debug(i18n.G("created tag %s at %s", tagString, hash))
+	log.Debugf(fmt.Sprintf("created tag %s at %s", tagString, hash))
 
 	return nil
 }
 
 func pushRelease(recipe recipe.Recipe, tagString string) error {
 	if internal.Dry {
-		log.Info(i18n.G("dry run: no changes published"))
+		log.Info("dry run: no changes published")
 		return nil
 	}
 
 	if !publish && !internal.NoInput {
 		prompt := &survey.Confirm{
-			Message: i18n.G("publish new release?"),
+			Message: "publish new release?",
 		}
 
 		if err := survey.AskOne(prompt, &publish); err != nil {
@@ -410,9 +409,9 @@ func pushRelease(recipe recipe.Recipe, tagString string) error {
 			return err
 		}
 		url := fmt.Sprintf("%s/src/tag/%s", recipe.GitURL, tagString)
-		log.Info(i18n.G("new release published: %s", url))
+		log.Infof("new release published: %s", url)
 	} else {
-		log.Info(i18n.G("no -p/--publish passed, not publishing"))
+		log.Info("no -p/--publish passed, not publishing")
 	}
 
 	return nil
@@ -427,7 +426,7 @@ func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recip
 	bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch)
 	if bumpType != 0 {
 		if (bumpType & (bumpType - 1)) != 0 {
-			return errors.New(i18n.G("you can only use one of: --major, --minor, --patch"))
+			return fmt.Errorf("you can only use one of: --major, --minor, --patch")
 		}
 	}
 
@@ -484,12 +483,12 @@ func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recip
 	}
 
 	if lastGitTag.String() == tagString {
-		log.Fatal(i18n.G("latest git tag (%s) and synced label (%s) are the same?", lastGitTag, tagString))
+		log.Fatalf("latest git tag (%s) and synced label (%s) are the same?", lastGitTag, tagString)
 	}
 
 	if !internal.NoInput {
 		prompt := &survey.Confirm{
-			Message: i18n.G("current: %s, new: %s, correct?", lastGitTag, tagString),
+			Message: fmt.Sprintf("current: %s, new: %s, correct?", lastGitTag, tagString),
 		}
 
 		var ok bool
@@ -498,7 +497,7 @@ func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recip
 		}
 
 		if !ok {
-			log.Fatal(i18n.G("exiting as requested"))
+			log.Fatal("exiting as requested")
 		}
 	}
 
@@ -507,15 +506,15 @@ func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recip
 	}
 
 	if err := commitRelease(recipe, tagString); err != nil {
-		log.Fatal(i18n.G("failed to commit changes: %s", err.Error()))
+		log.Fatalf("failed to commit changes: %s", err.Error())
 	}
 
 	if err := tagRelease(tagString, repo); err != nil {
-		log.Fatal(i18n.G("failed to tag release: %s", err.Error()))
+		log.Fatalf("failed to tag release: %s", err.Error())
 	}
 
 	if err := pushRelease(recipe, tagString); err != nil {
-		log.Fatal(i18n.G("failed to publish new release: %s", err.Error()))
+		log.Fatalf("failed to publish new release: %s", err.Error())
 	}
 
 	return nil
@@ -534,7 +533,7 @@ func cleanUpTag(recipe recipe.Recipe, tag string) error {
 		}
 	}
 
-	log.Debug(i18n.G("removed freshly created tag %s", tag))
+	log.Debugf("removed freshly created tag %s", tag)
 
 	return nil
 }
@@ -546,20 +545,20 @@ func getLabelVersion(recipe recipe.Recipe, prompt bool) (string, error) {
 	}
 
 	if initTag == "" {
-		log.Fatal(i18n.G("unable to read version for %s from synced label. Did you try running \"abra recipe sync %s\" already?", recipe.Name, recipe.Name))
+		log.Fatalf("unable to read version for %s from synced label. Did you try running \"abra recipe sync %s\" already?", recipe.Name, recipe.Name)
 	}
 
-	log.Warn(i18n.G("discovered %s as currently synced recipe label", initTag))
+	log.Warnf("discovered %s as currently synced recipe label", initTag)
 
 	if prompt && !internal.NoInput {
 		var response bool
-		prompt := &survey.Confirm{Message: i18n.G("use %s as the new version?", initTag)}
+		prompt := &survey.Confirm{Message: fmt.Sprintf("use %s as the new version?", initTag)}
 		if err := survey.AskOne(prompt, &response); err != nil {
 			return "", err
 		}
 
 		if !response {
-			return "", errors.New(i18n.G("please fix your synced label for %s and re-run this command", recipe.Name))
+			return "", fmt.Errorf("please fix your synced label for %s and re-run this command", recipe.Name)
 		}
 	}
 
@@ -573,41 +572,42 @@ var (
 func init() {
 	RecipeReleaseCommand.Flags().BoolVarP(
 		&internal.Dry,
-		i18n.G("dry-run"),
+		"dry-run",
-		i18n.G("r"),
+		"r",
 		false,
-		i18n.G("report changes that would be made"),
+		"report changes that would be made",
 	)
 
 	RecipeReleaseCommand.Flags().BoolVarP(
 		&internal.Major,
-		i18n.G("major"),
+		"major",
-		i18n.G("x"),
+		"x",
 		false,
-		i18n.G("increase the major part of the version"),
+		"increase the major part of the version",
 	)
 
 	RecipeReleaseCommand.Flags().BoolVarP(
 		&internal.Minor,
-		i18n.G("minor"),
+		"minor",
-		i18n.G("y"),
+		"y",
 		false,
-		i18n.G("increase the minor part of the version"),
+		"increase the minor part of the version",
 	)
 
 	RecipeReleaseCommand.Flags().BoolVarP(
 		&internal.Patch,
-		i18n.G("patch"),
+		"patch",
-		i18n.G("z"),
+		"z",
 		false,
-		i18n.G("increase the patch part of the version"),
+		"increase the patch part of the version",
 	)
 
 	RecipeReleaseCommand.Flags().BoolVarP(
 		&publish,
-		i18n.G("publish"),
+		"publish",
-		i18n.G("p"),
+		"p",
 		false,
-		i18n.G("publish changes to git.coopcloud.tech"),
+		"publish changes to git.coopcloud.tech",
 	)
+
 }

cli/recipe/reset.go

@@ -3,17 +3,16 @@ package recipe
 import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/spf13/cobra"
 )
 
 var RecipeResetCommand = &cobra.Command{
-	Use:     i18n.G("reset <recipe> [flags]"),
+	Use:     "reset <recipe> [flags]",
-	Aliases: []string{i18n.G("rs")},
+	Aliases: []string{"rs"},
-	Short:   i18n.G("Remove all unstaged changes from recipe config"),
+	Short:   "Remove all unstaged changes from recipe config",
-	Long:    i18n.G("WARNING: this will delete your changes. Be Careful."),
+	Long:    "WARNING: this will delete your changes. Be Careful.",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,

cli/recipe/sync.go

@@ -7,7 +7,6 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	gitPkg "coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/tagcmp"
 	"github.com/AlecAivazis/survey/v2"
@@ -17,10 +16,10 @@ import (
 )
 
 var RecipeSyncCommand = &cobra.Command{
-	Use:     i18n.G("sync <recipe> [version] [flags]"),
+	Use:     "sync <recipe> [version] [flags]",
-	Aliases: []string{i18n.G("s")},
+	Aliases: []string{"s"},
-	Short:   i18n.G("Sync recipe version label"),
+	Short:   "Sync recipe version label",
-	Long: i18n.G(`Generate labels for the main recipe service.
+	Long: `Generate labels for the main recipe service.
 
 By convention, the service named "app" using the following format:
 
@@ -28,7 +27,7 @@ By convention, the service named "app" using the following format:
 
 Where [version] can be specifed on the command-line or Abra can attempt to
 auto-generate it for you. The <recipe> configuration will be updated on the
-local file system.`),
+local file system.`,
 	Args: cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -69,11 +68,11 @@ local file system.`),
 		}
 
 		if len(tags) == 0 && nextTag == "" {
-			log.Warn(i18n.G("no git tags found for %s", recipe.Name))
+			log.Warnf("no git tags found for %s", recipe.Name)
 			if internal.NoInput {
-				log.Fatal(i18n.G("unable to continue, input required for initial version"))
+				log.Fatalf("unable to continue, input required for initial version")
 			}
-			fmt.Println(i18n.G(`
+			fmt.Println(fmt.Sprintf(`
 The following options are two types of initial semantic version that you can
 pick for %s that will be published in the recipe catalogue. This follows the
 semver convention (more on https://semver.org), here is a short cheatsheet
@@ -93,7 +92,7 @@ likely to change.
 `, recipe.Name, recipe.Name))
 			var chosenVersion string
 			edPrompt := &survey.Select{
-				Message: i18n.G("which version do you want to begin with?"),
+				Message: "which version do you want to begin with?",
 				Options: []string{"0.1.0", "1.0.0"},
 			}
 
@@ -126,7 +125,7 @@ likely to change.
 			if err := iter.ForEach(func(ref *plumbing.Reference) error {
 				obj, err := repo.TagObject(ref.Hash())
 				if err != nil {
-					log.Fatal(i18n.G("tag at commit %s is unannotated or otherwise broken", ref.Hash()))
+					log.Fatal("Tag at commit ", ref.Hash(), " is unannotated or otherwise broken. Please fix it.")
 					return err
 				}
 
@@ -151,7 +150,7 @@ likely to change.
 			if bumpType != 0 {
 				// a bitwise check if the number is a power of 2
 				if (bumpType & (bumpType - 1)) != 0 {
-					log.Fatal(i18n.G("you can only use one version flag: --major, --minor or --patch"))
+					log.Fatal("you can only use one version flag: --major, --minor or --patch")
 				}
 			}
 
@@ -185,22 +184,22 @@ likely to change.
 			}
 
 			newTag.Metadata = mainAppVersion
-			log.Debug(i18n.G("choosing %s as new version for %s", newTag.String(), recipe.Name))
+			log.Debugf("choosing %s as new version for %s", newTag.String(), recipe.Name)
 			nextTag = newTag.String()
 		}
 
 		if _, err := tagcmp.Parse(nextTag); err != nil {
-			log.Fatal(i18n.G("invalid version %s specified", nextTag))
+			log.Fatalf("invalid version %s specified", nextTag)
 		}
 
 		mainService := "app"
-		label := i18n.G("coop-cloud.${STACK_NAME}.version=%s", nextTag)
+		label := fmt.Sprintf("coop-cloud.${STACK_NAME}.version=%s", nextTag)
 		if !internal.Dry {
 			if err := recipe.UpdateLabel("compose.y*ml", mainService, label); err != nil {
 				log.Fatal(err)
 			}
 		} else {
-			log.Info(i18n.G("dry run: not syncing label %s for recipe %s", nextTag, recipe.Name))
+			log.Infof("dry run: not syncing label %s for recipe %s", nextTag, recipe.Name)
 		}
 
 		isClean, err := gitPkg.IsClean(recipe.Dir)
@@ -208,7 +207,7 @@ likely to change.
 			log.Fatal(err)
 		}
 		if !isClean {
-			log.Info(i18n.G("%s currently has these unstaged changes 👇", recipe.Name))
+			log.Infof("%s currently has these unstaged changes 👇", recipe.Name)
 			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
 				log.Fatal(err)
 			}
@@ -219,33 +218,33 @@ likely to change.
 func init() {
 	RecipeSyncCommand.Flags().BoolVarP(
 		&internal.Dry,
-		i18n.G("dry-run"),
+		"dry-run",
-		i18n.G("r"),
+		"r",
 		false,
-		i18n.G("report changes that would be made"),
+		"report changes that would be made",
 	)
 
 	RecipeSyncCommand.Flags().BoolVarP(
 		&internal.Major,
-		i18n.G("major"),
+		"major",
-		i18n.G("x"),
+		"x",
 		false,
-		i18n.G("increase the major part of the version"),
+		"increase the major part of the version",
 	)
 
 	RecipeSyncCommand.Flags().BoolVarP(
 		&internal.Minor,
-		i18n.G("minor"),
+		"minor",
-		i18n.G("y"),
+		"y",
 		false,
-		i18n.G("increase the minor part of the version"),
+		"increase the minor part of the version",
 	)
 
 	RecipeSyncCommand.Flags().BoolVarP(
 		&internal.Patch,
-		i18n.G("patch"),
+		"patch",
-		i18n.G("z"),
+		"z",
 		false,
-		i18n.G("increase the patch part of the version"),
+		"increase the patch part of the version",
 	)
 }

cli/recipe/upgrade.go

@@ -14,7 +14,6 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/formatter"
 	gitPkg "coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	recipePkg "coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/tagcmp"
@@ -38,10 +37,10 @@ type anUpgrade struct {
 }
 
 var RecipeUpgradeCommand = &cobra.Command{
-	Use:     i18n.G("upgrade <recipe> [flags]"),
+	Use:     "upgrade <recipe> [flags]",
-	Aliases: []string{i18n.G("u")},
+	Aliases: []string{"u"},
-	Short:   i18n.G("Upgrade recipe image tags"),
+	Short:   "Upgrade recipe image tags",
-	Long: i18n.G(`Upgrade a given <recipe> configuration.
+	Long: `Upgrade a given <recipe> configuration.
 
 It will update the relevant compose file tags on the local file system.
 
@@ -53,7 +52,7 @@ The command is interactive and will show a select input which allows you to
 make a seclection. Use the "?" key to see more help on navigating this
 interface.
 
-You may invoke this command in "wizard" mode and be prompted for input.`),
+You may invoke this command in "wizard" mode and be prompted for input.`,
 	Args: cobra.RangeArgs(0, 1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -72,7 +71,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 		if bumpType != 0 {
 			// a bitwise check if the number is a power of 2
 			if (bumpType & (bumpType - 1)) != 0 {
-				log.Fatal(i18n.G("you can only use one of: --major, --minor, --patch."))
+				log.Fatal("you can only use one of: --major, --minor, --patch.")
 			}
 		}
 
@@ -88,7 +87,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 		versionsPath := path.Join(recipe.Dir, "versions")
 		servicePins := make(map[string]imgPin)
 		if _, err := os.Stat(versionsPath); err == nil {
-			log.Debug(i18n.G("found versions file for %s", recipe.Name))
+			log.Debugf("found versions file for %s", recipe.Name)
 			file, err := os.Open(versionsPath)
 			if err != nil {
 				log.Fatal(err)
@@ -98,7 +97,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 				line := scanner.Text()
 				splitLine := strings.Split(line, " ")
 				if splitLine[0] != "pin" || len(splitLine) != 3 {
-					log.Fatal(i18n.G("malformed version pin specification: %s", line))
+					log.Fatalf("malformed version pin specification: %s", line)
 				}
 				pinSlice := strings.Split(splitLine[2], ":")
 				pinTag, err := tagcmp.Parse(pinSlice[1])
@@ -116,7 +115,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 			}
 			versionsPresent = true
 		} else {
-			log.Debug(i18n.G("did not find versions file for %s", recipe.Name))
+			log.Debugf("did not find versions file for %s", recipe.Name)
 		}
 
 		config, err := recipe.GetComposeConfig(nil)
@@ -136,26 +135,26 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 			}
 
 			image := reference.Path(img)
-			log.Debug(i18n.G("retrieved %s from remote registry for %s", regVersions, image))
+			log.Debugf("retrieved %s from remote registry for %s", regVersions, image)
 			image = formatter.StripTagMeta(image)
 
 			switch img.(type) {
 			case reference.NamedTagged:
 				if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) {
-					log.Debug(i18n.G("%s not considered semver-like", img.(reference.NamedTagged).Tag()))
+					log.Debugf("%s not considered semver-like", img.(reference.NamedTagged).Tag())
 				}
 			default:
-				log.Warn(i18n.G("unable to read tag for image %s, is it missing? skipping upgrade for %s", image, service.Name))
+				log.Warnf("unable to read tag for image %s, is it missing? skipping upgrade for %s", image, service.Name)
 				continue
 			}
 
 			tag, err := tagcmp.Parse(img.(reference.NamedTagged).Tag())
 			if err != nil {
-				log.Warn(i18n.G("unable to parse %s, error was: %s, skipping upgrade for %s", image, err.Error(), service.Name))
+				log.Warnf("unable to parse %s, error was: %s, skipping upgrade for %s", image, err.Error(), service.Name)
 				continue
 			}
 
-			log.Debug(i18n.G("parsed %s for %s", tag, service.Name))
+			log.Debugf("parsed %s for %s", tag, service.Name)
 
 			var compatible []tagcmp.Tag
 			for _, regVersion := range regVersions {
@@ -169,12 +168,12 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 				}
 			}
 
-			log.Debug(i18n.G("detected potential upgradable tags %s for %s", compatible, service.Name))
+			log.Debugf("detected potential upgradable tags %s for %s", compatible, service.Name)
 
 			sort.Sort(tagcmp.ByTagDesc(compatible))
 
 			if len(compatible) == 0 && !allTags {
-				log.Info(i18n.G("no new versions available for %s, assuming %s is the latest (use -a/--all-tags to see all anyway)", image, tag))
+				log.Info(fmt.Sprintf("no new versions available for %s, assuming %s is the latest (use -a/--all-tags to see all anyway)", image, tag))
 				continue // skip on to the next tag and don't update any compose files
 			}
 
@@ -196,7 +195,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 				}
 			}
 
-			log.Debug(i18n.G("detected compatible upgradable tags %s for %s", compatibleStrings, service.Name))
+			log.Debugf("detected compatible upgradable tags %s for %s", compatibleStrings, service.Name)
 
 			var upgradeTag string
 			_, ok := servicePins[service.Name]
@@ -213,13 +212,13 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 						}
 					}
 					if contains {
-						log.Info(i18n.G("upgrading service %s from %s to %s (pinned tag: %s)", service.Name, tag.String(), upgradeTag, pinnedTagString))
+						log.Infof("upgrading service %s from %s to %s (pinned tag: %s)", service.Name, tag.String(), upgradeTag, pinnedTagString)
 					} else {
-						log.Info(i18n.G("service %s, image %s pinned to %s, no compatible upgrade found", service.Name, servicePins[service.Name].image, pinnedTagString))
+						log.Infof("service %s, image %s pinned to %s, no compatible upgrade found", service.Name, servicePins[service.Name].image, pinnedTagString)
 						continue
 					}
 				} else {
-					log.Fatal(i18n.G("service %s is at version %s, but pinned to %s, please correct your compose.yml file manually!", service.Name, tag.String(), pinnedTag.String()))
+					log.Fatalf("service %s is at version %s, but pinned to %s, please correct your compose.yml file manually!", service.Name, tag.String(), pinnedTag.String())
 					continue
 				}
 			} else {
@@ -236,17 +235,17 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 						}
 					}
 					if upgradeTag == "" {
-						log.Warn(i18n.G("not upgrading from %s to %s for %s, because the upgrade type is more serious than what user wants", tag.String(), compatible[0].String(), image))
+						log.Warnf("not upgrading from %s to %s for %s, because the upgrade type is more serious than what user wants", tag.String(), compatible[0].String(), image)
 						continue
 					}
 				} else {
-					msg := i18n.G("upgrade to which tag? (service: %s, image: %s, tag: %s)", service.Name, image, tag)
+					msg := fmt.Sprintf("upgrade to which tag? (service: %s, image: %s, tag: %s)", service.Name, image, tag)
 					if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) || allTags {
 						tag := img.(reference.NamedTagged).Tag()
 						if !allTags {
-							log.Warn(i18n.G("unable to determine versioning semantics of %s, listing all tags", tag))
+							log.Warn(fmt.Sprintf("unable to determine versioning semantics of %s, listing all tags", tag))
 						}
-						msg = i18n.G("upgrade to which tag? (service: %s, tag: %s)", service.Name, tag)
+						msg = fmt.Sprintf("upgrade to which tag? (service: %s, tag: %s)", service.Name, tag)
 						compatibleStrings = []string{"skip"}
 						for _, regVersion := range regVersions {
 							compatibleStrings = append(compatibleStrings, regVersion)
@@ -277,7 +276,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 					} else {
 						prompt := &survey.Select{
 							Message: msg,
-							Help:    i18n.G("enter / return to confirm, choose 'skip' to not upgrade this tag, vim mode is enabled"),
+							Help:    "enter / return to confirm, choose 'skip' to not upgrade this tag, vim mode is enabled",
 							VimMode: true,
 							Options: compatibleStrings,
 						}
@@ -293,11 +292,11 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 					log.Fatal(err)
 				}
 				if ok {
-					log.Info(i18n.G("tag upgraded from %s to %s for %s", tag.String(), upgradeTag, image))
+					log.Infof("tag upgraded from %s to %s for %s", tag.String(), upgradeTag, image)
 				}
 			} else {
 				if !internal.NoInput {
-					log.Warn(i18n.G("not upgrading %s, skipping as requested", image))
+					log.Warnf("not upgrading %s, skipping as requested", image)
 				}
 			}
 		}
@@ -315,7 +314,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 			}
 
 			for _, upgrade := range upgradeList {
-				log.Info(i18n.G("can upgrade service: %s, image: %s, tag: %s ::", upgrade.Service, upgrade.Image, upgrade.Tag))
+				log.Infof("can upgrade service: %s, image: %s, tag: %s ::", upgrade.Service, upgrade.Image, upgrade.Tag)
 				for _, utag := range upgrade.UpgradeTags {
 					log.Infof("    %s", utag)
 				}
@@ -327,7 +326,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 			log.Fatal(err)
 		}
 		if !isClean {
-			log.Info(i18n.G("%s currently has these unstaged changes 👇", recipe.Name))
+			log.Infof("%s currently has these unstaged changes 👇", recipe.Name)
 			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
 				log.Fatal(err)
 			}
@@ -342,41 +341,41 @@ var (
 func init() {
 	RecipeUpgradeCommand.Flags().BoolVarP(
 		&internal.Major,
-		i18n.G("major"),
+		"major",
-		i18n.G("x"),
+		"x",
 		false,
-		i18n.G("increase the major part of the version"),
+		"increase the major part of the version",
 	)
 
 	RecipeUpgradeCommand.Flags().BoolVarP(
 		&internal.Minor,
-		i18n.G("minor"),
+		"minor",
-		i18n.G("y"),
+		"y",
 		false,
-		i18n.G("increase the minor part of the version"),
+		"increase the minor part of the version",
 	)
 
 	RecipeUpgradeCommand.Flags().BoolVarP(
 		&internal.Patch,
-		i18n.G("patch"),
+		"patch",
-		i18n.G("z"),
+		"z",
 		false,
-		i18n.G("increase the patch part of the version"),
+		"increase the patch part of the version",
 	)
 
 	RecipeUpgradeCommand.Flags().BoolVarP(
 		&internal.MachineReadable,
-		i18n.G("machine"),
+		"machine",
-		i18n.G("m"),
+		"m",
 		false,
-		i18n.G("print machine-readable output"),
+		"print machine-readable output",
 	)
 
 	RecipeUpgradeCommand.Flags().BoolVarP(
 		&allTags,
-		i18n.G("all-tags"),
+		"all-tags",
-		i18n.G("a"),
+		"a",
 		false,
-		i18n.G("list all tags, not just upgrades"),
+		"list all tags, not just upgrades",
 	)
 }

cli/recipe/version.go

@@ -7,16 +7,15 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	recipePkg "coopcloud.tech/abra/pkg/recipe"
 	"github.com/spf13/cobra"
 )
 
 var RecipeVersionCommand = &cobra.Command{
-	Use:     i18n.G("versions <recipe> [flags]"),
+	Use:     "versions <recipe> [flags]",
-	Aliases: []string{i18n.G("v")},
+	Aliases: []string{"v"},
-	Short:   i18n.G("List recipe versions"),
+	Short:   "List recipe versions",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -36,7 +35,7 @@ var RecipeVersionCommand = &cobra.Command{
 
 		recipeMeta, ok := catl[recipe.Name]
 		if !ok {
-			warnMessages = append(warnMessages, i18n.G("retrieved versions from local recipe repository"))
+			warnMessages = append(warnMessages, "retrieved versions from local recipe repository")
 
 			recipeVersions, warnMsg, err := recipe.GetRecipeVersions()
 			if err != nil {
@@ -50,7 +49,7 @@ var RecipeVersionCommand = &cobra.Command{
 		}
 
 		if len(recipeMeta.Versions) == 0 {
-			log.Fatal(i18n.G("%s has no published versions?", recipe.Name))
+			log.Fatalf("%s has no published versions?", recipe.Name)
 		}
 
 		for i := len(recipeMeta.Versions) - 1; i >= 0; i-- {
@@ -59,7 +58,7 @@ var RecipeVersionCommand = &cobra.Command{
 				log.Fatal(err)
 			}
 
-			table.Headers(i18n.G("SERVICE"), i18n.G("IMAGE"), i18n.G("TAG"), i18n.G("VERSION"))
+			table.Headers("SERVICE", "IMAGE", "TAG", "VERSION")
 
 			for version, meta := range recipeMeta.Versions[i] {
 				var allRows [][]string
@@ -100,10 +99,10 @@ var RecipeVersionCommand = &cobra.Command{
 
 				if internal.MachineReadable {
 					sort.Slice(allRows, sortServiceByName(allRows))
-					headers := []string{i18n.G("VERSION"), i18n.G("SERVICE"), i18n.G("NAME"), i18n.G("TAG")}
+					headers := []string{"VERSION", "SERVICE", "NAME", "TAG"}
 					out, err := formatter.ToJSON(headers, allRows)
 					if err != nil {
-						log.Fatal(i18n.G("unable to render to JSON: %s", err))
+						log.Fatal("unable to render to JSON: %s", err)
 					}
 					fmt.Println(out)
 					continue
@@ -128,9 +127,9 @@ func sortServiceByName(versions [][]string) func(i, j int) bool {
 func init() {
 	RecipeVersionCommand.Flags().BoolVarP(
 		&internal.MachineReadable,
-		i18n.G("machine"),
+		"machine",
-		i18n.G("m"),
+		"m",
 		false,
-		i18n.G("print machine-readable output"),
+		"print machine-readable output",
 	)
 }

cli/run.go

@@ -1,7 +1,6 @@
 package cli
 
 import (
-	"errors"
 	"fmt"
 	"os"
 
@@ -11,8 +10,6 @@ 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/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	charmLog "github.com/charmbracelet/log"
 	"github.com/spf13/cobra"
@@ -21,35 +18,33 @@ import (
 
 func Run(version, commit string) {
 	rootCmd := &cobra.Command{
-		Use:     i18n.G("abra [cmd] [args] [flags]"),
+		Use:     "abra [cmd] [args] [flags]",
-		Short:   i18n.G("The Co-op Cloud command-line utility belt 🎩🐇"),
+		Short:   "The Co-op Cloud command-line utility belt 🎩🐇",
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
 		ValidArgs: []string{
-			i18n.G("app"),
+			"app",
-			i18n.G("autocomplete"),
+			"autocomplete",
-			i18n.G("catalogue"),
+			"catalogue",
-			i18n.G("man"),
+			"man",
-			i18n.G("recipe"),
+			"recipe",
-			i18n.G("server"),
+			"server",
-			i18n.G("upgrade"),
+			"upgrade",
 		},
-
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			paths := []string{
-			dirs := []map[string]os.FileMode{
+				config.ABRA_DIR,
-				{config.ABRA_DIR: 0764},
+				config.SERVERS_DIR,
-				{config.SERVERS_DIR: 0700},
+				config.RECIPES_DIR,
-				{config.RECIPES_DIR: 0764},
+				config.VENDOR_DIR, // TODO(d1): remove > 0.9.x
-				{config.LOGS_DIR: 0764},
+				config.BACKUP_DIR, // TODO(d1): remove > 0.9.x
 			}
 
-			for _, dir := range dirs {
+			for _, path := range paths {
-				for path, perm := range dir {
+				if err := os.Mkdir(path, 0764); err != nil {
-					if err := os.Mkdir(path, perm); err != nil {
+					if !os.IsExist(err) {
-						if !os.IsExist(err) {
+						log.Fatal(err)
-							return errors.New(i18n.G("unable to create %s: %s", path, err))
-						}
-						continue
 					}
+					continue
 				}
 			}
 
@@ -66,29 +61,23 @@ func Run(version, commit string) {
 				log.SetReportCaller(true)
 			}
 
-			log.Debug(i18n.G(
+			log.Debugf("abra version %s, commit %s", version, commit)
-				"abra version: %s, commit: %s, lang: %s",
-				version, formatter.SmallSHA(commit), i18n.Locale,
-			))
-
-			return nil
 		},
 	}
 
 	rootCmd.CompletionOptions.DisableDefaultCmd = true
 
 	manCommand := &cobra.Command{
-		Use:     i18n.G("man [flags]"),
+		Use:     "man [flags]",
 		Aliases: []string{"m"},
-		Short:   i18n.G("Generate manpage"),
+		Short:   "Generate manpage",
-		Example: i18n.G(`  # generate the man pages into /usr/local/share/man/man1
+		Example: `  # generate the man pages into /usr/local/share/man/man1
-  abra_path=$(which abra)  # pass abra absolute path to sudo below
+  sudo abra man
-  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",
@@ -97,7 +86,7 @@ func Run(version, commit string) {
 
 			manDir := "/usr/local/share/man/man1"
 			if _, err := os.Stat(manDir); os.IsNotExist(err) {
-				log.Fatal(i18n.G("unable to proceed, %s does not exist?", manDir))
+				log.Fatalf("unable to proceed, '%s' does not exist?")
 			}
 
 			err := doc.GenManTree(rootCmd, header, manDir)
@@ -105,7 +94,7 @@ func Run(version, commit string) {
 				log.Fatal(err)
 			}
 
-			log.Info(i18n.G("don't forget to run 'sudo mandb'"))
+			log.Info("don't forget to run 'sudo mandb'")
 		},
 	}
 
@@ -114,7 +103,7 @@ func Run(version, commit string) {
 		"debug",
 		"d",
 		false,
-		i18n.G("show debug messages"),
+		"show debug messages",
 	)
 
 	rootCmd.PersistentFlags().BoolVarP(
@@ -122,7 +111,7 @@ func Run(version, commit string) {
 		"no-input",
 		"n",
 		false,
-		i18n.G("toggle non-interactive mode"),
+		"toggle non-interactive mode",
 	)
 
 	rootCmd.PersistentFlags().BoolVarP(
@@ -130,7 +119,7 @@ func Run(version, commit string) {
 		"offline",
 		"o",
 		false,
-		i18n.G("prefer offline & filesystem access"),
+		"prefer offline & filesystem access",
 	)
 
 	rootCmd.PersistentFlags().BoolVarP(
@@ -138,12 +127,11 @@ func Run(version, commit string) {
 		"ignore-env-version",
 		"i",
 		false,
-		i18n.G("ignore .env version checkout"),
+		"ignore .env version checkout",
 	)
 
 	catalogue.CatalogueCommand.AddCommand(
 		catalogue.CatalogueGenerateCommand,
-		catalogue.CatalogueSyncCommand,
 	)
 
 	server.ServerCommand.AddCommand(

cli/server/add.go

@@ -10,7 +10,6 @@ import (
 	"coopcloud.tech/abra/pkg/config"
 	contextPkg "coopcloud.tech/abra/pkg/context"
 	"coopcloud.tech/abra/pkg/dns"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/server"
 	sshPkg "coopcloud.tech/abra/pkg/ssh"
@@ -18,10 +17,10 @@ import (
 )
 
 var ServerAddCommand = &cobra.Command{
-	Use:     i18n.G("add [[server] | --local] [flags]"),
+	Use:     "add [[server] | --local] [flags]",
-	Aliases: []string{i18n.G("a")},
+	Aliases: []string{"a"},
-	Short:   i18n.G("Add a new server"),
+	Short:   "Add a new server",
-	Long: i18n.G(`Add a new server to your configuration so that it can be managed by Abra.
+	Long: `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
@@ -36,8 +35,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".`),
+developer machine. The domain is then set to "default".`,
-	Example: i18n.G("  abra server add 1312.net"),
+	Example: "  abra server add 1312.net",
 	Args:    cobra.RangeArgs(0, 1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -50,11 +49,11 @@ developer machine. The domain is then set to "default".`),
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 0 && local {
-			log.Fatal(i18n.G("cannot use [server] and --local together"))
+			log.Fatal("cannot use [server] and --local together")
 		}
 
 		if len(args) == 0 && !local {
-			log.Fatal(i18n.G("missing argument or --local/-l flag"))
+			log.Fatal("missing argument or --local/-l flag")
 		}
 
 		name := "default"
@@ -73,7 +72,7 @@ developer machine. The domain is then set to "default".`),
 				log.Fatal(err)
 			}
 
-			log.Debug(i18n.G("attempting to create client for %s", name))
+			log.Debugf("attempting to create client for %s", name)
 
 			if _, err := client.New(name, timeout); err != nil {
 				cleanUp(name)
@@ -81,9 +80,9 @@ developer machine. The domain is then set to "default".`),
 			}
 
 			if created {
-				log.Info(i18n.G("local server successfully added"))
+				log.Info("local server successfully added")
 			} else {
-				log.Warn(i18n.G("local server already exists"))
+				log.Warn("local server already exists")
 			}
 
 			return
@@ -97,27 +96,28 @@ developer machine. The domain is then set to "default".`),
 		created, err := newContext(name)
 		if err != nil {
 			cleanUp(name)
-			log.Fatal(i18n.G("unable to create local context: %s", err))
+			log.Fatalf("unable to create local context: %s", err)
 		}
 
-		log.Debug(i18n.G("attempting to create client for %s", name))
+		log.Debugf("attempting to create client for %s", name)
 
 		if _, err := client.New(name, timeout); err != nil {
 			cleanUp(name)
-			log.Fatal(i18n.G("ssh %s error: %s", name, sshPkg.Fatal(name, err)))
+			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)
 		}
 
 		if created {
-			log.Info(i18n.G("%s successfully added", name))
+			log.Infof("%s successfully added", name)
 
 			if _, err := dns.EnsureIPv4(name); err != nil {
-				log.Warn(i18n.G("unable to resolve IPv4 for %s", name))
+				log.Warnf("unable to resolve IPv4 for %s", name)
 			}
 
 			return
 		}
 
-		log.Warn(i18n.G("%s already exists", name))
+		log.Warnf("%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.Debug(i18n.G("serverAdd: cleanUp: cleaning up context for %s", name))
+		log.Debugf("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.Fatal(i18n.G("serverAdd: cleanUp: unable to list files in %s: %s", serverDir, err))
+		log.Fatalf("serverAdd: cleanUp: unable to list files in %s: %s", serverDir, err)
 	}
 
 	if len(files) > 0 {
-		log.Debug(i18n.G("serverAdd: cleanUp: %s is not empty, aborting cleanup", serverDir))
+		log.Debugf("serverAdd: cleanUp: %s is not empty, aborting cleanup", serverDir)
 		return
 	}
 
 	if err := os.RemoveAll(serverDir); err != nil {
-		log.Fatal(i18n.G("serverAdd: cleanUp: failed to remove %s: %s", serverDir, err))
+		log.Fatalf("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.Debug(i18n.G("context for %s already exists", name))
+			log.Debugf("context for %s already exists", name)
 			return false, nil
 		}
 	}
 
-	log.Debugf(i18n.G("creating context with domain %s", name))
+	log.Debugf("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.Debug(i18n.G("server dir for %s already created", name))
+		log.Debugf("server dir for %s already created", name)
 
 		return false, nil
 	}
@@ -196,9 +196,9 @@ var (
 func init() {
 	ServerAddCommand.Flags().BoolVarP(
 		&local,
-		i18n.G("local"),
+		"local",
-		i18n.G("l"),
+		"l",
 		false,
-		i18n.G("use local server"),
+		"use local server",
 	)
 }

cli/server/list.go

@@ -8,16 +8,15 @@ import (
 	"coopcloud.tech/abra/pkg/config"
 	contextPkg "coopcloud.tech/abra/pkg/context"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/cli/cli/connhelper/ssh"
 	"github.com/spf13/cobra"
 )
 
 var ServerListCommand = &cobra.Command{
-	Use:     i18n.G("list [flags]"),
+	Use:     "list [flags]",
-	Aliases: []string{i18n.G("ls")},
+	Aliases: []string{"ls"},
-	Short:   i18n.G("List managed servers"),
+	Short:   "List managed servers",
 	Args:    cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		dockerContextStore := contextPkg.NewDefaultDockerContextStore()
@@ -31,7 +30,7 @@ var ServerListCommand = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		headers := []string{i18n.G("NAME"), i18n.G("HOST")}
+		headers := []string{"NAME", "HOST"}
 		table.Headers(headers...)
 
 		serverNames, err := config.ReadServerNames()
@@ -56,7 +55,7 @@ var ServerListCommand = &cobra.Command{
 					}
 
 					if sp.Host == "" {
-						sp.Host = i18n.G("unknown")
+						sp.Host = "unknown"
 					}
 
 					row = []string{serverName, sp.Host}
@@ -66,9 +65,9 @@ var ServerListCommand = &cobra.Command{
 
 			if len(row) == 0 {
 				if serverName == "default" {
-					row = []string{serverName, i18n.G("local")}
+					row = []string{serverName, "local"}
 				} else {
-					row = []string{serverName, i18n.G("unknown")}
+					row = []string{serverName, "unknown"}
 				}
 				rows = append(rows, row)
 			}
@@ -79,7 +78,7 @@ var ServerListCommand = &cobra.Command{
 		if internal.MachineReadable {
 			out, err := formatter.ToJSON(headers, rows)
 			if err != nil {
-				log.Fatal(i18n.G("unable to render to JSON: %s", err))
+				log.Fatal("unable to render to JSON: %s", err)
 			}
 
 			fmt.Println(out)
@@ -96,9 +95,9 @@ var ServerListCommand = &cobra.Command{
 func init() {
 	ServerListCommand.Flags().BoolVarP(
 		&internal.MachineReadable,
-		i18n.G("machine"),
+		"machine",
-		i18n.G("m"),
+		"m",
 		false,
-		i18n.G("print machine-readable output"),
+		"print machine-readable output",
 	)
 }

cli/server/prune.go

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

cli/server/remove.go

@@ -8,20 +8,19 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/spf13/cobra"
 )
 
 var ServerRemoveCommand = &cobra.Command{
-	Use:     i18n.G("remove <server> [flags]"),
+	Use:     "remove <server> [flags]",
-	Aliases: []string{i18n.G("rm")},
+	Aliases: []string{"rm"},
-	Short:   i18n.G("Remove a managed server"),
+	Short:   "Remove a managed server",
-	Long: i18n.G(`Remove a managed server.
+	Long: `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,
@@ -40,7 +39,7 @@ like tears in rain.`),
 			log.Fatal(err)
 		}
 
-		log.Info(i18n.G("%s is now lost in time, like tears in rain", serverName))
+		log.Infof("%s is now lost in time, like tears in rain", serverName)
 
 		return
 	},

cli/server/server.go

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

cli/updater/updater.go

@@ -2,7 +2,6 @@ package updater
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"strconv"
@@ -12,7 +11,6 @@ import (
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/envfile"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/lint"
 	"coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/abra/pkg/upstream/convert"
@@ -32,14 +30,14 @@ const SERVER = "localhost"
 
 // NotifyCommand checks for available upgrades.
 var NotifyCommand = &cobra.Command{
-	Use:     i18n.G("notify [flags]"),
+	Use:     "notify [flags]",
-	Aliases: []string{i18n.G("n")},
+	Aliases: []string{"n"},
-	Short:   i18n.G("Check for available upgrades"),
+	Short:   "Check for available upgrades",
-	Long: i18n.G(`Notify on new versions for deployed apps.
+	Long: `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")
@@ -71,10 +69,10 @@ Use "--major/-m" to include new major versions.`),
 
 // UpgradeCommand upgrades apps.
 var UpgradeCommand = &cobra.Command{
-	Use:     i18n.G("upgrade [[stack] [recipe] | --all] [flags]"),
+	Use:     "upgrade [[stack] [recipe] | --all] [flags]",
-	Aliases: []string{i18n.G("u")},
+	Aliases: []string{"u"},
-	Short:   i18n.G("Upgrade apps"),
+	Short:   "Upgrade apps",
-	Long: i18n.G(`Upgrade an app by specifying stack name and recipe. 
+	Long: `Upgrade an app by specifying stack name and recipe. 
 
 Use "--all" to upgrade every deployed app.
 
@@ -85,7 +83,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(
@@ -100,7 +98,7 @@ with care.`),
 		}
 
 		if !updateAll && len(args) != 2 {
-			log.Fatal(i18n.G("missing arguments or --all/-a flag"))
+			log.Fatal("missing arguments or --all/-a flag")
 		}
 
 		if !updateAll {
@@ -152,7 +150,7 @@ func getLabel(cl *dockerclient.Client, stackName string, label string) (string,
 		}
 	}
 
-	log.Debug(i18n.G("no %s label found for %s", label, stackName))
+	log.Debugf("no %s label found for %s", label, stackName)
 
 	return "", nil
 }
@@ -173,7 +171,7 @@ func getBoolLabel(cl *dockerclient.Client, stackName string, label string) (bool
 		return value, nil
 	}
 
-	log.Debug(i18n.G("boolean label %s could not be found for %s, set default to false.", label, stackName))
+	log.Debugf("boolean label %s could not be found for %s, set default to false.", label, stackName)
 
 	return false, nil
 }
@@ -194,12 +192,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.Debug(i18n.G("can't separate key from value: %s (this variable is probably unset)", envString))
+				log.Debugf("can't separate key from value: %s (this variable is probably unset)", envString)
 				continue
 			}
 			k := splitString[0]
 			v := splitString[1]
-			log.Debugf(i18n.G("for %s read env %s with value: %s from docker service", stackName, k, v))
+			log.Debugf("for %s read env %s with value: %s from docker service", stackName, k, v)
 			envMap[k] = v
 		}
 	}
@@ -221,14 +219,14 @@ func getLatestUpgrade(cl *dockerclient.Client, stackName string, recipeName stri
 	}
 
 	if len(availableUpgrades) == 0 {
-		log.Debugf(i18n.G("no available upgrades for %s", stackName))
+		log.Debugf("no available upgrades for %s", stackName)
 		return "", nil
 	}
 
 	var chosenUpgrade string
 	if len(availableUpgrades) > 0 {
 		chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
-		log.Info(i18n.G("%s (%s) can be upgraded from version %s to %s", stackName, recipeName, deployedVersion, chosenUpgrade))
+		log.Infof("%s (%s) can be upgraded from version %s to %s", stackName, recipeName, deployedVersion, chosenUpgrade)
 	}
 
 	return chosenUpgrade, nil
@@ -236,7 +234,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.Debug(i18n.G("retrieve deployed version whether %s is already deployed", stackName))
+	log.Debugf("retrieve deployed version whether %s is already deployed", stackName)
 
 	deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
 	if err != nil {
@@ -244,11 +242,11 @@ func getDeployedVersion(cl *dockerclient.Client, stackName string, recipeName st
 	}
 
 	if !deployMeta.IsDeployed {
-		return "", errors.New(i18n.G("%s is not deployed?", stackName))
+		return "", fmt.Errorf("%s is not deployed?", stackName)
 	}
 
 	if deployMeta.Version == "unknown" {
-		return "", errors.New(i18n.G("failed to determine deployed version of %s", stackName))
+		return "", fmt.Errorf("failed to determine deployed version of %s", stackName)
 	}
 
 	return deployMeta.Version, nil
@@ -270,7 +268,7 @@ func getAvailableUpgrades(cl *dockerclient.Client, stackName string, recipeName
 	}
 
 	if len(versions) == 0 {
-		log.Warn(i18n.G("no published releases for %s in the recipe catalogue?", recipeName))
+		log.Warnf("no published releases for %s in the recipe catalogue?", recipeName)
 		return nil, nil
 	}
 
@@ -296,7 +294,7 @@ func getAvailableUpgrades(cl *dockerclient.Client, stackName string, recipeName
 		}
 	}
 
-	log.Debug(i18n.G("available updates for %s: %s", stackName, availableUpgrades))
+	log.Debugf("available updates for %s: %s", stackName, availableUpgrades)
 
 	return availableUpgrades, nil
 }
@@ -373,7 +371,7 @@ func createDeployConfig(r recipe.Recipe, stackName string, env envfile.AppEnv) (
 // tryUpgrade performs the upgrade if all the requirements are fulfilled.
 func tryUpgrade(cl *dockerclient.Client, stackName, recipeName string) error {
 	if recipeName == "" {
-		log.Debug(i18n.G("don't update %s due to missing recipe name", stackName))
+		log.Debugf("don't update %s due to missing recipe name", stackName)
 		return nil
 	}
 
@@ -383,7 +381,7 @@ func tryUpgrade(cl *dockerclient.Client, stackName, recipeName string) error {
 	}
 
 	if chaos && !internal.Chaos {
-		log.Debug(i18n.G("don't update %s due to chaos deployment", stackName))
+		log.Debugf("don't update %s due to chaos deployment", stackName)
 		return nil
 	}
 
@@ -393,7 +391,7 @@ func tryUpgrade(cl *dockerclient.Client, stackName, recipeName string) error {
 	}
 
 	if !updatesEnabled {
-		log.Debug(i18n.G("don't update %s due to disabled auto updates or missing ENABLE_AUTO_UPDATE env", stackName))
+		log.Debugf("don't update %s due to disabled auto updates or missing ENABLE_AUTO_UPDATE env", stackName)
 		return nil
 	}
 
@@ -403,7 +401,7 @@ func tryUpgrade(cl *dockerclient.Client, stackName, recipeName string) error {
 	}
 
 	if upgradeVersion == "" {
-		log.Debug(i18n.G("don't update %s due to no new version", stackName))
+		log.Debugf("don't update %s due to no new version", stackName)
 		return nil
 	}
 
@@ -441,36 +439,18 @@ func upgrade(cl *dockerclient.Client, stackName, recipeName, upgradeVersion stri
 		return err
 	}
 
-	log.Info(i18n.G("upgrade %s (%s) to version %s", stackName, recipeName, upgradeVersion))
+	log.Infof("upgrade %s (%s) to version %s", stackName, recipeName, upgradeVersion)
 
-	serviceNames, err := appPkg.GetAppServiceNames(app.Name)
+	err = stack.RunDeploy(cl, deployOpts, compose, stackName, true)
-	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
 }
 
 func newKadabraApp(version, commit string) *cobra.Command {
 	rootCmd := &cobra.Command{
-		Use:     i18n.G("kadabra [cmd] [flags]"),
+		Use:     "kadabra [cmd] [flags]",
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
-		Short:   i18n.G("The Co-op Cloud auto-updater 🤖 🚀"),
+		Short:   "The Co-op Cloud auto-updater 🤖 🚀",
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			log.Logger.SetStyles(charmLog.DefaultStyles())
 			charmLog.SetDefault(log.Logger)
@@ -481,24 +461,18 @@ func newKadabraApp(version, commit string) *cobra.Command {
 				log.SetReportCaller(true)
 			}
 
-			log.Debug(i18n.G("kadabra version %s, commit %s", version, commit))
+			log.Debugf("kadabra version %s, commit %s", version, commit)
 		},
 	}
 
 	rootCmd.PersistentFlags().BoolVarP(
-		&internal.Debug,
+		&internal.Debug, "debug", "d", false,
-		i18n.G("debug"),
+		"show debug messages",
-		i18n.G("d"),
-		false,
-		i18n.G("show debug messages"),
 	)
 
 	rootCmd.PersistentFlags().BoolVarP(
-		&internal.NoInput,
+		&internal.NoInput, "no-input", "n", false,
-		i18n.G("no-input"),
+		"toggle non-interactive mode",
-		i18n.G("n"),
-		false,
-		i18n.G("toggle non-interactive mode"),
 	)
 
 	rootCmd.AddCommand(
@@ -534,25 +508,25 @@ func init() {
 
 	UpgradeCommand.Flags().BoolVarP(
 		&internal.Chaos,
-		i18n.G("chaos"),
+		"chaos",
-		i18n.G("C"),
+		"C",
 		false,
-		i18n.G("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 
 	UpgradeCommand.Flags().BoolVarP(
 		&includeMajorUpdates,
-		i18n.G("major"),
+		"major",
-		i18n.G("m"),
+		"m",
 		false,
-		i18n.G("check for major updates"),
+		"check for major updates",
 	)
 
 	UpgradeCommand.Flags().BoolVarP(
 		&updateAll,
-		i18n.G("all"),
+		"all",
-		i18n.G("a"),
+		"a",
 		false,
-		i18n.G("update all deployed apps"),
+		"update all deployed apps",
 	)
 }

cli/upgrade.go

@@ -6,24 +6,23 @@ import (
 	"os/exec"
 
 	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/spf13/cobra"
 )
 
 // UpgradeCommand upgrades abra in-place.
 var UpgradeCommand = &cobra.Command{
-	Use:     i18n.G("upgrade [flags]"),
+	Use:     "upgrade [flags]",
 	Aliases: []string{"u"},
-	Short:   i18n.G("Upgrade abra"),
+	Short:   "Upgrade abra",
-	Long: i18n.G(`Upgrade abra in-place with the latest stable or release candidate.
+	Long: `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 💗`),
+for the testing efforts 💗`,
-	Example: i18n.G("  abra upgrade --rc"),
+	Example: "  abra upgrade --rc",
 	Args:    cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		mainURL := "https://install.abra.coopcloud.tech"
@@ -34,7 +33,7 @@ for the testing efforts 💗`),
 			c = exec.Command("bash", "-c", fmt.Sprintf("wget -q -O- %s | bash -s -- --rc", releaseCandidateURL))
 		}
 
-		log.Debugf(i18n.G("attempting to run %s", c))
+		log.Debugf("attempting to run %s", c)
 
 		if err := internal.RunCmd(c); err != nil {
 			log.Fatal(err)
@@ -52,6 +51,6 @@ func init() {
 		"rc",
 		"r",
 		false,
-		i18n.G("install release candidate (may contain bugs)"),
+		"install release candidate (may contain bugs)",
 	)
 }

go.mod

@@ -1,73 +1,69 @@
 module coopcloud.tech/abra
 
-go 1.24.0
+go 1.23.0
 
-toolchain go1.24.1
+toolchain go1.23.1
 
 require (
-	coopcloud.tech/tagcmp v0.0.0-20250818180036-0ec1b205b5ca
+	coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb
 	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.2
+	github.com/charmbracelet/log v0.4.1
 	github.com/distribution/reference v0.6.0
-	github.com/docker/cli v28.3.3+incompatible
+	github.com/docker/cli v28.0.1+incompatible
-	github.com/docker/docker v28.3.3+incompatible
+	github.com/docker/docker v28.0.1+incompatible
 	github.com/docker/go-units v0.5.0
-	github.com/go-git/go-git/v5 v5.16.2
+	github.com/go-git/go-git/v5 v5.14.0
 	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.34.0
+	golang.org/x/term v0.30.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.2
 )
 
 require (
-	dario.cat/mergo v1.0.2 // indirect
+	dario.cat/mergo v1.0.1 // indirect
+	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
-	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.3.0 // indirect
+	github.com/ProtonMail/go-crypto v1.1.6 // 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.3.2 // indirect
+	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
-	github.com/charmbracelet/x/ansi v0.10.1 // indirect
+	github.com/charmbracelet/x/ansi v0.8.0 // 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.1 // indirect
+	github.com/cloudflare/circl v1.6.0 // 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/containerd/platforms v0.2.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.6 // 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-connections v0.6.0 // 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-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.3 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // 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.27.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // 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
@@ -77,60 +73,61 @@ 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/go-archive v0.1.0 // indirect
+	github.com/moby/sys/mountinfo v0.6.2 // indirect
-	github.com/moby/sys/atomicwriter v0.1.0 // indirect
+	github.com/moby/sys/user v0.3.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/pjbgf/sha1cd v0.4.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.65.0 // indirect
+	github.com/prometheus/common v0.63.0 // indirect
-	github.com/prometheus/procfs v0.17.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // 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.7 // indirect
+	github.com/spf13/pflag v1.0.6 // 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.62.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
-	go.opentelemetry.io/otel v1.37.0 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
-	go.opentelemetry.io/otel/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/metric v1.35.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
-	go.opentelemetry.io/otel/trace v1.37.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
+	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
-	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/net v0.37.0 // indirect
-	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/time v0.12.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect
+	golang.org/x/time v0.11.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect
+	golang.org/x/tools v0.31.0 // indirect
-	google.golang.org/grpc v1.74.2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
-	google.golang.org/protobuf v1.36.7 // 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
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
@@ -143,15 +140,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.8
+	github.com/hashicorp/go-retryablehttp v0.7.7
 	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.23.0 // indirect
+	github.com/prometheus/client_golang v1.21.1 // indirect
-	github.com/sergi/go-diff v1.4.0 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // 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.35.0
+	golang.org/x/sys v0.31.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-20250818180036-0ec1b205b5ca h1:gSD53tBAsbIGq4SnFfq+mEep6foekQ2a5ea7b38qkm0=
+coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb h1:Ws6WEwKXeaYEkfdkX6AqX1XLPuaCeyStEtxbmEJPllk=
-coopcloud.tech/tagcmp v0.0.0-20250818180036-0ec1b205b5ca/go.mod h1:ESVm0wQKcbcFi06jItF3rI7enf4Jt2PvbkWpDDHk1DQ=
+coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb/go.mod h1:ESVm0wQKcbcFi06jItF3rI7enf4Jt2PvbkWpDDHk1DQ=
-dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
+dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 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-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/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.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
+github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
-github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.4.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,13 +79,16 @@ 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.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
+github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
-github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
+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/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=
@@ -120,29 +123,35 @@ 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/bubbletea v1.3.6 h1:VkHIxPJQeDt0aFJIsVxw8BQdh/F/L2KKZGsK6et5taU=
+github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
-github.com/charmbracelet/bubbletea v1.3.6/go.mod h1:oQD9VCRQFF8KplacJLo28/jofOI2ToOfGYeFgBBxHOc=
+github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
-github.com/charmbracelet/colorprofile v0.3.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqITmrvb1uTIiI=
+github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
-github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI=
+github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
 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.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
+github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
-github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
+github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
-github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ=
+github.com/charmbracelet/log v0.4.1 h1:6AYnoHKADkghm/vt4neaNEXkxcXLSV2g1rdyFDOpTyk=
-github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
+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/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=
@@ -164,9 +173,12 @@ 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.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys=
-github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+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/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=
@@ -212,10 +224,6 @@ 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=
@@ -238,8 +246,6 @@ 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=
@@ -286,9 +292,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=
@@ -296,6 +302,8 @@ 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=
@@ -316,24 +324,30 @@ 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 v28.3.3+incompatible h1:fp9ZHAr1WWPGdIWBM1b3zLtgCF+83gRdVMTJsUeiyAo=
+github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI=
-github.com/docker/cli v28.3.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+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/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 v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
+github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
-github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+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-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.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
+github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
-github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
+github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 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=
@@ -351,8 +365,9 @@ 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=
@@ -363,8 +378,6 @@ 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=
@@ -376,6 +389,8 @@ 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=
@@ -387,12 +402,16 @@ 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.16.2 h1:fT6ZIOjE5iEnkzKyxTHK1W4HGAsPhqEqiSAssSO77hM=
+github.com/go-git/go-git/v5 v5.13.1 h1:DAQ9APonnlvSWpvolXWIuV6Q6zXy2wHbN4cVlNR5Q+M=
-github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
+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-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=
@@ -406,8 +425,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.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.2/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=
@@ -421,10 +440,11 @@ 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.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
+github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
-github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.2.1/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=
@@ -476,6 +496,7 @@ 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=
@@ -487,6 +508,8 @@ 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=
@@ -528,9 +551,13 @@ 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.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
+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/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=
@@ -541,10 +568,11 @@ 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.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=
+github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
-github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
+github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
 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=
@@ -561,7 +589,9 @@ 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=
@@ -588,6 +618,8 @@ 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=
@@ -607,13 +639,12 @@ 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=
@@ -622,14 +653,15 @@ 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=
@@ -653,31 +685,33 @@ 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.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
+github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
-github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
+github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 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.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs=
+github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
-github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
+github.com/moby/sys/user v0.3.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=
@@ -688,10 +722,8 @@ 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/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
+github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
+github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
-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=
@@ -730,6 +762,8 @@ 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=
@@ -754,12 +788,17 @@ 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.4.0 h1:NXzbL1RvjTUi6kgYZCX3fPwwl27Q1LJndxtUDVfJGRY=
+github.com/pjbgf/sha1cd v0.3.1 h1:Dh2GYdpJnO84lIw0LJwTFXjcNbasP/bklicSznyAaPI=
-github.com/pjbgf/sha1cd v0.4.0/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
+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/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=
@@ -775,23 +814,27 @@ 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.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
-github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
+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_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.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 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.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
+github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
-github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
+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/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=
@@ -803,8 +846,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.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 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=
@@ -812,20 +855,25 @@ 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/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
+github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
 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.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
-github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/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=
@@ -837,6 +885,8 @@ 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=
@@ -844,27 +894,33 @@ 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=
@@ -939,29 +995,49 @@ 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.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
-go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0 h1:zG8GlgXCJQd5BU98C0hZnBbElszTmUgCNCfYneaDL0A=
+go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0/go.mod h1:hOfBCz8kv/wuq73Mx2H2QnWokh/kHZxkh6SNF2bdKtw=
+go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM=
+go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M=
+go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 h1:7F29RDmnlqk6B5d+sUqemt8TBfDqxryYW5gX6L74RFA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI=
+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/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.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
+go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
-go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
+go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
+go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
-go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
+go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
-go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
+go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
-go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
+go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
-go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
+go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
-go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
+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/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
+go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
-go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
+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.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=
@@ -986,8 +1062,12 @@ 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.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+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/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=
@@ -998,8 +1078,12 @@ 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-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE=
+golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 h1:9kj3STMvgqy3YA4VQXBrN7925ICMxD5wzMRcgA30588=
-golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
+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/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=
@@ -1022,6 +1106,10 @@ 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=
@@ -1063,8 +1151,12 @@ 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.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+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/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=
@@ -1082,8 +1174,10 @@ 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.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+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/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=
@@ -1153,7 +1247,6 @@ 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=
@@ -1161,14 +1254,24 @@ 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.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+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/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.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
+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/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=
@@ -1178,16 +1281,22 @@ 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.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+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/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.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
-golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+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/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=
@@ -1233,6 +1342,12 @@ 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=
@@ -1281,10 +1396,18 @@ 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-20250811230008-5f3141c8851a h1:DMCgtIAIQGZqJXMVzJF4MV8BlWoJh2ZuFiRdAleyr58=
+google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d h1:H8tOf8XM88HvKqLTxe755haY6r1fqqzLbEnfrmLXlSA=
-google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE=
+google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d/go.mod h1:2v7Z7gP2ZUOGsaFyxATQSRoBnKygqVq2Cwnvom7QiqY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=
+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/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=
@@ -1304,8 +1427,10 @@ 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.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
+google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
+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/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=
@@ -1319,10 +1444,15 @@ 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.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+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=
 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=
@@ -1338,6 +1468,7 @@ 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=
@@ -1358,9 +1489,12 @@ 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

@@ -2,7 +2,6 @@ package app
 
 import (
 	"bufio"
-	"errors"
 	"fmt"
 	"os"
 	"path"
@@ -14,7 +13,6 @@ import (
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/envfile"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/abra/pkg/upstream/convert"
 	"coopcloud.tech/abra/pkg/upstream/stack"
@@ -38,7 +36,7 @@ func Get(appName string) (App, error) {
 		return App{}, err
 	}
 
-	log.Debug(i18n.G("loaded app %s: %s", appName, app))
+	log.Debugf("loaded app %s: %s", appName, app)
 
 	return app, nil
 }
@@ -49,7 +47,7 @@ func Get(appName string) (App, error) {
 func GetApp(apps AppFiles, name AppName) (App, error) {
 	appFile, exists := apps[name]
 	if !exists {
-		return App{}, errors.New(i18n.G("cannot find app with name %s", name))
+		return App{}, fmt.Errorf("cannot find app with name %s", name)
 	}
 
 	app, err := ReadAppEnvFile(appFile, name)
@@ -138,7 +136,7 @@ func StackName(appName string) string {
 	stackName := SanitiseAppName(appName)
 
 	if len(stackName) > config.MAX_SANITISED_APP_NAME_LENGTH {
-		log.Debug(i18n.G("trimming %s to %s to avoid runtime limits", stackName, stackName[:config.MAX_SANITISED_APP_NAME_LENGTH]))
+		log.Debugf("trimming %s to %s to avoid runtime limits", stackName, stackName[:config.MAX_SANITISED_APP_NAME_LENGTH])
 		stackName = stackName[:config.MAX_SANITISED_APP_NAME_LENGTH]
 	}
 
@@ -245,12 +243,12 @@ func (a ByName) Less(i, j int) bool {
 func ReadAppEnvFile(appFile AppFile, name AppName) (App, error) {
 	env, err := envfile.ReadEnv(appFile.Path)
 	if err != nil {
-		return App{}, errors.New(i18n.G("env file for %s couldn't be read: %s", name, err.Error()))
+		return App{}, fmt.Errorf("env file for %s couldn't be read: %s", name, err.Error())
 	}
 
 	app, err := NewApp(env, name, appFile)
 	if err != nil {
-		return App{}, errors.New(i18n.G("env file for %s has issues: %s", name, err.Error()))
+		return App{}, fmt.Errorf("env file for %s has issues: %s", name, err.Error())
 	}
 
 	return app, nil
@@ -264,7 +262,7 @@ func NewApp(env envfile.AppEnv, name string, appFile AppFile) (App, error) {
 	if !exists {
 		recipeName, exists = env["TYPE"]
 		if !exists {
-			return App{}, errors.New(i18n.G("%s is missing the TYPE env var?", name))
+			return App{}, fmt.Errorf("%s is missing the TYPE env var?", name)
 		}
 	}
 
@@ -292,13 +290,13 @@ func LoadAppFiles(servers ...string) (AppFiles, error) {
 		}
 	}
 
-	log.Debug(i18n.G("collecting metadata from %v servers: %s", len(servers), strings.Join(servers, ", ")))
+	log.Debugf("collecting metadata from %v servers: %s", len(servers), strings.Join(servers, ", "))
 
 	for _, server := range servers {
 		serverDir := path.Join(config.SERVERS_DIR, server)
 		files, err := config.GetAllFilesInDirectory(serverDir)
 		if err != nil {
-			return appFiles, errors.New(i18n.G("server %s doesn't exist? Run \"abra server ls\" to check", server))
+			return appFiles, fmt.Errorf("server %s doesn't exist? Run \"abra server ls\" to check", server)
 		}
 
 		for _, file := range files {
@@ -377,7 +375,7 @@ func TemplateAppEnvSample(r recipe.Recipe, appName, server, domain string) error
 
 	appEnvPath := path.Join(config.ABRA_DIR, "servers", server, fmt.Sprintf("%s.env", appName))
 	if _, err := os.Stat(appEnvPath); !os.IsNotExist(err) {
-		return errors.New(i18n.G("%s already exists?", appEnvPath))
+		return fmt.Errorf("%s already exists?", appEnvPath)
 	}
 
 	err = os.WriteFile(appEnvPath, envSample, 0o664)
@@ -397,7 +395,7 @@ func TemplateAppEnvSample(r recipe.Recipe, appName, server, domain string) error
 		return err
 	}
 
-	log.Debug(i18n.G("copied & templated %s to %s", r.SampleEnvPath, appEnvPath))
+	log.Debugf("copied & templated %s to %s", r.SampleEnvPath, appEnvPath)
 
 	return nil
 }
@@ -421,16 +419,14 @@ func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]str
 
 	var bar *progressbar.ProgressBar
 	if !MachineReadable {
-		bar = formatter.CreateProgressbar(len(servers), i18n.G("querying remote servers..."))
+		bar = formatter.CreateProgressbar(len(servers), "querying remote servers...")
 	}
 
 	ch := make(chan stack.StackStatus, len(servers))
 	for server := range servers {
 		cl, err := client.New(server)
 		if err != nil {
-			log.Warn(err)
+			return statuses, err
-			ch <- stack.StackStatus{}
-			continue
 		}
 
 		go func(s string) {
@@ -484,7 +480,7 @@ func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]str
 		}
 	}
 
-	log.Debug(i18n.G("retrieved app statuses: %s", statuses))
+	log.Debugf("retrieved app statuses: %s", statuses)
 
 	return statuses, nil
 }
@@ -498,7 +494,7 @@ func GetAppComposeConfig(recipe string, opts stack.Deploy, appEnv envfile.AppEnv
 		return &composetypes.Config{}, err
 	}
 
-	log.Debug(i18n.G("retrieved %s for %s", compose.Filename, recipe))
+	log.Debugf("retrieved %s for %s", compose.Filename, recipe)
 
 	return compose, nil
 }
@@ -507,13 +503,13 @@ func GetAppComposeConfig(recipe string, opts stack.Deploy, appEnv envfile.AppEnv
 func ExposeAllEnv(stackName string, compose *composetypes.Config, appEnv envfile.AppEnv) {
 	for _, service := range compose.Services {
 		if service.Name == "app" {
-			log.Debug(i18n.G("adding env vars to %s service config", stackName))
+			log.Debugf("adding env vars to %s service config", stackName)
 			for k, v := range appEnv {
 				_, exists := service.Environment[k]
 				if !exists {
 					value := v
 					service.Environment[k] = &value
-					log.Debug(i18n.G("%s: %s: %s", stackName, k, value))
+					log.Debugf("%s: %s: %s", stackName, k, value)
 				}
 			}
 		}
@@ -574,9 +570,9 @@ func ReadAbraShCmdNames(abraSh string) ([]string, error) {
 	}
 
 	if len(cmdNames) > 0 {
-		log.Debug(i18n.G("read %s from %s", strings.Join(cmdNames, " "), abraSh))
+		log.Debugf("read %s from %s", strings.Join(cmdNames, " "), abraSh)
 	} else {
-		log.Debug(i18n.G("read 0 command names from %s", abraSh))
+		log.Debugf("read 0 command names from %s", abraSh)
 	}
 
 	return cmdNames, nil
@@ -619,7 +615,7 @@ func (a App) WipeRecipeVersion() error {
 		log.Fatal(err)
 	}
 
-	log.Debug(i18n.G("version wiped from %s.env", a.Domain))
+	log.Debugf("version wiped from %s.env", a.Domain)
 
 	return nil
 }
@@ -676,13 +672,13 @@ func (a App) WriteRecipeVersion(version string, dryRun bool) error {
 			log.Fatal(err)
 		}
 	} else {
-		log.Debug(i18n.G("skipping writing version %s because dry run", version))
+		log.Debugf("skipping writing version %s because dry run", version)
 	}
 
 	if !skipped {
-		log.Debug(i18n.G("version %s saved to %s.env", version, a.Domain))
+		log.Debugf("version %s saved to %s.env", version, a.Domain)
 	} else {
-		log.Debug(i18n.G("skipping version %s write as already exists in %s.env", version, a.Domain))
+		log.Debugf("skipping version %s write as already exists in %s.env", version, a.Domain)
 	}
 
 	return nil

pkg/app/compose.go

@@ -5,7 +5,6 @@ import (
 	"strconv"
 
 	"coopcloud.tech/abra/pkg/envfile"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	composetypes "github.com/docker/cli/cli/compose/types"
 )
@@ -15,7 +14,7 @@ import (
 func SetRecipeLabel(compose *composetypes.Config, stackName string, recipe string) {
 	for _, service := range compose.Services {
 		if service.Name == "app" {
-			log.Debug(i18n.G("set recipe label 'coop-cloud.%s.recipe' to %s for %s", stackName, recipe, stackName))
+			log.Debugf("set recipe label 'coop-cloud.%s.recipe' to %s for %s", stackName, recipe, stackName)
 			labelKey := fmt.Sprintf("coop-cloud.%s.recipe", stackName)
 			service.Deploy.Labels[labelKey] = recipe
 		}
@@ -27,7 +26,7 @@ func SetRecipeLabel(compose *composetypes.Config, stackName string, recipe strin
 func SetChaosLabel(compose *composetypes.Config, stackName string, chaos bool) {
 	for _, service := range compose.Services {
 		if service.Name == "app" {
-			log.Debug(i18n.G("set label 'coop-cloud.%s.chaos' to %v for %s", stackName, chaos, stackName))
+			log.Debugf("set label 'coop-cloud.%s.chaos' to %v for %s", stackName, chaos, stackName)
 			labelKey := fmt.Sprintf("coop-cloud.%s.chaos", stackName)
 			service.Deploy.Labels[labelKey] = strconv.FormatBool(chaos)
 		}
@@ -38,7 +37,7 @@ func SetChaosLabel(compose *composetypes.Config, stackName string, chaos bool) {
 func SetChaosVersionLabel(compose *composetypes.Config, stackName string, chaosVersion string) {
 	for _, service := range compose.Services {
 		if service.Name == "app" {
-			log.Debug(i18n.G("set label 'coop-cloud.%s.chaos-version' to %v for %s", stackName, chaosVersion, stackName))
+			log.Debugf("set label 'coop-cloud.%s.chaos-version' to %v for %s", stackName, chaosVersion, stackName)
 			labelKey := fmt.Sprintf("coop-cloud.%s.chaos-version", stackName)
 			service.Deploy.Labels[labelKey] = chaosVersion
 		}
@@ -48,7 +47,7 @@ func SetChaosVersionLabel(compose *composetypes.Config, stackName string, chaosV
 func SetVersionLabel(compose *composetypes.Config, stackName string, version string) {
 	for _, service := range compose.Services {
 		if service.Name == "app" {
-			log.Debug(i18n.G("set label 'coop-cloud.%s.version' to %v for %s", stackName, version, stackName))
+			log.Debugf("set label 'coop-cloud.%s.version' to %v for %s", stackName, version, stackName)
 			labelKey := fmt.Sprintf("coop-cloud.%s.version", stackName)
 			service.Deploy.Labels[labelKey] = version
 		}
@@ -65,7 +64,7 @@ func SetUpdateLabel(compose *composetypes.Config, stackName string, appEnv envfi
 			if !exists {
 				enable_auto_update = "false"
 			}
-			log.Debug(i18n.G("set label 'coop-cloud.%s.autoupdate' to %s for %s", stackName, enable_auto_update, stackName))
+			log.Debugf("set label 'coop-cloud.%s.autoupdate' to %s for %s", stackName, enable_auto_update, stackName)
 			labelKey := fmt.Sprintf("coop-cloud.%s.autoupdate", stackName)
 			service.Deploy.Labels[labelKey] = enable_auto_update
 		}
@@ -77,13 +76,13 @@ func GetLabel(compose *composetypes.Config, stackName string, label string) stri
 	for _, service := range compose.Services {
 		if service.Name == "app" {
 			labelKey := fmt.Sprintf("coop-cloud.%s.%s", stackName, label)
-			log.Debug(i18n.G("get label '%s'", labelKey))
+			log.Debugf("get label '%s'", labelKey)
 			if labelValue, ok := service.Deploy.Labels[labelKey]; ok {
 				return labelValue
 			}
 		}
 	}
-	log.Debug(i18n.G("no %s label found for %s", label, stackName))
+	log.Debugf("no %s label found for %s", label, stackName)
 	return ""
 }
 
@@ -92,7 +91,7 @@ func GetTimeoutFromLabel(compose *composetypes.Config, stackName string) (int, e
 	timeout := 50 // Default Timeout
 	var err error = nil
 	if timeoutLabel := GetLabel(compose, stackName, "timeout"); timeoutLabel != "" {
-		log.Debug(i18n.G("timeout label: %s", timeoutLabel))
+		log.Debugf("timeout label: %s", timeoutLabel)
 		timeout, err = strconv.Atoi(timeoutLabel)
 	}
 	return timeout, err

pkg/autocomplete/autocomplete.go

@@ -1,12 +1,11 @@
 package autocomplete
 
 import (
+	"fmt"
 	"sort"
-	"strings"
 
 	"coopcloud.tech/abra/pkg/app"
 	appPkg "coopcloud.tech/abra/pkg/app"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/recipe"
 	"github.com/spf13/cobra"
 )
@@ -15,7 +14,7 @@ import (
 func AppNameComplete() ([]string, cobra.ShellCompDirective) {
 	appFiles, err := app.LoadAppFiles("")
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -30,7 +29,7 @@ func AppNameComplete() ([]string, cobra.ShellCompDirective) {
 func ServiceNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
 	serviceNames, err := app.GetAppServiceNames(appName)
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -39,15 +38,9 @@ func ServiceNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
 
 // RecipeNameComplete completes recipe names.
 func RecipeNameComplete() ([]string, cobra.ShellCompDirective) {
-	catl, err := recipe.ReadRecipeCatalogue(true)
+	catl, err := recipe.ReadRecipeCatalogue(false)
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
-		return []string{err}, cobra.ShellCompDirectiveError
-	}
-
-	localRecipes, err := recipe.GetRecipesLocal()
-	if err != nil && !strings.Contains(err.Error(), "empty") {
-		err := i18n.G("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -56,10 +49,6 @@ func RecipeNameComplete() ([]string, cobra.ShellCompDirective) {
 		recipeNames = append(recipeNames, name)
 	}
 
-	for _, recipeLocal := range localRecipes {
-		recipeNames = append(recipeNames, recipeLocal)
-	}
-
 	return recipeNames, cobra.ShellCompDirectiveDefault
 }
 
@@ -67,7 +56,7 @@ func RecipeNameComplete() ([]string, cobra.ShellCompDirective) {
 func RecipeVersionComplete(recipeName string) ([]string, cobra.ShellCompDirective) {
 	catl, err := recipe.ReadRecipeCatalogue(true)
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -85,7 +74,7 @@ func RecipeVersionComplete(recipeName string) ([]string, cobra.ShellCompDirectiv
 func ServerNameComplete() ([]string, cobra.ShellCompDirective) {
 	files, err := app.LoadAppFiles("")
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -101,13 +90,13 @@ func ServerNameComplete() ([]string, cobra.ShellCompDirective) {
 func CommandNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
 	app, err := app.Get(appName)
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
 	cmdNames, err := appPkg.ReadAbraShCmdNames(app.Recipe.AbraShPath)
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
@@ -122,7 +111,7 @@ func SecretComplete(recipeName string) ([]string, cobra.ShellCompDirective) {
 
 	config, err := r.GetComposeConfig(nil)
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}
 

pkg/catalogue/catalogue.go

@@ -1,7 +1,6 @@
 package catalogue
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path"
@@ -9,7 +8,6 @@ import (
 
 	"coopcloud.tech/abra/pkg/config"
 	gitPkg "coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 )
@@ -18,7 +16,7 @@ import (
 func EnsureCatalogue() error {
 	catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
 	if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
-		log.Debug(i18n.G("catalogue is missing, retrieving now"))
+		log.Debugf("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 {
@@ -37,7 +35,8 @@ func EnsureIsClean() error {
 	}
 
 	if !isClean {
-		return errors.New(i18n.G("%s has locally unstaged changes? please commit/remove your changes before proceeding", config.CATALOGUE_DIR))
+		msg := "%s has locally unstaged changes? please commit/remove your changes before proceeding"
+		return fmt.Errorf(msg, config.CATALOGUE_DIR)
 	}
 
 	return nil
@@ -56,7 +55,8 @@ func EnsureUpToDate() error {
 	}
 
 	if len(remotes) == 0 {
-		log.Debug(i18n.G("cannot ensure %s is up-to-date, no git remotes configured", config.CATALOGUE_DIR))
+		msg := "cannot ensure %s is up-to-date, no git remotes configured"
+		log.Debugf(msg, config.CATALOGUE_DIR)
 		return nil
 	}
 
@@ -81,7 +81,7 @@ func EnsureUpToDate() error {
 		}
 	}
 
-	log.Debug(i18n.G("fetched latest git changes for %s", config.CATALOGUE_DIR))
+	log.Debugf("fetched latest git changes for %s", config.CATALOGUE_DIR)
 
 	return nil
 }

pkg/client/client.go

@@ -4,12 +4,12 @@ package client
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"os"
 	"time"
 
 	contextPkg "coopcloud.tech/abra/pkg/context"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	sshPkg "coopcloud.tech/abra/pkg/ssh"
 	commandconnPkg "coopcloud.tech/abra/pkg/upstream/commandconn"
@@ -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, errors.New(i18n.G("unknown server, run \"abra server add %s\"?", serverName))
+			return nil, fmt.Errorf("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.Debug(i18n.G("created client for %s", serverName))
+	log.Debugf("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, errors.New(i18n.G("swarm mode not enabled on %s?", serverName))
+			return cl, fmt.Errorf("swarm mode not enabled on %s?", serverName)
 		}
 
-		return cl, errors.New(i18n.G("swarm mode not enabled on local server?"))
+		return cl, errors.New("swarm mode not enabled on local server?")
 	}
 
 	return cl, nil

pkg/client/configs.go

@@ -1,39 +0,0 @@
-package client
-
-import (
-	"context"
-	"errors"
-
-	"coopcloud.tech/abra/pkg/i18n"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/client"
-)
-
-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(i18n.G("conf %s: %s", confName, err))
-		}
-	}
-	return nil
-}

pkg/client/context.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"coopcloud.tech/abra/pkg/context"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	commandconnPkg "coopcloud.tech/abra/pkg/upstream/commandconn"
 	dConfig "github.com/docker/cli/cli/config"
@@ -23,7 +22,7 @@ func CreateContext(contextName string) error {
 		return err
 	}
 
-	log.Debug(i18n.G("created the %s context", contextName))
+	log.Debugf("created the %s context", contextName)
 
 	return nil
 }
@@ -63,7 +62,7 @@ func createContext(name string, host string) error {
 
 func DeleteContext(name string) error {
 	if name == "default" {
-		return errors.New(i18n.G("context 'default' cannot be removed"))
+		return errors.New("context 'default' cannot be removed")
 	}
 
 	if _, err := GetContext(name); err != nil {

pkg/client/registry.go

@@ -2,10 +2,8 @@ package client
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"github.com/containers/image/docker"
 	"github.com/containers/image/types"
 	"github.com/distribution/reference"
@@ -17,7 +15,7 @@ func GetRegistryTags(img reference.Named) ([]string, error) {
 
 	ref, err := docker.ParseReference(fmt.Sprintf("//%s", img))
 	if err != nil {
-		return tags, errors.New(i18n.G("failed to parse image %s, saw: %s", img, err.Error()))
+		return tags, fmt.Errorf("failed to parse image %s, saw: %s", img, err.Error())
 	}
 
 	ctx := context.Background()

pkg/client/volumes.go

@@ -2,10 +2,9 @@ package client
 
 import (
 	"context"
-	"errors"
+	"fmt"
 	"time"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/volume"
@@ -38,7 +37,7 @@ func RemoveVolumes(cl *client.Client, ctx context.Context, volumeNames []string,
 			return cl.VolumeRemove(context.Background(), volName, force)
 		})
 		if err != nil {
-			return errors.New(i18n.G("volume %s: %s", volName, err))
+			return fmt.Errorf("volume %s: %s", volName, err)
 		}
 	}
 	return nil
@@ -55,9 +54,9 @@ func retryFunc(retries int, fn func() error) error {
 		}
 		if i+1 < retries {
 			sleep := time.Duration(i+1) * time.Duration(i+1)
-			log.Info(i18n.G("%s: waiting %d seconds before next retry", err, sleep))
+			log.Infof("%s: waiting %d seconds before next retry", err, sleep)
 			time.Sleep(sleep * time.Second)
 		}
 	}
-	return errors.New(i18n.G("%d retries failed", retries))
+	return fmt.Errorf("%d retries failed", retries)
 }

pkg/config/abra.go

@@ -5,7 +5,6 @@ import (
 	"path"
 	"path/filepath"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"gopkg.in/yaml.v3"
 )
@@ -17,13 +16,13 @@ func LoadAbraConfig() Abra {
 	wd, _ := os.Getwd()
 	configFile := findAbraConfig(wd)
 	if configFile == "" {
-		log.Debug(i18n.G("no config file found"))
+		log.Debugf("no config file found")
 		return Abra{}
 	}
 	data, err := os.ReadFile(configFile)
 	if err != nil {
 		// Do nothing, when an error occurs
-		log.Debug(i18n.G("error reading config file: %s", err))
+		log.Debugf("error reading config file: %s", err)
 		return Abra{}
 	}
 
@@ -31,10 +30,10 @@ func LoadAbraConfig() Abra {
 	err = yaml.Unmarshal(data, &config)
 	if err != nil {
 		// Do nothing, when an error occurs
-		log.Debug(i18n.G("error loading config file: %s", err))
+		log.Debugf("error loading config file: %s", err)
 		return Abra{}
 	}
-	log.Debug(i18n.G("config file loaded from: %s", configFile))
+	log.Debugf("config file loaded from: %s", configFile)
 	config.configPath = filepath.Dir(configFile)
 	return config
 }
@@ -74,24 +73,25 @@ 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(i18n.G("read abra dir from $ABRA_DIR"))
+		log.Debug("read abra dir from $ABRA_DIR")
 		return dir
 	}
 	if a.AbraDir != "" {
-		log.Debug(i18n.G("read abra dir from config file"))
+		log.Debug("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(i18n.G("using default abra dir"))
+	log.Debug("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) GetLogsDir() string      { return path.Join(a.GetAbraDir(), "logs") }
+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) GetCatalogueDir() string { return path.Join(a.GetAbraDir(), "catalogue") }
 
 var config = LoadAbraConfig()
@@ -100,7 +100,8 @@ var (
 	ABRA_DIR                  = config.GetAbraDir()
 	SERVERS_DIR               = config.GetServersDir()
 	RECIPES_DIR               = config.GetRecipesDir()
-	LOGS_DIR                  = config.GetLogsDir()
+	VENDOR_DIR                = config.GetVendorDir()
+	BACKUP_DIR                = config.GetBackupDir()
 	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 (
-	"errors"
+	"fmt"
 	"io/fs"
 	"io/ioutil"
 	"os"
@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 )
 
@@ -34,7 +33,7 @@ func GetServers() ([]string, error) {
 		}
 	}
 
-	log.Debug(i18n.G("retrieved %v servers: %s", len(filtered), filtered))
+	log.Debugf("retrieved %v servers: %s", len(filtered), filtered)
 
 	return filtered, nil
 }
@@ -47,7 +46,7 @@ func ReadServerNames() ([]string, error) {
 		return nil, err
 	}
 
-	log.Debug(i18n.G("read %s from %s", strings.Join(serverNames, ","), SERVERS_DIR))
+	log.Debugf("read %s from %s", strings.Join(serverNames, ","), SERVERS_DIR)
 
 	return serverNames, nil
 }
@@ -71,7 +70,7 @@ func GetAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
 
 		realPath, err := filepath.EvalSymlinks(filePath)
 		if err != nil {
-			log.Warn(i18n.G("broken symlink in your abra config folders: %s", filePath))
+			log.Warnf("broken symlink in your abra config folders: %s", filePath)
 		} else {
 			realFile, err := os.Stat(realPath)
 			if err != nil {
@@ -95,7 +94,7 @@ func GetAllFoldersInDirectory(directory string) ([]string, error) {
 		return nil, err
 	}
 	if len(files) == 0 {
-		return nil, errors.New(i18n.G("directory is empty: %s", directory))
+		return nil, fmt.Errorf("directory is empty: %s", directory)
 	}
 
 	for _, file := range files {
@@ -104,7 +103,7 @@ func GetAllFoldersInDirectory(directory string) ([]string, error) {
 			filePath := path.Join(directory, file.Name())
 			realDir, err := filepath.EvalSymlinks(filePath)
 			if err != nil {
-				log.Warn(i18n.G("broken symlink in your abra config folders: %s", filePath))
+				log.Warnf("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,12 +2,10 @@ package container
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/docker/docker/api/types"
@@ -28,7 +26,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{}, errors.New(i18n.G("no containers matching the %v filter found?", filter))
+		return types.Container{}, fmt.Errorf("no containers matching the %v filter found?", filter)
 	}
 
 	if len(containers) > 1 {
@@ -37,19 +35,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, i18n.G("%s (created %v)", trimmed, created))
+			containersRaw = append(containersRaw, fmt.Sprintf("%s (created %v)", trimmed, created))
 		}
 
 		if noInput {
-			err := errors.New(i18n.G("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " ")))
+			err := fmt.Errorf("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " "))
 			return types.Container{}, err
 		}
 
-		log.Warnf(i18n.G("ambiguous container list received, prompting for input"))
+		log.Warnf("ambiguous container list received, prompting for input")
 
 		var response string
 		prompt := &survey.Select{
-			Message: i18n.G("which container are you looking for?"),
+			Message: "which container are you looking for?",
 			Options: containersRaw,
 		}
 
@@ -66,7 +64,7 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, no
 			}
 		}
 
-		log.Fatal(i18n.G("failed to match chosen container"))
+		log.Fatal("failed to match chosen container")
 	}
 
 	return containers[0], nil
@@ -81,6 +79,5 @@ func GetContainerFromStackAndService(cl *client.Client, stack, service string) (
 	if err != nil {
 		return types.Container{}, err
 	}
-
 	return container, nil
 }

pkg/context/context.go

@@ -3,7 +3,6 @@ package context
 import (
 	"errors"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"github.com/docker/cli/cli/command"
 	dConfig "github.com/docker/cli/cli/config"
 	"github.com/docker/cli/cli/context"
@@ -31,7 +30,7 @@ func NewDefaultDockerContextStore() *command.ContextStoreWithDefault {
 func GetContextEndpoint(ctx contextStore.Metadata) (string, error) {
 	endpointmeta, ok := ctx.Endpoints["docker"].(context.EndpointMetaBase)
 	if !ok {
-		err := errors.New(i18n.G("context lacks Docker endpoint"))
+		err := errors.New("context lacks Docker endpoint")
 		return "", err
 	}
 	return endpointmeta.Host, nil

pkg/dns/dns.go

@@ -1,21 +1,19 @@
 package dns
 
 import (
-	"errors"
+	"fmt"
 	"net"
-
-	"coopcloud.tech/abra/pkg/i18n"
 )
 
 // 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 "", errors.New(i18n.G("%s: unable to resolve IPv4 address: %s", domainName, err))
+		return "", fmt.Errorf("%s: unable to resolve IPv4 address: %s", domainName, err)
 	}
 
 	if ipv4 == nil {
-		return "", errors.New(i18n.G("%s: no IPv4 available", domainName))
+		return "", fmt.Errorf("%s: no IPv4 available", domainName)
 	}
 
 	return ipv4.String(), nil
@@ -35,7 +33,7 @@ func EnsureDomainsResolveSameIPv4(domainName, server string) (string, error) {
 	}
 
 	if domainIPv4 == "" {
-		return ipv4, errors.New(i18n.G("cannot resolve ipv4 for %s?", domainName))
+		return ipv4, fmt.Errorf("cannot resolve ipv4 for %s?", domainName)
 	}
 
 	serverIPv4, err := EnsureIPv4(server)
@@ -44,16 +42,12 @@ func EnsureDomainsResolveSameIPv4(domainName, server string) (string, error) {
 	}
 
 	if serverIPv4 == "" {
-		return ipv4, errors.New(i18n.G("cannot resolve ipv4 for %s?", server))
+		return ipv4, fmt.Errorf("cannot resolve ipv4 for %s?", server)
 	}
 
 	if domainIPv4 != serverIPv4 {
-		return ipv4, errors.New(
+		err := "app domain %s (%s) does not appear to resolve to app server %s (%s)?"
-			i18n.G(
+		return ipv4, fmt.Errorf(err, domainName, domainIPv4, server, serverIPv4)
-				"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,16 +2,20 @@ package envfile
 
 import (
 	"bufio"
-	"errors"
+	"fmt"
 	"os"
 	"regexp"
 	"strings"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"git.coopcloud.tech/toolshed/godotenv"
 )
 
+// 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
 
@@ -39,7 +43,7 @@ func ReadEnvWithModifiers(filePath string) (AppEnv, AppModifiers, error) {
 		return nil, mods, err
 	}
 
-	log.Debug(i18n.G("read %s from %s", envVars, filePath))
+	log.Debugf("read %s from %s", envVars, filePath)
 
 	return envVars, mods, nil
 }
@@ -70,16 +74,16 @@ func ReadAbraShEnvVars(abraSh string) (map[string]string, error) {
 			envVarDef := splitVals[len(splitVals)-1]
 			keyVal := strings.Split(envVarDef, "=")
 			if len(keyVal) != 2 {
-				return envVars, errors.New(i18n.G("couldn't parse %s", txt))
+				return envVars, fmt.Errorf("couldn't parse %s", txt)
 			}
 			envVars[keyVal[0]] = keyVal[1]
 		}
 	}
 
 	if len(envVars) > 0 {
-		log.Debug(i18n.G("read %s from %s", envVars, abraSh))
+		log.Debugf("read %s from %s", envVars, abraSh)
 	} else {
-		log.Debug(i18n.G("read 0 env var exports from %s", abraSh))
+		log.Debugf("read 0 env var exports from %s", abraSh)
 	}
 
 	return envVars, nil

pkg/formatter/formatter.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/lipgloss/table"
 	"github.com/docker/go-units"
@@ -43,7 +42,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)) + i18n.G(" ago")
+	return units.HumanDuration(now.Sub(date)) + " ago"
 }
 
 // CreateTable prepares a table layout for output.
@@ -77,7 +76,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(i18n.G("detected ABRA_CI=1"))
+		log.Debug("detected ABRA_CI=1")
 		fmt.Println(t)
 		return nil
 	}
@@ -131,7 +130,7 @@ func CreateOverview(header string, rows [][]string) string {
 		}
 
 		if len(row) > 2 {
-			panic(i18n.G("CreateOverview: only accepts rows of len == 2"))
+			panic("CreateOverview: only accepts rows of len == 2")
 		}
 
 		lenOffset := 4
@@ -235,7 +234,7 @@ func StripTagMeta(image string) string {
 	}
 
 	if originalImage != image {
-		log.Debug(i18n.G("stripped %s to %s for parsing", originalImage, image))
+		log.Debugf("stripped %s to %s for parsing", originalImage, image)
 	}
 
 	return image

pkg/git/add.go

@@ -1,7 +1,6 @@
 package git
 
 import (
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 )
@@ -19,7 +18,7 @@ func Add(repoPath, path string, dryRun bool) error {
 	}
 
 	if dryRun {
-		log.Debug(i18n.G("dry run: adding %s", path))
+		log.Debugf("dry run: adding %s", path)
 	} else {
 		worktree.Add(path)
 	}

pkg/git/branch.go

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

pkg/git/clone.go

@@ -1,14 +1,9 @@
 package git
 
 import (
-	"context"
-	"errors"
-	"fmt"
 	"os"
-	"os/signal"
 	"strings"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -27,81 +22,46 @@ func gitCloneIgnoreErr(err error) bool {
 	return false
 }
 
-// Clone runs a git clone which accounts for different default branches. This
+// Clone runs a git clone which accounts for different default branches.
-// 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 {
-	ctx := context.Background()
+	if _, err := os.Stat(dir); os.IsNotExist(err) {
-	ctx, cancelCtx := context.WithCancel(ctx)
+		log.Debugf("git clone: %s", dir, url)
 
-	sigIntCh := make(chan os.Signal, 1)
+		_, err := git.PlainClone(dir, false, &git.CloneOptions{
-	signal.Notify(sigIntCh, os.Interrupt)
+			URL:           url,
-	defer func() {
+			Tags:          git.AllTags,
-		signal.Stop(sigIntCh)
+			ReferenceName: plumbing.ReferenceName("refs/heads/main"),
-		cancelCtx()
+			SingleBranch:  true,
-	}()
+		})
 
-	errCh := make(chan error)
+		if err != nil && gitCloneIgnoreErr(err) {
+			log.Debugf("git clone: %s cloned successfully", dir)
+			return nil
+		}
 
-	go func() {
+		if err != nil {
-		if _, err := os.Stat(dir); os.IsNotExist(err) {
+			log.Debug("git clone: main branch failed, attempting master branch")
-			log.Debug(i18n.G("git clone: %s", url))
 
-			_, err := git.PlainCloneContext(ctx, dir, false, &git.CloneOptions{
+			_, err := git.PlainClone(dir, false, &git.CloneOptions{
 				URL:           url,
 				Tags:          git.AllTags,
-				ReferenceName: plumbing.ReferenceName("refs/heads/main"),
+				ReferenceName: plumbing.ReferenceName("refs/heads/master"),
 				SingleBranch:  true,
 			})
 
 			if err != nil && gitCloneIgnoreErr(err) {
-				log.Debug(i18n.G("git clone: %s cloned successfully", dir))
+				log.Debugf("git clone: %s cloned successfully", dir)
-				errCh <- nil
+				return nil
-			}
-
-			if err := ctx.Err(); err != nil {
-				errCh <- errors.New(i18n.G("git clone %s: cancelled due to interrupt", dir))
 			}
 
 			if err != nil {
-				log.Debug(i18n.G("git clone: main branch failed, attempting master branch"))
+				return err
-
-				_, 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(i18n.G("git clone: %s cloned successfully", dir))
-					errCh <- nil
-				}
-
-				if err != nil {
-					errCh <- err
-				}
 			}
-
-			log.Debug(i18n.G("git clone: %s cloned successfully", dir))
-		} else {
-			log.Debug(i18n.G("git clone: %s already exists", dir))
 		}
 
-		errCh <- nil
+		log.Debugf("git clone: %s cloned successfully", dir)
-	}()
+	} else {
-
+		log.Debugf("git clone: %s already exists", dir)
-	select {
-	case <-sigIntCh:
-		cancelCtx()
-		fmt.Println() // NOTE(d1): newline after ^C
-		if err := os.RemoveAll(dir); err != nil {
-			return errors.New(i18n.G("unable to clean up git clone of %s: %s", dir, err))
-		}
-		return errors.New(i18n.G("git clone %s: cancelled due to interrupt", dir))
-	case err := <-errCh:
-		return err
 	}
 
 	return nil

pkg/git/clone_test.go

@@ -1,48 +0,0 @@
-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,9 +1,8 @@
 package git
 
 import (
-	"errors"
+	"fmt"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 )
@@ -11,7 +10,7 @@ import (
 // Commit runs a git commit
 func Commit(repoPath, commitMessage string, dryRun bool) error {
 	if commitMessage == "" {
-		return errors.New(i18n.G("no commit message specified?"))
+		return fmt.Errorf("no commit message specified?")
 	}
 
 	commitRepo, err := git.PlainOpen(repoPath)
@@ -39,9 +38,9 @@ func Commit(repoPath, commitMessage string, dryRun bool) error {
 		if err != nil {
 			return err
 		}
-		log.Debug(i18n.G("git changes commited"))
+		log.Debug("git changes commited")
 	} else {
-		log.Debug(i18n.G("dry run: no changes commited"))
+		log.Debug("dry run: no changes commited")
 	}
 
 	return nil

pkg/git/common.go

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

pkg/git/diff.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os/exec"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 )
 
@@ -27,7 +26,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(i18n.G("unable to locate git command, cannot output diff"))
+		log.Warnf("unable to locate git command, cannot output diff")
 		return nil
 	}
 

pkg/git/init.go

@@ -1,9 +1,8 @@
 package git
 
 import (
-	"errors"
+	"fmt"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -14,28 +13,28 @@ import (
 func Init(repoPath string, commit bool, gitName, gitEmail string) error {
 	repo, err := git.PlainInit(repoPath, false)
 	if err != nil {
-		return errors.New(i18n.G("git init: %s", err))
+		return fmt.Errorf("git init: %s", err)
 	}
 
 	if err = SwitchToMain(repo); err != nil {
-		return errors.New(i18n.G("git branch rename: %s", err))
+		return fmt.Errorf("git branch rename: %s", err)
 	}
 
-	log.Debug(i18n.G("initialised new git repo in %s", repoPath))
+	log.Debugf("initialised new git repo in %s", repoPath)
 
 	if commit {
 		commitRepo, err := git.PlainOpen(repoPath)
 		if err != nil {
-			return errors.New(i18n.G("git open: %s", err))
+			return fmt.Errorf("git open: %s", err)
 		}
 
 		commitWorktree, err := commitRepo.Worktree()
 		if err != nil {
-			return errors.New(i18n.G("git worktree: %s", err))
+			return fmt.Errorf("git worktree: %s", err)
 		}
 
 		if err := commitWorktree.AddWithOptions(&git.AddOptions{All: true}); err != nil {
-			return errors.New(i18n.G("git add: %s", err))
+			return fmt.Errorf("git add: %s", err)
 		}
 
 		var author *object.Signature
@@ -44,10 +43,10 @@ func Init(repoPath string, commit bool, gitName, gitEmail string) error {
 		}
 
 		if _, err = commitWorktree.Commit("init", &git.CommitOptions{Author: author}); err != nil {
-			return errors.New(i18n.G("git commit: %s", err))
+			return fmt.Errorf("git commit: %s", err)
 		}
 
-		log.Debug(i18n.G("init committed all files for new git repo in %s", repoPath))
+		log.Debugf("init committed all files for new git repo in %s", repoPath)
 	}
 
 	return nil
@@ -57,20 +56,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 errors.New(i18n.G("set reference: %s", err))
+		return fmt.Errorf("set reference: %s", err)
 	}
 
 	cfg, err := repo.Config()
 	if err != nil {
-		return errors.New(i18n.G("repo config: %s", err))
+		return fmt.Errorf("repo config: %s", err)
 	}
 
 	cfg.Init.DefaultBranch = "main"
 	if err := repo.SetConfig(cfg); err != nil {
-		return errors.New(i18n.G("repo set config: %s", err))
+		return fmt.Errorf("repo set config: %s", err)
 	}
 
-	log.Debug(i18n.G("set 'main' as the default branch"))
+	log.Debug("set 'main' as the default branch")
 
 	return nil
 }

pkg/git/push.go

@@ -1,7 +1,6 @@
 package git
 
 import (
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
@@ -10,7 +9,7 @@ import (
 // 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.Debug(i18n.G("dry run: no git changes pushed in %s", repoDir))
+		log.Debugf("dry run: no git changes pushed in %s", repoDir)
 		return nil
 	}
 
@@ -28,7 +27,7 @@ func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 		return err
 	}
 
-	log.Debug(i18n.G("git changes pushed"))
+	log.Debugf("git changes pushed")
 
 	if tags {
 		opts.RefSpecs = append(opts.RefSpecs, config.RefSpec("+refs/tags/*:refs/tags/*"))
@@ -37,7 +36,7 @@ func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 			return err
 		}
 
-		log.Debug(i18n.G("git tags pushed"))
+		log.Debugf("git tags pushed")
 	}
 
 	return nil

pkg/git/read.go

@@ -2,13 +2,13 @@ package git
 
 import (
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"os/user"
 	"path/filepath"
 	"strings"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	gitConfigPkg "github.com/go-git/go-git/v5/config"
@@ -23,12 +23,12 @@ func IsClean(repoPath string) (bool, error) {
 			return false, git.ErrRepositoryNotExists
 		}
 
-		return false, errors.New(i18n.G("unable to open %s: %s", repoPath, err))
+		return false, fmt.Errorf("unable to open %s: %s", repoPath, err)
 	}
 
 	worktree, err := repo.Worktree()
 	if err != nil {
-		return false, errors.New(i18n.G("unable to open worktree of %s: %s", repoPath, err))
+		return false, fmt.Errorf("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, errors.New(i18n.G("unable to query status of %s: %s", repoPath, err))
+		return false, fmt.Errorf("unable to query status of %s: %s", repoPath, err)
 	}
 
 	if status.String() != "" {
 		noNewline := strings.TrimSuffix(status.String(), "\n")
-		log.Debug(i18n.G("git status: %s: %s", repoPath, noNewline))
+		log.Debugf("git status: %s: %s", repoPath, noNewline)
 	} else {
-		log.Debug(i18n.G("git status: %s: clean", repoPath))
+		log.Debugf("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.Debug(i18n.G("no %s exists, not reading any global gitignore config", globalGitConfig))
+			log.Debugf("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.Debug(i18n.G("no %s exists, skipping reading gitignore paths", excludesfile))
+			log.Debugf("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.Debug(i18n.G("read global ignore paths: %s", strings.Join(pathsRaw, " ")))
+	log.Debugf("read global ignore paths: %s", strings.Join(pathsRaw, " "))
 
 	return ps, nil
 }

pkg/git/remote.go

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

pkg/i18n/i18n.go

@@ -1,62 +0,0 @@
-package i18n
-
-import (
-	"embed"
-	"fmt"
-	"os"
-	"path/filepath"
-	"slices"
-	"strings"
-
-	"coopcloud.tech/abra/pkg/log"
-	"github.com/leonelquinteros/gotext"
-)
-
-//go:embed locales/*.mo
-var assetFS embed.FS
-
-var (
-	DefaultLocale = "en"
-	Locale        = DefaultLocale
-)
-
-func LoadLocale() *gotext.Mo {
-	entries, err := assetFS.ReadDir("locales")
-	if err != nil {
-		log.Fatalf("i18n: unable to read embedded locales directory: %s", err)
-	}
-
-	var linguas []string
-	for _, entry := range entries {
-		if filepath.Ext(entry.Name()) == ".mo" {
-			fname := entry.Name()
-			fnameWithoutExt := strings.TrimSuffix(fname, filepath.Ext(fname))
-			linguas = append(linguas, fnameWithoutExt)
-		}
-	}
-
-	locale := os.Getenv("LANG")
-	if locale != "" {
-		if slices.Contains(linguas, locale) {
-			Locale = locale
-		} else {
-			log.Debugf("unsupported language: %s (want: %s)", locale, strings.Join(linguas, " "))
-		}
-	}
-
-	if Locale == DefaultLocale {
-		return gotext.NewMo()
-	}
-
-	b, err := assetFS.ReadFile(fmt.Sprintf("locales/%s.mo", Locale))
-	if err != nil {
-		log.Fatalf("i18n: %s", err)
-	}
-
-	mo := gotext.NewMo()
-	mo.Parse(b)
-
-	return mo
-}
-
-var G = LoadLocale().Get

pkg/integration/integration.go

@@ -0,0 +1,12 @@
+package integration
+
+import (
+	"os"
+	"testing"
+)
+
+func skipIfNotIntegration(t *testing.T) {
+	if os.Getenv("ABRA_INTEGRATION") == "" {
+		t.Skip("missing 'ABRA_INTEGRATION', not running integration tests")
+	}
+}

pkg/lint/recipe.go

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

pkg/log/log.go

@@ -2,10 +2,8 @@
 package log
 
 import (
-	"math"
 	"os"
 
-	tea "github.com/charmbracelet/bubbletea"
 	charmLog "github.com/charmbracelet/log"
 )
 
@@ -34,13 +32,3 @@ 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

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

pkg/recipe/files.go

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

pkg/recipe/git.go

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

pkg/recipe/recipe.go

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

pkg/secret/pass.go

@@ -5,14 +5,13 @@ import (
 	"fmt"
 	"os/exec"
 
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 )
 
 // 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(i18n.G("pass command not found on $PATH, is it installed?"))
+		return errors.New("pass command not found on $PATH, is it installed?")
 	}
 
 	cmd := fmt.Sprintf(
@@ -20,13 +19,13 @@ func PassInsertSecret(secretValue, secretName, appName, server string) error {
 		secretValue, server, appName, secretName,
 	)
 
-	log.Debug(i18n.G("attempting to run %s", cmd))
+	log.Debugf("attempting to run %s", cmd)
 
 	if err := exec.Command("bash", "-c", cmd).Run(); err != nil {
 		return err
 	}
 
-	log.Info(i18n.G("%s inserted into pass store", secretName))
+	log.Infof("%s inserted into pass store", secretName)
 
 	return nil
 }
@@ -34,7 +33,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(i18n.G("pass command not found on $PATH, is it installed?"))
+		return errors.New("pass command not found on $PATH, is it installed?")
 	}
 
 	cmd := fmt.Sprintf(
@@ -42,13 +41,13 @@ func PassRmSecret(secretName, appName, server string) error {
 		server, appName, secretName,
 	)
 
-	log.Debug(i18n.G("attempting to run %s", cmd))
+	log.Debugf("attempting to run %s", cmd)
 
 	if err := exec.Command("bash", "-c", cmd).Run(); err != nil {
 		return err
 	}
 
-	log.Info(i18n.G("%s removed from pass store", secretName))
+	log.Infof("%s removed from pass store", secretName)
 
 	return nil
 }

pkg/secret/secret.go

@@ -5,7 +5,6 @@ package secret
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"slices"
 	"strconv"
@@ -16,7 +15,6 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/envfile"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/stack"
 	loader "coopcloud.tech/abra/pkg/upstream/stack"
@@ -35,13 +33,6 @@ 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:
@@ -52,34 +43,38 @@ type Secret struct {
 	RemoteName string
 }
 
-// GeneratePassword generates passwords.
+// GeneratePasswords generates passwords.
-func GeneratePassword(length uint, charset string) (string, error) {
+func GeneratePasswords(count, length uint) ([]string, error) {
-	passwords, err := passgen.GeneratePasswords(1, length, charset)
+	passwords, err := passgen.GeneratePasswords(
+		count,
+		length,
+		passgen.AlphabetDefault,
+	)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
-	log.Debug(i18n.G("generated %s", strings.Join(passwords, ", ")))
+	log.Debugf("generated %s", strings.Join(passwords, ", "))
 
-	return passwords[0], nil
+	return passwords, nil
 }
 
-// GeneratePassphrase generates human readable and rememberable passphrases.
+// GeneratePassphrases generates human readable and rememberable passphrases.
-func GeneratePassphrase() (string, error) {
+func GeneratePassphrases(count uint) ([]string, error) {
 	passphrases, err := passgen.GeneratePassphrases(
-		1,
+		count,
 		passgen.PassphraseWordCountDefault,
 		rune('-'),
 		passgen.PassphraseCasingDefault,
 		passgen.WordListDefault,
 	)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
-	log.Debug(i18n.G("generated %s", strings.Join(passphrases, ", ")))
+	log.Debugf("generated %s", strings.Join(passphrases, ", "))
 
-	return passphrases[0], nil
+	return passphrases, nil
 }
 
 // ReadSecretsConfig reads secret names/versions from the recipe config. The
@@ -92,7 +87,6 @@ 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
 
@@ -101,7 +95,6 @@ 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 {
@@ -116,18 +109,18 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 	}
 
 	if len(enabledSecrets) == 0 {
-		log.Debug(i18n.G("not generating app secrets, none enabled in recipe config"))
+		log.Debugf("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, errors.New(i18n.G("missing version for secret? (%s)", secretId))
+			return nil, fmt.Errorf("missing version for secret? (%s)", secretId)
 		}
 
 		if !(slices.Contains(enabledSecrets, secretId)) {
-			log.Warnf(i18n.G("%s not enabled in recipe config, skipping", secretId))
+			log.Warnf("%s not enabled in recipe config, skipping", secretId)
 			continue
 		}
 
@@ -136,7 +129,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, errors.New(i18n.G("secret %s is > %d chars when combined with %s", secretId, config.MAX_DOCKER_SECRET_LENGTH, stackName))
+			return nil, fmt.Errorf("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.
@@ -149,7 +142,6 @@ 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)
@@ -158,15 +150,6 @@ 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
@@ -175,22 +158,6 @@ 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{}
@@ -203,24 +170,18 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 		go func(secretName string, secret Secret) {
 			defer wg.Done()
 
-			if secret.SkipGenerate {
+			log.Debugf("attempting to generate and store %s on %s", secret.RemoteName, server)
-				log.Debug(i18n.G("skipping generation of %s (generate=false)", secretName))
-				ch <- nil
-				return
-			}
-
-			log.Debug(i18n.G("attempting to generate and store %s on %s", secret.RemoteName, server))
 
 			if secret.Length > 0 {
-				password, err := GeneratePassword(uint(secret.Length), secret.Charset)
+				passwords, err := GeneratePasswords(1, uint(secret.Length))
 				if err != nil {
 					ch <- err
 					return
 				}
 
-				if err := client.StoreSecret(cl, secret.RemoteName, password, server); err != nil {
+				if err := client.StoreSecret(cl, secret.RemoteName, passwords[0], server); err != nil {
 					if strings.Contains(err.Error(), "AlreadyExists") {
-						log.Warnf(i18n.G("%s already exists", secret.RemoteName))
+						log.Warnf("%s already exists", secret.RemoteName)
 						ch <- nil
 					} else {
 						ch <- err
@@ -230,17 +191,17 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 
 				mutex.Lock()
 				defer mutex.Unlock()
-				secretsGenerated[secretName] = password
+				secretsGenerated[secretName] = passwords[0]
 			} else {
-				passphrase, err := GeneratePassphrase()
+				passphrases, err := GeneratePassphrases(1)
 				if err != nil {
 					ch <- err
 					return
 				}
 
-				if err := client.StoreSecret(cl, secret.RemoteName, passphrase, server); err != nil {
+				if err := client.StoreSecret(cl, secret.RemoteName, passphrases[0], server); err != nil {
 					if strings.Contains(err.Error(), "AlreadyExists") {
-						log.Warnf(i18n.G("%s already exists", secret.RemoteName))
+						log.Warnf("%s already exists", secret.RemoteName)
 						ch <- nil
 					} else {
 						ch <- err
@@ -250,7 +211,7 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 
 				mutex.Lock()
 				defer mutex.Unlock()
-				secretsGenerated[secretName] = passphrase
+				secretsGenerated[secretName] = passphrases[0]
 			}
 			ch <- nil
 		}(n, v)
@@ -265,7 +226,7 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 		}
 	}
 
-	log.Debug(i18n.G("generated and stored %v on %s", secrets, server))
+	log.Debugf("generated and stored %v on %s", secrets, server)
 
 	return secretsGenerated, nil
 }

pkg/secret/secret_test.go

@@ -17,37 +17,16 @@ 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,6 +1,3 @@
 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,9 +8,6 @@ services:
       - test_pass_one
       - test_pass_two
       - test_pass_three
-      - test_pass_four
-      - test_pass_five
-      - test_pass_six
 
 secrets:
   test_pass_one:
@@ -22,12 +19,3 @@ 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

@@ -5,7 +5,6 @@ import (
 	"path"
 
 	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/log"
 )
 
@@ -13,16 +12,16 @@ import (
 func CreateServerDir(serverName string) error {
 	serverPath := path.Join(config.ABRA_DIR, "servers", serverName)
 
-	if err := os.Mkdir(serverPath, 0700); err != nil {
+	if err := os.Mkdir(serverPath, 0764); err != nil {
 		if !os.IsExist(err) {
 			return err
 		}
 
-		log.Debug(i18n.G("%s already exists", serverPath))
+		log.Debugf("%s already exists", serverPath)
 		return nil
 	}
 
-	log.Debug(i18n.G("successfully created %s", serverPath))
+	log.Debugf("successfully created %s", serverPath)
 
 	return nil
 }