reset

.dockerignore

@@ -4,4 +4,5 @@
 Dockerfile
 abra
 dist
+kadabra
 tags

.drone.yml

@@ -3,48 +3,17 @@ kind: pipeline
 name: coopcloud.tech/abra
 steps:
   - name: make check
-    image: golang:1.24
+    image: golang:1.21
     commands:
       - make check
 
-  - name: xgettext-go
-    image: git.coopcloud.tech/toolshed/drone-xgettext-go:latest
-    settings:
-      keyword: i18n.G
-      keyword_ctx: i18n.GC
-      out: pkg/i18n/locales/abra.pot
-      comments_tag: translators
-    depends_on:
-      - make check
-    when:
-      event:
-        exclude:
-          - tag
-
-  - name: xgettext-go status
-    image: golang:1.24-alpine3.22
-    commands:
-      - apk add patchutils git make
-      - cd /drone/src
-      - sed -i "s/charset=CHARSET/charset=UTF-8/g" pkg/i18n/locales/*.pot
-      - git diff pkg/i18n/locales/abra.pot | grepdiff --output-matching=hunk POT-Creation-Date | git apply --reverse --allow-empty
-      - git diff
-      - git diff-files --exit-code
-    depends_on:
-      - xgettext-go
-    when:
-      event:
-        exclude:
-          - tag
-
   - name: make test
-    image: golang:1.24
+    image: golang:1.21
     environment:
-      ABRA_DIR: $HOME/.abra
+      ABRA_DIR: "/root/.abra"
-      CATL_URL: https://git.coopcloud.tech/toolshed/recipes-catalogue-json.git
     commands:
-      - mkdir -p $HOME/.abra
+      - make build-abra
-      - git clone $CATL_URL $HOME/.abra/catalogue
+      - ./abra help # show version, initialise $ABRA_DIR
       - make test
     depends_on:
       - make check
@@ -60,7 +29,7 @@ steps:
       event: tag
 
   - name: release
-    image: goreleaser/goreleaser:v2.5.1
+    image: goreleaser/goreleaser:v1.18.2
     environment:
       GITEA_TOKEN:
         from_secret: goreleaser_gitea_token
@@ -78,72 +47,19 @@ steps:
     image: plugins/docker
     settings:
       auto_tag: true
-      username: abra-bot
+      username: 3wordchant
       password:
-        from_secret: git_coopcloud_tech_token_abra_bot
+        from_secret: git_coopcloud_tech_token_3wc
-      repo: git.coopcloud.tech/toolshed/abra
+      repo: git.coopcloud.tech/coop-cloud/abra
       tags: dev
       registry: git.coopcloud.tech
-    when:
-      branch:
-        - main
-    depends_on:
-      - make check
-      - make test
-
-  - name: on-demand integration test
-    image: appleboy/drone-ssh
-    settings:
-      host:
-        - int.coopcloud.tech
-      username: abra
-      key:
-        from_secret: abra_int_private_key
-      port: 22
-      command_timeout: 60m
-      script_stop: true
-      request_pty: true
-      script:
-        - |
-          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:
-      ref:
-        - refs/heads/int-*
-    depends_on:
-      - make check
-      - make test
-
-  - name: nightly integration test
-    image: appleboy/drone-ssh
-    settings:
-      host:
-        - int.coopcloud.tech
-      username: abra
-      key:
-        from_secret: abra_int_private_key
-      port: 22
-      command_timeout: 60m
-      script_stop: true
-      request_pty: true
-      script:
-        - |
-          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:
       event:
-        - cron:
+        exclude:
-      cron:
+          - pull_request
-        # @daily https://docs.drone.io/cron/
+    depends_on:
-        - integration 
+      - make check
 
 volumes:
   - name: deps
     temp: {}
-
-trigger:
-  action:
-    exclude:
-      - synchronized

.envrc.sample

@@ -1,7 +1,7 @@
-# integration test suite
+go env -w GOPRIVATE=coopcloud.tech
-# export ABRA_DIR="$HOME/.abra_test"
-# export TEST_SERVER=test.example.com
-# export ABRA_CI=1
 
-# release automation
+# export PASSWORD_STORE_DIR=$(pwd)/../../autonomic/passwords/passwords/
-# export GITEA_TOKEN=
+
+# export ABRA_DIR="$HOME/.abra_test"
+# export ABRA_TEST_DOMAIN=test.example.com
+# export ABRA_SKIP_TEARDOWN=1 # for faster feedback when developing tests

.gitea/ISSUE_TEMPLATE.md

@@ -0,0 +1,8 @@
+---
+name: "Do not use this issue tracker"
+about: "Do not use this issue tracker"
+title: "Do not use this issue tracker"
+labels: []
+---
+
+Please report your issue on [`coop-cloud/organising`](https://git.coopcloud.tech/coop-cloud/organising)

.gitignore

@@ -1,9 +1,9 @@
-*.tar.gz
 *fmtcoverage.html
 .e2e.env
 .envrc
 .vscode/
-/abra
+/kadabra
-/bin
+abra
 dist/
 tests/integration/.bats
+vendor/

.goreleaser.yml

@@ -29,8 +29,33 @@ builds:
     ldflags:
       - "-X 'main.Commit={{ .Commit }}'"
       - "-X 'main.Version={{ .Version }}'"
-      - "-s"
+
-      - "-w"
+  - id: kadabra
+    binary: kadabra
+    dir: cmd/kadabra
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - 386
+      - amd64
+      - arm
+      - arm64
+    goarm:
+      - 5
+      - 6
+      - 7
+    ldflags:
+      - "-X 'main.Commit={{ .Commit }}'"
+      - "-X 'main.Version={{ .Version }}'"
+
+archives:
+  - replacements:
+      386: i386
+      amd64: x86_64
+    format: binary
 
 checksum:
   name_template: "checksums.txt"

AUTHORS.md

@@ -4,21 +4,13 @@
 > please do add yourself! This is a community project, let's show some 💞
 
 - 3wordchant
-- ammaratef45
-- apfelwurm
-- basebuilder
 - cassowary
-- chasqui
 - codegod100
 - decentral1se
-- fauno
 - frando
-- iexos
 - kawaiipunk
 - knoflook
-- mayel
 - moritz
-- p4u1
 - rix
 - roxxers
 - vera

Dockerfile

@@ -1,29 +1,23 @@
-# Build image
+FROM golang:1.21-alpine AS build
-FROM golang:1.24-alpine AS build
 
-ENV GOPRIVATE=coopcloud.tech
+ENV GOPRIVATE coopcloud.tech
 
 RUN apk add --no-cache \
+  ca-certificates \
   gcc \
   git \
   make \
   musl-dev
 
+RUN update-ca-certificates
+
 COPY . /app
 
 WORKDIR /app
 
 RUN CGO_ENABLED=0 make build
 
-# Release image ("slim")
+FROM scratch
-FROM alpine:3.19.1
-
-RUN apk add --no-cache \
-  ca-certificates \
-  git \
-  openssh
-
-RUN update-ca-certificates
 
 COPY --from=build /app/abra /abra
 

Makefile

@@ -1,87 +1,48 @@
 ABRA         := ./cmd/abra
-XGETTEXT     := ./bin/xgettext-go
+KADABRA      := ./cmd/kadabra
 COMMIT       := $(shell git rev-list -1 HEAD)
 GOPATH       := $(shell go env GOPATH)
-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
 
-all: format check build
+# NOTE(d1): default `make` optimised for Abra hacking
+all: format check build-abra test
 
-run:
+run-abra:
-	@go run -gcflags=$(GCFLAGS) -ldflags=$(LDFLAGS) $(ABRA)
+	@go run -ldflags=$(LDFLAGS) $(ABRA)
 
-install:
+run-kadabra:
-	@go install -gcflags=$(GCFLAGS) -ldflags=$(LDFLAGS) $(ABRA)
+	@go run -ldflags=$(LDFLAGS) $(KADABRA)
 
-build:
+install-abra:
-	@go build -v -gcflags=$(GCFLAGS) -ldflags=$(DIST_LDFLAGS) $(ABRA)
+	@go install -ldflags=$(LDFLAGS) $(ABRA)
 
-build-docker:
+install-kadabra:
-	@docker run -it -v $(PWD):/abra golang:$(GOVERSION) \
+	@go install -ldflags=$(LDFLAGS) $(KADABRA)
-		bash -c 'cd /abra; ./scripts/docker/build.sh'
+
+build-abra:
+	@go build -v -ldflags=$(DIST_LDFLAGS) $(ABRA)
+
+build-kadabra:
+	@go build -v -ldflags=$(DIST_LDFLAGS) $(KADABRA)
+
+build: build-abra build-kadabra
 
 clean:
 	@rm '$(GOPATH)/bin/abra'
+	@rm '$(GOPATH)/bin/kadabra'
 
 format:
-	@gofmt -s -w $$(find . -type f -name '*.go' | grep -v "/vendor/")
+	@gofmt -s -w .
 
 check:
-	@test -z $$(gofmt -l $$(find . -type f -name '*.go' | grep -v "/vendor/")) || \
+	@test -z $$(gofmt -l .) || \
 	(echo "gofmt: formatting issue - run 'make format' to resolve" && exit 1)
 
 test:
 	@go test ./... -cover -v
 
-find-tests:
-	@find . -name "*_test.go"
-
 loc:
 	@find . -name "*.go" | xargs wc -l
-
-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)
-	@${XGETTEXT} \
-		-o pkg/i18n/locales/$(DOMAIN).pot \
-		--keyword=i18n.G \
-		--keyword-ctx=i18n.GC \
-		--sort-output \
-		--add-comments-tag="translators" \
-		$$(find . -name "*.go" -not -path "*vendor*" | sort)
-
-${XGETTEXT}:
-	@mkdir -p ./bin && \
-	wget -O ./bin/xgettext-go https://git.coopcloud.tech/toolshed/xgettext-go/raw/branch/main/xgettext-go && \
-	chmod +x ./bin/xgettext-go
-
-.PHONY: update-pot-po-metadata
-update-pot-po-metadata:
-	@sed -i "s/charset=CHARSET/charset=UTF-8/g" pkg/i18n/locales/*.po pkg/i18n/locales/*.pot
-
-.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

@@ -1,9 +1,8 @@
 # `abra`
 
-[![Build Status](https://build.coopcloud.tech/api/badges/toolshed/abra/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/toolshed/abra)
+[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/abra/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/coop-cloud/abra)
-[![Go Report Card](https://goreportcard.com/badge/git.coopcloud.tech/toolshed/abra)](https://goreportcard.com/report/git.coopcloud.tech/toolshed/abra)
+[![Go Report Card](https://goreportcard.com/badge/git.coopcloud.tech/coop-cloud/abra)](https://goreportcard.com/report/git.coopcloud.tech/coop-cloud/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,20 +1,37 @@
 package app
 
 import (
-	"strings"
+	"github.com/urfave/cli"
-
-	"coopcloud.tech/abra/pkg/i18n"
-	"github.com/spf13/cobra"
 )
 
-// translators: `abra app` aliases. use a comma separated list of aliases with
+var AppCommand = cli.Command{
-// no spaces in between
+	Name:        "app",
-var appAliases = i18n.GC("a", "abra app")
+	Aliases:     []string{"a"},
-
+	Usage:       "Manage apps",
-var AppCommand = &cobra.Command{
+	ArgsUsage:   "<domain>",
-	// translators: `app` command group
+	Description: "Functionality for managing the life cycle of your apps",
-	Use:     i18n.G("app [cmd] [args] [flags]"),
+	Subcommands: []cli.Command{
-	Aliases: strings.Split(appAliases, ","),
+		appBackupCommand,
-	// translators: Short description for `app` command group
+		appCheckCommand,
-	Short: i18n.G("Manage apps"),
+		appCmdCommand,
+		appConfigCommand,
+		appCpCommand,
+		appDeployCommand,
+		appErrorsCommand,
+		appListCommand,
+		appLogsCommand,
+		appNewCommand,
+		appPsCommand,
+		appRemoveCommand,
+		appRestartCommand,
+		appRestoreCommand,
+		appRollbackCommand,
+		appRunCommand,
+		appSecretCommand,
+		appServicesCommand,
+		appUndeployCommand,
+		appUpgradeCommand,
+		appVersionCommand,
+		appVolumeCommand,
+	},
 }

cli/app/backup.go

@@ -1,339 +1,414 @@
 package app
 
 import (
+	"archive/tar"
+	"context"
 	"fmt"
+	"io"
+	"os"
+	"path/filepath"
 	"strings"
+	"time"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/i18n"
+	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/log"
+	containerPkg "coopcloud.tech/abra/pkg/container"
-	"github.com/spf13/cobra"
+	recipePkg "coopcloud.tech/abra/pkg/recipe"
+	"coopcloud.tech/abra/pkg/upstream/container"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
+	dockerClient "github.com/docker/docker/client"
+	"github.com/docker/docker/pkg/archive"
+	"github.com/klauspost/pgzip"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app backup list` aliases. use a comma separated list of aliases with
+type backupConfig struct {
-// no spaces in between
+	preHookCmd  string
-var appBackupListAliases = i18n.G("ls")
+	postHookCmd string
-
+	backupPaths []string
-var AppBackupListCommand = &cobra.Command{
-	// translators: `app backup list` command
-	Use:     i18n.G("list <domain> [flags]"),
-	Aliases: strings.Split(appBackupListAliases, ","),
-	// translators: Short description for `app backup list` command
-	Short: i18n.G("List the contents of a snapshot"),
-	Args:  cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
-
-		cl, err := client.New(app.Server)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		targetContainer, err := internal.RetrieveBackupBotContainer(cl)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		execEnv := []string{
-			fmt.Sprintf("SERVICE=%s", app.Domain),
-			"MACHINE_LOGS=true",
-		}
-
-		if snapshot != "" {
-			log.Debug(i18n.G("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))
-			execEnv = append(execEnv, fmt.Sprintf("SHOW_ALL=%v", showAllPaths))
-		}
-
-		if timestamps {
-			log.Debug(i18n.G("including TIMESTAMPS=%v in backupbot exec invocation", timestamps))
-			execEnv = append(execEnv, fmt.Sprintf("TIMESTAMPS=%v", timestamps))
-		}
-
-		if _, err = internal.RunBackupCmdRemote(cl, "ls", targetContainer.ID, execEnv); err != nil {
-			log.Fatal(err)
-		}
-	},
 }
 
-// translators: `abra app backup download` aliases. use a comma separated list of aliases with
+var appBackupCommand = cli.Command{
-// no spaces in between
+	Name:      "backup",
-var appBackupDownloadAliases = i18n.G("d")
+	Aliases:   []string{"bk"},
-
+	Usage:     "Run app backup",
-var AppBackupDownloadCommand = &cobra.Command{
+	ArgsUsage: "<domain> [<service>]",
-	// translators: `app backup download` command
+	Flags: []cli.Flag{
-	Use:     i18n.G("download <domain> [flags]"),
+		internal.DebugFlag,
-	Aliases: strings.Split(appBackupDownloadAliases, ","),
+		internal.OfflineFlag,
-	// translators: Short description for `app backup download` command
+		internal.ChaosFlag,
-	Short: i18n.G("Download a snapshot"),
-	Long: i18n.G(`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.`),
-	Args: cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	BashComplete: autocomplete.AppNameComplete,
+	Description: `
+Run an app backup.
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+A backup command and pre/post hook commands are defined in the recipe
-			log.Fatal(err)
+configuration. Abra reads this configuration and run the comands in the context
+of the deployed services. Pass <service> if you only want to back up a single
+service. All backups are placed in the ~/.abra/backups directory.
+
+A single backup file is produced for all backup paths specified for a service.
+If we have the following backup configuration:
+
+    - "backupbot.backup.path=/var/lib/foo,/var/lib/bar"
+
+And we run "abra app backup example.com app", Abra will produce a file that
+looks like:
+
+    ~/.abra/backups/example_com_app_609341138.tar.gz
+
+This file is a compressed archive which contains all backup paths. To see paths, run:
+
+    tar -tf ~/.abra/backups/example_com_app_609341138.tar.gz
+
+(Make sure to change the name of the backup file)
+
+This single file can be used to restore your app. See "abra app restore" for more.
+`,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+
+		recipe, err := recipePkg.Get(app.Recipe, internal.Offline)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if !internal.Chaos {
+			if err := recipePkg.EnsureIsClean(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+
+			if !internal.Offline {
+				if err := recipePkg.EnsureUpToDate(app.Recipe); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+
+			if err := recipePkg.EnsureLatest(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		backupConfigs := make(map[string]backupConfig)
+		for _, service := range recipe.Config.Services {
+			if backupsEnabled, ok := service.Deploy.Labels["backupbot.backup"]; ok {
+				if backupsEnabled == "true" {
+					fullServiceName := fmt.Sprintf("%s_%s", app.StackName(), service.Name)
+					bkConfig := backupConfig{}
+
+					logrus.Debugf("backup config detected for %s", fullServiceName)
+
+					if paths, ok := service.Deploy.Labels["backupbot.backup.path"]; ok {
+						logrus.Debugf("detected backup paths for %s: %s", fullServiceName, paths)
+						bkConfig.backupPaths = strings.Split(paths, ",")
+					}
+
+					if preHookCmd, ok := service.Deploy.Labels["backupbot.backup.pre-hook"]; ok {
+						logrus.Debugf("detected pre-hook command for %s: %s", fullServiceName, preHookCmd)
+						bkConfig.preHookCmd = preHookCmd
+					}
+
+					if postHookCmd, ok := service.Deploy.Labels["backupbot.backup.post-hook"]; ok {
+						logrus.Debugf("detected post-hook command for %s: %s", fullServiceName, postHookCmd)
+						bkConfig.postHookCmd = postHookCmd
+					}
+
+					backupConfigs[service.Name] = bkConfig
+				}
+			}
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		targetContainer, err := internal.RetrieveBackupBotContainer(cl)
+		serviceName := c.Args().Get(1)
-		if err != nil {
+		if serviceName != "" {
-			log.Fatal(err)
+			backupConfig, ok := backupConfigs[serviceName]
+			if !ok {
+				logrus.Fatalf("no backup config for %s? does %s exist?", serviceName, serviceName)
+			}
+
+			logrus.Infof("running backup for the %s service", serviceName)
+
+			if err := runBackup(cl, app, serviceName, backupConfig); err != nil {
+				logrus.Fatal(err)
+			}
+		} else {
+			if len(backupConfigs) == 0 {
+				logrus.Fatalf("no backup configs discovered for %s?", app.Name)
+			}
+
+			for serviceName, backupConfig := range backupConfigs {
+				logrus.Infof("running backup for the %s service", serviceName)
+
+				if err := runBackup(cl, app, serviceName, backupConfig); err != nil {
+					logrus.Fatal(err)
+				}
+			}
 		}
 
-		execEnv := []string{
+		return nil
-			fmt.Sprintf("SERVICE=%s", app.Domain),
-			"MACHINE_LOGS=true",
-		}
-
-		if snapshot != "" {
-			log.Debug(i18n.G("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))
-			execEnv = append(execEnv, fmt.Sprintf("INCLUDE_PATH=%s", includePath))
-		}
-
-		if includeSecrets {
-			log.Debug(i18n.G("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))
-			execEnv = append(execEnv, fmt.Sprintf("VOLUMES=%v", includeVolumes))
-		}
-
-		if _, err := internal.RunBackupCmdRemote(cl, "download", targetContainer.ID, execEnv); err != nil {
-			log.Fatal(err)
-		}
-
-		remoteBackupDir := "/tmp/backup.tar.gz"
-		currentWorkingDir := "."
-		if err = CopyFromContainer(cl, targetContainer.ID, remoteBackupDir, currentWorkingDir); err != nil {
-			log.Fatal(err)
-		}
 	},
 }
 
-// translators: `abra app backup create` aliases. use a comma separated list of aliases with
+// TimeStamp generates a file name friendly timestamp.
-// no spaces in between
+func TimeStamp() string {
-var appBackupCreateAliases = i18n.G("c")
+	ts := time.Now().UTC().Format(time.RFC3339)
-
+	return strings.Replace(ts, ":", "-", -1)
-var AppBackupCreateCommand = &cobra.Command{
-	// translators: `app backup create` command
-	Use:     i18n.G("create <domain> [flags]"),
-	Aliases: strings.Split(appBackupCreateAliases, ","),
-	// translators: Short description for `app backup create` command
-	Short: i18n.G("Create a new snapshot"),
-	Args:  cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
-
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
-			log.Fatal(err)
-		}
-
-		cl, err := client.New(app.Server)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		targetContainer, err := internal.RetrieveBackupBotContainer(cl)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		execEnv := []string{
-			fmt.Sprintf("SERVICE=%s", app.Domain),
-			"MACHINE_LOGS=true",
-		}
-
-		if retries != "" {
-			log.Debug(i18n.G("including RETRIES=%s in backupbot exec invocation", retries))
-			execEnv = append(execEnv, fmt.Sprintf("RETRIES=%s", retries))
-		}
-
-		if _, err := internal.RunBackupCmdRemote(cl, "create", targetContainer.ID, execEnv); err != nil {
-			log.Fatal(err)
-		}
-	},
 }
 
-// translators: `abra app backup snapshots` aliases. use a comma separated list of aliases with
+// runBackup does the actual backup logic.
-// no spaces in between
+func runBackup(cl *dockerClient.Client, app config.App, serviceName string, bkConfig backupConfig) error {
-var appBackupSnapshotsAliases = i18n.G("s")
+	if len(bkConfig.backupPaths) == 0 {
+		return fmt.Errorf("backup paths are empty for %s?", serviceName)
+	}
 
-var AppBackupSnapshotsCommand = &cobra.Command{
+	// FIXME: avoid instantiating a new CLI
-	// translators: `app backup snapshots` command
+	dcli, err := command.NewDockerCli()
-	Use:     i18n.G("snapshots <domain> [flags]"),
+	if err != nil {
-	Aliases: strings.Split(appBackupSnapshotsAliases, ","),
+		return err
-	// translators: Short description for `app backup snapshots` command
+	}
-	Short: i18n.G("List all snapshots"),
-	Args:  cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
 
-		cl, err := client.New(app.Server)
+	filters := filters.NewArgs()
+	filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName))
+
+	targetContainer, err := containerPkg.GetContainer(context.Background(), cl, filters, true)
+	if err != nil {
+		return err
+	}
+
+	fullServiceName := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
+	if bkConfig.preHookCmd != "" {
+		splitCmd := internal.SafeSplit(bkConfig.preHookCmd)
+
+		logrus.Debugf("split pre-hook command for %s into %s", fullServiceName, splitCmd)
+
+		preHookExecOpts := types.ExecConfig{
+			AttachStderr: true,
+			AttachStdin:  true,
+			AttachStdout: true,
+			Cmd:          splitCmd,
+			Detach:       false,
+			Tty:          true,
+		}
+
+		if err := container.RunExec(dcli, cl, targetContainer.ID, &preHookExecOpts); err != nil {
+			return fmt.Errorf("failed to run %s on %s: %s", bkConfig.preHookCmd, targetContainer.ID, err.Error())
+		}
+
+		logrus.Infof("succesfully ran %s pre-hook command: %s", fullServiceName, bkConfig.preHookCmd)
+	}
+
+	var tempBackupPaths []string
+	for _, remoteBackupPath := range bkConfig.backupPaths {
+		sanitisedPath := strings.ReplaceAll(remoteBackupPath, "/", "_")
+		localBackupPath := filepath.Join(config.BACKUP_DIR, fmt.Sprintf("%s%s_%s.tar.gz", fullServiceName, sanitisedPath, TimeStamp()))
+		logrus.Debugf("temporarily backing up %s:%s to %s", fullServiceName, remoteBackupPath, localBackupPath)
+
+		logrus.Infof("backing up %s:%s", fullServiceName, remoteBackupPath)
+
+		content, _, err := cl.CopyFromContainer(context.Background(), targetContainer.ID, remoteBackupPath)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Debugf("failed to copy %s from container: %s", remoteBackupPath, err.Error())
+			if err := cleanupTempArchives(tempBackupPaths); err != nil {
+				return fmt.Errorf("failed to clean up temporary archives: %s", err.Error())
+			}
+			return fmt.Errorf("failed to copy %s from container: %s", remoteBackupPath, err.Error())
+		}
+		defer content.Close()
+
+		_, srcBase := archive.SplitPathDirEntry(remoteBackupPath)
+		preArchive := archive.RebaseArchiveEntries(content, srcBase, remoteBackupPath)
+		if err := copyToFile(localBackupPath, preArchive); err != nil {
+			logrus.Debugf("failed to create tar archive (%s): %s", localBackupPath, err.Error())
+			if err := cleanupTempArchives(tempBackupPaths); err != nil {
+				return fmt.Errorf("failed to clean up temporary archives: %s", err.Error())
+			}
+			return fmt.Errorf("failed to create tar archive (%s): %s", localBackupPath, err.Error())
 		}
 
-		targetContainer, err := internal.RetrieveBackupBotContainer(cl)
+		tempBackupPaths = append(tempBackupPaths, localBackupPath)
-		if err != nil {
+	}
-			log.Fatal(err)
+
+	logrus.Infof("compressing and merging archives...")
+
+	if err := mergeArchives(tempBackupPaths, fullServiceName); err != nil {
+		logrus.Debugf("failed to merge archive files: %s", err.Error())
+		if err := cleanupTempArchives(tempBackupPaths); err != nil {
+			return fmt.Errorf("failed to clean up temporary archives: %s", err.Error())
+		}
+		return fmt.Errorf("failed to merge archive files: %s", err.Error())
+	}
+
+	if err := cleanupTempArchives(tempBackupPaths); err != nil {
+		return fmt.Errorf("failed to clean up temporary archives: %s", err.Error())
+	}
+
+	if bkConfig.postHookCmd != "" {
+		splitCmd := internal.SafeSplit(bkConfig.postHookCmd)
+
+		logrus.Debugf("split post-hook command for %s into %s", fullServiceName, splitCmd)
+
+		postHookExecOpts := types.ExecConfig{
+			AttachStderr: true,
+			AttachStdin:  true,
+			AttachStdout: true,
+			Cmd:          splitCmd,
+			Detach:       false,
+			Tty:          true,
 		}
 
-		execEnv := []string{
+		if err := container.RunExec(dcli, cl, targetContainer.ID, &postHookExecOpts); err != nil {
-			fmt.Sprintf("SERVICE=%s", app.Domain),
+			return err
-			"MACHINE_LOGS=true",
 		}
 
-		if _, err = internal.RunBackupCmdRemote(cl, "snapshots", targetContainer.ID, execEnv); err != nil {
+		logrus.Infof("succesfully ran %s post-hook command: %s", fullServiceName, bkConfig.postHookCmd)
-			log.Fatal(err)
+	}
-		}
+
-	},
+	return nil
 }
 
-// translators: `abra app backup` aliases. use a comma separated list of aliases with
+func copyToFile(outfile string, r io.Reader) error {
-// no spaces in between
+	tmpFile, err := os.CreateTemp(filepath.Dir(outfile), ".tar_temp")
-var appBackupAliases = i18n.G("b")
+	if err != nil {
+		return err
+	}
 
-var AppBackupCommand = &cobra.Command{
+	tmpPath := tmpFile.Name()
-	// translators: `app backup` command group
+
-	Use:     i18n.G("backup [cmd] [args] [flags]"),
+	_, err = io.Copy(tmpFile, r)
-	Aliases: strings.Split(appBackupAliases, ","),
+	tmpFile.Close()
-	// translators: Short description for `app backup` command group
+
-	Short: i18n.G("Manage app backups"),
+	if err != nil {
+		os.Remove(tmpPath)
+		return err
+	}
+
+	if err = os.Rename(tmpPath, outfile); err != nil {
+		os.Remove(tmpPath)
+		return err
+	}
+
+	return nil
 }
 
-var (
+func cleanupTempArchives(tarPaths []string) error {
-	snapshot       string
+	for _, tarPath := range tarPaths {
-	retries        string
+		if err := os.RemoveAll(tarPath); err != nil {
-	includePath    string
+			return err
-	showAllPaths   bool
+		}
-	timestamps     bool
-	includeSecrets bool
-	includeVolumes bool
-)
 
-func init() {
+		logrus.Debugf("remove temporary archive file %s", tarPath)
-	AppBackupListCommand.Flags().StringVarP(
+	}
-		&snapshot,
-		i18n.G("snapshot"),
-		i18n.G("s"),
-		"",
-		i18n.G("list specific snapshot"),
-	)
 
-	AppBackupListCommand.Flags().BoolVarP(
+	return nil
-		&showAllPaths,
+}
-		i18n.G("all"),
+
-		i18n.GC("a", "app backup list"),
+func mergeArchives(tarPaths []string, serviceName string) error {
-		false,
+	var out io.Writer
-		i18n.G("show all paths"),
+	var cout *pgzip.Writer
-	)
+
-
+	localBackupPath := filepath.Join(config.BACKUP_DIR, fmt.Sprintf("%s_%s.tar.gz", serviceName, TimeStamp()))
-	AppBackupListCommand.Flags().BoolVarP(
+
-		&timestamps,
+	fout, err := os.Create(localBackupPath)
-		i18n.G("timestamps"),
+	if err != nil {
-		i18n.G("t"),
+		return fmt.Errorf("Failed to open %s: %s", localBackupPath, err)
-		false,
+	}
-		i18n.G("include timestamps"),
+
-	)
+	defer fout.Close()
-
+	out = fout
-	AppBackupDownloadCommand.Flags().StringVarP(
+
-		&snapshot,
+	cout = pgzip.NewWriter(out)
-		i18n.G("snapshot"),
+	out = cout
-		i18n.G("s"),
+
-		"",
+	tw := tar.NewWriter(out)
-		i18n.G("list specific snapshot"),
+
-	)
+	for _, tarPath := range tarPaths {
-
+		if err := addTar(tw, tarPath); err != nil {
-	AppBackupDownloadCommand.Flags().StringVarP(
+			return fmt.Errorf("failed to merge %s: %v", tarPath, err)
-		&includePath,
+		}
-		i18n.G("path"),
+	}
-		i18n.G("p"),
+
-		"",
+	if err := tw.Close(); err != nil {
-		i18n.G("volumes path"),
+		return fmt.Errorf("failed to close tar writer %v", err)
-	)
+	}
-
+
-	AppBackupDownloadCommand.Flags().BoolVarP(
+	if cout != nil {
-		&includeSecrets,
+		if err := cout.Flush(); err != nil {
-		i18n.G("secrets"),
+			return fmt.Errorf("failed to flush: %s", err)
-		i18n.G("S"),
+		} else if err = cout.Close(); err != nil {
-		false,
+			return fmt.Errorf("failed to close compressed writer: %s", err)
-		i18n.G("include secrets"),
+		}
-	)
+	}
-
+
-	AppBackupDownloadCommand.Flags().BoolVarP(
+	logrus.Infof("backed up %s to %s", serviceName, localBackupPath)
-		&includeVolumes,
+
-		i18n.G("volumes"),
+	return nil
-		i18n.G("v"),
+}
-		false,
+
-		i18n.G("include volumes"),
+func addTar(tw *tar.Writer, pth string) (err error) {
-	)
+	var tr *tar.Reader
-
+	var rc io.ReadCloser
-	AppBackupDownloadCommand.Flags().BoolVarP(
+	var hdr *tar.Header
-		&internal.Chaos,
+
-		i18n.G("chaos"),
+	if tr, rc, err = openTarFile(pth); err != nil {
-		i18n.G("C"),
+		return
-		false,
+	}
-		i18n.G("ignore uncommitted recipes changes"),
+
-	)
+	for {
-
+		if hdr, err = tr.Next(); err != nil {
-	AppBackupCreateCommand.Flags().StringVarP(
+			if err == io.EOF {
-		&retries,
+				err = nil
-		i18n.G("retries"),
+			}
-		i18n.G("r"),
+			break
-		"1",
+		}
-		i18n.G("number of retry attempts"),
+		if err = tw.WriteHeader(hdr); err != nil {
-	)
+			break
-
+		} else if _, err = io.Copy(tw, tr); err != nil {
-	AppBackupCreateCommand.Flags().BoolVarP(
+			break
-		&internal.Chaos,
+		}
-		i18n.G("chaos"),
+	}
-		i18n.G("C"),
+	if err == nil {
-		false,
+		err = rc.Close()
-		i18n.G("ignore uncommitted recipes changes"),
+	} else {
-	)
+		rc.Close()
+	}
+	return
+}
+
+func openTarFile(pth string) (tr *tar.Reader, rc io.ReadCloser, err error) {
+	var fin *os.File
+	var n int
+	buff := make([]byte, 1024)
+
+	if fin, err = os.Open(pth); err != nil {
+		return
+	}
+
+	if n, err = fin.Read(buff); err != nil {
+		fin.Close()
+		return
+	} else if n == 0 {
+		fin.Close()
+		err = fmt.Errorf("%s is empty", pth)
+		return
+	}
+
+	if _, err = fin.Seek(0, 0); err != nil {
+		fin.Close()
+		return
+	}
+
+	rc = fin
+	tr = tar.NewReader(rc)
+
+	return tr, rc, nil
 }

cli/app/check.go

@@ -1,30 +1,23 @@
 package app
 
 import (
-	"fmt"
-	"strings"
-
 	"coopcloud.tech/abra/cli/internal"
-	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
+	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
+	"coopcloud.tech/abra/pkg/recipe"
-	"coopcloud.tech/abra/pkg/log"
+	recipePkg "coopcloud.tech/abra/pkg/recipe"
-	"github.com/charmbracelet/lipgloss"
+	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app check` aliases. use a comma separated list of aliases with
+var appCheckCommand = cli.Command{
-// no spaces in between
+	Name:    "check",
-var appCheckAliases = i18n.G("chk")
+	Aliases: []string{"chk"},
-
+	Usage:   "Ensure an app is well configured",
-var AppCheckCommand = &cobra.Command{
+	Description: `
-	// translators: `app check` command
+This command compares env vars in both the app ".env" and recipe ".env.sample"
-	Use:     i18n.G("check <domain> [flags]"),
+file.
-	Aliases: strings.Split(appCheckAliases, ","),
-	// translators: Short description for `app check` command
-	Short: i18n.G("Ensure an app is well configured"),
-	Long: i18n.G(`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
@@ -33,67 +26,56 @@ 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),
+	ArgsUsage: "<domain>",
-	ValidArgsFunction: func(
+	Flags: []cli.Flag{
-		cmd *cobra.Command,
+		internal.DebugFlag,
-		args []string,
+		internal.ChaosFlag,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
+		internal.OfflineFlag,
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := recipe.EnsureExists(app.Recipe); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		table, err := formatter.CreateTable()
+		if !internal.Chaos {
-		if err != nil {
+			if err := recipePkg.EnsureIsClean(app.Recipe); err != nil {
-			log.Fatal(err)
+				logrus.Fatal(err)
-		}
+			}
 
-		table.
+			if !internal.Offline {
-			Headers(
+				if err := recipePkg.EnsureUpToDate(app.Recipe); err != nil {
-				fmt.Sprintf("%s .env.sample", app.Recipe.Name),
+					logrus.Fatal(err)
-				fmt.Sprintf("%s.env", app.Name),
-			).
-			StyleFunc(func(row, col int) lipgloss.Style {
-				switch {
-				case col == 1:
-					return lipgloss.NewStyle().Padding(0, 1, 0, 1).Align(lipgloss.Center)
-				default:
-					return lipgloss.NewStyle().Padding(0, 1, 0, 1)
 				}
-			})
+			}
 
-		envVars, err := appPkg.CheckEnv(app)
+			if err := recipePkg.EnsureLatest(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		tableCol := []string{"recipe env sample", "app env"}
+		table := formatter.CreateTable(tableCol)
+
+		envVars, err := config.CheckEnv(app)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		for _, envVar := range envVars {
 			if envVar.Present {
-				val := []string{envVar.Name, "✅"}
+				table.Append([]string{envVar.Name, "✅"})
-				table.Row(val...)
 			} else {
-				val := []string{envVar.Name, "❌"}
+				table.Append([]string{envVar.Name, "❌"})
-				table.Row(val...)
 			}
 		}
 
-		if err := formatter.PrintTable(table); err != nil {
+		table.Render()
-			log.Fatal(err)
+
-		}
+		return nil
 	},
 }
-
-func init() {
-	AppCheckCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-}

cli/app/cmd.go

@@ -5,124 +5,94 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"slices"
+	"path"
 	"sort"
 	"strings"
 
 	"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/config"
-	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/recipe"
-	"github.com/spf13/cobra"
+	recipePkg "coopcloud.tech/abra/pkg/recipe"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app cmd` aliases. use a comma separated list of aliases with
+var appCmdCommand = cli.Command{
-// no spaces in between
+	Name:    "command",
-var appCmdAliases = i18n.G("cmd")
+	Aliases: []string{"cmd"},
-
+	Usage:   "Run app commands",
-var AppCmdCommand = &cobra.Command{
+	Description: `Run an app specific command.
-	// translators: `app command` command
-	Use:     i18n.G("command <domain> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]"),
-	Aliases: strings.Split(appCmdAliases, ","),
-	// translators: Short description for `app cmd` command
-	Short: i18n.G("Run app commands"),
-	Long: i18n.G(`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
-work station by passing "--local/-l".
+work station by passing "--local". Arguments can be passed into these functions
+using the "-- <args>" syntax.
 
-N.B. If using the "--" style to pass arguments, flags (e.g. "--local/-l") must
+Example:
-be passed *before* the "--". It is possible to pass arguments without the "--"
-as long as no dashes are present (i.e. "foo" works without "--", "-foo"
-does not).`),
-	Example: i18n.G(`  # 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 example.com app create_user -- me@example.com
-  abra app cmd 1312.net app my_cmd_args --user bar -- foo -vvv
+`,
+	ArgsUsage: "<domain> [<service>] <command> [-- <args>]",
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+		internal.LocalCmdFlag,
+		internal.RemoteUserFlag,
+		internal.TtyFlag,
+		internal.OfflineFlag,
+		internal.ChaosFlag,
+	},
+	Before:      internal.SubCommandBefore,
+	Subcommands: []cli.Command{appCmdListCommand},
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
 
-  # drop the [service] arg if using "--local/-l"
+		if err := recipe.EnsureExists(app.Recipe); err != nil {
-  abra app cmd 1312.net my_cmd --local`),
+			logrus.Fatal(err)
-	Args: func(cmd *cobra.Command, args []string) error {
+		}
-		if local {
+
-			if !(len(args) >= 2) {
+		if !internal.Chaos {
-				return errors.New(i18n.G("requires at least 2 arguments with --local/-l"))
+			if err := recipePkg.EnsureIsClean(app.Recipe); err != nil {
+				logrus.Fatal(err)
 			}
 
-			if slices.Contains(os.Args, "--") {
+			if !internal.Offline {
-				if cmd.ArgsLenAtDash() > 2 {
+				if err := recipePkg.EnsureUpToDate(app.Recipe); err != nil {
-					return errors.New(i18n.G("accepts at most 2 args with --local/-l"))
+					logrus.Fatal(err)
 				}
 			}
 
-			// NOTE(d1): it is unclear how to correctly validate this case
+			if err := recipePkg.EnsureLatest(app.Recipe); err != nil {
-			//
+				logrus.Fatal(err)
-			// abra app cmd 1312.net app test_cmd_args foo --local
-			// FATAL <recipe> doesn't have a app function
-			//
-			// "app" should not be there, but there is no reliable way to detect arg
-			// count when the user can pass an arbitrary amount of recipe command
-			// arguments
-			return nil
-		}
-
-		if !(len(args) >= 3) {
-			return errors.New(i18n.G("requires at least 3 arguments"))
-		}
-
-		return nil
-	},
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		case 1:
-			if !local {
-				return autocomplete.ServiceNameComplete(args[0])
 			}
-			return autocomplete.CommandNameComplete(args[0])
-		case 2:
-			if !local {
-				return autocomplete.CommandNameComplete(args[0])
-			}
-			return nil, cobra.ShellCompDirectiveDefault
-		default:
-			return nil, cobra.ShellCompDirectiveError
-		}
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
-
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
-			log.Fatal(err)
 		}
 
-		if local && remoteUser != "" {
+		if internal.LocalCmd && internal.RemoteUser != "" {
-			log.Fatal(i18n.G("cannot use --local & --user together"))
+			internal.ShowSubcommandHelpAndError(c, errors.New("cannot use --local & --user together"))
 		}
 
-		hasCmdArgs, parsedCmdArgs := parseCmdArgs(args, local)
+		hasCmdArgs, parsedCmdArgs := parseCmdArgs(c.Args(), internal.LocalCmd)
 
-		if _, err := os.Stat(app.Recipe.AbraShPath); err != nil {
+		abraSh := path.Join(config.RECIPES_DIR, app.Recipe, "abra.sh")
+		if _, err := os.Stat(abraSh); err != nil {
 			if os.IsNotExist(err) {
-				log.Fatal(i18n.G("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name))
+				logrus.Fatalf("%s does not exist for %s?", abraSh, app.Name)
 			}
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if local {
+		if internal.LocalCmd {
-			cmdName := args[1]
+			if !(len(c.Args()) >= 2) {
-			if err := internal.EnsureCommand(app.Recipe.AbraShPath, app.Recipe.Name, cmdName); err != nil {
+				internal.ShowSubcommandHelpAndError(c, errors.New("missing arguments"))
-				log.Fatal(err)
 			}
 
-			log.Debug(i18n.G("--local detected, running %s on local work station", cmdName))
+			cmdName := c.Args().Get(1)
+			if err := internal.EnsureCommand(abraSh, app.Recipe, cmdName); err != nil {
+				logrus.Fatal(err)
+			}
+
+			logrus.Debugf("--local detected, running %s on local work station", cmdName)
 
 			var exportEnv string
 			for k, v := range app.Env {
@@ -131,101 +101,70 @@ does not).`),
 
 			var sourceAndExec string
 			if hasCmdArgs {
-				log.Debug(i18n.G("parsed following command arguments: %s", parsedCmdArgs))
+				logrus.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)
+				sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; %s . %s; %s %s", app.Name, app.StackName(), exportEnv, abraSh, cmdName, parsedCmdArgs)
 			} else {
-				log.Debug(i18n.G("did not detect any command arguments"))
+				logrus.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)
+				sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; %s . %s; %s", app.Name, app.StackName(), exportEnv, abraSh, 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))
+				logrus.Debugf("%s does not exist locally, use /bin/sh as fallback", shell)
 				shell = "/bin/sh"
 			}
 			cmd := exec.Command(shell, "-c", sourceAndExec)
 
 			if err := internal.RunCmd(cmd); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
-
-			return
-		}
-
-		cmdName := args[2]
-		if err := internal.EnsureCommand(app.Recipe.AbraShPath, app.Recipe.Name, cmdName); err != nil {
-			log.Fatal(err)
-		}
-
-		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		matchingServiceName := false
-		targetServiceName := args[1]
-		for _, serviceName := range serviceNames {
-			if serviceName == targetServiceName {
-				matchingServiceName = true
-			}
-		}
-
-		if !matchingServiceName {
-			log.Fatal(i18n.G("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))
-
-		if hasCmdArgs {
-			log.Debug(i18n.G("parsed following command arguments: %s", parsedCmdArgs))
 		} else {
-			log.Debug(i18n.G("did not detect any command arguments"))
+			if !(len(c.Args()) >= 3) {
+				internal.ShowSubcommandHelpAndError(c, errors.New("missing arguments"))
+			}
+
+			targetServiceName := c.Args().Get(1)
+
+			cmdName := c.Args().Get(2)
+			if err := internal.EnsureCommand(abraSh, app.Recipe, cmdName); err != nil {
+				logrus.Fatal(err)
+			}
+
+			serviceNames, err := config.GetAppServiceNames(app.Name)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			matchingServiceName := false
+			for _, serviceName := range serviceNames {
+				if serviceName == targetServiceName {
+					matchingServiceName = true
+				}
+			}
+
+			if !matchingServiceName {
+				logrus.Fatalf("no service %s for %s?", targetServiceName, app.Name)
+			}
+
+			logrus.Debugf("running command %s within the context of %s_%s", cmdName, app.StackName(), targetServiceName)
+
+			if hasCmdArgs {
+				logrus.Debugf("parsed following command arguments: %s", parsedCmdArgs)
+			} else {
+				logrus.Debug("did not detect any command arguments")
+			}
+
+			cl, err := client.New(app.Server)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			if err := internal.RunCmdRemote(cl, app, abraSh, targetServiceName, cmdName, parsedCmdArgs); err != nil {
+				logrus.Fatal(err)
+			}
 		}
 
-		cl, err := client.New(app.Server)
+		return nil
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if err := internal.RunCmdRemote(
-			cl,
-			app,
-			disableTTY,
-			app.Recipe.AbraShPath,
-			targetServiceName, cmdName, parsedCmdArgs, remoteUser); err != nil {
-			log.Fatal(err)
-		}
-	},
-}
-
-// translators: `abra app command list` aliases. use a comma separated list of
-// aliases with no spaces in between
-var appCmdListAliases = i18n.G("ls")
-
-var AppCmdListCommand = &cobra.Command{
-	// translators: `app cmd list` command
-	Use:     i18n.G("list <domain> [flags]"),
-	Aliases: strings.Split(appCmdListAliases, ","),
-	// translators: Short description for `app cmd list` command
-	Short: i18n.G("List all available commands"),
-	Args:  cobra.MinimumNArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
-
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
-			log.Fatal(err)
-		}
-
-		cmdNames, err := appPkg.ReadAbraShCmdNames(app.Recipe.AbraShPath)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		sort.Strings(cmdNames)
-
-		for _, cmdName := range cmdNames {
-			fmt.Println(cmdName)
-		}
 	},
 }
 
@@ -248,42 +187,52 @@ func parseCmdArgs(args []string, isLocal bool) (bool, string) {
 	return hasCmdArgs, parsedCmdArgs
 }
 
-var (
+var appCmdListCommand = cli.Command{
-	local      bool
+	Name:      "list",
-	remoteUser string
+	Aliases:   []string{"ls"},
-	disableTTY bool
+	Usage:     "List all available commands",
-)
+	ArgsUsage: "<domain>",
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+		internal.OfflineFlag,
+		internal.ChaosFlag,
+	},
+	BashComplete: autocomplete.AppNameComplete,
+	Before:       internal.SubCommandBefore,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
 
-func init() {
+		if err := recipe.EnsureExists(app.Recipe); err != nil {
-	AppCmdCommand.Flags().BoolVarP(
+			logrus.Fatal(err)
-		&local,
+		}
-		i18n.G("local"),
-		i18n.G("l"),
-		false,
-		i18n.G("run command locally"),
-	)
 
-	AppCmdCommand.Flags().StringVarP(
+		if !internal.Chaos {
-		&remoteUser,
+			if err := recipePkg.EnsureIsClean(app.Recipe); err != nil {
-		i18n.G("user"),
+				logrus.Fatal(err)
-		i18n.G("u"),
+			}
-		"",
-		i18n.G("request remote user"),
-	)
 
-	AppCmdCommand.Flags().BoolVarP(
+			if !internal.Offline {
-		&disableTTY,
+				if err := recipePkg.EnsureUpToDate(app.Recipe); err != nil {
-		i18n.G("tty"),
+					logrus.Fatal(err)
-		i18n.G("T"),
+				}
-		false,
+			}
-		i18n.G("disable remote TTY"),
-	)
 
-	AppCmdCommand.Flags().BoolVarP(
+			if err := recipePkg.EnsureLatest(app.Recipe); err != nil {
-		&internal.Chaos,
+				logrus.Fatal(err)
-		i18n.G("chaos"),
+			}
-		i18n.G("C"),
+		}
-		false,
+
-		i18n.G("ignore uncommitted recipes changes"),
+		abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
-	)
+		cmdNames, err := config.ReadAbraShCmdNames(abraShPath)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		sort.Strings(cmdNames)
+		for _, cmdName := range cmdNames {
+			fmt.Println(cmdName)
+		}
+
+		return nil
+	},
 }

cli/app/cmd_test.go

@@ -13,7 +13,7 @@ func TestParseCmdArgs(t *testing.T) {
 	}{
 		// `--` is not parsed when passed in from the command-line e.g. -- foo bar baz
 		// so we need to eumlate that as missing when testing if bash args are passed in
-		// see https://git.coopcloud.tech/toolshed/organising/issues/336 for more
+		// see https://git.coopcloud.tech/coop-cloud/organising/issues/336 for more
 		{[]string{"foo.com", "app", "test"}, false, ""},
 		{[]string{"foo.com", "app", "test", "foo"}, true, "foo "},
 		{[]string{"foo.com", "app", "test", "foo", "bar", "baz"}, true, "foo bar baz "},

cli/app/config.go

@@ -1,65 +1,64 @@
 package app
 
 import (
+	"errors"
 	"os"
 	"os/exec"
-	"strings"
 
-	appPkg "coopcloud.tech/abra/pkg/app"
+	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
-	"coopcloud.tech/abra/pkg/i18n"
+	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/log"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app config` aliases. use a comma separated list of
+var appConfigCommand = cli.Command{
-// aliases with no spaces in between
+	Name:      "config",
-var appConfigAliases = i18n.G("cfg")
+	Aliases:   []string{"cfg"},
-
+	Usage:     "Edit app config",
-var AppConfigCommand = &cobra.Command{
+	ArgsUsage: "<domain>",
-	// translators: `app config` command
+	Flags: []cli.Flag{
-	Use:     i18n.G("config <domain> [flags]"),
+		internal.DebugFlag,
-	Aliases: strings.Split(appConfigAliases, ","),
-	// translators: Short description for `app config` command
-	Short:   i18n.G("Edit app config"),
-	Example: i18n.G("  abra config 1312.net"),
-	Args:    cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		files, err := appPkg.LoadAppFiles("")
+	BashComplete: autocomplete.AppNameComplete,
-		if err != nil {
+	Action: func(c *cli.Context) error {
-			log.Fatal(err)
+		appName := c.Args().First()
+
+		if appName == "" {
+			internal.ShowSubcommandHelpAndError(c, errors.New("no app provided"))
+		}
+
+		files, err := config.LoadAppFiles("")
+		if err != nil {
+			logrus.Fatal(err)
 		}
 
-		appName := args[0]
 		appFile, exists := files[appName]
 		if !exists {
-			log.Fatal(i18n.G("cannot find app with name %s", appName))
+			logrus.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 {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		}
 
-		c := exec.Command(ed, appFile.Path)
+		cmd := exec.Command(ed, appFile.Path)
-		c.Stdin = os.Stdin
+		cmd.Stdin = os.Stdin
-		c.Stdout = os.Stdout
+		cmd.Stdout = os.Stdout
-		c.Stderr = os.Stderr
+		cmd.Stderr = os.Stderr
-		if err := c.Run(); err != nil {
+		if err := cmd.Run(); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
+
+		return nil
 	},
 }

cli/app/cp.go

@@ -2,388 +2,148 @@ package app
 
 import (
 	"context"
-	"errors"
+	"fmt"
-	"io"
 	"os"
-	"path"
-	"path/filepath"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
-	containerPkg "coopcloud.tech/abra/pkg/container"
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/container"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
+	"github.com/docker/docker/api/types"
-	"coopcloud.tech/abra/pkg/log"
+	"github.com/docker/docker/api/types/filters"
-	"coopcloud.tech/abra/pkg/upstream/container"
-	"github.com/docker/cli/cli/command"
-	containertypes "github.com/docker/docker/api/types/container"
 	dockerClient "github.com/docker/docker/client"
-	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/archive"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app cp` aliases. use a comma separated list of aliases with
+var appCpCommand = cli.Command{
-// no spaces in between
+	Name:      "cp",
-var appCpAliases = i18n.G("c")
+	Aliases:   []string{"c"},
-
+	ArgsUsage: "<domain> <src> <dst>",
-var AppCpCommand = &cobra.Command{
+	Flags: []cli.Flag{
-	// translators: `app cp` command
+		internal.DebugFlag,
-	Use:     i18n.G("cp <domain> <src> <dst> [flags]"),
+		internal.NoInputFlag,
-	Aliases: strings.Split(appCpAliases, ","),
-	// translators: Short description for `app cp` command
-	Short: i18n.G("Copy files to/from a deployed app service"),
-	Example: i18n.G(`  # 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 ./`),
-	Args: cobra.ExactArgs(3),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		default:
-			return nil, cobra.ShellCompDirectiveDefault
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before: internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	Usage:  "Copy files to/from a deployed app service",
+	Description: `
+Copy files to and from any app service file system.
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+If you want to copy a myfile.txt to the root of the app service:
-			log.Fatal(err)
+
+    abra app cp <domain> myfile.txt app:/
+
+And if you want to copy that file back to your current working directory locally:
+
+    abra app cp <domain> app:/myfile.txt .
+`,
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+
+		src := c.Args().Get(1)
+		dst := c.Args().Get(2)
+		if src == "" {
+			logrus.Fatal("missing <src> argument")
+		} else if dst == "" {
+			logrus.Fatal("missing <dest> argument")
 		}
 
-		src := args[1]
+		parsedSrc := strings.SplitN(src, ":", 2)
-		dst := args[2]
+		parsedDst := strings.SplitN(dst, ":", 2)
-		srcPath, dstPath, service, toContainer, err := parseSrcAndDst(src, dst)
+		errorMsg := "one of <src>/<dest> arguments must take $SERVICE:$PATH form"
-		if err != nil {
+		if len(parsedSrc) == 2 && len(parsedDst) == 2 {
-			log.Fatal(err)
+			logrus.Fatal(errorMsg)
+		} else if len(parsedSrc) != 2 {
+			if len(parsedDst) != 2 {
+				logrus.Fatal(errorMsg)
+			}
+		} else if len(parsedDst) != 2 {
+			if len(parsedSrc) != 2 {
+				logrus.Fatal(errorMsg)
+			}
+		}
+
+		var service string
+		var srcPath string
+		var dstPath string
+		isToContainer := false // <container:src> <dst>
+		if len(parsedSrc) == 2 {
+			service = parsedSrc[0]
+			srcPath = parsedSrc[1]
+			dstPath = dst
+			logrus.Debugf("assuming transfer is coming FROM the container")
+		} else if len(parsedDst) == 2 {
+			service = parsedDst[0]
+			dstPath = parsedDst[1]
+			srcPath = src
+			isToContainer = true // <src> <container:dst>
+			logrus.Debugf("assuming transfer is going TO the container")
+		}
+
+		if isToContainer {
+			if _, err := os.Stat(srcPath); os.IsNotExist(err) {
+				logrus.Fatalf("%s does not exist locally?", srcPath)
+			}
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		container, err := containerPkg.GetContainerFromStackAndService(cl, app.StackName(), service)
+		if err := configureAndCp(c, cl, app, srcPath, dstPath, service, isToContainer); err != nil {
-		if err != nil {
+			logrus.Fatal(err)
-			log.Fatal(err)
 		}
-		log.Debug(i18n.G("retrieved %s as target container on %s", formatter.ShortenID(container.ID), app.Server))
 
-		if toContainer {
+		return nil
-			err = CopyToContainer(cl, container.ID, srcPath, dstPath)
-		} else {
-			err = CopyFromContainer(cl, container.ID, srcPath, dstPath)
-		}
-		if err != nil {
-			log.Fatal(err)
-		}
 	},
 }
 
-var errServiceMissing = errors.New(i18n.G("one of <src>/<dest> arguments must take $SERVICE:$PATH form"))
+func configureAndCp(
+	c *cli.Context,
+	cl *dockerClient.Client,
+	app config.App,
+	srcPath string,
+	dstPath string,
+	service string,
+	isToContainer bool) error {
+	filters := filters.NewArgs()
+	filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service))
 
-// parseSrcAndDst parses src and dest string. One of src or dst must be of the form $SERVICE:$PATH
+	container, err := container.GetContainer(context.Background(), cl, filters, internal.NoInput)
-func parseSrcAndDst(src, dst string) (srcPath string, dstPath string, service string, toContainer bool, err error) {
-	parsedSrc := strings.SplitN(src, ":", 2)
-	parsedDst := strings.SplitN(dst, ":", 2)
-	if len(parsedSrc)+len(parsedDst) != 3 {
-		return "", "", "", false, errServiceMissing
-	}
-	if len(parsedSrc) == 2 {
-		return parsedSrc[1], dst, parsedSrc[0], false, nil
-	}
-	if len(parsedDst) == 2 {
-		return src, parsedDst[1], parsedDst[0], true, nil
-	}
-	return "", "", "", false, errServiceMissing
-}
-
-// CopyToContainer copies a file or directory from the local file system to the container.
-// See the possible copy modes and their documentation.
-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))
+		logrus.Fatal(err)
 	}
 
-	dstStat, err := cl.ContainerStatPath(context.Background(), containerID, dstPath)
+	logrus.Debugf("retrieved %s as target container on %s", formatter.ShortenID(container.ID), app.Server)
-	dstExists := true
-	if err != nil {
-		if errdefs.IsNotFound(err) {
-			dstExists = false
-		} else {
-			return errors.New(i18n.G("remote path: %s", err))
-		}
-	}
 
-	mode, err := copyMode(srcPath, dstPath, srcStat.Mode(), dstStat.Mode, dstExists)
+	if isToContainer {
-	if err != nil {
+		toTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
-		return err
+		content, err := archive.TarWithOptions(srcPath, toTarOpts)
-	}
-	movePath := ""
-	switch mode {
-	case CopyModeDirToDir:
-		// Add the src directory to the destination path
-		_, srcDir := path.Split(srcPath)
-		dstPath = path.Join(dstPath, srcDir)
-
-		// Make sure the dst directory exits.
-		dcli, err := command.NewDockerCli()
 		if err != nil {
-			return err
+			logrus.Fatal(err)
 		}
-		if _, err := container.RunExec(dcli, cl, containerID, &containertypes.ExecOptions{
-			AttachStderr: true,
-			AttachStdin:  true,
-			AttachStdout: true,
-			Cmd:          []string{"mkdir", "-p", dstPath},
-			Detach:       false,
-			Tty:          true,
-		}); err != nil {
-			return errors.New(i18n.G("create remote directory: %s", err))
-		}
-	case CopyModeFileToFile:
-		// Remove the file component from the path, since docker can only copy
-		// to a directory.
-		dstPath, _ = path.Split(dstPath)
-	case CopyModeFileToFileRename:
-		// Copy the file to the temp directory and move it to its dstPath
-		// afterwards.
-		movePath = dstPath
-		dstPath = "/tmp"
-	}
 
-	toTarOpts := &archive.TarOptions{IncludeSourceDir: true, NoOverwriteDirNonDir: true, Compression: archive.Gzip}
+		copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
-	content, err := archive.TarWithOptions(srcPath, toTarOpts)
+		if err := cl.CopyToContainer(context.Background(), container.ID, dstPath, content, copyOpts); err != nil {
-	if err != nil {
+			logrus.Fatal(err)
-		return err
-	}
-
-	log.Debug(i18n.G("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
-	}
-
-	if movePath != "" {
-		_, srcFile := path.Split(srcPath)
-		dcli, err := command.NewDockerCli()
-		if err != nil {
-			return err
-		}
-		if _, err := container.RunExec(dcli, cl, containerID, &containertypes.ExecOptions{
-			AttachStderr: true,
-			AttachStdin:  true,
-			AttachStdout: true,
-			Cmd:          []string{"mv", path.Join("/tmp", srcFile), movePath},
-			Detach:       false,
-			Tty:          true,
-		}); err != nil {
-			return errors.New(i18n.G("create remote directory: %s", err))
-		}
-	}
-
-	return nil
-}
-
-// CopyFromContainer copies a file or directory from the given container to the local file system.
-// See the possible copy modes and their documentation.
-func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath string) error {
-	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))
-		} else {
-			return errors.New(i18n.G("remote path: %s", err))
-		}
-	}
-
-	dstStat, err := os.Stat(dstPath)
-	dstExists := true
-	var dstMode os.FileMode
-	if err != nil {
-		if os.IsNotExist(err) {
-			dstExists = false
-		} else {
-			return errors.New(i18n.G("remote path: %s", err))
 		}
 	} else {
-		dstMode = dstStat.Mode()
+		content, _, err := cl.CopyFromContainer(context.Background(), container.ID, srcPath)
-	}
-
-	mode, err := copyMode(srcPath, dstPath, srcStat.Mode, dstMode, dstExists)
-	if err != nil {
-		return err
-	}
-
-	moveDstDir := ""
-	moveDstFile := ""
-	switch mode {
-	case CopyModeFileToFile:
-		// Remove the file component from the path, since docker can only copy
-		// to a directory.
-		dstPath, _ = path.Split(dstPath)
-	case CopyModeFileToFileRename:
-		// Copy the file to the temp directory and move it to its dstPath
-		// afterwards.
-		moveDstFile = dstPath
-		dstPath = "/tmp"
-	case CopyModeFilesToDir:
-		// Copy the directory to the temp directory and move it to its
-		// dstPath afterwards.
-		moveDstDir = path.Join(dstPath, "/")
-		dstPath = "/tmp"
-
-		// Make sure the temp directory always gets removed
-		defer os.Remove(path.Join("/tmp"))
-	}
-
-	content, _, err := cl.CopyFromContainer(context.Background(), containerID, srcPath)
-	if err != nil {
-		return errors.New(i18n.G("copy: %s", err))
-	}
-	defer content.Close()
-	if err := archive.Untar(content, dstPath, &archive.TarOptions{
-		NoOverwriteDirNonDir: true,
-		Compression:          archive.Gzip,
-		NoLchown:             true,
-	}); err != nil {
-		return errors.New(i18n.G("untar: %s", err))
-	}
-
-	if moveDstFile != "" {
-		_, srcFile := path.Split(strings.TrimSuffix(srcPath, "/"))
-		if err := moveFile(path.Join("/tmp", srcFile), moveDstFile); err != nil {
-			return err
-		}
-	}
-	if moveDstDir != "" {
-		_, srcDir := path.Split(strings.TrimSuffix(srcPath, "/"))
-		if err := moveDir(path.Join("/tmp", srcDir), moveDstDir); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-var (
-	ErrCopyDirToFile  = errors.New(i18n.G("can't copy dir to file"))
-	ErrDstDirNotExist = errors.New(i18n.G("destination directory does not exist"))
-)
-
-type CopyMode int
-
-const (
-	// Copy a src file to a dest file. The src and dest file names are the same.
-	//  <dir_src>/<file> + <dir_dst>/<file> -> <dir_dst>/<file>
-	CopyModeFileToFile = CopyMode(iota)
-	// Copy a src file to a dest file. The src and dest file names are  not the same.
-	//  <dir_src>/<file_src> + <dir_dst>/<file_dst> -> <dir_dst>/<file_dst>
-	CopyModeFileToFileRename
-	// Copy a src file to dest directory. The dest file gets created in the dest
-	// folder with the src filename.
-	//  <dir_src>/<file> + <dir_dst> -> <dir_dst>/<file>
-	CopyModeFileToDir
-	// Copy a src directory to dest directory.
-	//  <dir_src> + <dir_dst> -> <dir_dst>/<dir_src>
-	CopyModeDirToDir
-	// Copy all files in the src directory to the dest directory. This works recursively.
-	//  <dir_src>/ + <dir_dst> -> <dir_dst>/<files_from_dir_src>
-	CopyModeFilesToDir
-)
-
-// copyMode takes a src and dest path and file mode to determine the copy mode.
-// See the possible copy modes and their documentation.
-func copyMode(srcPath, dstPath string, srcMode os.FileMode, dstMode os.FileMode, dstExists bool) (CopyMode, error) {
-	_, srcFile := path.Split(srcPath)
-	_, dstFile := path.Split(dstPath)
-	if srcMode.IsDir() {
-		if !dstExists {
-			return -1, ErrDstDirNotExist
-		}
-		if dstMode.IsDir() {
-			if strings.HasSuffix(srcPath, "/") {
-				return CopyModeFilesToDir, nil
-			}
-			return CopyModeDirToDir, nil
-		}
-		return -1, ErrCopyDirToFile
-	}
-
-	if dstMode.IsDir() {
-		return CopyModeFileToDir, nil
-	}
-
-	if srcFile != dstFile {
-		return CopyModeFileToFileRename, nil
-	}
-
-	return CopyModeFileToFile, nil
-}
-
-// moveDir moves all files from a source path to the destination path recursively.
-func moveDir(sourcePath, destPath string) error {
-	return filepath.Walk(sourcePath, func(p string, info os.FileInfo, err error) error {
 		if err != nil {
-			return err
+			logrus.Fatal(err)
 		}
-		newPath := path.Join(destPath, strings.TrimPrefix(p, sourcePath))
+		defer content.Close()
-		if info.IsDir() {
+		fromTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
-			err := os.Mkdir(newPath, info.Mode())
+		if err := archive.Untar(content, dstPath, fromTarOpts); err != nil {
-			if err != nil {
+			logrus.Fatal(err)
-				if os.IsExist(err) {
-					return nil
-				}
-				return err
-			}
 		}
-		if info.Mode().IsRegular() {
-			return moveFile(p, newPath)
-		}
-		return nil
-	})
-}
-
-// moveFile moves a file from a source path to a destination path.
-func moveFile(sourcePath, destPath string) error {
-	inputFile, err := os.Open(sourcePath)
-	if err != nil {
-		return err
-	}
-	outputFile, err := os.Create(destPath)
-	if err != nil {
-		inputFile.Close()
-		return err
-	}
-	defer outputFile.Close()
-	_, err = io.Copy(outputFile, inputFile)
-	inputFile.Close()
-	if err != nil {
-		return err
 	}
 
-	// Remove file after succesfull copy.
-	err = os.Remove(sourcePath)
-	if err != nil {
-		return err
-	}
 	return nil
 }
-
-func init() {
-	AppCpCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-}

cli/app/cp_test.go

@@ -1,113 +0,0 @@
-package app
-
-import (
-	"os"
-	"testing"
-)
-
-func TestParse(t *testing.T) {
-	tests := []struct {
-		src         string
-		dst         string
-		srcPath     string
-		dstPath     string
-		service     string
-		toContainer bool
-		err         error
-	}{
-		{src: "foo", dst: "bar", err: errServiceMissing},
-		{src: "app:foo", dst: "app:bar", err: errServiceMissing},
-		{src: "app:foo", dst: "bar", srcPath: "foo", dstPath: "bar", service: "app", toContainer: false},
-		{src: "foo", dst: "app:bar", srcPath: "foo", dstPath: "bar", service: "app", toContainer: true},
-	}
-
-	for i, tc := range tests {
-		srcPath, dstPath, service, toContainer, err := parseSrcAndDst(tc.src, tc.dst)
-		if srcPath != tc.srcPath {
-			t.Errorf("[%d] srcPath: want (%s), got(%s)", i, tc.srcPath, srcPath)
-		}
-		if dstPath != tc.dstPath {
-			t.Errorf("[%d] dstPath: want (%s), got(%s)", i, tc.dstPath, dstPath)
-		}
-		if service != tc.service {
-			t.Errorf("[%d] service: want (%s), got(%s)", i, tc.service, service)
-		}
-		if toContainer != tc.toContainer {
-			t.Errorf("[%d] toConainer: want (%t), got(%t)", i, tc.toContainer, toContainer)
-		}
-		if err == nil && tc.err != nil && err.Error() != tc.err.Error() {
-			t.Errorf("[%d] err: want (%s), got(%s)", i, tc.err, err)
-		}
-	}
-}
-
-func TestCopyMode(t *testing.T) {
-	tests := []struct {
-		srcPath   string
-		dstPath   string
-		srcMode   os.FileMode
-		dstMode   os.FileMode
-		dstExists bool
-		mode      CopyMode
-		err       error
-	}{
-		{
-			srcPath:   "foo.txt",
-			dstPath:   "foo.txt",
-			srcMode:   os.ModePerm,
-			dstMode:   os.ModePerm,
-			dstExists: true,
-			mode:      CopyModeFileToFile,
-		},
-		{
-			srcPath:   "foo.txt",
-			dstPath:   "bar.txt",
-			srcMode:   os.ModePerm,
-			dstExists: true,
-			mode:      CopyModeFileToFileRename,
-		},
-		{
-			srcPath:   "foo",
-			dstPath:   "foo",
-			srcMode:   os.ModeDir,
-			dstMode:   os.ModeDir,
-			dstExists: true,
-			mode:      CopyModeDirToDir,
-		},
-		{
-			srcPath:   "foo/",
-			dstPath:   "foo",
-			srcMode:   os.ModeDir,
-			dstMode:   os.ModeDir,
-			dstExists: true,
-			mode:      CopyModeFilesToDir,
-		},
-		{
-			srcPath:   "foo",
-			dstPath:   "foo",
-			srcMode:   os.ModeDir,
-			dstExists: false,
-			mode:      -1,
-			err:       ErrDstDirNotExist,
-		},
-		{
-			srcPath:   "foo",
-			dstPath:   "foo",
-			srcMode:   os.ModeDir,
-			dstMode:   os.ModePerm,
-			dstExists: true,
-			mode:      -1,
-			err:       ErrCopyDirToFile,
-		},
-	}
-
-	for i, tc := range tests {
-		mode, err := copyMode(tc.srcPath, tc.dstPath, tc.srcMode, tc.dstMode, tc.dstExists)
-		if mode != tc.mode {
-			t.Errorf("[%d] mode: want (%d), got(%d)", i, tc.mode, mode)
-		}
-		if err != tc.err {
-			t.Errorf("[%d] err: want (%s), got(%s)", i, tc.err, err)
-		}
-	}
-}

cli/app/deploy.go

@@ -2,436 +2,253 @@ package app
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
-	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/secret"
 
-	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/deploy"
+	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/dns"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
+	"coopcloud.tech/abra/pkg/git"
 	"coopcloud.tech/abra/pkg/lint"
-	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/abra/pkg/upstream/stack"
-	dockerClient "github.com/docker/docker/client"
+	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app deploy` aliases. use a comma separated list of aliases with
+var appDeployCommand = cli.Command{
-// no spaces in between
+	Name:      "deploy",
-var appDeployAliases = i18n.G("d")
+	Aliases:   []string{"d"},
-
+	Usage:     "Deploy an app",
-var AppDeployCommand = &cobra.Command{
+	ArgsUsage: "<domain> [<version>]",
-	// translators: `app deploy` command
+	Flags: []cli.Flag{
-	Use:     i18n.G("deploy <domain> [version] [flags]"),
+		internal.DebugFlag,
-	Aliases: strings.Split(appDeployAliases, ","),
+		internal.NoInputFlag,
-	// translators: Short description for `app deploy` command
+		internal.ForceFlag,
-	Short: i18n.G("Deploy an app"),
+		internal.ChaosFlag,
-	Long: i18n.G(`Deploy an app.
+		internal.NoDomainChecksFlag,
-
+		internal.DontWaitConvergeFlag,
-This command supports chaos operations. Use "--chaos/-C" to deploy your recipe
+		internal.OfflineFlag,
-checkout as-is. Recipe commit hashes are also supported as values for
-"[version]". Please note, "upgrade"/"rollback" do not support chaos operations.`),
-	Example: i18n.G(`  # standard deployment
-  abra app deploy 1312.net
-
-  # chaos deployment
-  abra app deploy 1312.net --chaos
-  
-  # deploy specific version
-  abra app deploy 1312.net 2.0.0+1.2.3
-
-  # deploy a specific git hash
-  abra app deploy 1312.net 886db76d`),
-	Args: cobra.RangeArgs(1, 2),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string,
-	) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		case 1:
-			app, err := appPkg.Get(args[0])
-			if err != nil {
-				errMsg := i18n.G("autocomplete failed: %s", err)
-				return []string{errMsg}, cobra.ShellCompDirectiveError
-			}
-			return autocomplete.RecipeVersionComplete(app.Recipe.Name)
-		default:
-			return nil, cobra.ShellCompDirectiveDefault
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before: internal.SubCommandBefore,
-		var (
+	Description: `
-			deployWarnMessages []string
+Deploy an app. It does not support incrementing the version of a deployed app,
-			toDeployVersion    string
+for this you need to look at the "abra app upgrade <domain>" command.
-		)
 
-		app := internal.ValidateApp(args)
+You may pass "--force" to re-deploy the same version again. This can be useful
+if the container runtime has gotten into a weird state.
 
-		if err := validateArgsAndFlags(args); err != nil {
+Chaos mode ("--chaos") will deploy your local checkout of a recipe as-is,
-			log.Fatal(err)
+including unstaged changes and can be useful for live hacking and testing new
+recipes.
+`,
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+		stackName := app.StackName()
+
+		specificVersion := c.Args().Get(1)
+		if specificVersion != "" && internal.Chaos {
+			logrus.Fatal("cannot use <version> and --chaos together")
 		}
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := recipe.EnsureExists(app.Recipe); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
-		}
-
-		cl, err := client.New(app.Server)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		log.Debug(i18n.G("checking whether %s is already deployed", app.StackName()))
-
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if deployMeta.IsDeployed && !(internal.Force || internal.Chaos) {
-			log.Fatal(i18n.G("%s is already deployed", app.Name))
-		}
-
-		toDeployVersion, err = getDeployVersion(args, deployMeta, app)
-		if err != nil {
-			log.Fatal(err)
 		}
 
 		if !internal.Chaos {
-			isChaosCommit, err := app.Recipe.EnsureVersion(toDeployVersion)
+			if err := recipe.EnsureIsClean(app.Recipe); err != nil {
-			if err != nil {
+				logrus.Fatal(err)
-				log.Fatal(i18n.G("ensure recipe: %s", err))
 			}
-			if isChaosCommit {
+
-				log.Warnf(i18n.G("version '%s' appears to be a chaos commit, but --chaos/-C was not provided", toDeployVersion))
+			if !internal.Offline {
-				internal.Chaos = true
+				if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+
+			if err := recipe.EnsureLatest(app.Recipe); err != nil {
+				logrus.Fatal(err)
 			}
 		}
 
-		if err := lint.LintForErrors(app.Recipe); err != nil {
+		r, err := recipe.Get(app.Recipe, internal.Offline)
-			if internal.Chaos {
-				log.Warn(err)
-			} else {
-				log.Fatal(err)
-			}
-		}
-
-		if err := validateSecrets(cl, app); err != nil {
-			log.Fatal(err)
-		}
-
-		if err := deploy.MergeAbraShEnv(app.Recipe, app.Env); err != nil {
-			log.Fatal(err)
-		}
-
-		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
+		}
+
+		if err := lint.LintForErrors(r); err != nil {
+			logrus.Fatal(err)
+		}
+
+		logrus.Debugf("checking whether %s is already deployed", stackName)
+
+		cl, err := client.New(app.Server)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		secStats, err := secret.PollSecretsStatus(cl, app)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		for _, secStat := range secStats {
+			if !secStat.CreatedOnRemote {
+				logrus.Fatalf("unable to deploy, secrets not generated (%s)?", secStat.LocalName)
+			}
+		}
+
+		if isDeployed {
+			if internal.Force || internal.Chaos {
+				logrus.Warnf("%s is already deployed but continuing (--force/--chaos)", app.Name)
+			} else {
+				logrus.Fatalf("%s is already deployed", app.Name)
+			}
+		}
+
+		version := deployedVersion
+		if specificVersion != "" {
+			version = specificVersion
+			logrus.Debugf("choosing %s as version to deploy", version)
+			if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		if !internal.Chaos && specificVersion == "" {
+			catl, err := recipe.ReadRecipeCatalogue(internal.Offline)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			if len(versions) == 0 && !internal.Chaos {
+				logrus.Warn("no published versions in catalogue, trying local recipe repository")
+				recipeVersions, err := recipe.GetRecipeVersions(app.Recipe, internal.Offline)
+				if err != nil {
+					logrus.Warn(err)
+				}
+				for _, recipeVersion := range recipeVersions {
+					for version := range recipeVersion {
+						versions = append(versions, version)
+					}
+				}
+			}
+
+			if len(versions) > 0 && !internal.Chaos {
+				version = versions[len(versions)-1]
+				logrus.Debugf("choosing %s as version to deploy", version)
+				if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
+					logrus.Fatal(err)
+				}
+			} else {
+				head, err := git.GetRecipeHead(app.Recipe)
+				if err != nil {
+					logrus.Fatal(err)
+				}
+				version = formatter.SmallSHA(head.String())
+				logrus.Warn("no versions detected, using latest commit")
+			}
+		}
+
+		if internal.Chaos {
+			logrus.Warnf("chaos mode engaged")
+			var err error
+			version, err = recipe.ChaosVersion(app.Recipe)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
+		abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		for k, v := range abraShEnv {
+			app.Env[k] = v
+		}
+
+		composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
+		if err != nil {
+			logrus.Fatal(err)
 		}
 
-		stackName := app.StackName()
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    stackName,
 			Prune:        false,
 			ResolveImage: stack.ResolveImageAlways,
-			Detach:       false,
 		}
-		compose, err := appPkg.GetAppComposeConfig(app.Name, deployOpts, app.Env)
+		compose, err := config.GetAppComposeConfig(app.Name, deployOpts, app.Env)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		appPkg.ExposeAllEnv(stackName, compose, app.Env)
+		config.ExposeAllEnv(stackName, compose, app.Env)
-		appPkg.SetRecipeLabel(compose, stackName, app.Recipe.Name)
+		config.SetRecipeLabel(compose, stackName, app.Recipe)
-		appPkg.SetChaosLabel(compose, stackName, internal.Chaos)
+		config.SetChaosLabel(compose, stackName, internal.Chaos)
-		if internal.Chaos {
+		config.SetChaosVersionLabel(compose, stackName, version)
-			appPkg.SetChaosVersionLabel(compose, stackName, toDeployVersion)
+		config.SetUpdateLabel(compose, stackName, app.Env)
-		}
 
-		versionLabel := toDeployVersion
+		envVars, err := config.CheckEnv(app)
-		if internal.Chaos {
-			for _, service := range compose.Services {
-				if service.Name == "app" {
-					labelKey := fmt.Sprintf("coop-cloud.%s.version", stackName)
-					// NOTE(d1): keep non-chaos version labbeling when doing chaos ops
-					versionLabel = service.Deploy.Labels[labelKey]
-				}
-			}
-		}
-		appPkg.SetVersionLabel(compose, stackName, versionLabel)
-
-		envVars, err := appPkg.CheckEnv(app)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		for _, envVar := range envVars {
 			if !envVar.Present {
-				deployWarnMessages = append(deployWarnMessages,
+				logrus.Warnf("env var %s missing from %s.env, present in recipe .env.sample", envVar.Name, app.Domain)
-					i18n.G("%s missing from %s.env", envVar.Name, app.Domain),
-				)
 			}
 		}
 
+		if err := internal.DeployOverview(app, version, "continue with deployment?"); err != nil {
+			logrus.Fatal(err)
+		}
+
 		if !internal.NoDomainChecks {
-			if domainName, ok := app.Env["DOMAIN"]; ok {
+			domainName, ok := app.Env["DOMAIN"]
+			if ok {
 				if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
-					log.Fatal(err)
+					logrus.Fatal(err)
 				}
 			} else {
-				log.Debug(i18n.G("skipping domain checks, no DOMAIN=... configured"))
+				logrus.Warn("skipping domain checks as no DOMAIN=... configured for app")
 			}
 		} else {
-			log.Debug(i18n.G("skipping domain checks"))
+			logrus.Warn("skipping domain checks as requested")
 		}
 
-		deployedVersion := config.MISSING_DEFAULT
+		stack.WaitTimeout, err = config.GetTimeoutFromLabel(compose, stackName)
-		if deployMeta.IsDeployed {
-			deployedVersion = deployMeta.Version
-			if deployMeta.IsChaos {
-				deployedVersion = deployMeta.ChaosVersion
-			}
-		}
-
-		// Gather secrets
-		secretInfo, err := deploy.GatherSecretsForDeploy(cl, app, internal.ShowUnchanged)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
+		logrus.Debugf("set waiting timeout to %d s", stack.WaitTimeout)
 
-		// Gather configs
+		if err := stack.RunDeploy(cl, deployOpts, compose, app.Name, internal.DontWaitConverge); err != nil {
-		configInfo, err := deploy.GatherConfigsForDeploy(cl, app, compose, app.Env, internal.ShowUnchanged)
+			logrus.Fatal(err)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		// Gather images
-		imageInfo, err := deploy.GatherImagesForDeploy(cl, app, compose, internal.ShowUnchanged)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		// Show deploy overview
-		if err := internal.DeployOverview(
-			app,
-			deployedVersion,
-			toDeployVersion,
-			"",
-			deployWarnMessages,
-			secretInfo,
-			configInfo,
-			imageInfo,
-		); err != nil {
-			log.Fatal(err)
-		}
-
-		stack.WaitTimeout, err = appPkg.GetTimeoutFromLabel(compose, stackName)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		f, err := app.Filters(true, false, serviceNames...)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if err := stack.RunDeploy(
-			cl,
-			deployOpts,
-			compose,
-			app.Name,
-			app.Server,
-			internal.DontWaitConverge,
-			f,
-		); err != nil {
-			log.Fatal(err)
 		}
 
 		postDeployCmds, ok := app.Env["POST_DEPLOY_CMDS"]
 		if ok && !internal.DontWaitConverge {
-			log.Debug(i18n.G("run the following post-deploy commands: %s", postDeployCmds))
+			logrus.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))
+				logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)
 			}
 		}
-
+		return nil
-		if err := app.WriteRecipeVersion(toDeployVersion, false); err != nil {
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
-		}
 	},
 }
-
-func getLatestVersionOrCommit(app appPkg.App) (string, error) {
-	versions, err := app.Recipe.Tags()
-	if err != nil {
-		return "", err
-	}
-
-	if len(versions) > 0 && !internal.Chaos {
-		return versions[len(versions)-1], nil
-	}
-
-	head, err := app.Recipe.Head()
-	if err != nil {
-		return "", err
-	}
-
-	return formatter.SmallSHA(head.String()), nil
-}
-
-// 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"))
-	}
-
-	if len(args) == 2 && args[1] != "" && internal.DeployLatest {
-		return errors.New(i18n.G("cannot use [version] and --latest together"))
-	}
-
-	if internal.DeployLatest && internal.Chaos {
-		return errors.New(i18n.G("cannot use --chaos and --latest together"))
-	}
-
-	return nil
-}
-
-func validateSecrets(cl *dockerClient.Client, app appPkg.App) error {
-	composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
-	if err != nil {
-		return err
-	}
-
-	secretsConfig, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.StackName())
-	if err != nil {
-		return err
-	}
-
-	secStats, err := secret.PollSecretsStatus(cl, app)
-	if err != nil {
-		return err
-	}
-
-	for _, secStat := range secStats {
-		if !secStat.CreatedOnRemote {
-			secretConfig := secretsConfig[secStat.LocalName]
-			if secretConfig.SkipGenerate {
-				return errors.New(i18n.G("secret not inserted (#generate=false): %s", secStat.LocalName))
-			}
-			return errors.New(i18n.G("secret not generated: %s", secStat.LocalName))
-		}
-	}
-
-	return nil
-}
-
-func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app appPkg.App) (string, error) {
-	// Chaos mode overrides everything
-	if internal.Chaos {
-		v, err := app.Recipe.ChaosVersion()
-		if err != nil {
-			return "", err
-		}
-		log.Debug(i18n.G("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]))
-		return cliArgs[1], nil
-	}
-
-	// Check if the recipe has a version in the .env file
-	if app.Recipe.EnvVersion != "" && !internal.DeployLatest {
-		if strings.HasSuffix(app.Recipe.EnvVersionRaw, "+U") {
-			// NOTE(d1): use double-line 5 spaces ("FATA ") trick to make a more
-			// informative error message. it's ugly but that's our logging situation
-			// atm
-			return "", errors.New(i18n.G(`cannot redeploy previous chaos version (%s), did you mean to use "--chaos"?
-     to return to a regular release, specify a release tag, commit SHA or use "--latest"`,
-				formatter.BoldDirtyDefault(app.Recipe.EnvVersionRaw)))
-		}
-		log.Debug(i18n.G("version: taking version from .env file: %s", app.Recipe.EnvVersion))
-		return app.Recipe.EnvVersion, nil
-	}
-
-	// Take deployed version
-	if deployMeta.IsDeployed && !internal.DeployLatest {
-		log.Debug(i18n.G("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))
-	if err != nil {
-		return "", err
-	}
-	return v, nil
-}
-
-func init() {
-	AppDeployCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-
-	AppDeployCommand.Flags().BoolVarP(
-		&internal.Force,
-		i18n.G("force"),
-		i18n.G("f"),
-		false,
-		i18n.G("perform action without further prompt"),
-	)
-
-	AppDeployCommand.Flags().BoolVarP(
-		&internal.NoDomainChecks,
-		i18n.G("no-domain-checks"),
-		i18n.G("D"),
-		false,
-		i18n.G("disable public DNS checks"),
-	)
-
-	AppDeployCommand.Flags().BoolVarP(
-		&internal.DontWaitConverge,
-		i18n.G("no-converge-checks"),
-		i18n.G("c"),
-		false,
-		i18n.G("disable converge logic checks"),
-	)
-
-	AppDeployCommand.PersistentFlags().BoolVarP(
-		&internal.DeployLatest,
-		i18n.G("latest"),
-		i18n.G("l"),
-		false,
-		i18n.G("deploy latest recipe version"),
-	)
-
-	AppDeployCommand.Flags().BoolVarP(
-		&internal.ShowUnchanged,
-		i18n.G("show-unchanged"),
-		i18n.G("U"),
-		false,
-		i18n.G("show all configs & images, including unchanged ones"),
-	)
-}

cli/app/env.go

@@ -1,51 +0,0 @@
-package app
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-
-	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/autocomplete"
-	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
-	"github.com/spf13/cobra"
-)
-
-// translators: `abra app env` aliases. use a comma separated list of aliases with
-// no spaces in between
-var appEnvAliases = i18n.G("e")
-
-var AppEnvCommand = &cobra.Command{
-	// translators: `app env` command
-	Use:     i18n.G("env <domain> [flags]"),
-	Aliases: strings.Split(appEnvAliases, ","),
-	// translators: Short description for `app env` command
-	Short:   i18n.G("Show app .env values"),
-	Example: i18n.G("  abra app env 1312.net"),
-	Args:    cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
-
-		var envKeys []string
-		for k := range app.Env {
-			envKeys = append(envKeys, k)
-		}
-
-		sort.Strings(envKeys)
-
-		var rows [][]string
-		for _, k := range envKeys {
-			rows = append(rows, []string{k, app.Env[k]})
-		}
-
-		overview := formatter.CreateOverview(i18n.G("ENV OVERVIEW"), rows)
-		fmt.Println(overview)
-	},
-}

cli/app/errors.go

@@ -0,0 +1,142 @@
+package app
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/pkg/autocomplete"
+	"coopcloud.tech/abra/pkg/client"
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/recipe"
+	stack "coopcloud.tech/abra/pkg/upstream/stack"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
+	dockerClient "github.com/docker/docker/client"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
+)
+
+var appErrorsCommand = cli.Command{
+	Name:      "errors",
+	Usage:     "List errors for a deployed app",
+	ArgsUsage: "<domain>",
+	Description: `
+List errors for a deployed app.
+
+This is a best-effort implementation and an attempt to gather a number of tips
+& tricks for finding errors together into one convenient command. When an app
+is failing to deploy or having issues, it could be a lot of things.
+
+This command currently takes into account:
+
+    Is the service deployed?
+    Is the service killed by an OOM error?
+    Is the service reporting an error (like in "ps --no-trunc" output)
+    Is the service healthcheck failing? what are the healthcheck logs?
+
+Got any more ideas? Please let us know:
+
+    https://git.coopcloud.tech/coop-cloud/organising/issues/new/choose
+
+This command is best accompanied by "abra app logs <domain>" which may reveal
+further information which can help you debug the cause of an app failure via
+the logs.
+`,
+	Aliases: []string{"e"},
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+		internal.WatchFlag,
+		internal.OfflineFlag,
+	},
+	Before:       internal.SubCommandBefore,
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+
+		cl, err := client.New(app.Server)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		isDeployed, _, err := stack.IsDeployed(context.Background(), cl, app.StackName())
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if !isDeployed {
+			logrus.Fatalf("%s is not deployed?", app.Name)
+		}
+
+		if !internal.Watch {
+			if err := checkErrors(c, cl, app); err != nil {
+				logrus.Fatal(err)
+			}
+			return nil
+		}
+
+		for {
+			if err := checkErrors(c, cl, app); err != nil {
+				logrus.Fatal(err)
+			}
+			time.Sleep(2 * time.Second)
+		}
+	},
+}
+
+func checkErrors(c *cli.Context, cl *dockerClient.Client, app config.App) error {
+	recipe, err := recipe.Get(app.Recipe, internal.Offline)
+	if err != nil {
+		return err
+	}
+
+	for _, service := range recipe.Config.Services {
+		filters := filters.NewArgs()
+		filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service.Name))
+
+		containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters})
+		if err != nil {
+			return err
+		}
+
+		if len(containers) == 0 {
+			logrus.Warnf("%s is not up, something seems wrong", service.Name)
+			continue
+		}
+
+		container := containers[0]
+		containerState, err := cl.ContainerInspect(context.Background(), container.ID)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if containerState.State.OOMKilled {
+			logrus.Warnf("%s has been killed due to an out of memory error", service.Name)
+		}
+
+		if containerState.State.Error != "" {
+			logrus.Warnf("%s reports this error: %s", service.Name, containerState.State.Error)
+		}
+
+		if containerState.State.Health != nil {
+			if containerState.State.Health.Status != "healthy" {
+				logrus.Warnf("%s healthcheck status is %s", service.Name, containerState.State.Health.Status)
+				logrus.Warnf("%s healthcheck has failed %s times", service.Name, strconv.Itoa(containerState.State.Health.FailingStreak))
+				for _, log := range containerState.State.Health.Log {
+					logrus.Warnf("%s healthcheck logs: %s", service.Name, strings.TrimSpace(log.Output))
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
+func getServiceName(names []string) string {
+	containerName := strings.Join(names, " ")
+	trimmed := strings.TrimPrefix(containerName, "/")
+	return strings.Split(trimmed, ".")[0]
+}

cli/app/labels.go

@@ -1,147 +0,0 @@
-package app
-
-import (
-	"context"
-	"fmt"
-	"sort"
-	"strings"
-
-	"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/convert"
-	composetypes "github.com/docker/cli/cli/compose/types"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	dockerClient "github.com/docker/docker/client"
-	"github.com/spf13/cobra"
-)
-
-// translators: `abra app labels` aliases. use a comma separated list of
-// aliases with no spaces in between
-var appLabelsAliases = i18n.G("lb")
-
-var AppLabelsCommand = &cobra.Command{
-	// translators: `app labels` command
-	Use:     i18n.G("labels <domain> [flags]"),
-	Aliases: strings.Split(appLabelsAliases, ","),
-	// translators: Short description for `app labels` command
-	Short:   i18n.G("Show deployment labels"),
-	Long:    i18n.G("Both local recipe and live deployment labels are shown."),
-	Example: "  " + i18n.G("abra app labels 1312.net"),
-	Args:    cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
-
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
-			log.Fatal(err)
-		}
-
-		cl, err := client.New(app.Server)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		remoteLabels, err := getLabels(cl, app.StackName())
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		rows := [][]string{
-			{i18n.G("DEPLOYED LABELS"), "---"},
-		}
-
-		remoteLabelKeys := make([]string, 0, len(remoteLabels))
-		for k := range remoteLabels {
-			remoteLabelKeys = append(remoteLabelKeys, k)
-		}
-
-		sort.Strings(remoteLabelKeys)
-
-		for _, k := range remoteLabelKeys {
-			rows = append(rows, []string{
-				k,
-				remoteLabels[k],
-			})
-		}
-
-		if len(remoteLabelKeys) == 0 {
-			rows = append(rows, []string{i18n.G("unknown")})
-		}
-
-		rows = append(rows, []string{i18n.G("RECIPE LABELS"), "---"})
-
-		config, err := app.Recipe.GetComposeConfig(app.Env)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		var localLabelKeys []string
-		var appServiceConfig composetypes.ServiceConfig
-		for _, service := range config.Services {
-			if service.Name == "app" {
-				appServiceConfig = service
-
-				for k := range service.Deploy.Labels {
-					localLabelKeys = append(localLabelKeys, k)
-				}
-			}
-		}
-
-		sort.Strings(localLabelKeys)
-
-		for _, k := range localLabelKeys {
-			rows = append(rows, []string{
-				k,
-				appServiceConfig.Deploy.Labels[k],
-			})
-		}
-
-		overview := formatter.CreateOverview(i18n.G("LABELS OVERVIEW"), rows)
-		fmt.Println(overview)
-	},
-}
-
-// getLabels reads docker labels from running services in the format of "coop-cloud.${STACK_NAME}.${LABEL}".
-func getLabels(cl *dockerClient.Client, stackName string) (map[string]string, error) {
-	labels := make(map[string]string)
-
-	filter := filters.NewArgs()
-	filter.Add("label", fmt.Sprintf("%s=%s", convert.LabelNamespace, stackName))
-
-	services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: filter})
-	if err != nil {
-		return labels, err
-	}
-
-	for _, service := range services {
-		if service.Spec.Name != fmt.Sprintf("%s_app", stackName) {
-			continue
-		}
-
-		for k, v := range service.Spec.Labels {
-			labels[k] = v
-		}
-	}
-
-	return labels, nil
-}
-
-func init() {
-	AppLabelsCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-}

cli/app/list.go

@@ -8,15 +8,37 @@ import (
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
-	appPkg "coopcloud.tech/abra/pkg/app"
+	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
+	"coopcloud.tech/abra/pkg/recipe"
-	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/tagcmp"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
+var status bool
+var statusFlag = &cli.BoolFlag{
+	Name:        "status, S",
+	Usage:       "Show app deployment status",
+	Destination: &status,
+}
+
+var recipeFilter string
+var recipeFlag = &cli.StringFlag{
+	Name:        "recipe, r",
+	Value:       "",
+	Usage:       "Show apps of a specific recipe",
+	Destination: &recipeFilter,
+}
+
+var listAppServer string
+var listAppServerFlag = &cli.StringFlag{
+	Name:        "server, s",
+	Value:       "",
+	Usage:       "Show apps of a specific server",
+	Destination: &listAppServer,
+}
+
 type appStatus struct {
 	Server       string `json:"server"`
 	Recipe       string `json:"recipe"`
@@ -25,6 +47,7 @@ type appStatus struct {
 	Status       string `json:"status"`
 	Chaos        string `json:"chaos"`
 	ChaosVersion string `json:"chaosVersion"`
+	AutoUpdate   string `json:"autoUpdate"`
 	Version      string `json:"version"`
 	Upgrade      string `json:"upgrade"`
 }
@@ -38,42 +61,42 @@ type serverStatus struct {
 	UpgradeCount     int         `json:"upgradeCount"`
 }
 
-// translators: `abra app list` aliases. use a comma separated list of aliases with
+var appListCommand = cli.Command{
-// no spaces in between
+	Name:    "list",
-var appListAliases = i18n.G("ls")
+	Aliases: []string{"ls"},
+	Usage:   "List all managed apps",
+	Description: `
+Read the local file system listing of apps and servers (e.g. ~/.abra/) to
+generate a report of all your apps.
 
-var AppListCommand = &cobra.Command{
+By passing the "--status/-S" flag, you can query all your servers for the
-	// translators: `app list` command
+actual live deployment status. Depending on how many servers you manage, this
-	Use:     i18n.G("list [flags]"),
+can take some time.
-	Aliases: strings.Split(appListAliases, ","),
+`,
-	// translators: Short description for `app list` command
+	Flags: []cli.Flag{
-	Short: i18n.G("List all managed apps"),
+		internal.DebugFlag,
-	Long: i18n.G(`Generate a report of all managed apps.
+		internal.MachineReadableFlag,
-
+		statusFlag,
-Use "--status/-S" flag to query all servers for the live deployment status.`),
+		listAppServerFlag,
-	Example: i18n.G(`  # list apps of all servers without live status
+		recipeFlag,
-  abra app ls
+		internal.OfflineFlag,
-
+	},
-  # list apps of a specific server with live status
+	Before: internal.SubCommandBefore,
-  abra app ls -s 1312.net -S
+	Action: func(c *cli.Context) error {
-
+		appFiles, err := config.LoadAppFiles(listAppServer)
-  # list apps of all servers which match a specific recipe
-  abra app ls -r gitea`),
-	Args: cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-		appFiles, err := appPkg.LoadAppFiles(listAppServer)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		apps, err := appPkg.GetApps(appFiles, recipeFilter)
+		apps, err := config.GetApps(appFiles, recipeFilter)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		sort.Sort(appPkg.ByServerAndRecipe(apps))
+		sort.Sort(config.ByServerAndRecipe(apps))
 
 		statuses := make(map[string]map[string]string)
+		var catl recipe.RecipeCatalogue
 		if status {
 			alreadySeen := make(map[string]bool)
 			for _, app := range apps {
@@ -82,9 +105,14 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 				}
 			}
 
-			statuses, err = appPkg.GetAppStatuses(apps, internal.MachineReadable)
+			statuses, err = config.GetAppStatuses(apps, internal.MachineReadable)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
+			}
+
+			catl, err = recipe.ReadRecipeCatalogue(internal.Offline)
+			if err != nil {
+				logrus.Fatal(err)
 			}
 		}
 
@@ -102,7 +130,7 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 				}
 			}
 
-			if app.Recipe.Name == recipeFilter || recipeFilter == "" {
+			if app.Recipe == recipeFilter || recipeFilter == "" {
 				if recipeFilter != "" {
 					// only count server if matches filter
 					totalServersCount++
@@ -113,10 +141,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 := "unknown"
 					if statusMeta, ok := statuses[app.StackName()]; ok {
 						if currentVersion, exists := statusMeta["version"]; exists {
 							if currentVersion != "" {
@@ -129,6 +158,9 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 						if chaosDeployVersion, exists := statusMeta["chaosVersion"]; exists {
 							chaosVersion = chaosDeployVersion
 						}
+						if autoUpdateState, exists := statusMeta["autoUpdate"]; exists {
+							autoUpdate = autoUpdateState
+						}
 						if statusMeta["status"] != "" {
 							status = statusMeta["status"]
 						}
@@ -141,32 +173,24 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 					appStats.Chaos = chaos
 					appStats.ChaosVersion = chaosVersion
 					appStats.Version = version
+					appStats.AutoUpdate = autoUpdate
 
 					var newUpdates []string
-					if version != "unknown" && chaos == "false" {
+					if version != "unknown" {
-						if err := app.Recipe.EnsureExists(); err != nil {
+						updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
-							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))
+							logrus.Fatal(err)
 						}
 
 						parsedVersion, err := tagcmp.Parse(version)
 						if err != nil {
-							log.Fatal(err)
+							logrus.Fatal(err)
 						}
 
 						for _, update := range updates {
-							if ok := tagcmp.IsParsable(update); !ok {
-								log.Debug(i18n.G("unable to parse %s, skipping as upgrade option", update))
-								continue
-							}
-
 							parsedUpdate, err := tagcmp.Parse(update)
 							if err != nil {
-								log.Fatal(err)
+								logrus.Fatal(err)
 							}
 
 							if update != version && parsedUpdate.IsGreaterThan(parsedVersion) {
@@ -177,20 +201,20 @@ 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 {
-						newUpdates = internal.SortVersionsDesc(newUpdates)
+						newUpdates = internal.ReverseStringList(newUpdates)
 						appStats.Upgrade = strings.Join(newUpdates, "\n")
 						stats.UpgradeCount++
 					}
 				}
 
 				appStats.Server = app.Server
-				appStats.Recipe = app.Recipe.Name
+				appStats.Recipe = app.Recipe
 				appStats.AppName = app.Name
 				appStats.Domain = app.Domain
 
@@ -202,12 +226,11 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 		if internal.MachineReadable {
 			jsonstring, err := json.Marshal(allStats)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			} else {
 				fmt.Println(string(jsonstring))
 			}
-
+			return nil
-			return
 		}
 
 		alreadySeen := make(map[string]bool)
@@ -218,117 +241,60 @@ 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")}
+			tableCol := []string{"recipe", "domain"}
 			if status {
-				headers = append(headers, []string{
+				tableCol = append(tableCol, []string{"status", "chaos", "version", "upgrade", "autoupdate"}...)
-					i18n.G("STATUS"),
-					i18n.G("CHAOS"),
-					i18n.G("VERSION"),
-					i18n.G("UPGRADE"),
-				}...,
-				)
 			}
 
-			table, err := formatter.CreateTable()
+			table := formatter.CreateTable(tableCol)
-			if err != nil {
-				log.Fatal(err)
-			}
 
-			table.Headers(headers...)
-
-			var rows [][]string
 			for _, appStat := range serverStat.Apps {
-				row := []string{appStat.Recipe, appStat.Domain, appStat.Server}
+				tableRow := []string{appStat.Recipe, appStat.Domain}
 				if status {
 					chaosStatus := appStat.Chaos
 					if chaosStatus != "unknown" {
 						chaosEnabled, err := strconv.ParseBool(chaosStatus)
 						if err != nil {
-							log.Fatal(err)
+							logrus.Fatal(err)
 						}
 						if chaosEnabled && appStat.ChaosVersion != "unknown" {
 							chaosStatus = appStat.ChaosVersion
 						}
 					}
-
+					tableRow = append(tableRow, []string{appStat.Status, chaosStatus, appStat.Version, appStat.Upgrade, appStat.AutoUpdate}...)
-					row = append(row, []string{
-						appStat.Status,
-						chaosStatus,
-						appStat.Version,
-						appStat.Upgrade}...,
-					)
 				}
-
+				table.Append(tableRow)
-				rows = append(rows, row)
 			}
 
-			table.Rows(rows...)
+			if table.NumLines() > 0 {
+				table.Render()
 
-			if len(rows) > 0 {
+				if status {
-				if err := formatter.PrintTable(table); err != nil {
+					fmt.Println(fmt.Sprintf(
-					log.Fatal(err)
+						"server: %s | total apps: %v | versioned: %v | unversioned: %v | latest: %v | upgrade: %v",
+						app.Server,
+						serverStat.AppCount,
+						serverStat.VersionCount,
+						serverStat.UnversionedCount,
+						serverStat.LatestCount,
+						serverStat.UpgradeCount,
+					))
+				} else {
+					fmt.Println(fmt.Sprintf("server: %s | total apps: %v", app.Server, serverStat.AppCount))
 				}
+			}
 
-				if len(allStats) > 1 && len(rows) > 0 {
+			if len(allStats) > 1 && table.NumLines() > 0 {
-					fmt.Println() // newline separator for multiple servers
+				fmt.Println() // newline separator for multiple servers
-				}
 			}
 
 			alreadySeen[app.Server] = true
 		}
+
+		if len(allStats) > 1 {
+			fmt.Println(fmt.Sprintf("total servers: %v | total apps: %v ", totalServersCount, totalAppsCount))
+		}
+
+		return nil
 	},
 }
-
-var (
-	status        bool
-	recipeFilter  string
-	listAppServer string
-)
-
-func init() {
-	AppListCommand.Flags().BoolVarP(
-		&status,
-		i18n.G("status"),
-		i18n.G("S"),
-		false,
-		i18n.G("show app deployment status"),
-	)
-
-	AppListCommand.Flags().StringVarP(
-		&recipeFilter,
-		i18n.G("recipe"),
-		i18n.G("r"),
-		"",
-		i18n.G("show apps of a specific recipe"),
-	)
-
-	AppListCommand.RegisterFlagCompletionFunc(
-		i18n.G("recipe"),
-		func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return autocomplete.RecipeNameComplete()
-		},
-	)
-
-	AppListCommand.Flags().BoolVarP(
-		&internal.MachineReadable,
-		i18n.G("machine"),
-		i18n.G("m"),
-		false,
-		i18n.G("print machine-readable output"),
-	)
-
-	AppListCommand.Flags().StringVarP(
-		&listAppServer,
-		i18n.G("server"),
-		i18n.G("s"),
-		"",
-		i18n.G("show apps of a specific server"),
-	)
-
-	AppListCommand.RegisterFlagCompletionFunc(
-		i18n.G("server"),
-		func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return autocomplete.ServerNameComplete()
-		},
-	)
-}

cli/app/logs.go

@@ -2,112 +2,149 @@ package app
 
 import (
 	"context"
-	"strings"
+	"fmt"
+	"io"
+	"os"
+	"sync"
 
 	"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/config"
-	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/recipe"
-	"coopcloud.tech/abra/pkg/logs"
+	"coopcloud.tech/abra/pkg/service"
 	"coopcloud.tech/abra/pkg/upstream/stack"
-	"github.com/spf13/cobra"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
+	dockerClient "github.com/docker/docker/client"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app logs` aliases. use a comma separated list of aliases with
+var logOpts = types.ContainerLogsOptions{
-// no spaces in between
+	ShowStderr: true,
-var appLogsAliases = i18n.G("l")
+	ShowStdout: true,
+	Since:      "",
+	Until:      "",
+	Timestamps: true,
+	Follow:     true,
+	Tail:       "20",
+	Details:    false,
+}
 
-var AppLogsCommand = &cobra.Command{
+// stackLogs lists logs for all stack services
-	// translators: `app logs` command
+func stackLogs(c *cli.Context, app config.App, client *dockerClient.Client) {
-	Use:     i18n.G("logs <domain> [service] [flags]"),
+	filters, err := app.Filters(true, false)
-	Aliases: strings.Split(appLogsAliases, ","),
+	if err != nil {
-	// translators: Short description for `app logs` command
+		logrus.Fatal(err)
-	Short: i18n.G("Tail app logs"),
+	}
-	Args:  cobra.RangeArgs(1, 2),
+
-	ValidArgsFunction: func(
+	serviceOpts := types.ServiceListOptions{Filters: filters}
-		cmd *cobra.Command,
+	services, err := client.ServiceList(context.Background(), serviceOpts)
-		args []string,
+	if err != nil {
-		toComplete string) ([]string, cobra.ShellCompDirective) {
+		logrus.Fatal(err)
-		switch l := len(args); l {
+	}
-		case 0:
+
-			return autocomplete.AppNameComplete()
+	var wg sync.WaitGroup
-		case 1:
+	for _, service := range services {
-			app, err := appPkg.Get(args[0])
+		wg.Add(1)
-			if err != nil {
+		go func(s string) {
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
+			if internal.StdErrOnly {
+				logOpts.ShowStdout = false
 			}
-			return autocomplete.ServiceNameComplete(app.Name)
+
-		default:
+			logs, err := client.ServiceLogs(context.Background(), s, logOpts)
-			return nil, cobra.ShellCompDirectiveDefault
+			if err != nil {
-		}
+				logrus.Fatal(err)
+			}
+			defer logs.Close()
+
+			_, err = io.Copy(os.Stdout, logs)
+			if err != nil && err != io.EOF {
+				logrus.Fatal(err)
+			}
+		}(service.ID)
+	}
+
+	wg.Wait()
+
+	os.Exit(0)
+}
+
+var appLogsCommand = cli.Command{
+	Name:      "logs",
+	Aliases:   []string{"l"},
+	ArgsUsage: "<domain> [<service>]",
+	Usage:     "Tail app logs",
+	Flags: []cli.Flag{
+		internal.StdErrOnlyFlag,
+		internal.SinceLogsFlag,
+		internal.DebugFlag,
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
 		stackName := app.StackName()
 
-		if err := app.Recipe.EnsureExists(); err != nil {
+		if err := recipe.EnsureExists(app.Recipe); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
+		isDeployed, _, err := stack.IsDeployed(context.Background(), cl, stackName)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if !deployMeta.IsDeployed {
+		if !isDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
+			logrus.Fatalf("%s is not deployed?", app.Name)
 		}
 
-		var serviceNames []string
+		logOpts.Since = internal.SinceLogs
-		if len(args) == 2 {
+
-			serviceNames = []string{args[1]}
+		serviceName := c.Args().Get(1)
+		if serviceName == "" {
+			logrus.Debugf("tailing logs for all %s services", app.Recipe)
+			stackLogs(c, app, cl)
+		} else {
+			logrus.Debugf("tailing logs for %s", serviceName)
+			if err := tailServiceLogs(c, cl, app, serviceName); err != nil {
+				logrus.Fatal(err)
+			}
 		}
 
-		f, err := app.Filters(true, false, serviceNames...)
+		return 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)
-		}
 	},
 }
 
-var (
+func tailServiceLogs(c *cli.Context, cl *dockerClient.Client, app config.App, serviceName string) error {
-	stdErr    bool
+	filters := filters.NewArgs()
-	sinceLogs string
+	filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), serviceName))
-)
 
-func init() {
+	chosenService, err := service.GetService(context.Background(), cl, filters, internal.NoInput)
-	AppLogsCommand.Flags().BoolVarP(
+	if err != nil {
-		&stdErr,
+		logrus.Fatal(err)
-		i18n.G("stderr"),
+	}
-		i18n.G("s"),
-		false,
-		i18n.G("only tail stderr"),
-	)
 
-	AppLogsCommand.Flags().StringVarP(
+	if internal.StdErrOnly {
-		&sinceLogs,
+		logOpts.ShowStdout = false
-		i18n.G("since"),
+	}
-		i18n.G("S"),
+
-		"",
+	logs, err := cl.ServiceLogs(context.Background(), chosenService.ID, logOpts)
-		i18n.G("tail logs since YYYY-MM-DDTHH:MM:SSZ"),
+	if err != nil {
-	)
+		logrus.Fatal(err)
+	}
+	defer logs.Close()
+
+	_, err = io.Copy(os.Stdout, logs)
+	if err != nil && err != io.EOF {
+		logrus.Fatal(err)
+	}
+
+	return nil
 }

cli/app/move.go

@@ -1,350 +0,0 @@
-package app
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-
-	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/app"
-	appPkg "coopcloud.tech/abra/pkg/app"
-	"coopcloud.tech/abra/pkg/autocomplete"
-	"coopcloud.tech/abra/pkg/client"
-	"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/secret"
-	"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/mount"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/api/types/volume"
-	dockerclient "github.com/docker/docker/client"
-	"github.com/spf13/cobra"
-)
-
-// translators: `abra app move` aliases. use a comma separated list of aliases
-// with no spaces in between
-var appMoveAliases = i18n.G("m")
-
-var AppMoveCommand = &cobra.Command{
-	// translators: `app move` command
-	Use:     i18n.G("move <domain> <server> [flags]"),
-	Aliases: strings.Split(appMoveAliases, ","),
-	// translators: Short description for `app move` command
-	Short: i18n.G("Moves an app to a different server"),
-	Long: i18n.G(`Move an app to a differnt server.
-
-This command will migrate an app config and copy secrets and volumes from the
-old server to the new one. The app MUST be deployed on the old server before
-doing the move. The app will be undeployed from the current server but not
-deployed on the new server.
-
-The "tar" command is required on both the old and new server as well as "sudo"
-permissions. The "rsync" command is required on your local machine for
-transferring volumes.
-
-Do not forget to update your DNS records. Don't panic, it might take a while
-for the dust to settle after you move an app. If anything goes wrong, you can
-always move the app config file to the original server and deploy it there
-again. No data is removed from the old server.
-
-Use "--dry-run/-r" to see which secrets and volumes will be moved.`),
-	Example: i18n.G(`  # move an app
-  abra app move nextcloud.1312.net myserver.com`),
-	Args: cobra.RangeArgs(1, 2),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string,
-	) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		case 1:
-			return autocomplete.ServerNameComplete()
-		default:
-			return nil, cobra.ShellCompDirectiveDefault
-		}
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
-
-		if len(args) <= 1 {
-			log.Fatal(i18n.G("no server provided?"))
-		}
-		newServer := internal.ValidateServer([]string{args[1]})
-
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
-			log.Fatal(err)
-		}
-
-		currentServerClient, err := client.New(app.Server)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		deployMeta, err := stack.IsDeployed(context.Background(), currentServerClient, app.StackName())
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if !deployMeta.IsDeployed {
-			log.Fatal(i18n.G("%s must first be deployed on %s before moving", app.Name, app.Server))
-		}
-
-		resources, err := getAppResources(currentServerClient, app)
-		if err != nil {
-			log.Fatal(i18n.G("unable to retrieve %s resources on %s: %s", app.Name, app.Server, err))
-		}
-
-		internal.MoveOverview(app, newServer, resources.SecretNames(), resources.VolumeNames())
-		if err := internal.PromptProcced(); err != nil {
-			log.Fatal(i18n.G("bailing out: %s", err))
-		}
-
-		log.Info(i18n.G("undeploying %s on %s", app.Name, app.Server))
-		rmOpts := stack.Remove{
-			Namespaces: []string{app.StackName()},
-			Detach:     false,
-		}
-		if err := stack.RunRemove(context.Background(), currentServerClient, rmOpts); err != nil {
-			log.Fatal(i18n.G("failed to remove app from %s: %s", err, app.Server))
-		}
-
-		newServerClient, err := client.New(newServer)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		for _, s := range resources.SecretList {
-			sname := strings.Split(strings.TrimPrefix(s.Spec.Name, app.StackName()+"_"), "_")
-			secretName := strings.Join(sname[:len(sname)-1], "_")
-			data := resources.Secrets[secretName]
-			if err := client.StoreSecret(newServerClient, s.Spec.Name, data); err != nil {
-				log.Fatal(i18n.G("failed to store secret on %s: %s", err, newServer))
-			}
-			log.Info(i18n.G("created secret on %s: %s", s.Spec.Name, newServer))
-		}
-
-		for _, v := range resources.Volumes {
-			log.Info(i18n.G("moving volume %s from %s to %s", v.Name, app.Server, newServer))
-
-			// NOTE(p4u1): Need to create the volume before copying the data, because
-			// when docker creates a new volume it set the folder permissions to
-			// root, which might be wrong. This ensures we always have the correct
-			// folder permissions inside the volume.
-			log.Debug(i18n.G("creating volume %s on %s", v.Name, newServer))
-			_, err := newServerClient.VolumeCreate(context.Background(), volume.CreateOptions{
-				Name:   v.Name,
-				Driver: v.Driver,
-			})
-			if err != nil {
-				log.Fatal(i18n.G("failed to create volume %s on %s: %s", v.Name, newServer, err))
-			}
-
-			filename := fmt.Sprintf("%s_outgoing.tar.gz", v.Name)
-			log.Debug(i18n.G("creating %s on %s", filename, app.Server))
-			tarCmd := fmt.Sprintf("sudo tar --same-owner -czhpf %s -C /var/lib/docker/volumes %s", filename, v.Name)
-			cmd := exec.Command("ssh", app.Server, "-tt", tarCmd)
-			if out, err := cmd.CombinedOutput(); err != nil {
-				log.Fatal(i18n.G("%s failed on %s: output:%s err:%s", tarCmd, app.Server, string(out), err))
-			}
-
-			log.Debug(i18n.G("rsyncing %s from %s to local machine", filename, app.Server))
-			cmd = exec.Command("rsync", "-a", "-v", fmt.Sprintf("%s:%s", app.Server, filename), filename)
-			if out, err := cmd.CombinedOutput(); err != nil {
-				log.Fatal(i18n.G("failed to copy %s from %s to local machine: output:%s err:%s", filename, app.Server, string(out), err))
-			}
-
-			log.Debug(i18n.G("rsyncing %s to %s from local machine", filename, filename, newServer))
-			cmd = exec.Command("rsync", "-a", "-v", filename, fmt.Sprintf("%s:%s", newServer, filename))
-			if out, err := cmd.CombinedOutput(); err != nil {
-				log.Fatal(i18n.G("failed to copy %s from local machine to %s: output:%s err:%s", filename, newServer, string(out), err))
-			}
-
-			log.Debug(i18n.G("extracting %s on %s", filename, newServer))
-			tarExtractCmd := fmt.Sprintf("sudo tar --same-owner -xzpf %s -C /var/lib/docker/volumes", filename)
-			cmd = exec.Command("ssh", newServer, "-tt", tarExtractCmd)
-			if out, err := cmd.CombinedOutput(); err != nil {
-				log.Fatal(i18n.G("%s failed to extract %s on %s: output:%s err:%s", tarExtractCmd, filename, newServer, string(out), err))
-			}
-
-			// Remove tar files
-			log.Debug(i18n.G("removing %s from %s", filename, newServer))
-			cmd = exec.Command("ssh", newServer, "-tt", fmt.Sprintf("sudo rm -rf %s", filename))
-			if out, err := cmd.CombinedOutput(); err != nil {
-				log.Fatal(i18n.G("failed to remove %s from %s: output:%s err:%s", filename, newServer, string(out), err))
-			}
-
-			log.Debug(i18n.G("removing %s from %s", filename, app.Server))
-			cmd = exec.Command("ssh", app.Server, "-tt", fmt.Sprintf("sudo rm -rf %s", filename))
-			if out, err := cmd.CombinedOutput(); err != nil {
-				log.Fatal(i18n.G("failed to remove %s from %s: output:%s err:%s", filename, app.Server, string(out), err))
-			}
-
-			log.Debug(i18n.G("removing %s from local machine", filename))
-			cmd = exec.Command("rm", "-r", "-f", filename)
-			if out, err := cmd.CombinedOutput(); err != nil {
-				log.Fatal(i18n.G("failed to remove %s on local machine: output:%s err:%s", filename, string(out), err))
-			}
-		}
-
-		newServerPath := fmt.Sprintf("%s/servers/%s/%s.env", config.ABRA_DIR, newServer, app.Name)
-		log.Info(i18n.G("migrating app config from %s to %s", app.Server, newServerPath))
-		if err := copyFile(app.Path, newServerPath); err != nil {
-			log.Fatal(i18n.G("failed to migrate app config: %s", err))
-		}
-
-		if err := os.Remove(app.Path); err != nil {
-			log.Fatal(i18n.G("unable to remove %s: %s", app.Path, err))
-		}
-
-		log.Info(i18n.G("%s was successfully moved from %s to %s 🎉", app.Name, app.Server, newServer))
-	},
-}
-
-type AppResources struct {
-	Secrets    map[string]string
-	SecretList []swarm.Secret
-	Volumes    map[string]containertypes.MountPoint
-}
-
-func (a *AppResources) SecretNames() []string {
-	secrets := []string{}
-	for name := range a.Secrets {
-		secrets = append(secrets, name)
-	}
-	return secrets
-}
-
-func (a *AppResources) VolumeNames() []string {
-	volumes := []string{}
-	for name := range a.Volumes {
-		volumes = append(volumes, name)
-	}
-	return volumes
-}
-
-func getAppResources(cl *dockerclient.Client, app app.App) (*AppResources, error) {
-	filter, err := app.Filters(false, false)
-	if err != nil {
-		return nil, err
-	}
-
-	services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: filter})
-	if err != nil {
-		return nil, err
-	}
-
-	composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
-	if err != nil {
-		return nil, err
-	}
-
-	secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: filter})
-	if err != nil {
-		return nil, err
-	}
-
-	secretConfigs, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.StackName())
-	if err != nil {
-		return nil, err
-	}
-
-	opts := stack.Deploy{Composefiles: composeFiles, Namespace: app.StackName()}
-	compose, err := appPkg.GetAppComposeConfig(app.Name, opts, app.Env)
-	if err != nil {
-		return nil, err
-	}
-
-	resources := &AppResources{
-		Secrets:    make(map[string]string),
-		SecretList: secretList,
-		Volumes:    make(map[string]containertypes.MountPoint),
-	}
-
-	for _, s := range services {
-		secretNames := map[string]string{}
-		for _, serviceCompose := range compose.Services {
-			stackService := fmt.Sprintf("%s_%s", app.StackName(), serviceCompose.Name)
-			if stackService != s.Spec.Name {
-				log.Debug(i18n.G("skipping %s as it does not match %s", stackService, s.Spec.Name))
-				continue
-			}
-
-			for _, secret := range serviceCompose.Secrets {
-				for _, s := range secretList {
-					stackSecret := fmt.Sprintf("%s_%s_%s", app.StackName(), secret.Source, secretConfigs[secret.Source].Version)
-					if s.Spec.Name == stackSecret {
-						secretNames[secret.Source] = s.ID
-						break
-					}
-				}
-			}
-		}
-
-		f := filters.NewArgs()
-		f.Add("name", s.Spec.Name)
-		targetContainer, err := containerPkg.GetContainer(context.Background(), cl, f, true)
-		if err != nil {
-			return nil, errors.New(i18n.G("unable to get container matching %s: %s", s.Spec.Name, err))
-		}
-
-		for _, m := range targetContainer.Mounts {
-			if m.Type == mount.TypeVolume {
-				resources.Volumes[m.Name] = m
-			}
-		}
-
-		for secretName, secretID := range secretNames {
-			if _, ok := resources.Secrets[secretName]; ok {
-				continue
-			}
-
-			log.Debug(i18n.G("extracting secret %s on %s", secretName, app.Server))
-
-			cmd := fmt.Sprintf("sudo cat /var/lib/docker/containers/%s/mounts/secrets/%s", targetContainer.ID, secretID)
-			out, err := exec.Command("ssh", app.Server, "-tt", cmd).Output()
-			if err != nil {
-				return nil, errors.New(i18n.G("%s failed on %s: output:%s err:%s", cmd, app.Server, string(out), err))
-			}
-
-			resources.Secrets[secretName] = string(out)
-		}
-	}
-
-	return resources, nil
-}
-
-func copyFile(src string, dst string) error {
-	// Read all content of src to data, may cause OOM for a large file.
-	data, err := os.ReadFile(src)
-	if err != nil {
-		return err
-	}
-
-	// Write data to dst
-	err = os.WriteFile(dst, data, 0o644)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func init() {
-	AppMoveCommand.Flags().BoolVarP(
-		&internal.Dry,
-		i18n.G("dry-run"),
-		i18n.G("r"),
-		false,
-		i18n.G("report changes that would be made"),
-	)
-}

cli/app/new.go

@@ -1,39 +1,34 @@
 package app
 
 import (
-	"errors"
 	"fmt"
-	"strings"
+	"path"
 
 	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/app"
-	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
+	"coopcloud.tech/abra/pkg/jsontable"
-	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/recipe"
 	recipePkg "coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/abra/pkg/secret"
 	"github.com/AlecAivazis/survey/v2"
 	dockerClient "github.com/docker/docker/client"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-var appNewDescription = i18n.G(`Creates a new app from a default recipe.
+var appNewDescription = `
-
+Take a recipe and uses it to create a new app. This new app configuration is
-This new app configuration is stored in your $ABRA_DIR directory under the
+stored in your ~/.abra directory under the appropriate server.
-appropriate server.
 
 This command does not deploy your app for you. You will need to run "abra app
 deploy <domain>" to do so.
 
-You can see what recipes are available (i.e. values for the [recipe] argument)
+You can see what recipes are available (i.e. values for the <recipe> argument)
 by running "abra recipe ls".
 
-Recipe commit hashes are supported values for "[version]".
-
 Passing the "--secrets/-S" flag will automatically generate secrets for your
 app and store them encrypted at rest on the chosen target server. These
 generated secrets are only visible at generation time, so please take care to
@@ -41,205 +36,131 @@ 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.
+`
 
-// translators: `abra app new` aliases. use a comma separated list of aliases with
+var appNewCommand = cli.Command{
-// no spaces in between
+	Name:        "new",
-var appNewAliases = i18n.G("n")
+	Aliases:     []string{"n"},
-
+	Usage:       "Create a new app",
-var AppNewCommand = &cobra.Command{
+	Description: appNewDescription,
-	// translators: `app new` command
+	Flags: []cli.Flag{
-	Use:     i18n.G("new [recipe] [version] [flags]"),
+		internal.DebugFlag,
-	Aliases: strings.Split(appNewAliases, ","),
+		internal.NoInputFlag,
-	// translators: Short description for `app new` command
+		internal.NewAppServerFlag,
-	Short: i18n.G("Create a new app"),
+		internal.DomainFlag,
-	Long:  appNewDescription,
+		internal.PassFlag,
-	Args:  cobra.RangeArgs(0, 2),
+		internal.SecretsFlag,
-	ValidArgsFunction: func(
+		internal.OfflineFlag,
-		cmd *cobra.Command,
+		internal.ChaosFlag,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.RecipeNameComplete()
-		case 1:
-			recipe := internal.ValidateRecipe(args, cmd.Name())
-			return autocomplete.RecipeVersionComplete(recipe.Name)
-		default:
-			return nil, cobra.ShellCompDirectiveDefault
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		recipe := internal.ValidateRecipe(args, cmd.Name())
+	ArgsUsage:    "[<recipe>]",
+	BashComplete: autocomplete.RecipeNameComplete,
+	Action: func(c *cli.Context) error {
+		recipe := internal.ValidateRecipe(c)
 
-		if len(args) == 2 && internal.Chaos {
+		if !internal.Chaos {
-			log.Fatal(i18n.G("cannot use [version] and --chaos together"))
+			if err := recipePkg.EnsureIsClean(recipe.Name); err != nil {
-		}
+				logrus.Fatal(err)
-
-		var recipeVersion string
-		if len(args) == 2 {
-			recipeVersion = args[1]
-		}
-
-		chaosVersion := config.CHAOS_DEFAULT
-		if internal.Chaos {
-			var err error
-			chaosVersion, err = recipe.ChaosVersion()
-			if err != nil {
-				log.Fatal(err)
 			}
-
+			if !internal.Offline {
-			recipeVersion = chaosVersion
+				if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
-		} else {
+					logrus.Fatal(err)
-			if err := recipe.EnsureIsClean(); err != nil {
-				log.Fatal(err)
-			}
-
-			var recipeVersions recipePkg.RecipeVersions
-			if recipeVersion == "" {
-				var err error
-				recipeVersions, _, err = recipe.GetRecipeVersions()
-				if err != nil {
-					log.Fatal(err)
 				}
 			}
-
+			if err := recipePkg.EnsureLatest(recipe.Name); err != nil {
-			if len(recipeVersions) > 0 {
+				logrus.Fatal(err)
-				latest := recipeVersions[len(recipeVersions)-1]
-				for tag := range latest {
-					recipeVersion = tag
-				}
-
-				if _, err := recipe.EnsureVersion(recipeVersion); err != nil {
-					log.Fatal(err)
-				}
-			} else {
-				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())
-				}
 			}
 		}
 
 		if err := ensureServerFlag(); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if err := ensureDomainFlag(recipe, newAppServer); err != nil {
+		if err := ensureDomainFlag(recipe, internal.NewAppServer); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		sanitisedAppName := appPkg.SanitiseAppName(appDomain)
+		sanitisedAppName := config.SanitiseAppName(internal.Domain)
-		log.Debug(i18n.G("%s sanitised as %s for new app", appDomain, sanitisedAppName))
+		logrus.Debugf("%s sanitised as %s for new app", internal.Domain, sanitisedAppName)
 
-		if err := appPkg.TemplateAppEnvSample(
+		if err := config.TemplateAppEnvSample(
-			recipe,
+			recipe.Name,
-			appDomain,
+			internal.Domain,
-			newAppServer,
+			internal.NewAppServer,
-			appDomain,
+			internal.Domain,
 		); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		sampleEnv, err := recipe.SampleEnv()
+		var secrets AppSecrets
-		if err != nil {
+		var secretTable *jsontable.JSONTable
-			log.Fatal(err)
+		if internal.Secrets {
-		}
+			sampleEnv, err := recipe.SampleEnv(config.ReadEnvOptions{})
+			if err != nil {
+				logrus.Fatal(err)
+			}
 
-		composeFiles, err := recipe.GetComposeFiles(sampleEnv)
+			composeFiles, err := config.GetComposeFiles(recipe.Name, sampleEnv)
-		if err != nil {
+			if err != nil {
-			log.Fatal(err)
+				logrus.Fatal(err)
-		}
+			}
 
-		secretsConfig, err := secret.ReadSecretsConfig(
+			envSamplePath := path.Join(config.RECIPES_DIR, recipe.Name, ".env.sample")
-			recipe.SampleEnvPath,
+			secretsConfig, err := secret.ReadSecretsConfig(envSamplePath, composeFiles, recipe.Name)
-			composeFiles,
+			if err != nil {
-			appPkg.StackName(appDomain),
+				return err
-		)
+			}
-		if err != nil {
-			log.Fatal(err)
-		}
 
-		var appSecrets AppSecrets
-		if generateSecrets {
 			if err := promptForSecrets(recipe.Name, secretsConfig); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
-			cl, err := client.New(newAppServer)
+			cl, err := client.New(internal.NewAppServer)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
-			appSecrets, err = createSecrets(cl, secretsConfig, sanitisedAppName)
+			secrets, err = createSecrets(cl, secretsConfig, sanitisedAppName)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
+			}
+
+			secretCols := []string{"Name", "Value"}
+			secretTable = formatter.CreateTable(secretCols)
+			for name, val := range secrets {
+				secretTable.Append([]string{name, val})
 			}
 		}
 
-		if newAppServer == "default" {
+		if internal.NewAppServer == "default" {
-			newAppServer = "local"
+			internal.NewAppServer = "local"
 		}
 
-		log.Info(i18n.G("%s created (version: %s)", appDomain, recipeVersion))
+		tableCol := []string{"server", "recipe", "domain"}
+		table := formatter.CreateTable(tableCol)
+		table.Append([]string{internal.NewAppServer, recipe.Name, internal.Domain})
 
-		if len(secretsConfig) > 0 {
+		fmt.Println(fmt.Sprintf("A new %s app has been created! Here is an overview:", recipe.Name))
-			var (
+		fmt.Println("")
-				hasSecretToGenerate bool
+		table.Render()
-				hasSecretToSkip     bool
+		fmt.Println("")
-			)
+		fmt.Println("You can configure this app by running the following:")
+		fmt.Println(fmt.Sprintf("\n    abra app config %s", internal.Domain))
+		fmt.Println("")
+		fmt.Println("You can deploy this app by running the following:")
+		fmt.Println(fmt.Sprintf("\n    abra app deploy %s", internal.Domain))
 
-			for _, secretConfig := range secretsConfig {
+		if len(secrets) > 0 {
-				if secretConfig.SkipGenerate {
+			fmt.Println("")
-					hasSecretToSkip = true
+			fmt.Println("Here are your generated secrets:")
-					continue
+			fmt.Println("")
-				}
+			secretTable.Render()
-
+			logrus.Warn("generated secrets are not shown again, please take note of them NOW")
-				hasSecretToGenerate = true
-			}
-
-			if hasSecretToGenerate && !generateSecrets {
-				log.Warn(i18n.G("%s requires secret generation before deploy, run \"abra app secret generate %s --all\"", recipe.Name, appDomain))
-			}
-
-			if hasSecretToSkip {
-				log.Warn(i18n.G("%s requires secret insertion before deploy (#generate=false)", recipe.Name))
-			}
 		}
 
-		if len(appSecrets) > 0 {
+		return nil
-			rows := [][]string{}
-			for k, v := range appSecrets {
-				rows = append(rows, []string{k, v})
-			}
-
-			overview := formatter.CreateOverview(i18n.G("SECRETS OVERVIEW"), rows)
-
-			fmt.Println(overview)
-
-			log.Warn(i18n.G(
-				"secrets are %s shown again, please save them %s",
-				formatter.BoldUnderlineStyle.Render("NOT"),
-				formatter.BoldUnderlineStyle.Render("NOW"),
-			))
-		}
-
-		app, err := app.Get(appDomain)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if err := app.WriteRecipeVersion(recipeVersion, false); err != nil {
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
-		}
 	},
 }
 
@@ -247,26 +168,26 @@ var AppNewCommand = &cobra.Command{
 type AppSecrets map[string]string
 
 // createSecrets creates all secrets for a new app.
-func createSecrets(cl *dockerClient.Client, secretsConfig map[string]secret.Secret, sanitisedAppName string) (AppSecrets, error) {
+func createSecrets(cl *dockerClient.Client, secretsConfig map[string]string, sanitisedAppName string) (AppSecrets, error) {
 	// NOTE(d1): trim to match app.StackName() implementation
-	if len(sanitisedAppName) > config.MAX_SANITISED_APP_NAME_LENGTH {
+	if len(sanitisedAppName) > 45 {
-		log.Debug(i18n.G("trimming %s to %s to avoid runtime limits", sanitisedAppName, sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]))
+		logrus.Debugf("trimming %s to %s to avoid runtime limits", sanitisedAppName, sanitisedAppName[:45])
-		sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]
+		sanitisedAppName = sanitisedAppName[:45]
 	}
 
-	secrets, err := secret.GenerateSecrets(cl, secretsConfig, newAppServer)
+	secrets, err := secret.GenerateSecrets(cl, secretsConfig, sanitisedAppName, internal.NewAppServer)
 	if err != nil {
 		return nil, err
 	}
 
-	if saveInPass {
+	if internal.Pass {
 		for secretName := range secrets {
 			secretValue := secrets[secretName]
 			if err := secret.PassInsertSecret(
 				secretValue,
 				secretName,
-				appDomain,
+				internal.Domain,
-				newAppServer,
+				internal.NewAppServer,
 			); err != nil {
 				return nil, err
 			}
@@ -277,36 +198,36 @@ func createSecrets(cl *dockerClient.Client, secretsConfig map[string]secret.Secr
 }
 
 // ensureDomainFlag checks if the domain flag was used. if not, asks the user for it/
-func ensureDomainFlag(recipe recipePkg.Recipe, server string) error {
+func ensureDomainFlag(recipe recipe.Recipe, server string) error {
-	if appDomain == "" && !internal.NoInput {
+	if internal.Domain == "" && !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 {
+		if err := survey.AskOne(prompt, &internal.Domain); err != nil {
 			return err
 		}
 	}
 
-	if appDomain == "" {
+	if internal.Domain == "" {
-		return errors.New(i18n.G("no domain provided"))
+		return fmt.Errorf("no domain provided")
 	}
 
 	return nil
 }
 
 // promptForSecrets asks if we should generate secrets for a new app.
-func promptForSecrets(recipeName string, secretsConfig map[string]secret.Secret) error {
+func promptForSecrets(recipeName string, secretsConfig map[string]string) error {
 	if len(secretsConfig) == 0 {
-		log.Debug(i18n.G("%s has no secrets to generate, skipping...", recipeName))
+		logrus.Debugf("%s has no secrets to generate, skipping...", recipeName)
 		return nil
 	}
 
-	if !generateSecrets && !internal.NoInput {
+	if !internal.Secrets && !internal.NoInput {
 		prompt := &survey.Confirm{
-			Message: i18n.G("Generate app secrets?"),
+			Message: "Generate app secrets?",
 		}
-		if err := survey.AskOne(prompt, &generateSecrets); err != nil {
+		if err := survey.AskOne(prompt, &internal.Secrets); err != nil {
 			return err
 		}
 	}
@@ -321,82 +242,19 @@ func ensureServerFlag() error {
 		return err
 	}
 
-	if len(servers) == 1 {
+	if internal.NewAppServer == "" && !internal.NoInput {
-		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 {
+		if err := survey.AskOne(prompt, &internal.NewAppServer); err != nil {
 			return err
 		}
 	}
 
-	if newAppServer == "" {
+	if internal.NewAppServer == "" {
-		return errors.New(i18n.G("no server provided"))
+		return fmt.Errorf("no server provided")
 	}
 
 	return nil
 }
-
-var (
-	newAppServer    string
-	appDomain       string
-	saveInPass      bool
-	generateSecrets bool
-)
-
-func init() {
-	AppNewCommand.Flags().StringVarP(
-		&newAppServer,
-		i18n.G("server"),
-		i18n.G("s"),
-		"",
-		i18n.G("specify server for new app"),
-	)
-
-	AppNewCommand.RegisterFlagCompletionFunc(
-		i18n.G("server"),
-		func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return autocomplete.ServerNameComplete()
-		},
-	)
-
-	AppNewCommand.Flags().StringVarP(
-		&appDomain,
-		i18n.G("domain"),
-		i18n.G("D"),
-		"",
-		i18n.G("domain name for app"),
-	)
-
-	AppNewCommand.Flags().BoolVarP(
-		&saveInPass,
-		i18n.G("pass"),
-		i18n.G("p"),
-		false,
-		i18n.G("store secrets in a local pass store"),
-	)
-
-	AppNewCommand.Flags().BoolVarP(
-		&generateSecrets,
-		i18n.G("secrets"),
-		i18n.G("S"),
-		false,
-		i18n.G("automatically generate secrets"),
-	)
-
-	AppNewCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-
-}

cli/app/ps.go

@@ -2,216 +2,100 @@ package app
 
 import (
 	"context"
-	"encoding/json"
-	"fmt"
-	"sort"
 	"strings"
+	"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/config"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
+	"coopcloud.tech/abra/pkg/service"
-	"coopcloud.tech/abra/pkg/log"
-	abraService "coopcloud.tech/abra/pkg/service"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
+	"github.com/buger/goterm"
 	dockerFormatter "github.com/docker/cli/cli/command/formatter"
-	containerTypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	dockerClient "github.com/docker/docker/client"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app ps` aliases. use a comma separated list of aliases
+var appPsCommand = cli.Command{
-// with no spaces in between
+	Name:        "ps",
-var appPsAliases = i18n.G("p")
+	Aliases:     []string{"p"},
-
+	Usage:       "Check app status",
-var AppPsCommand = &cobra.Command{
+	ArgsUsage:   "<domain>",
-	// translators: `app ps` command
+	Description: "Show a more detailed status output of a specific deployed app",
-	Use:     i18n.G("ps <domain> [flags]"),
+	Flags: []cli.Flag{
-	Aliases: strings.Split(appPsAliases, ","),
+		internal.WatchFlag,
-	// translators: Short description for `app ps` command
+		internal.DebugFlag,
-	Short: i18n.G("Check app deployment status"),
-	Args:  cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	BashComplete: autocomplete.AppNameComplete,
-
+	Action: func(c *cli.Context) error {
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		app := internal.ValidateApp(c)
-			log.Fatal(err)
-		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
+		isDeployed, _, err := stack.IsDeployed(context.Background(), cl, app.StackName())
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if !deployMeta.IsDeployed {
+		if !isDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
+			logrus.Fatalf("%s is not deployed?", app.Name)
 		}
 
-		chaosVersion := config.CHAOS_DEFAULT
+		if !internal.Watch {
-		statuses, err := appPkg.GetAppStatuses([]appPkg.App{app}, true)
+			showPSOutput(c, app, cl)
-		if statusMeta, ok := statuses[app.StackName()]; ok {
+			return nil
-			if isChaos, exists := statusMeta["chaos"]; exists && isChaos == "true" {
-				if cVersion, exists := statusMeta["chaosVersion"]; exists {
-					chaosVersion = cVersion
-					if strings.HasSuffix(chaosVersion, config.DIRTY_DEFAULT) {
-						chaosVersion = formatter.BoldDirtyDefault(chaosVersion)
-					}
-				}
-			}
 		}
 
-		showPSOutput(app, cl, deployMeta.Version, chaosVersion)
+		goterm.Clear()
+		for {
+			goterm.MoveCursor(1, 1)
+			showPSOutput(c, app, cl)
+			goterm.Flush()
+			time.Sleep(2 * time.Second)
+		}
 	},
 }
 
 // showPSOutput renders ps output.
-func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chaosVersion string) {
+func showPSOutput(c *cli.Context, app config.App, cl *dockerClient.Client) {
-	composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
+	filters, err := app.Filters(true, true)
 	if err != nil {
-		log.Fatal(err)
+		logrus.Fatal(err)
-		return
 	}
 
-	deployOpts := stack.Deploy{
+	containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters})
-		Composefiles: composeFiles,
-		Namespace:    app.StackName(),
-		Prune:        false,
-		ResolveImage: stack.ResolveImageAlways,
-	}
-	compose, err := appPkg.GetAppComposeConfig(app.Name, deployOpts, app.Env)
 	if err != nil {
-		log.Fatal(err)
+		logrus.Fatal(err)
-		return
 	}
 
-	services := compose.Services
+	tableCol := []string{"service name", "image", "created", "status", "state", "ports"}
-	sort.Slice(services, func(i, j int) bool {
+	table := formatter.CreateTable(tableCol)
-		return services[i].Name < services[j].Name
-	})
 
-	var rows [][]string
+	for _, container := range containers {
-	allContainerStats := make(map[string]map[string]string)
+		var containerNames []string
-	for _, service := range services {
+		for _, containerName := range container.Names {
-		filters := filters.NewArgs()
+			trimmed := strings.TrimPrefix(containerName, "/")
-		filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service.Name))
+			containerNames = append(containerNames, trimmed)
-
-		containers, err := cl.ContainerList(context.Background(), containerTypes.ListOptions{Filters: filters})
-		if err != nil {
-			log.Fatal(err)
-			return
 		}
 
-		var containerStats map[string]string
+		tableRow := []string{
-		if len(containers) == 0 {
+			service.ContainerToServiceName(container.Names, app.StackName()),
-			containerStats = map[string]string{
+			formatter.RemoveSha(container.Image),
-				"version": deployedVersion,
+			formatter.HumanDuration(container.Created),
-				"chaos":   chaosVersion,
+			container.Status,
-				"service": service.Name,
+			container.State,
-				"image":   i18n.G("unknown"),
+			dockerFormatter.DisplayablePorts(container.Ports),
-				"created": i18n.G("unknown"),
-				"status":  i18n.G("unknown"),
-				"state":   i18n.G("unknown"),
-				"ports":   i18n.G("unknown"),
-			}
-		} else {
-			container := containers[0]
-			containerStats = map[string]string{
-				"version": deployedVersion,
-				"chaos":   chaosVersion,
-				"service": abraService.ContainerToServiceName(container.Names, app.StackName()),
-				"image":   formatter.RemoveSha(container.Image),
-				"created": formatter.HumanDuration(container.Created),
-				"status":  container.Status,
-				"state":   container.State,
-				"ports":   dockerFormatter.DisplayablePorts(container.Ports),
-			}
 		}
-
+		table.Append(tableRow)
-		allContainerStats[containerStats["service"]] = containerStats
-
-		// NOTE(d1): don't clobber these variables for --machine output
-		dVersion := deployedVersion
-		cVersion := chaosVersion
-
-		if containerStats["service"] != "app" {
-			// NOTE(d1): don't repeat info which only relevant for the "app" service
-			dVersion = ""
-			cVersion = ""
-		}
-
-		row := []string{
-			containerStats["service"],
-			containerStats["status"],
-			containerStats["image"],
-			dVersion,
-			cVersion,
-		}
-
-		rows = append(rows, row)
 	}
 
-	if internal.MachineReadable {
+	table.Render()
-		rendered, err := json.Marshal(allContainerStats)
-		if err != nil {
-			log.Fatal(i18n.G("unable to convert to JSON: %s", err))
-		}
-
-		fmt.Println(string(rendered))
-
-		return
-	}
-
-	table, err := formatter.CreateTable()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	headers := []string{
-		i18n.G("SERVICE"),
-		i18n.G("STATUS"),
-		i18n.G("IMAGE"),
-		i18n.G("VERSION"),
-		i18n.G("CHAOS"),
-	}
-
-	table.
-		Headers(headers...).
-		Rows(rows...)
-
-	if err := formatter.PrintTable(table); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func init() {
-	AppPsCommand.Flags().BoolVarP(
-		&internal.MachineReadable,
-		i18n.G("machine"),
-		i18n.G("m"),
-		false,
-		i18n.G("print machine-readable output"),
-	)
-
-	AppPsCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
 }

cli/app/remove.go

@@ -2,31 +2,27 @@ package app
 
 import (
 	"context"
+	"fmt"
 	"os"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/i18n"
+	stack "coopcloud.tech/abra/pkg/upstream/stack"
-	"coopcloud.tech/abra/pkg/log"
-	"coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/docker/docker/api/types"
-	"github.com/spf13/cobra"
+	"github.com/docker/docker/api/types/volume"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app remove` aliases. use a comma separated list of aliases with
+var appRemoveCommand = cli.Command{
-// no spaces in between
+	Name:      "remove",
-var appRemoveAliases = i18n.G("rm")
+	Aliases:   []string{"rm"},
-
+	ArgsUsage: "<domain>",
-var AppRemoveCommand = &cobra.Command{
+	Usage:     "Remove all app data, locally and remotely",
-	// translators: `app remove` command
+	Description: `
-	Use:     i18n.G("remove <domain> [flags]"),
+This command removes everything related to an app which is already undeployed.
-	Aliases: strings.Split(appRemoveAliases, ","),
-	// translators: Short description for `app remove` command
-	Short: i18n.G("Remove all app data, locally and remotely"),
-	Long: i18n.G(`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.
@@ -41,69 +37,52 @@ 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"),
+`,
-	Args:    cobra.ExactArgs(1),
+	Flags: []cli.Flag{
-	ValidArgsFunction: func(
+		internal.ForceFlag,
-		cmd *cobra.Command,
+		internal.DebugFlag,
-		args []string,
+		internal.NoInputFlag,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
+		internal.OfflineFlag,
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	BashComplete: autocomplete.AppNameComplete,
-		app := internal.ValidateApp(args)
+	Before:       internal.SubCommandBefore,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
 
 		if !internal.Force && !internal.NoInput {
-			log.Warn(i18n.G("ALERTA ALERTA: deleting %s data and config (local/remote)", app.Name))
-
 			response := false
-			prompt := &survey.Confirm{Message: i18n.G("are you sure?")}
+			msg := "ALERTA ALERTA: this will completely remove %s data and configurations locally and remotely, are you sure?"
+			prompt := &survey.Confirm{Message: fmt.Sprintf(msg, app.Name)}
 			if err := survey.AskOne(prompt, &response); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
-
 			if !response {
-				log.Fatal(i18n.G("aborting as requested"))
+				logrus.Fatal("aborting as requested")
 			}
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
+		isDeployed, _, err := stack.IsDeployed(context.Background(), cl, app.StackName())
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
-		if deployMeta.IsDeployed {
+		if isDeployed {
-			log.Fatal(i18n.G("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name))
+			logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
 		}
 
 		fs, err := app.Filters(false, false)
 		if err != nil {
-			log.Fatal(err)
+			logrus.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)
+			logrus.Fatal(err)
 		}
 
 		secrets := make(map[string]string)
@@ -118,50 +97,49 @@ flag.`),
 			for _, name := range secretNames {
 				err := cl.SecretRemove(context.Background(), secrets[name])
 				if err != nil {
-					log.Fatal(err)
+					logrus.Fatal(err)
 				}
-				log.Info(i18n.G("secret: %s removed", name))
+				logrus.Info(fmt.Sprintf("secret: %s removed", name))
 			}
 		} else {
-			log.Info(i18n.G("no secrets to remove"))
+			logrus.Info("no secrets to remove")
 		}
 
 		fs, err = app.Filters(false, true)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		volumeList, err := client.GetVolumes(cl, context.Background(), app.Server, fs)
+		volumeListOptions := volume.ListOptions{fs}
+		volumeListOKBody, err := cl.VolumeList(context.Background(), volumeListOptions)
+		volumeList := volumeListOKBody.Volumes
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
-		volumeNames := client.GetVolumeNames(volumeList)
 
-		if len(volumeNames) > 0 {
+		var vols []string
-			err := client.RemoveVolumes(cl, context.Background(), volumeNames, internal.Force, 5)
+		for _, vol := range volumeList {
-			if err != nil {
+			vols = append(vols, vol.Name)
-				log.Fatal(i18n.G("removing volumes failed: %s", err))
+		}
+
+		if len(vols) > 0 {
+			for _, vol := range vols {
+				err := cl.VolumeRemove(context.Background(), vol, internal.Force) // last argument is for force removing
+				if err != nil {
+					logrus.Fatal(err)
+				}
+				logrus.Info(fmt.Sprintf("volume %s removed", vol))
 			}
-
-			log.Info(i18n.G("%d volume(s) removed successfully", len(volumeNames)))
 		} else {
-			log.Info(i18n.G("no volumes to remove"))
+			logrus.Info("no volumes to remove")
 		}
 
 		if err = os.Remove(app.Path); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		log.Info(i18n.G("file: %s removed", app.Path))
+		logrus.Info(fmt.Sprintf("file: %s removed", app.Path))
+
+		return nil
 	},
 }
-
-func init() {
-	AppRemoveCommand.Flags().BoolVarP(
-		&internal.Force,
-		i18n.G("force"),
-		i18n.G("f"),
-		false,
-		i18n.G("perform action without further prompt"),
-	)
-}

cli/app/restart.go

@@ -2,172 +2,79 @@ package app
 
 import (
 	"context"
+	"errors"
 	"fmt"
-	"strings"
 
 	"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/ui"
 	upstream "coopcloud.tech/abra/pkg/upstream/service"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
-	"github.com/docker/docker/api/types"
+	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app restart` aliases. use a comma separated list of aliases with
+var appRestartCommand = cli.Command{
-// no spaces in between
+	Name:      "restart",
-var appRestartAliases = i18n.G("re")
+	Aliases:   []string{"re"},
-
+	Usage:     "Restart an app",
-var AppRestartCommand = &cobra.Command{
+	ArgsUsage: "<domain>",
-	// translators: `app restart` command
+	Flags: []cli.Flag{
-	Use:     i18n.G("restart <domain> [[service] | --all-services] [flags]"),
+		internal.DebugFlag,
-	Aliases: strings.Split(appRestartAliases, ","),
+		internal.OfflineFlag,
-	// translators: Short description for `app restart` command
-	Short: i18n.G("Restart an app"),
-	Long: i18n.G(`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.`),
-	Example: i18n.G(`  # restart a single app service
-  abra app restart 1312.net app
-
-  # restart all app services
-  abra app restart 1312.net -a`),
-	Args: cobra.RangeArgs(1, 2),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		case 1:
-			if !allServices {
-				return autocomplete.ServiceNameComplete(args[0])
-			}
-			return nil, cobra.ShellCompDirectiveDefault
-		default:
-			return nil, cobra.ShellCompDirectiveError
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	Description:  `This command restarts a service within a deployed app.`,
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		serviceNameShort := c.Args().Get(1)
-			log.Fatal(err)
+		if serviceNameShort == "" {
-		}
+			err := errors.New("missing service?")
-
+			internal.ShowSubcommandHelpAndError(c, err)
-		var serviceName string
-		if len(args) == 2 {
-			serviceName = args[1]
-		}
-
-		if serviceName == "" && !allServices {
-			log.Fatal(i18n.G("missing [service]"))
-		}
-
-		if serviceName != "" && allServices {
-			log.Fatal(i18n.G("cannot use [service] and --all-services/-a together"))
-		}
-
-		var serviceNames []string
-		if allServices {
-			var err error
-			serviceNames, err = appPkg.GetAppServiceNames(app.Name)
-			if err != nil {
-				log.Fatal(err)
-			}
-		} else {
-			serviceNames = append(serviceNames, serviceName)
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
+		isDeployed, _, err := stack.IsDeployed(context.Background(), cl, app.StackName())
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if !deployMeta.IsDeployed {
+		if !isDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
+			logrus.Fatalf("%s is not deployed?", app.Name)
 		}
 
-		for _, serviceName := range serviceNames {
+		serviceName := fmt.Sprintf("%s_%s", app.StackName(), serviceNameShort)
-			stackServiceName := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
 
-			service, _, err := cl.ServiceInspectWithRaw(
+		logrus.Debugf("attempting to scale %s to 0 (restart logic)", serviceName)
-				context.Background(),
+		if err := upstream.RunServiceScale(context.Background(), cl, serviceName, 0); err != nil {
-				stackServiceName,
+			logrus.Fatal(err)
-				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 != nil {
-				log.Fatal(err)
-			}
-
-			waitOpts := stack.WaitOpts{
-				Services:   []ui.ServiceMeta{{Name: stackServiceName, ID: service.ID}},
-				AppName:    app.Name,
-				ServerName: app.Server,
-				Filters:    f,
-				NoLog:      true,
-				Quiet:      true,
-			}
-
-			if err := stack.WaitOnServices(cmd.Context(), cl, waitOpts); err != nil {
-				log.Fatal(err)
-			}
-
-			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 {
-				log.Fatal(err)
-			}
-
-			log.Debug(i18n.G("%s has been scaled to 1", stackServiceName))
-			log.Info(i18n.G("%s service successfully restarted", serviceName))
 		}
+
+		if err := stack.WaitOnService(context.Background(), cl, serviceName, app.Name); err != nil {
+			logrus.Fatal(err)
+		}
+
+		logrus.Debugf("%s has been scaled to 0 (restart logic)", serviceName)
+
+		logrus.Debugf("attempting to scale %s to 1 (restart logic)", serviceName)
+		if err := upstream.RunServiceScale(context.Background(), cl, serviceName, 1); err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := stack.WaitOnService(context.Background(), cl, serviceName, app.Name); err != nil {
+			logrus.Fatal(err)
+		}
+
+		logrus.Debugf("%s has been scaled to 1 (restart logic)", serviceName)
+
+		logrus.Infof("%s service successfully restarted", serviceNameShort)
+
+		return nil
 	},
 }
-
-var allServices bool
-
-func init() {
-	AppRestartCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-	AppRestartCommand.Flags().BoolVarP(
-		&allServices,
-		i18n.G("all-services"),
-		i18n.GC("a", "app restart"),
-		false,
-		i18n.G("restart all services"),
-	)
-}

cli/app/restore.go

@@ -1,142 +1,223 @@
 package app
 
 import (
+	"context"
+	"errors"
 	"fmt"
-	"strings"
+	"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/config"
-	"coopcloud.tech/abra/pkg/log"
+	containerPkg "coopcloud.tech/abra/pkg/container"
-	"github.com/spf13/cobra"
+	"coopcloud.tech/abra/pkg/recipe"
+	recipePkg "coopcloud.tech/abra/pkg/recipe"
+	"coopcloud.tech/abra/pkg/upstream/container"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
+	dockerClient "github.com/docker/docker/client"
+	"github.com/docker/docker/pkg/archive"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app restore` aliases. use a comma separated list of
+type restoreConfig struct {
-// aliases with no spaces in between
+	preHookCmd  string
-var appRestoreAliases = i18n.G("rs")
+	postHookCmd string
+}
 
-var AppRestoreCommand = &cobra.Command{
+var appRestoreCommand = cli.Command{
-	// translators: `app restore` command
+	Name:      "restore",
-	Use:     i18n.G("restore <domain> [flags]"),
+	Aliases:   []string{"rs"},
-	Aliases: strings.Split(appRestoreAliases, ","),
+	Usage:     "Run app restore",
-	// translators: Short description for `app restore` command
+	ArgsUsage: "<domain> <service> <file>",
-	Short: i18n.G("Restore a snapshot"),
+	Flags: []cli.Flag{
-	Long: i18n.G(`Snapshots are restored while apps are deployed.
+		internal.DebugFlag,
-
+		internal.OfflineFlag,
-Some restore scenarios may require service / app restarts.`),
+		internal.ChaosFlag,
-	Args: cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	BashComplete: autocomplete.AppNameComplete,
+	Description: `
+Run an app restore.
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+Pre/post hook commands are defined in the recipe configuration. Abra reads this
-			log.Fatal(err)
+configuration and run the comands in the context of the service before
+restoring the backup.
+
+Unlike "abra app backup", restore must be run on a per-service basis. You can
+not restore all services in one go. Backup files produced by Abra are
+compressed archives which use absolute paths. This allows Abra to restore
+according to standard tar command logic, i.e. the backup will be restored to
+the path it was originally backed up from.
+
+Example:
+
+    abra app restore example.com app ~/.abra/backups/example_com_app_609341138.tar.gz
+`,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+
+		recipe, err := recipe.Get(app.Recipe, internal.Offline)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if !internal.Chaos {
+			if err := recipePkg.EnsureIsClean(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+
+			if !internal.Offline {
+				if err := recipePkg.EnsureUpToDate(app.Recipe); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+
+			if err := recipePkg.EnsureLatest(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		serviceName := c.Args().Get(1)
+		if serviceName == "" {
+			internal.ShowSubcommandHelpAndError(c, errors.New("missing <service>?"))
+		}
+
+		backupPath := c.Args().Get(2)
+		if backupPath == "" {
+			internal.ShowSubcommandHelpAndError(c, errors.New("missing <file>?"))
+		}
+
+		if _, err := os.Stat(backupPath); err != nil {
+			if os.IsNotExist(err) {
+				logrus.Fatalf("%s doesn't exist?", backupPath)
+			}
+		}
+
+		restoreConfigs := make(map[string]restoreConfig)
+		for _, service := range recipe.Config.Services {
+			if restoreEnabled, ok := service.Deploy.Labels["backupbot.restore"]; ok {
+				if restoreEnabled == "true" {
+					fullServiceName := fmt.Sprintf("%s_%s", app.StackName(), service.Name)
+					rsConfig := restoreConfig{}
+
+					logrus.Debugf("restore config detected for %s", fullServiceName)
+
+					if preHookCmd, ok := service.Deploy.Labels["backupbot.restore.pre-hook"]; ok {
+						logrus.Debugf("detected pre-hook command for %s: %s", fullServiceName, preHookCmd)
+						rsConfig.preHookCmd = preHookCmd
+					}
+
+					if postHookCmd, ok := service.Deploy.Labels["backupbot.restore.post-hook"]; ok {
+						logrus.Debugf("detected post-hook command for %s: %s", fullServiceName, postHookCmd)
+						rsConfig.postHookCmd = postHookCmd
+					}
+
+					restoreConfigs[service.Name] = rsConfig
+				}
+			}
+		}
+
+		rsConfig, ok := restoreConfigs[serviceName]
+		if !ok {
+			rsConfig = restoreConfig{}
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		targetContainer, err := internal.RetrieveBackupBotContainer(cl)
+		if err := runRestore(cl, app, backupPath, serviceName, rsConfig); err != nil {
-		if err != nil {
+			logrus.Fatal(err)
-			log.Fatal(err)
 		}
 
-		execEnv := []string{
+		return nil
-			fmt.Sprintf("SERVICE=%s", app.Domain),
-			"MACHINE_LOGS=true",
-		}
-
-		if snapshot != "" {
-			log.Debug(i18n.G("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))
-			execEnv = append(execEnv, fmt.Sprintf("TARGET=%s", targetPath))
-		}
-
-		if internal.NoInput {
-			log.Debug(i18n.G("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))
-			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))
-			execEnv = append(execEnv, fmt.Sprintf("CONTAINER=%s", allServices))
-		}
-
-		if hooks {
-			log.Debug(i18n.G("including NO_COMMANDS=%v in backupbot exec invocation", false))
-			execEnv = append(execEnv, fmt.Sprintf("NO_COMMANDS=%v", false))
-		}
-
-		if _, err := internal.RunBackupCmdRemote(cl, "restore", targetContainer.ID, execEnv); err != nil {
-			log.Fatal(err)
-		}
 	},
 }
 
-var (
+// runRestore does the actual restore logic.
-	targetPath string
+func runRestore(cl *dockerClient.Client, app config.App, backupPath, serviceName string, rsConfig restoreConfig) error {
-	hooks      bool
+	// FIXME: avoid instantiating a new CLI
-	services   []string
+	dcli, err := command.NewDockerCli()
-	volumes    []string
+	if err != nil {
-)
+		return err
+	}
 
-func init() {
+	filters := filters.NewArgs()
-	AppRestoreCommand.Flags().StringVarP(
+	filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName))
-		&targetPath,
-		i18n.G("target"),
-		i18n.G("t"),
-		"/",
-		i18n.G("target path"),
-	)
 
-	AppRestoreCommand.Flags().StringArrayVarP(
+	targetContainer, err := containerPkg.GetContainer(context.Background(), cl, filters, true)
-		&services,
+	if err != nil {
-		i18n.G("services"),
+		return err
-		i18n.G("s"),
+	}
-		[]string{},
-		i18n.G("restore specific services"),
-	)
 
-	AppRestoreCommand.Flags().StringArrayVarP(
+	fullServiceName := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
-		&volumes,
+	if rsConfig.preHookCmd != "" {
-		i18n.G("volumes"),
+		splitCmd := internal.SafeSplit(rsConfig.preHookCmd)
-		i18n.G("v"),
-		[]string{},
-		i18n.G("restore specific volumes"),
-	)
 
-	AppRestoreCommand.Flags().BoolVarP(
+		logrus.Debugf("split pre-hook command for %s into %s", fullServiceName, splitCmd)
-		&hooks,
-		i18n.G("hooks"),
-		i18n.G("H"),
-		false,
-		i18n.G("enable pre/post-hook command execution"),
-	)
 
-	AppRestoreCommand.Flags().BoolVarP(
+		preHookExecOpts := types.ExecConfig{
-		&internal.Chaos,
+			AttachStderr: true,
-		i18n.G("chaos"),
+			AttachStdin:  true,
-		i18n.G("C"),
+			AttachStdout: true,
-		false,
+			Cmd:          splitCmd,
-		i18n.G("ignore uncommitted recipes changes"),
+			Detach:       false,
-	)
+			Tty:          true,
+		}
+
+		if err := container.RunExec(dcli, cl, targetContainer.ID, &preHookExecOpts); err != nil {
+			return err
+		}
+
+		logrus.Infof("succesfully ran %s pre-hook command: %s", fullServiceName, rsConfig.preHookCmd)
+	}
+
+	backupReader, err := os.Open(backupPath)
+	if err != nil {
+		return err
+	}
+
+	content, err := archive.DecompressStream(backupReader)
+	if err != nil {
+		return err
+	}
+
+	// NOTE(d1): we use absolute paths so tar knows what to do. it will restore
+	// files according to the paths set in the compressed archive
+	restorePath := "/"
+
+	copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
+	if err := cl.CopyToContainer(context.Background(), targetContainer.ID, restorePath, content, copyOpts); err != nil {
+		return err
+	}
+
+	logrus.Infof("restored %s to %s", backupPath, fullServiceName)
+
+	if rsConfig.postHookCmd != "" {
+		splitCmd := internal.SafeSplit(rsConfig.postHookCmd)
+
+		logrus.Debugf("split post-hook command for %s into %s", fullServiceName, splitCmd)
+
+		postHookExecOpts := types.ExecConfig{
+			AttachStderr: true,
+			AttachStdin:  true,
+			AttachStdout: true,
+			Cmd:          splitCmd,
+			Detach:       false,
+			Tty:          true,
+		}
+
+		if err := container.RunExec(dcli, cl, targetContainer.ID, &postHookExecOpts); err != nil {
+			return err
+		}
+
+		logrus.Infof("succesfully ran %s post-hook command: %s", fullServiceName, rsConfig.postHookCmd)
+	}
+
+	return nil
 }

cli/app/rollback.go

@@ -1,377 +1,240 @@
 package app
 
 import (
-	"errors"
+	"context"
-	"strings"
+	"fmt"
 
-	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/deploy"
-	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/lint"
+	"coopcloud.tech/abra/pkg/recipe"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"coopcloud.tech/tagcmp"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/log"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app rollback` aliases. use a comma separated list of
+var appRollbackCommand = cli.Command{
-// aliases with no spaces in between
+	Name:      "rollback",
-var appRollbackAliases = i18n.G("rl")
+	Aliases:   []string{"rl"},
-
+	Usage:     "Roll an app back to a previous version",
-var AppRollbackCommand = &cobra.Command{
+	ArgsUsage: "<domain> [<version>]",
-	// translators: `app rollback` command
+	Flags: []cli.Flag{
-	Use:     i18n.G("rollback <domain> [version] [flags]"),
+		internal.DebugFlag,
-	Aliases: strings.Split(appRollbackAliases, ","),
+		internal.NoInputFlag,
-	// translators: Short description for `app rollback` command
+		internal.ForceFlag,
-	Short: i18n.G("Roll an app back to a previous version"),
+		internal.ChaosFlag,
-	Long: i18n.G(`This command rolls an app back to a previous version.
+		internal.NoDomainChecksFlag,
-
+		internal.DontWaitConvergeFlag,
-Unlike "abra app deploy", chaos operations are not supported here. Only recipe
+		internal.OfflineFlag,
-versions are supported values for "[version]".
-
-It is possible to "--force/-f" an downgrade if you want to re-deploy a specific
-version.
-
-Only the deployed version is consulted when trying to determine what downgrades
-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.`),
-	Example: i18n.G(` # standard rollback
-  abra app rollback 1312.net
-
-  # rollback to specific version
-  abra app rollback 1312.net 2.0.0+1.2.3`),
-	Args: cobra.RangeArgs(1, 2),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		case 1:
-			app, err := appPkg.Get(args[0])
-			if err != nil {
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
-			}
-			return autocomplete.RecipeVersionComplete(app.Recipe.Name)
-		default:
-			return nil, cobra.ShellCompDirectiveError
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before: internal.SubCommandBefore,
-		var (
+	Description: `
-			downgradeWarnMessages []string
+This command rolls an app back to a previous version if one exists.
-			chosenDowngrade       string
-			availableDowngrades   []string
-		)
 
-		app := internal.ValidateApp(args)
+You may pass "--force/-f" to downgrade to the same version again. This can be
+useful if the container runtime has gotten into a weird state.
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+This action could be destructive, please ensure you have a copy of your app
-			log.Fatal(err)
+data beforehand.
+
+Chaos mode ("--chaos") will deploy your local checkout of a recipe as-is,
+including unstaged changes and can be useful for live hacking and testing new
+recipes.
+`,
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+		stackName := app.StackName()
+
+		specificVersion := c.Args().Get(1)
+		if specificVersion != "" && internal.Chaos {
+			logrus.Fatal("cannot use <version> and --chaos together")
+		}
+
+		if err := recipe.EnsureExists(app.Recipe); err != nil {
+			logrus.Fatal(err)
+		}
+
+		if !internal.Chaos {
+			if err := recipe.EnsureIsClean(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+
+			if !internal.Offline {
+				if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+
+			if err := recipe.EnsureLatest(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		r, err := recipe.Get(app.Recipe, internal.Offline)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := lint.LintForErrors(r); err != nil {
+			logrus.Fatal(err)
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		deployMeta, err := ensureDeployed(cl, app)
+		logrus.Debugf("checking whether %s is already deployed", stackName)
+
+		isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if err := lint.LintForErrors(app.Recipe); err != nil {
+		if !isDeployed {
-			log.Fatal(err)
+			logrus.Fatalf("%s is not deployed?", app.Name)
 		}
 
-		versions, err := app.Recipe.Tags()
+		catl, err := recipe.ReadRecipeCatalogue(internal.Offline)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		// NOTE(d1): we've no idea what the live deployment version is, so every
+		versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
-		// possible downgrade can be shown. it's up to the user to make the choice
+		if err != nil {
-		if deployMeta.Version == config.UNKNOWN_DEFAULT {
+			logrus.Fatal(err)
-			availableDowngrades = versions
 		}
 
-		if len(args) == 2 && args[1] != "" {
+		if len(versions) == 0 && !internal.Chaos {
-			chosenDowngrade = args[1]
+			logrus.Warn("no published versions in catalogue, trying local recipe repository")
-
+			recipeVersions, err := recipe.GetRecipeVersions(app.Recipe, internal.Offline)
-			if err := validateDowngradeVersionArg(chosenDowngrade, app, deployMeta); err != nil {
-				log.Fatal(err)
-			}
-
-			availableDowngrades = append(availableDowngrades, chosenDowngrade)
-		}
-
-		if deployMeta.Version != config.UNKNOWN_DEFAULT && chosenDowngrade == "" {
-			downgradeAvailable, err := ensureDowngradesAvailable(versions, &availableDowngrades, deployMeta)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Warn(err)
 			}
-
+			for _, recipeVersion := range recipeVersions {
-			if !downgradeAvailable {
+				for version := range recipeVersion {
-				log.Info(i18n.G("no available downgrades"))
+					versions = append(versions, version)
-				return
+				}
 			}
 		}
 
-		if internal.Force || internal.NoInput || chosenDowngrade != "" {
+		var availableDowngrades []string
-			if len(availableDowngrades) > 0 {
+		if deployedVersion == "unknown" {
+			availableDowngrades = versions
+			logrus.Warnf("failed to determine deployed version of %s", app.Name)
+		}
+
+		if specificVersion != "" {
+			parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			if parsedSpecificVersion.IsGreaterThan(parsedDeployedVersion) || parsedSpecificVersion.Equals(parsedDeployedVersion) {
+				logrus.Fatalf("%s is not a downgrade for %s?", deployedVersion, specificVersion)
+			}
+			availableDowngrades = append(availableDowngrades, specificVersion)
+		}
+
+		if deployedVersion != "unknown" && !internal.Chaos && specificVersion == "" {
+			for _, version := range versions {
+				parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
+				if err != nil {
+					logrus.Fatal(err)
+				}
+				parsedVersion, err := tagcmp.Parse(version)
+				if err != nil {
+					logrus.Fatal(err)
+				}
+				if parsedVersion.IsLessThan(parsedDeployedVersion) && !(parsedVersion.Equals(parsedDeployedVersion)) {
+					availableDowngrades = append(availableDowngrades, version)
+				}
+			}
+
+			if len(availableDowngrades) == 0 && !internal.Force {
+				logrus.Info("no available downgrades, you're on oldest ✌️")
+				return nil
+			}
+		}
+
+		var chosenDowngrade string
+		if len(availableDowngrades) > 0 && !internal.Chaos {
+			if internal.Force || internal.NoInput || specificVersion != "" {
 				chosenDowngrade = availableDowngrades[len(availableDowngrades)-1]
-			}
+				logrus.Debugf("choosing %s as version to downgrade to (--force/--no-input)", chosenDowngrade)
-		} else {
+			} else {
-			if err := chooseDowngrade(availableDowngrades, deployMeta, &chosenDowngrade); err != nil {
+				prompt := &survey.Select{
-				log.Fatal(err)
+					Message: fmt.Sprintf("Please select a downgrade (current version: %s):", deployedVersion),
+					Options: internal.ReverseStringList(availableDowngrades),
+				}
+				if err := survey.AskOne(prompt, &chosenDowngrade); err != nil {
+					return err
+				}
 			}
 		}
 
-		if internal.Force &&
+		if !internal.Chaos {
-			chosenDowngrade == "" &&
+			if err := recipe.EnsureVersion(app.Recipe, chosenDowngrade); err != nil {
-			deployMeta.Version != config.UNKNOWN_DEFAULT {
+				logrus.Fatal(err)
-			chosenDowngrade = deployMeta.Version
+			}
 		}
 
-		if chosenDowngrade == "" {
+		if internal.Chaos {
-			log.Fatal(i18n.G("unknown deployed version, unable to downgrade"))
+			logrus.Warn("chaos mode engaged")
+			var err error
+			chosenDowngrade, err = recipe.ChaosVersion(app.Recipe)
+			if err != nil {
+				logrus.Fatal(err)
+			}
 		}
 
-		log.Debug(i18n.G("choosing %s as version to rollback", chosenDowngrade))
+		abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
-
+		abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
-		if _, err := app.Recipe.EnsureVersion(chosenDowngrade); err != nil {
-			log.Fatal(err)
-		}
-
-		if err := deploy.MergeAbraShEnv(app.Recipe, app.Env); err != nil {
-			log.Fatal(err)
-		}
-
-		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
+		}
+		for k, v := range abraShEnv {
+			app.Env[k] = v
 		}
 
-		stackName := app.StackName()
+		composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
+		if err != nil {
+			logrus.Fatal(err)
+		}
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    stackName,
 			Prune:        false,
 			ResolveImage: stack.ResolveImageAlways,
-			Detach:       false,
 		}
-
+		compose, err := config.GetAppComposeConfig(app.Name, deployOpts, app.Env)
-		compose, err := appPkg.GetAppComposeConfig(app.Name, deployOpts, app.Env)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
-		}
-
-		appPkg.ExposeAllEnv(stackName, compose, app.Env)
-		appPkg.SetRecipeLabel(compose, stackName, app.Recipe.Name)
-		appPkg.SetChaosLabel(compose, stackName, internal.Chaos)
-		if internal.Chaos {
-			appPkg.SetChaosVersionLabel(compose, stackName, chosenDowngrade)
-		}
-
-		// Gather secrets
-		secretInfo, err := deploy.GatherSecretsForDeploy(cl, app, internal.ShowUnchanged)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		// Gather configs
-		configInfo, err := deploy.GatherConfigsForDeploy(cl, app, compose, app.Env, internal.ShowUnchanged)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		// Gather images
-		imageInfo, err := deploy.GatherImagesForDeploy(cl, app, compose, internal.ShowUnchanged)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		deployedVersion := deployMeta.Version
-		if deployMeta.IsChaos {
-			deployedVersion = deployMeta.ChaosVersion
 		}
+		config.ExposeAllEnv(stackName, compose, app.Env)
+		config.SetRecipeLabel(compose, stackName, app.Recipe)
+		config.SetChaosLabel(compose, stackName, internal.Chaos)
+		config.SetChaosVersionLabel(compose, stackName, chosenDowngrade)
+		config.SetUpdateLabel(compose, stackName, app.Env)
 
 		// NOTE(d1): no release notes implemeneted for rolling back
-		if err := internal.DeployOverview(
+		if err := internal.NewVersionOverview(app, deployedVersion, chosenDowngrade, ""); err != nil {
-			app,
+			logrus.Fatal(err)
-			deployedVersion,
-			chosenDowngrade,
-			"",
-			downgradeWarnMessages,
-			secretInfo,
-			configInfo,
-			imageInfo,
-		); err != nil {
-			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 {
+			logrus.Fatal(err)
-			log.Fatal(err)
 		}
 
-		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
+		return 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)
-		}
-
-		if err := app.WriteRecipeVersion(chosenDowngrade, false); err != nil {
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
-		}
 	},
 }
-
-// chooseDowngrade prompts the user to choose an downgrade interactively.
-func chooseDowngrade(
-	availableDowngrades []string,
-	deployMeta stack.DeployMeta,
-	chosenDowngrade *string,
-) error {
-	msg := i18n.G("please select a downgrade (version: %s):", deployMeta.Version)
-
-	if deployMeta.IsChaos {
-		chaosVersion := formatter.BoldDirtyDefault(deployMeta.ChaosVersion)
-
-		msg = i18n.G(
-			"please select a downgrade (version: %s, chaos: %s):",
-			deployMeta.Version,
-			chaosVersion,
-		)
-	}
-
-	prompt := &survey.Select{
-		Message: msg,
-		Options: internal.SortVersionsDesc(availableDowngrades),
-	}
-
-	if err := survey.AskOne(prompt, chosenDowngrade); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// validateDownpgradeVersionArg validates the specific version.
-func validateDowngradeVersionArg(
-	specificVersion string,
-	app appPkg.App,
-	deployMeta stack.DeployMeta,
-) 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))
-	}
-
-	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))
-	}
-
-	if parsedSpecificVersion.IsGreaterThan(parsedDeployedVersion) &&
-		!parsedSpecificVersion.Equals(parsedDeployedVersion) {
-		return errors.New(i18n.G("%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 nil
-}
-
-// ensureDowngradesAvailable ensures that there are available downgrades.
-func ensureDowngradesAvailable(
-	versions []string,
-	availableDowngrades *[]string,
-	deployMeta stack.DeployMeta,
-) (bool, error) {
-	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
-	if err != nil {
-		return false, err
-	}
-
-	for _, version := range versions {
-		parsedVersion, err := tagcmp.Parse(version)
-		if err != nil {
-			return false, err
-		}
-
-		if parsedVersion.IsLessThan(parsedDeployedVersion) &&
-			!(parsedVersion.Equals(parsedDeployedVersion)) {
-			*availableDowngrades = append(*availableDowngrades, version)
-		}
-	}
-
-	if len(*availableDowngrades) == 0 && !internal.Force {
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func init() {
-	AppRollbackCommand.Flags().BoolVarP(
-		&internal.Force,
-		i18n.G("force"),
-		i18n.G("f"),
-		false,
-		i18n.G("perform action without further prompt"),
-	)
-
-	AppRollbackCommand.Flags().BoolVarP(
-		&internal.NoDomainChecks,
-		i18n.G("no-domain-checks"),
-		i18n.G("D"),
-		false,
-		i18n.G("disable public DNS checks"),
-	)
-
-	AppRollbackCommand.Flags().BoolVarP(
-		&internal.DontWaitConverge,
-		i18n.G("no-converge-checks"),
-		i18n.G("c"),
-		false,
-		i18n.G("disable converge logic checks"),
-	)
-
-	AppRollbackCommand.Flags().BoolVarP(
-		&internal.ShowUnchanged,
-		i18n.G("show-unchanged"),
-		i18n.G("U"),
-		false,
-		i18n.G("show all configs & images, including unchanged ones"),
-	)
-}

cli/app/run.go

@@ -2,121 +2,99 @@ package app
 
 import (
 	"context"
+	"errors"
 	"fmt"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"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"
-	containertypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app run` aliases. use a comma separated list of aliases
+var user string
-// with no spaces in between
+var userFlag = &cli.StringFlag{
-var appRunAliases = i18n.G("r")
+	Name:        "user, u",
+	Value:       "",
+	Destination: &user,
+}
 
-var AppRunCommand = &cobra.Command{
+var noTTY bool
-	// translators: `app run` command
+var noTTYFlag = &cli.BoolFlag{
-	Use:     i18n.G("run <domain> <service> <cmd> [[args] [flags] | [flags] -- [args]]"),
+	Name:        "no-tty, t",
-	Aliases: strings.Split(appRunAliases, ","),
+	Destination: &noTTY,
-	// translators: Short description for `app run` command
+}
-	Short: i18n.G("Run a command inside a service container"),
-	Example: i18n.G(`  # run <cmd> with args/flags
-  abra app run 1312.net app -- ls -lha
 
-  # run <cmd> without args/flags
+var appRunCommand = cli.Command{
-  abra app run 1312.net app bash --user nobody
+	Name:    "run",
-
+	Aliases: []string{"r"},
-  # run <cmd> with both kinds of args/flags 
+	Flags: []cli.Flag{
-  abra app run 1312.net app --user nobody -- ls -lha`),
+		internal.DebugFlag,
-	Args: cobra.MinimumNArgs(3),
+		noTTYFlag,
-	ValidArgsFunction: func(
+		userFlag,
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		case 1:
-			return autocomplete.ServiceNameComplete(args[0])
-		case 2:
-			return autocomplete.CommandNameComplete(args[0])
-		default:
-			return nil, cobra.ShellCompDirectiveError
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	ArgsUsage:    "<domain> <service> <args>...",
+	Usage:        "Run a command in a service container",
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+
+		if len(c.Args()) < 2 {
+			internal.ShowSubcommandHelpAndError(c, errors.New("no <service> provided?"))
+		}
+
+		if len(c.Args()) < 3 {
+			internal.ShowSubcommandHelpAndError(c, errors.New("no <args> provided?"))
+		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		serviceName := args[1]
+		serviceName := c.Args().Get(1)
 		stackAndServiceName := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
-
 		filters := filters.NewArgs()
 		filters.Add("name", stackAndServiceName)
 
 		targetContainer, err := containerPkg.GetContainer(context.Background(), cl, filters, false)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		userCmd := args[2:]
+		cmd := c.Args()[2:]
-		execCreateOpts := containertypes.ExecOptions{
+		execCreateOpts := types.ExecConfig{
 			AttachStderr: true,
 			AttachStdin:  true,
 			AttachStdout: true,
-			Cmd:          userCmd,
+			Cmd:          cmd,
 			Detach:       false,
 			Tty:          true,
 		}
 
-		if runAsUser != "" {
+		if user != "" {
-			execCreateOpts.User = runAsUser
+			execCreateOpts.User = user
 		}
 		if noTTY {
 			execCreateOpts.Tty = false
 		}
 
+		// FIXME: avoid instantiating a new CLI
 		dcli, err := command.NewDockerCli()
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if _, err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
+		if err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
+
+		return nil
 	},
 }
-
-var (
-	noTTY     bool
-	runAsUser string
-)
-
-func init() {
-	AppRunCommand.Flags().BoolVarP(&noTTY,
-		i18n.G("no-tty"),
-		i18n.G("t"),
-		false,
-		i18n.G("do not request a TTY"),
-	)
-
-	AppRunCommand.Flags().StringVarP(
-		&runAsUser,
-		i18n.G("user"),
-		i18n.G("u"),
-		"",
-		i18n.G("run command as user"),
-	)
-}

cli/app/secret.go

@@ -4,406 +4,304 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io"
 	"os"
-	"sort"
 	"strconv"
-	"strings"
 
 	"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/config"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/i18n"
+	"coopcloud.tech/abra/pkg/recipe"
-	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/secret"
-	"github.com/AlecAivazis/survey/v2"
 	"github.com/docker/docker/api/types"
 	dockerClient "github.com/docker/docker/client"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app secret generate` aliases. use a comma separated list of aliases with
+var allSecrets bool
-// no spaces in between
+var allSecretsFlag = &cli.BoolFlag{
-var appSecretGenerateAliases = i18n.G("g")
+	Name:        "all, a",
+	Destination: &allSecrets,
+	Usage:       "Generate all secrets",
+}
 
-var AppSecretGenerateCommand = &cobra.Command{
+var rmAllSecrets bool
-	// translators: `app secret generate` command
+var rmAllSecretsFlag = &cli.BoolFlag{
-	Use:     i18n.G("generate <domain> [[secret] [version] | --all] [flags]"),
+	Name:        "all, a",
-	Aliases: strings.Split(appSecretGenerateAliases, ","),
+	Destination: &rmAllSecrets,
-	// translators: Short description for `app secret generate` command
+	Usage:       "Remove all secrets",
-	Short: i18n.G("Generate secrets"),
+}
-	Args:  cobra.RangeArgs(1, 3),
+
-	ValidArgsFunction: func(
+var appSecretGenerateCommand = cli.Command{
-		cmd *cobra.Command,
+	Name:      "generate",
-		args []string,
+	Aliases:   []string{"g"},
-		toComplete string,
+	Usage:     "Generate secrets",
-	) ([]string, cobra.ShellCompDirective) {
+	ArgsUsage: "<domain> <secret> <version>",
-		switch l := len(args); l {
+	Flags: []cli.Flag{
-		case 0:
+		internal.DebugFlag,
-			return autocomplete.AppNameComplete()
+		allSecretsFlag,
-		case 1:
+		internal.PassFlag,
-			app, err := appPkg.Get(args[0])
+		internal.MachineReadableFlag,
-			if err != nil {
+		internal.OfflineFlag,
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
+		internal.ChaosFlag,
-			}
-			return autocomplete.SecretComplete(app.Recipe.Name)
-		default:
-			return nil, cobra.ShellCompDirectiveDefault
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := recipe.EnsureExists(app.Recipe); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if len(args) <= 2 && !generateAllSecrets {
+		if !internal.Chaos {
-			log.Fatal(i18n.G("missing arguments [secret]/[version] or '--all'"))
+			if err := recipe.EnsureIsClean(app.Recipe); err != nil {
-		}
+				logrus.Fatal(err)
-
-		if len(args) > 2 && generateAllSecrets {
-			log.Fatal(i18n.G("cannot use '[secret] [version]' and '--all' together"))
-		}
-
-		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)
-		}
-
-		if !generateAllSecrets {
-			secretName := args[1]
-			secretVersion := args[2]
-			s, ok := secrets[secretName]
-			if !ok {
-				log.Fatal(i18n.G("%s doesn't exist in the env config?", secretName))
 			}
-			s.Version = secretVersion
+
-			secrets = map[string]secret.Secret{
+			if !internal.Offline {
-				secretName: s,
+				if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+
+			if err := recipe.EnsureLatest(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		if len(c.Args()) == 1 && !allSecrets {
+			err := errors.New("missing arguments <secret>/<version> or '--all'")
+			internal.ShowSubcommandHelpAndError(c, err)
+		}
+
+		if c.Args().Get(1) != "" && allSecrets {
+			err := errors.New("cannot use '<secret> <version>' and '--all' together")
+			internal.ShowSubcommandHelpAndError(c, err)
+		}
+
+		composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		secretsConfig, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.Recipe)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		secretsToCreate := make(map[string]string)
+		if allSecrets {
+			secretsToCreate = secretsConfig
+		} else {
+			secretName := c.Args().Get(1)
+			secretVersion := c.Args().Get(2)
+			matches := false
+			for name := range secretsConfig {
+				if secretName == name {
+					secretsToCreate[name] = secretVersion
+					matches = true
+				}
+			}
+
+			if !matches {
+				logrus.Fatalf("%s doesn't exist in the env config?", secretName)
 			}
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		secretVals, err := secret.GenerateSecrets(cl, secrets, app.Server)
+		secretVals, err := secret.GenerateSecrets(cl, secretsToCreate, app.StackName(), app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if storeInPass {
+		if internal.Pass {
 			for name, data := range secretVals {
 				if err := secret.PassInsertSecret(data, name, app.Name, app.Server); err != nil {
-					log.Fatal(err)
+					logrus.Fatal(err)
 				}
 			}
 		}
 
 		if len(secretVals) == 0 {
-			log.Warn(i18n.G("no secrets generated"))
+			logrus.Warn("no secrets generated")
 			os.Exit(1)
 		}
 
-		headers := []string{i18n.G("NAME"), i18n.G("VALUE")}
+		tableCol := []string{"name", "value"}
-		table, err := formatter.CreateTable()
+		table := formatter.CreateTable(tableCol)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		table.Headers(headers...)
-
-		var rows [][]string
 		for name, val := range secretVals {
-			row := []string{name, val}
+			table.Append([]string{name, val})
-			rows = append(rows, row)
-			table.Row(row...)
 		}
 
 		if internal.MachineReadable {
-			out, err := formatter.ToJSON(headers, rows)
+			table.JSONRender()
-			if err != nil {
+		} else {
-				log.Fatal(i18n.G("unable to render to JSON: %s", err))
+			table.Render()
-			}
-			fmt.Println(out)
-			return
 		}
+		logrus.Warn("generated secrets are not shown again, please take note of them NOW")
 
-		if err := formatter.PrintTable(table); err != nil {
+		return nil
-			log.Fatal(err)
-		}
-
-		log.Warn(i18n.G(
-			"generated secrets %s shown again, please take note of them %s",
-			formatter.BoldStyle.Render(i18n.G("NOT")),
-			formatter.BoldStyle.Render(i18n.G("NOW")),
-		))
 	},
 }
 
-// translators: `abra app secret insert` aliases. use a comma separated list of aliases with
+var appSecretInsertCommand = cli.Command{
-// no spaces in between
+	Name:    "insert",
-var appSecretInsertAliases = i18n.G("i")
+	Aliases: []string{"i"},
-
+	Usage:   "Insert secret",
-var AppSecretInsertCommand = &cobra.Command{
+	Flags: []cli.Flag{
-	// translators: `app secret insert` command
+		internal.DebugFlag,
-	Use:     i18n.G("insert <domain> <secret> <version> [<data>] [flags]"),
+		internal.PassFlag,
-	Aliases: strings.Split(appSecretInsertAliases, ","),
-	// translators: Short description for `app secret insert` command
-	Short: i18n.G("Insert secret"),
-	Long: i18n.G(`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 command can be useful when you want to manually generate secrets for an app
-environment. Typically, you can let Abra generate them for you on app creation
-(see "abra app new --secrets/-S" for more).`),
-	Example: 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
-
-  # insert secret from stdin
-  echo "mmySuperSecret" | abra app secret insert 1312.net my_secret v1`),
-	Args: cobra.MinimumNArgs(3),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string,
-	) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		case 1:
-			app, err := appPkg.Get(args[0])
-			if err != nil {
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
-			}
-			return autocomplete.SecretComplete(app.Recipe.Name)
-		default:
-			return nil, cobra.ShellCompDirectiveDefault
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	ArgsUsage:    "<domain> <secret-name> <version> <data>",
+	BashComplete: autocomplete.AppNameComplete,
+	Description: `
+This command inserts a secret into an app environment.
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+This can be useful when you want to manually generate secrets for an app
-			log.Fatal(err)
+environment. Typically, you can let Abra generate them for you on app creation
+(see "abra app new --secrets" for more).
+
+Example:
+
+    abra app secret insert myapp db_pass v1 mySecretPassword
+
+`,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+
+		if len(c.Args()) != 4 {
+			internal.ShowSubcommandHelpAndError(c, errors.New("missing arguments?"))
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		name := args[1]
+		name := c.Args().Get(1)
-		version := args[2]
+		version := c.Args().Get(2)
-		data, err := readSecretData(args)
+		data := c.Args().Get(3)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		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))
-			}
-			data = string(raw)
-		}
-
-		if trimInput {
-			data = strings.TrimSpace(data)
-		}
 
 		secretName := fmt.Sprintf("%s_%s_%s", app.StackName(), name, version)
-		if err := client.StoreSecret(cl, secretName, data); err != nil {
+		if err := client.StoreSecret(cl, secretName, data, app.Server); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		log.Info(i18n.G("%s successfully stored on server", secretName))
+		logrus.Infof("%s successfully stored on server", secretName)
 
-		if storeInPass {
+		if internal.Pass {
 			if err := secret.PassInsertSecret(data, name, app.Name, app.Server); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		}
+
+		return nil
 	},
 }
 
-func readSecretData(args []string) (string, error) {
-	if len(args) == 4 {
-		return args[3], nil
-	}
-
-	if len(args) != 3 {
-		return "", errors.New(i18n.G("need 3 or 4 arguments"))
-	}
-	// First check if data is provided by stdin
-	fi, err := os.Stdin.Stat()
-	if err != nil {
-		return "", err
-	}
-	if fi.Mode()&os.ModeNamedPipe != 0 {
-		// Can't insert from stdin and read from file
-		if insertFromFile {
-			return "", errors.New(i18n.G("can not insert from file and read from stdin"))
-		}
-
-		log.Debug(i18n.G("reading secret data from stdin"))
-		bytes, err := io.ReadAll(os.Stdin)
-		if err != nil {
-			return "", errors.New(i18n.G("reading data from stdin: %s", err))
-		}
-
-		return string(bytes), nil
-	}
-	if internal.NoInput {
-		return "", errors.New(i18n.G("must provide <data> argument if --no-input is passed"))
-	}
-
-	log.Debug(i18n.G("secret data not provided on command-line or stdin, prompting"))
-	var prompt survey.Prompt
-	if !insertFromFile {
-		prompt = &survey.Password{
-			Message: i18n.G("specify secret value"),
-		}
-	} else {
-		prompt = &survey.Input{
-			Message: i18n.G("specify secret file"),
-		}
-	}
-	var data string
-	if err := survey.AskOne(prompt, &data); err != nil {
-		return "", err
-	}
-	return data, nil
-}
-
 // secretRm removes a secret.
-func secretRm(cl *dockerClient.Client, app appPkg.App, secretName, parsed string) error {
+func secretRm(cl *dockerClient.Client, app config.App, secretName, parsed string) error {
 	if err := cl.SecretRemove(context.Background(), secretName); err != nil {
 		return err
 	}
 
-	log.Info(i18n.G("deleted %s successfully from server", secretName))
+	logrus.Infof("deleted %s successfully from server", secretName)
 
-	if removeFromPass {
+	if internal.PassRemove {
 		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))
+		logrus.Infof("deleted %s successfully from local pass store", secretName)
 	}
 
 	return nil
 }
 
-// translators: `abra app secret remove` aliases. use a comma separated list of aliases with
+var appSecretRmCommand = cli.Command{
-// no spaces in between
+	Name:    "remove",
-var appSecretRemoveAliases = i18n.G("rm")
+	Aliases: []string{"rm"},
-
+	Usage:   "Remove a secret",
-var AppSecretRmCommand = &cobra.Command{
+	Flags: []cli.Flag{
-	// translators: `app secret remove` command
+		internal.DebugFlag,
-	Use:     i18n.G("remove <domain> [[secret] | --all] [flags]"),
+		internal.NoInputFlag,
-	Aliases: strings.Split(appSecretRemoveAliases, ","),
+		rmAllSecretsFlag,
-	// translators: Short description for `app secret remove` command
+		internal.PassRemoveFlag,
-	Short: i18n.G("Remove a secret"),
+		internal.OfflineFlag,
-	Long: i18n.G(`This command removes a secret from an app environment.
+		internal.ChaosFlag,
-
-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,
-		args []string,
-		toComplete string,
-	) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		case 1:
-			if !rmAllSecrets {
-				app, err := appPkg.Get(args[0])
-				if err != nil {
-					return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
-				}
-				return autocomplete.SecretComplete(app.Recipe.Name)
-			}
-			return nil, cobra.ShellCompDirectiveDefault
-		default:
-			return nil, cobra.ShellCompDirectiveError
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	ArgsUsage:    "<domain> [<secret-name>]",
+	BashComplete: autocomplete.AppNameComplete,
+	Description: `
+This command removes app secrets.
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+Example:
-			log.Fatal(err)
+
+    abra app secret remove myapp db_pass
+`,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+
+		if err := recipe.EnsureExists(app.Recipe); err != nil {
+			logrus.Fatal(err)
 		}
 
-		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
+		if !internal.Chaos {
+			if err := recipe.EnsureIsClean(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+
+			if !internal.Offline {
+				if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+
+			if err := recipe.EnsureLatest(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		secrets, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.StackName())
+		secretsConfig, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.Recipe)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if len(args) == 2 && rmAllSecrets {
+		if c.Args().Get(1) != "" && rmAllSecrets {
-			log.Fatal(i18n.G("cannot use [secret] and --all/-a together"))
+			internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
 		}
 
-		if len(args) != 2 && !rmAllSecrets {
+		if c.Args().Get(1) == "" && !rmAllSecrets {
-			log.Fatal(i18n.G("no secret(s) specified?"))
+			internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		filters, err := app.Filters(false, false)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: filters})
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		remoteSecretNames := make(map[string]bool)
@@ -411,243 +309,127 @@ match those configured in the recipe beforehand.`),
 			remoteSecretNames[cont.Spec.Annotations.Name] = true
 		}
 
-		var secretToRm string
-		if len(args) == 2 {
-			secretToRm = args[1]
-		}
-
 		match := false
-		for secretName, val := range secrets {
+		secretToRm := c.Args().Get(1)
+		for secretName, secretValue := range secretsConfig {
+			val, err := secret.ParseSecretValue(secretValue)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
 			secretRemoteName := fmt.Sprintf("%s_%s_%s", app.StackName(), secretName, val.Version)
 			if _, ok := remoteSecretNames[secretRemoteName]; ok {
 				if secretToRm != "" {
 					if secretName == secretToRm {
 						if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
-							log.Fatal(err)
+							logrus.Fatal(err)
 						}
 
-						return
+						return nil
 					}
 				} else {
 					match = true
 
 					if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
-						log.Fatal(err)
+						logrus.Fatal(err)
 					}
 				}
 			}
 		}
 
 		if !match && secretToRm != "" {
-			log.Fatal(i18n.G("%s doesn't exist on server?", secretToRm))
+			logrus.Fatalf("%s doesn't exist on server?", secretToRm)
 		}
 
 		if !match {
-			log.Fatal(i18n.G("no secrets to remove?"))
+			logrus.Fatal("no secrets to remove?")
 		}
+
+		return nil
 	},
 }
 
-// translators: `abra app secret ls` aliases. use a comma separated list of aliases with
+var appSecretLsCommand = cli.Command{
-// no spaces in between
+	Name:    "list",
-var appSecretLsAliases = i18n.G("ls")
+	Aliases: []string{"ls"},
-
+	Flags: []cli.Flag{
-var AppSecretLsCommand = &cobra.Command{
+		internal.DebugFlag,
-	// translators: `app secret list` command
+		internal.OfflineFlag,
-	Use:     i18n.G("list <domain>"),
+		internal.ChaosFlag,
-	Aliases: strings.Split(appSecretLsAliases, ","),
+		internal.MachineReadableFlag,
-	// translators: Short description for `app secret list` command
-	Short: i18n.G("List all secrets"),
-	Args:  cobra.MinimumNArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string,
-	) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	Usage:        "List all secrets",
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := recipe.EnsureExists(app.Recipe); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
+		}
+
+		if !internal.Chaos {
+			if err := recipe.EnsureIsClean(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+
+			if !internal.Offline {
+				if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+
+			if err := recipe.EnsureLatest(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
 		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		headers := []string{i18n.G("NAME"), i18n.G("VERSION"), i18n.G("GENERATED NAME"), i18n.G("CREATED ON SERVER")}
+		tableCol := []string{"Name", "Version", "Generated Name", "Created On Server"}
-		table, err := formatter.CreateTable()
+		table := formatter.CreateTable(tableCol)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		table.Headers(headers...)
 
 		secStats, err := secret.PollSecretsStatus(cl, app)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		// Sort secrets to ensure reproducible output
-		sort.Slice(secStats, func(i, j int) bool {
-			return secStats[i].LocalName < secStats[j].LocalName
-		})
-		var rows [][]string
 		for _, secStat := range secStats {
-			row := []string{
+			tableRow := []string{
 				secStat.LocalName,
 				secStat.Version,
 				secStat.RemoteName,
 				strconv.FormatBool(secStat.CreatedOnRemote),
 			}
-
+			table.Append(tableRow)
-			rows = append(rows, row)
-			table.Row(row...)
 		}
 
-		if len(rows) > 0 {
+		if table.NumLines() > 0 {
 			if internal.MachineReadable {
-				out, err := formatter.ToJSON(headers, rows)
+				table.JSONRender()
-				if err != nil {
+			} else {
-					log.Fatal(i18n.G("unable to render to JSON: %s", err))
+				table.Render()
-				}
-				fmt.Println(out)
-				return
 			}
-
+		} else {
-			if err := formatter.PrintTable(table); err != nil {
+			logrus.Warnf("no secrets stored for %s", app.Name)
-				log.Fatal(err)
-			}
-
-			return
 		}
 
-		log.Warn(i18n.G("no secrets stored for %s", app.Name))
+		return nil
 	},
 }
 
-var AppSecretCommand = &cobra.Command{
+var appSecretCommand = cli.Command{
-	// translators: `app secret` command group
+	Name:      "secret",
-	Use:     i18n.G("secret [cmd] [args] [flags]"),
+	Aliases:   []string{"s"},
-	Aliases: []string{i18n.G("s")},
+	Usage:     "Manage app secrets",
-	// translators: Short description for `app secret` command group
+	ArgsUsage: "<domain>",
-	Short: i18n.G("Manage app secrets"),
+	Subcommands: []cli.Command{
-}
+		appSecretGenerateCommand,
-
+		appSecretInsertCommand,
-var (
+		appSecretRmCommand,
-	storeInPass        bool
+		appSecretLsCommand,
-	insertFromFile     bool
+	},
-	trimInput          bool
-	rmAllSecrets       bool
-	generateAllSecrets bool
-	removeFromPass     bool
-)
-
-func init() {
-	AppSecretGenerateCommand.Flags().BoolVarP(
-		&internal.MachineReadable,
-		i18n.G("machine"),
-		i18n.G("m"),
-		false,
-		i18n.G("print machine-readable output"),
-	)
-
-	AppSecretGenerateCommand.Flags().BoolVarP(
-		&storeInPass,
-		i18n.G("pass"),
-		i18n.G("p"),
-		false,
-		i18n.G("store generated secrets in a local pass store"),
-	)
-
-	AppSecretGenerateCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-
-	AppSecretGenerateCommand.Flags().BoolVarP(
-		&generateAllSecrets,
-		i18n.G("all"),
-		i18n.GC("a", "app secret generate"),
-		false,
-		i18n.G("generate all secrets"),
-	)
-
-	AppSecretInsertCommand.Flags().BoolVarP(
-		&storeInPass,
-		i18n.G("pass"),
-		i18n.G("p"),
-		false,
-		i18n.G("store generated secrets in a local pass store"),
-	)
-
-	AppSecretInsertCommand.Flags().BoolVarP(
-		&insertFromFile,
-		i18n.G("file"),
-		i18n.G("f"),
-		false,
-		i18n.G("treat input as a file"),
-	)
-
-	AppSecretInsertCommand.Flags().BoolVarP(
-		&trimInput,
-		i18n.G("trim"),
-		i18n.G("t"),
-		false,
-		i18n.G("trim input"),
-	)
-
-	AppSecretInsertCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-
-	AppSecretRmCommand.Flags().BoolVarP(
-		&rmAllSecrets,
-		i18n.G("all"),
-		i18n.GC("a", "app secret rm"),
-		false,
-		i18n.G("remove all secrets"),
-	)
-
-	AppSecretRmCommand.Flags().BoolVarP(
-		&removeFromPass,
-		i18n.G("pass"),
-		i18n.G("p"),
-		false,
-		i18n.G("remove generated secrets from a local pass store"),
-	)
-
-	AppSecretRmCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-
-	AppSecretLsCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-
-	AppSecretLsCommand.Flags().BoolVarP(
-		&internal.MachineReadable,
-		i18n.G("machine"),
-		i18n.G("m"),
-		false,
-		i18n.G("print machine-readable output"),
-	)
 }

cli/app/services.go

@@ -9,71 +9,53 @@ 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"
-	containerTypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app services` aliases. use a comma separated list of
+var appServicesCommand = cli.Command{
-// aliases with no spaces in between
+	Name:      "services",
-var appServicesAliases = i18n.G("sr")
+	Aliases:   []string{"sr"},
-
+	Usage:     "Display all services of an app",
-var AppServicesCommand = &cobra.Command{
+	ArgsUsage: "<domain>",
-	// translators: `app services` command
+	Flags: []cli.Flag{
-	Use:     i18n.G("services <domain> [flags]"),
+		internal.DebugFlag,
-	Aliases: strings.Split(appServicesAliases, ","),
-	// translators: Short description for `app services` command
-	Short: i18n.G("Display all services of an app"),
-	Args:  cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	BashComplete: autocomplete.AppNameComplete,
-
+	Action: func(c *cli.Context) error {
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		app := internal.ValidateApp(c)
-			log.Fatal(err)
-		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
+		isDeployed, _, err := stack.IsDeployed(context.Background(), cl, app.StackName())
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if !deployMeta.IsDeployed {
+		if !isDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
+			logrus.Fatalf("%s is not deployed?", app.Name)
 		}
 
 		filters, err := app.Filters(true, true)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		containers, err := cl.ContainerList(context.Background(), containerTypes.ListOptions{Filters: filters})
+		containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters})
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		table, err := formatter.CreateTable()
+		tableCol := []string{"service name", "image"}
-		if err != nil {
+		table := formatter.CreateTable(tableCol)
-			log.Fatal(err)
-		}
 
-		headers := []string{i18n.G("SERVICE (SHORT)"), i18n.G("SERVICE (LONG)")}
-		table.Headers(headers...)
-
-		var rows [][]string
 		for _, container := range containers {
 			var containerNames []string
 			for _, containerName := range container.Names {
@@ -84,20 +66,15 @@ var AppServicesCommand = &cobra.Command{
 			serviceShortName := service.ContainerToServiceName(container.Names, app.StackName())
 			serviceLongName := fmt.Sprintf("%s_%s", app.StackName(), serviceShortName)
 
-			row := []string{
+			tableRow := []string{
-				serviceShortName,
 				serviceLongName,
+				formatter.RemoveSha(container.Image),
 			}
-
+			table.Append(tableRow)
-			rows = append(rows, row)
 		}
 
-		table.Rows(rows...)
+		table.Render()
 
-		if len(rows) > 0 {
+		return nil
-			if err := formatter.PrintTable(table); err != nil {
-				log.Fatal(err)
-			}
-		}
 	},
 }

cli/app/undeploy.go

@@ -3,131 +3,52 @@ package app
 import (
 	"context"
 	"fmt"
-	"strings"
+	"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/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"
 	dockerClient "github.com/docker/docker/client"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app undeploy` aliases. use a comma separated list of aliases with
+var prune bool
-// no spaces in between
-var appUndeployAliases = i18n.G("un")
 
-var AppUndeployCommand = &cobra.Command{
+var pruneFlag = &cli.BoolFlag{
-	// translators: `app undeploy` command
+	Name:        "prune, p",
-	Use: i18n.G("undeploy <domain> [flags]"),
+	Destination: &prune,
-	// translators: Short description for `app undeploy` command
+	Usage:       "Prunes unused containers, networks, and dangling images for an app",
-	Aliases: strings.Split(appUndeployAliases, ","),
-	Long: i18n.G(`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.`),
-	Args: cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		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))
-
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if !deployMeta.IsDeployed {
-			log.Fatal(i18n.G("%s is not deployed?", app.Name))
-		}
-
-		version := deployMeta.Version
-		if deployMeta.IsChaos {
-			version = deployMeta.ChaosVersion
-		}
-
-		if err := internal.DeployOverview(
-			app,
-			version,
-			config.MISSING_DEFAULT,
-			"",
-			nil,
-			nil,
-			nil,
-			nil,
-		); err != nil {
-			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)
-		}
-
-		rmOpts := stack.Remove{
-			Namespaces: []string{stackName},
-			Detach:     false,
-		}
-		if err := stack.RunRemove(context.Background(), cl, rmOpts); err != nil {
-			log.Fatal(err)
-		}
-
-		if prune {
-			if err := pruneApp(cl, app); err != nil {
-				log.Fatal(err)
-			}
-		}
-
-		log.Info(i18n.G("undeploy succeeded 🟢"))
-
-		if err := app.WriteRecipeVersion(version, false); err != nil {
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
-		}
-	},
 }
 
 // pruneApp runs the equivalent of a "docker system prune" but only filtering
 // against resources connected with the app deployment. It is not a system wide
 // prune. Volumes are not pruned to avoid unwated data loss.
-func pruneApp(cl *dockerClient.Client, app appPkg.App) error {
+func pruneApp(c *cli.Context, cl *dockerClient.Client, app config.App) error {
 	stackName := app.StackName()
 	ctx := context.Background()
 
+	for {
+		logrus.Debugf("polling for %s stack, waiting to be undeployed...", stackName)
+
+		services, err := stack.GetStackServices(ctx, cl, stackName)
+		if err != nil {
+			return err
+		}
+
+		if len(services) == 0 {
+			logrus.Debugf("%s undeployed, moving on with pruning logic", stackName)
+			time.Sleep(time.Second) // give runtime more time to tear down related state
+			break
+		}
+
+		time.Sleep(time.Second)
+	}
+
 	pruneFilters := filters.NewArgs()
 	stackSearch := fmt.Sprintf("%s*", stackName)
 	pruneFilters.Add("label", stackSearch)
@@ -137,14 +58,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))
+	logrus.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)))
+	logrus.Infof("networks pruned: %d", len(nr.NetworksDeleted))
 
 	ir, err := cl.ImagesPrune(ctx, pruneFilters)
 	if err != nil {
@@ -152,21 +73,66 @@ 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))
+	logrus.Infof("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed)
 
 	return nil
 }
 
-var (
+var appUndeployCommand = cli.Command{
-	prune bool
+	Name:      "undeploy",
-)
+	Aliases:   []string{"un"},
+	ArgsUsage: "<domain>",
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+		internal.NoInputFlag,
+		pruneFlag,
+	},
+	Before:       internal.SubCommandBefore,
+	Usage:        "Undeploy an app",
+	BashComplete: autocomplete.AppNameComplete,
+	Description: `
+This does not destroy any of the application data.
 
-func init() {
+However, you should remain vigilant, as your swarm installation will consider
-	AppUndeployCommand.Flags().BoolVarP(
+any previously attached volumes as eligible for pruning once undeployed.
-		&prune,
+
-		i18n.G("prune"),
+Passing "-p/--prune" does not remove those volumes.
-		i18n.G("p"),
+`,
-		false,
+	Action: func(c *cli.Context) error {
-		i18n.G("prune unused containers, networks, and dangling images"),
+		app := internal.ValidateApp(c)
-	)
+		stackName := app.StackName()
+
+		cl, err := client.New(app.Server)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		logrus.Debugf("checking whether %s is already deployed", stackName)
+
+		isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if !isDeployed {
+			logrus.Fatalf("%s is not deployed?", app.Name)
+		}
+
+		if err := internal.DeployOverview(app, deployedVersion, "continue with undeploy?"); err != nil {
+			logrus.Fatal(err)
+		}
+
+		rmOpts := stack.Remove{Namespaces: []string{app.StackName()}}
+		if err := stack.RunRemove(context.Background(), cl, rmOpts); err != nil {
+			logrus.Fatal(err)
+		}
+
+		if prune {
+			if err := pruneApp(c, cl, app); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		return nil
+	},
 }

cli/app/upgrade.go

@@ -2,494 +2,295 @@ package app
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"strings"
 
 	"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/config"
-	"coopcloud.tech/abra/pkg/deploy"
-	"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"
+	recipePkg "coopcloud.tech/abra/pkg/recipe"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"coopcloud.tech/tagcmp"
 	"github.com/AlecAivazis/survey/v2"
-	dockerClient "github.com/docker/docker/client"
+	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app upgrade` aliases. use a comma separated list of aliases with
+var appUpgradeCommand = cli.Command{
-// no spaces in between
+	Name:      "upgrade",
-var appUpgradeAliases = i18n.G("up")
+	Aliases:   []string{"up"},
-
+	Usage:     "Upgrade an app",
-var AppUpgradeCommand = &cobra.Command{
+	ArgsUsage: "<domain> [<version>]",
-	// translators: `app upgrade` command
+	Flags: []cli.Flag{
-	Use:     i18n.G("upgrade <domain> [version] [flags]"),
+		internal.DebugFlag,
-	Aliases: strings.Split(appUpgradeAliases, ","),
+		internal.NoInputFlag,
-	// translators: Short description for `app upgrade` command
+		internal.ForceFlag,
-	Short: i18n.G("Upgrade an app"),
+		internal.ChaosFlag,
-	Long: i18n.G(`Upgrade an app.
+		internal.NoDomainChecksFlag,
-
+		internal.DontWaitConvergeFlag,
-Unlike "abra app deploy", chaos operations are not supported here. Only recipe
+		internal.OfflineFlag,
-versions are supported values for "[version]".
-
-It is possible to "--force/-f" an upgrade if you want to re-deploy a specific
-version.
-
-Only the deployed version is consulted when trying to determine what upgrades
-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.`),
-	Args: cobra.RangeArgs(1, 2),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string,
-	) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.AppNameComplete()
-		case 1:
-			app, err := appPkg.Get(args[0])
-			if err != nil {
-				return []string{i18n.G("autocomplete failed: %s", err)}, cobra.ShellCompDirectiveError
-			}
-			return autocomplete.RecipeVersionComplete(app.Recipe.Name)
-		default:
-			return nil, cobra.ShellCompDirectiveError
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before: internal.SubCommandBefore,
-		var (
+	Description: `
-			upgradeWarnMessages []string
+Upgrade an app. You can use it to choose and roll out a new upgrade to an
-			chosenUpgrade       string
+existing app.
-			availableUpgrades   []string
-			upgradeReleaseNotes string
-		)
 
-		app := internal.ValidateApp(args)
+This command specifically supports incrementing the version of running apps, as
+opposed to "abra app deploy <domain>" which will not change the version of a
+deployed app.
 
-		if err := app.Recipe.Ensure(recipe.EnsureContext{
+You may pass "--force/-f" to upgrade to the same version again. This can be
-			Chaos:   internal.Chaos,
+useful if the container runtime has gotten into a weird state.
-			Offline: internal.Offline,
+
-			// Ignore the env version for now, to make sure we are at the latest commit.
+This action could be destructive, please ensure you have a copy of your app
-			// This enables us to get release notes, that were added after a release.
+data beforehand.
-			IgnoreEnvVersion: true,
+
-		}); err != nil {
+Chaos mode ("--chaos") will deploy your local checkout of a recipe as-is,
-			log.Fatal(err)
+including unstaged changes and can be useful for live hacking and testing new
+recipes.
+`,
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+		stackName := app.StackName()
+
+		specificVersion := c.Args().Get(1)
+		if specificVersion != "" && internal.Chaos {
+			logrus.Fatal("cannot use <version> and --chaos together")
 		}
 
+		if !internal.Chaos {
+			if err := recipe.EnsureIsClean(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+
+			if !internal.Offline {
+				if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+
+			if err := recipe.EnsureLatest(app.Recipe); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		recipe, err := recipePkg.Get(app.Recipe, internal.Offline)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := lint.LintForErrors(recipe); err != nil {
+			logrus.Fatal(err)
+		}
+
+		logrus.Debugf("checking whether %s is already deployed", stackName)
+
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		deployMeta, err := ensureDeployed(cl, app)
+		isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if err := lint.LintForErrors(app.Recipe); err != nil {
+		if !isDeployed {
-			log.Fatal(err)
+			logrus.Fatalf("%s is not deployed?", app.Name)
 		}
 
-		versions, err := app.Recipe.Tags()
+		catl, err := recipePkg.ReadRecipeCatalogue(internal.Offline)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		// NOTE(d1): we've no idea what the live deployment version is, so every
+		versions, err := recipePkg.GetRecipeCatalogueVersions(app.Recipe, catl)
-		// possible upgrade can be shown. it's up to the user to make the choice
+		if err != nil {
-		if deployMeta.Version == config.UNKNOWN_DEFAULT {
+			logrus.Fatal(err)
-			availableUpgrades = versions
 		}
 
-		if len(args) == 2 && args[1] != "" {
+		if len(versions) == 0 && !internal.Chaos {
-			chosenUpgrade = args[1]
+			logrus.Warn("no published versions in catalogue, trying local recipe repository")
-
+			recipeVersions, err := recipePkg.GetRecipeVersions(app.Recipe, internal.Offline)
-			if err := validateUpgradeVersionArg(chosenUpgrade, app, deployMeta); err != nil {
-				log.Fatal(err)
-			}
-
-			availableUpgrades = append(availableUpgrades, chosenUpgrade)
-		}
-
-		if deployMeta.Version != config.UNKNOWN_DEFAULT && chosenUpgrade == "" {
-			upgradeAvailable, err := ensureUpgradesAvailable(app, versions, &availableUpgrades, deployMeta)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Warn(err)
 			}
-
+			for _, recipeVersion := range recipeVersions {
-			if !upgradeAvailable {
+				for version := range recipeVersion {
-				log.Info(i18n.G("no available upgrades"))
+					versions = append(versions, version)
-				return
+				}
 			}
 		}
 
-		if internal.Force || internal.NoInput || chosenUpgrade != "" {
+		var availableUpgrades []string
-			if len(availableUpgrades) > 0 {
+		if deployedVersion == "unknown" {
-				chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
+			availableUpgrades = versions
+			logrus.Warnf("failed to determine deployed version of %s", app.Name)
+		}
+
+		if specificVersion != "" {
+			parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
+			if err != nil {
+				logrus.Fatal(err)
 			}
-		} else {
+			parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
-			if err := chooseUpgrade(availableUpgrades, deployMeta, &chosenUpgrade); err != nil {
+			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
+			if parsedSpecificVersion.IsLessThan(parsedDeployedVersion) || parsedSpecificVersion.Equals(parsedDeployedVersion) {
+				logrus.Fatalf("%s is not an upgrade for %s?", deployedVersion, specificVersion)
+			}
+			availableUpgrades = append(availableUpgrades, specificVersion)
 		}
 
-		if internal.Force &&
+		parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
-			chosenUpgrade == "" &&
-			deployMeta.Version != config.UNKNOWN_DEFAULT {
-			chosenUpgrade = deployMeta.Version
-		}
-
-		if chosenUpgrade == "" {
-			log.Fatal(i18n.G("unknown deployed version, unable to upgrade"))
-		}
-
-		log.Debug(i18n.G("choosing %s as version to upgrade", chosenUpgrade))
-
-		// Get the release notes before checking out the new version in the
-		// recipe. This enables us to get release notes, that were added after
-		// a release.
-		if err := getReleaseNotes(app, versions, chosenUpgrade, deployMeta, &upgradeReleaseNotes); err != nil {
-			log.Fatal(err)
-		}
-
-		if _, err := app.Recipe.EnsureVersion(chosenUpgrade); err != nil {
-			log.Fatal(err)
-		}
-
-		if err := deploy.MergeAbraShEnv(app.Recipe, app.Env); err != nil {
-			log.Fatal(err)
-		}
-
-		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		stackName := app.StackName()
+		if deployedVersion != "unknown" && !internal.Chaos && specificVersion == "" {
+			for _, version := range versions {
+				parsedVersion, err := tagcmp.Parse(version)
+				if err != nil {
+					logrus.Fatal(err)
+				}
+				if parsedVersion.IsGreaterThan(parsedDeployedVersion) && !(parsedVersion.Equals(parsedDeployedVersion)) {
+					availableUpgrades = append(availableUpgrades, version)
+				}
+			}
+
+			if len(availableUpgrades) == 0 && !internal.Force {
+				logrus.Infof("no available upgrades, you're on latest (%s) ✌️", deployedVersion)
+				return nil
+			}
+		}
+
+		var chosenUpgrade string
+		if len(availableUpgrades) > 0 && !internal.Chaos {
+			if internal.Force || internal.NoInput || specificVersion != "" {
+				chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
+				logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
+			} else {
+				prompt := &survey.Select{
+					Message: fmt.Sprintf("Please select an upgrade (current version: %s):", deployedVersion),
+					Options: internal.ReverseStringList(availableUpgrades),
+				}
+				if err := survey.AskOne(prompt, &chosenUpgrade); err != nil {
+					return err
+				}
+			}
+		}
+
+		if internal.Force && chosenUpgrade == "" {
+			logrus.Warnf("%s is already upgraded to latest but continuing (--force/--chaos)", app.Name)
+			chosenUpgrade = deployedVersion
+		}
+
+		// if release notes written after git tag published, read them before we
+		// check out the tag and then they'll appear to be missing. this covers
+		// when we obviously will forget to write release notes before publishing
+		var releaseNotes string
+		for _, version := range versions {
+			parsedVersion, err := tagcmp.Parse(version)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			parsedChosenUpgrade, err := tagcmp.Parse(chosenUpgrade)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			if !(parsedVersion.Equals(parsedDeployedVersion)) && parsedVersion.IsLessThan(parsedChosenUpgrade) {
+				note, err := internal.GetReleaseNotes(app.Recipe, version)
+				if err != nil {
+					return err
+				}
+				if note != "" {
+					releaseNotes += fmt.Sprintf("%s\n", note)
+				}
+			}
+		}
+
+		if !internal.Chaos {
+			if err := recipePkg.EnsureVersion(app.Recipe, chosenUpgrade); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		if internal.Chaos {
+			logrus.Warn("chaos mode engaged")
+			var err error
+			chosenUpgrade, err = recipePkg.ChaosVersion(app.Recipe)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
+		abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		for k, v := range abraShEnv {
+			app.Env[k] = v
+		}
+
+		composeFiles, err := config.GetComposeFiles(app.Recipe, app.Env)
+		if err != nil {
+			logrus.Fatal(err)
+		}
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    stackName,
 			Prune:        false,
 			ResolveImage: stack.ResolveImageAlways,
-			Detach:       false,
 		}
-
+		compose, err := config.GetAppComposeConfig(app.Name, deployOpts, app.Env)
-		compose, err := appPkg.GetAppComposeConfig(app.Name, deployOpts, app.Env)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
+		config.ExposeAllEnv(stackName, compose, app.Env)
+		config.SetRecipeLabel(compose, stackName, app.Recipe)
+		config.SetChaosLabel(compose, stackName, internal.Chaos)
+		config.SetChaosVersionLabel(compose, stackName, chosenUpgrade)
+		config.SetUpdateLabel(compose, stackName, app.Env)
 
-		appPkg.ExposeAllEnv(stackName, compose, app.Env)
+		envVars, err := config.CheckEnv(app)
-		appPkg.SetRecipeLabel(compose, stackName, app.Recipe.Name)
-		appPkg.SetChaosLabel(compose, stackName, internal.Chaos)
-		if internal.Chaos {
-			appPkg.SetChaosVersionLabel(compose, stackName, chosenUpgrade)
-		}
-
-		envVars, err := appPkg.CheckEnv(app)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		for _, envVar := range envVars {
 			if !envVar.Present {
-				upgradeWarnMessages = append(upgradeWarnMessages,
+				logrus.Warnf("env var %s missing from %s.env, present in recipe .env.sample", envVar.Name, app.Domain)
-					i18n.G("%s missing from %s.env", envVar.Name, app.Domain),
-				)
 			}
 		}
 
-		// Gather secrets
+		if err := internal.NewVersionOverview(app, deployedVersion, chosenUpgrade, releaseNotes); err != nil {
-		secretInfo, err := deploy.GatherSecretsForDeploy(cl, app, internal.ShowUnchanged)
+			logrus.Fatal(err)
+		}
+
+		stack.WaitTimeout, err = config.GetTimeoutFromLabel(compose, stackName)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
+		logrus.Debugf("set waiting timeout to %d s", stack.WaitTimeout)
 
-		// Gather configs
+		if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
-		configInfo, err := deploy.GatherConfigsForDeploy(cl, app, compose, app.Env, internal.ShowUnchanged)
+			logrus.Fatal(err)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		// Gather images
-		imageInfo, err := deploy.GatherImagesForDeploy(cl, app, compose, internal.ShowUnchanged)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if showReleaseNotes {
-			fmt.Print(upgradeReleaseNotes)
-			return
-		}
-
-		if upgradeReleaseNotes == "" {
-			upgradeWarnMessages = append(
-				upgradeWarnMessages,
-				fmt.Sprintf("no release notes available for %s", chosenUpgrade),
-			)
-		}
-
-		deployedVersion := deployMeta.Version
-		if deployMeta.IsChaos {
-			deployedVersion = deployMeta.ChaosVersion
-		}
-
-		if err := internal.DeployOverview(
-			app,
-			deployedVersion,
-			chosenUpgrade,
-			upgradeReleaseNotes,
-			upgradeWarnMessages,
-			secretInfo,
-			configInfo,
-			imageInfo,
-		); err != nil {
-			log.Fatal(err)
-		}
-
-		stack.WaitTimeout, err = appPkg.GetTimeoutFromLabel(compose, stackName)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		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)
 		}
 
 		postDeployCmds, ok := app.Env["POST_UPGRADE_CMDS"]
 		if ok && !internal.DontWaitConverge {
-			log.Debug(i18n.G("run the following post-deploy commands: %s", postDeployCmds))
+			logrus.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))
+				logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)
 			}
 		}
 
-		if err := app.WriteRecipeVersion(chosenUpgrade, false); err != nil {
+		return nil
-			log.Fatal(i18n.G("writing recipe version failed: %s", err))
-		}
 	},
 }
-
-// chooseUpgrade prompts the user to choose an upgrade interactively.
-func chooseUpgrade(
-	availableUpgrades []string,
-	deployMeta stack.DeployMeta,
-	chosenUpgrade *string,
-) error {
-	msg := i18n.G("please select an upgrade (version: %s):", deployMeta.Version)
-
-	if deployMeta.IsChaos {
-		chaosVersion := formatter.BoldDirtyDefault(deployMeta.ChaosVersion)
-
-		msg = i18n.G(
-			"please select an upgrade (version: %s, chaos: %s):",
-			deployMeta.Version,
-			chaosVersion,
-		)
-	}
-
-	prompt := &survey.Select{
-		Message: msg,
-		Options: internal.SortVersionsDesc(availableUpgrades),
-	}
-
-	if err := survey.AskOne(prompt, chosenUpgrade); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func getReleaseNotes(
-	app appPkg.App,
-	versions []string,
-	chosenUpgrade string,
-	deployMeta stack.DeployMeta,
-	upgradeReleaseNotes *string,
-) error {
-	parsedChosenUpgrade, err := tagcmp.Parse(chosenUpgrade)
-	if err != nil {
-		return errors.New(i18n.G("parsing chosen upgrade version failed: %s", err))
-	}
-
-	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
-	if err != nil {
-		return errors.New(i18n.G("parsing deployment version failed: %s", 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))
-		}
-
-		if parsedVersion.IsGreaterThan(parsedDeployedVersion) &&
-			parsedVersion.IsLessThan(parsedChosenUpgrade) {
-			note, err := app.Recipe.GetReleaseNotes(version, app.Domain)
-			if err != nil {
-				return err
-			}
-
-			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)
-			}
-		}
-	}
-
-	return nil
-}
-
-// ensureUpgradesAvailable ensures that there are available upgrades.
-func ensureUpgradesAvailable(
-	app appPkg.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))
-	}
-
-	for _, version := range versions {
-		parsedVersion, err := tagcmp.Parse(version)
-		if err != nil {
-			return false, errors.New(i18n.G("parsing recipe version failed: %s", err))
-		}
-
-		if parsedVersion.IsGreaterThan(parsedDeployedVersion) &&
-			!(parsedVersion.Equals(parsedDeployedVersion)) {
-			*availableUpgrades = append(*availableUpgrades, version)
-		}
-	}
-
-	if len(*availableUpgrades) == 0 && !internal.Force {
-		return false, nil
-	}
-
-	return true, nil
-}
-
-// validateUpgradeVersionArg validates the specific version.
-func validateUpgradeVersionArg(
-	specificVersion string,
-	app appPkg.App,
-	deployMeta stack.DeployMeta,
-) 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))
-	}
-
-	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
-	if err != nil {
-		return errors.New(i18n.G("'%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))
-	}
-
-	if parsedSpecificVersion.Equals(parsedDeployedVersion) && !internal.Force {
-		return errors.New(i18n.G("%s is not an upgrade for %s?", deployMeta.Version, specificVersion))
-	}
-
-	return nil
-}
-
-// ensureDeployed ensures the app is deployed and if so, returns deployment
-// meta info.
-func ensureDeployed(cl *dockerClient.Client, app appPkg.App) (stack.DeployMeta, error) {
-	log.Debug(i18n.G("checking whether %s is already deployed", app.StackName()))
-
-	deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
-	if err != nil {
-		return stack.DeployMeta{}, err
-	}
-
-	if !deployMeta.IsDeployed {
-		return stack.DeployMeta{}, errors.New(i18n.G("%s is not deployed?", app.Name))
-	}
-
-	return deployMeta, nil
-}
-
-var showReleaseNotes bool
-
-func init() {
-	AppUpgradeCommand.Flags().BoolVarP(
-		&internal.Force,
-		i18n.G("force"),
-		i18n.G("f"),
-		false,
-		i18n.G("perform action without further prompt"),
-	)
-
-	AppUpgradeCommand.Flags().BoolVarP(
-		&internal.NoDomainChecks,
-		i18n.G("no-domain-checks"),
-		i18n.G("D"),
-		false,
-		i18n.G("disable public DNS checks"),
-	)
-
-	AppUpgradeCommand.Flags().BoolVarP(
-		&internal.DontWaitConverge,
-		i18n.G("no-converge-checks"),
-		i18n.G("c"),
-		false,
-		i18n.G("disable converge logic checks"),
-	)
-
-	AppUpgradeCommand.Flags().BoolVarP(
-		&showReleaseNotes,
-		i18n.G("releasenotes"),
-		i18n.G("r"),
-		false,
-		i18n.G("only show release notes"),
-	)
-
-	AppUpgradeCommand.Flags().BoolVarP(
-		&internal.ShowUnchanged,
-		i18n.G("show-unchanged"),
-		i18n.G("U"),
-		false,
-		i18n.G("show all configs & images, including unchanged ones"),
-	)
-}

cli/app/version.go

@@ -0,0 +1,117 @@
+package app
+
+import (
+	"context"
+	"sort"
+
+	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/pkg/autocomplete"
+	"coopcloud.tech/abra/pkg/client"
+	"coopcloud.tech/abra/pkg/formatter"
+	"coopcloud.tech/abra/pkg/recipe"
+	"coopcloud.tech/abra/pkg/upstream/stack"
+	"github.com/docker/distribution/reference"
+	"github.com/olekukonko/tablewriter"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
+)
+
+func sortServiceByName(versions [][]string) func(i, j int) bool {
+	return func(i, j int) bool {
+		// NOTE(d1): corresponds to the `tableCol` definition below
+		if versions[i][1] == "app" {
+			return true
+		}
+		return versions[i][1] < versions[j][1]
+	}
+}
+
+// getImagePath returns the image name
+func getImagePath(image string) (string, error) {
+	img, err := reference.ParseNormalizedNamed(image)
+	if err != nil {
+		return "", err
+	}
+
+	path := reference.Path(img)
+
+	path = formatter.StripTagMeta(path)
+
+	logrus.Debugf("parsed %s from %s", path, image)
+
+	return path, nil
+}
+
+var appVersionCommand = cli.Command{
+	Name:      "version",
+	Aliases:   []string{"v"},
+	ArgsUsage: "<domain>",
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+		internal.NoInputFlag,
+		internal.OfflineFlag,
+	},
+	Before:       internal.SubCommandBefore,
+	Usage:        "Show version info of a deployed app",
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+		stackName := app.StackName()
+
+		cl, err := client.New(app.Server)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		logrus.Debugf("checking whether %s is already deployed", stackName)
+
+		isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if !isDeployed {
+			logrus.Fatalf("%s is not deployed?", app.Name)
+		}
+
+		if deployedVersion == "unknown" {
+			logrus.Fatalf("failed to determine version of deployed %s", app.Name)
+		}
+
+		recipeMeta, err := recipe.GetRecipeMeta(app.Recipe, internal.Offline)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		versionsMeta := make(map[string]recipe.ServiceMeta)
+		for _, recipeVersion := range recipeMeta.Versions {
+			if currentVersion, exists := recipeVersion[deployedVersion]; exists {
+				versionsMeta = currentVersion
+			}
+		}
+
+		if len(versionsMeta) == 0 {
+			logrus.Fatalf("could not retrieve deployed version (%s) from recipe catalogue?", deployedVersion)
+		}
+
+		tableCol := []string{"version", "service", "image", "tag"}
+		table := formatter.CreateTable(tableCol)
+
+		var versions [][]string
+		for serviceName, versionMeta := range versionsMeta {
+			versions = append(versions, []string{deployedVersion, serviceName, versionMeta.Image, versionMeta.Tag})
+		}
+
+		sort.Slice(versions, sortServiceByName(versions))
+
+		for _, version := range versions {
+			table.Append(version)
+		}
+
+		table.SetAutoMergeCellsByColumnIndex([]int{0})
+		table.SetAlignment(tablewriter.ALIGN_LEFT)
+		table.Render()
+
+		return nil
+	},
+}

cli/app/volume.go

@@ -2,183 +2,127 @@ package app
 
 import (
 	"context"
-	"fmt"
-	"strings"
 
 	"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"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra app volume list` aliases. use a comma separated list of aliases with
+var appVolumeListCommand = cli.Command{
-// no spaces in between
+	Name:      "list",
-var appVolumeListAliases = i18n.G("ls")
+	Aliases:   []string{"ls"},
-
+	ArgsUsage: "<domain>",
-var AppVolumeListCommand = &cobra.Command{
+	Flags: []cli.Flag{
-	// translators: `app volume list` command
+		internal.DebugFlag,
-	Use:     i18n.G("list <domain> [flags]"),
+		internal.NoInputFlag,
-	Aliases: strings.Split(appVolumeListAliases, ","),
-	// translators: Short description for `app list` command
-	Short: i18n.G("List volumes associated with an app"),
-	Args:  cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	Usage:        "List volumes associated with an app",
+	BashComplete: autocomplete.AppNameComplete,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		filters, err := app.Filters(false, true)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		volumes, err := client.GetVolumes(cl, context.Background(), app.Server, filters)
+		volumeList, err := client.GetVolumes(cl, context.Background(), app.Server, filters)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		headers := []string{i18n.G("NAME"), i18n.G("ON SERVER")}
+		table := formatter.CreateTable([]string{"name", "created", "mounted"})
-
+		var volTable [][]string
-		table, err := formatter.CreateTable()
+		for _, volume := range volumeList {
-		if err != nil {
+			volRow := []string{volume.Name, volume.CreatedAt, volume.Mountpoint}
-			log.Fatal(err)
+			volTable = append(volTable, volRow)
 		}
 
-		table.Headers(headers...)
+		table.AppendBulk(volTable)
 
-		var rows [][]string
+		if table.NumLines() > 0 {
-		for _, volume := range volumes {
+			table.Render()
-			row := []string{volume.Name, volume.Mountpoint}
+		} else {
-			rows = append(rows, row)
+			logrus.Warnf("no volumes created for %s", app.Name)
 		}
 
-		table.Rows(rows...)
+		return nil
-
-		if len(rows) > 0 {
-			if err := formatter.PrintTable(table); err != nil {
-				log.Fatal(err)
-			}
-			return
-		}
-
-		log.Warn(i18n.G("no volumes created for %s", app.Name))
 	},
 }
 
-// translators: `abra app volume remove` aliases. use a comma separated list of aliases with
+var appVolumeRemoveCommand = cli.Command{
-// no spaces in between
+	Name:  "remove",
-var appVolumeRemoveAliases = i18n.G("rm")
+	Usage: "Remove volume(s) associated with an app",
-
+	Description: `
-var AppVolumeRemoveCommand = &cobra.Command{
+This command supports removing volumes associated with an app. The app in
-	// translators: `app volume remove` command
+question must be undeployed before you try to remove volumes. See "abra app
-	Use: i18n.G("remove <domain> [volume] [flags]"),
+undeploy <domain>" for more.
-	// translators: Short description for `app volume remove` command
-	Short: i18n.G("Remove volume(s) associated with an app"),
-	Long: i18n.G(`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.
 
 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
+`,
-  abra app volume rm 1312.net
+	ArgsUsage: "<domain>",
-
+	Aliases:   []string{"rm"},
-  # delete specific volume
+	Flags: []cli.Flag{
-  abra app volume rm 1312.net my_volume`),
+		internal.DebugFlag,
-	Aliases: strings.Split(appVolumeRemoveAliases, ","),
+		internal.NoInputFlag,
-	Args:    cobra.MinimumNArgs(1),
+		internal.ForceFlag,
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		app := internal.ValidateApp(args)
+	BashComplete: autocomplete.AppNameComplete,
-
+	Action: func(c *cli.Context) error {
-		var volumeToDelete string
+		app := internal.ValidateApp(c)
-		if len(args) == 2 {
-			volumeToDelete = args[1]
-		}
 
 		cl, err := client.New(app.Server)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
+		isDeployed, _, err := stack.IsDeployed(context.Background(), cl, app.StackName())
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if deployMeta.IsDeployed {
+		if isDeployed {
-			log.Fatal(i18n.G("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name))
+			logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
 		}
 
 		filters, err := app.Filters(false, true)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		volumeList, err := client.GetVolumes(cl, context.Background(), app.Server, filters)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 		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,
 			}
 			if err := survey.AskOne(volumesPrompt, &volumesToRemove); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		}
 
@@ -187,35 +131,27 @@ 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)
+			err = client.RemoveVolumes(cl, context.Background(), app.Server, volumesToRemove, internal.Force)
 			if err != nil {
-				log.Fatal(i18n.G("removing volumes failed: %s", err))
+				logrus.Fatal(err)
 			}
 
-			log.Info(i18n.G("%d volumes removed successfully", len(volumesToRemove)))
+			logrus.Info("volumes removed successfully")
 		} else {
-			log.Info(i18n.G("no volumes removed"))
+			logrus.Info("no volumes removed")
 		}
+
+		return nil
 	},
 }
 
-// translators: `abra app volume` aliases. use a comma separated list of aliases with
+var appVolumeCommand = cli.Command{
-// no spaces in between
+	Name:      "volume",
-var appVolumeAliases = i18n.G("vl")
+	Aliases:   []string{"vl"},
-
+	Usage:     "Manage app volumes",
-var AppVolumeCommand = &cobra.Command{
+	ArgsUsage: "<domain>",
-	// translators: `app volume` command group
+	Subcommands: []cli.Command{
-	Use:     i18n.G("volume [cmd] [args] [flags]"),
+		appVolumeListCommand,
-	Aliases: strings.Split(appVolumeAliases, ","),
+		appVolumeRemoveCommand,
-	Short:   i18n.G("Manage app volumes"),
+	},
-}
-
-func init() {
-	AppVolumeRemoveCommand.Flags().BoolVarP(
-		&internal.Force,
-		i18n.G("force"),
-		i18n.G("f"),
-		false,
-		i18n.G("perform action without further prompt"),
-	)
 }

cli/catalogue/catalogue.go

@@ -4,10 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"path"
-	"slices"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
@@ -15,145 +12,100 @@ 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"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra catalogue sync` aliases. use a comma separated list of aliases with
+var catalogueGenerateCommand = cli.Command{
-// no spaces in between
+	Name:    "generate",
-var appCatalogueSyncAliases = i18n.G("s")
+	Aliases: []string{"g"},
-
+	Usage:   "Generate the recipe catalogue",
-var CatalogueSyncCommand = &cobra.Command{
+	Flags: []cli.Flag{
-	// translators: `catalogue sync` command
+		internal.DebugFlag,
-	Use:     i18n.G("sync [flags]"),
+		internal.NoInputFlag,
-	Aliases: strings.Split(appCatalogueSyncAliases, ","),
+		internal.PublishFlag,
-	// translators: Short description for `catalogue sync` command
+		internal.DryFlag,
-	Short: i18n.G("Sync recipe catalogue for latest changes"),
+		internal.SkipUpdatesFlag,
-	Args:  cobra.NoArgs,
+		internal.ChaosFlag,
-	Run: func(cmd *cobra.Command, args []string) {
+		internal.OfflineFlag,
-		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"))
 	},
-}
+	Before: internal.SubCommandBefore,
+	Description: `
+Generate a new copy of the recipe catalogue which can be found on:
 
-// translators: `abra catalogue` aliases. use a comma separated list of aliases with
+    https://recipes.coopcloud.tech (website that humans read)
-// no spaces in between
+    https://recipes.coopcloud.tech/recipes.json (JSON that Abra reads)
-var appCatalogueAliases = i18n.G("g")
 
-var CatalogueGenerateCommand = &cobra.Command{
+It polls the entire git.coopcloud.tech/coop-cloud/... recipe repository
-	// translators: `catalogue generate` command
+listing, parses README.md and git tags to produce recipe metadata which is
-	Use:     i18n.G("generate [recipe] [flags]"),
+loaded into the catalogue JSON file.
-	Aliases: strings.Split(appCatalogueAliases, ","),
-	// translators: Short description for `catalogue generate` command
-	Short: i18n.G("Generate the recipe catalogue"),
-	Long: i18n.G(`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
-("$ABRA_DIR/catalogue") and not the recipes. Please take care not to lose your
-changes.
 
 It is possible to generate new metadata for a single recipe by passing
-[recipe]. The existing local catalogue will be updated, not overwritten.
+<recipe>. The existing local catalogue will be updated, not overwritten.
 
 It is quite easy to get rate limited by Docker Hub when running this command.
-If you have a Hub account you can "docker login" and Abra will automatically
+If you have a Hub account you can have Abra log you in to avoid this. Pass
-use those details.
+"--user" and "--pass".
 
-Publish your new release to git.coopcloud.tech with "--publish/-p". This
+Push your new release to git.coopcloud.tech with "-p/--publish". This requires
-requires that you have permission to git push to these repositories and have
+that you have permission to git push to these repositories and have your SSH
-your SSH keys configured on your account. Enable ssh-agent and make sure to add
+keys configured on your account.
-your private key and enter your passphrase beforehand.
+`,
-
+	ArgsUsage:    "[<recipe>]",
-    eval ` + "`ssh-agent`" + `
+	BashComplete: autocomplete.RecipeNameComplete,
-    ssh-add ~/.ssh/<my-ssh-private-key-for-git-coopcloud-tech>`),
+	Action: func(c *cli.Context) error {
-	Example: `  # publish catalogue
+		recipeName := c.Args().First()
-  eval ` + "`ssh-agent`" + `
-  ssh-add ~/.ssh/id_ed25519
-  abra catalogue generate -p`,
-	Args: cobra.RangeArgs(0, 1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.RecipeNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		var recipeName string
-		if len(args) > 0 {
-			recipeName = args[0]
-		}
-
-		if os.Getenv("SSH_AUTH_SOCK") == "" {
-			log.Warn(i18n.G("ssh: SSH_AUTH_SOCK missing, --publish/-p will fail. see \"abra catalogue generate --help\""))
-		}
 
 		if recipeName != "" {
-			internal.ValidateRecipe(args, cmd.Name())
+			internal.ValidateRecipe(c)
-		}
-
-		if err := catalogue.EnsureCatalogue(); err != nil {
-			log.Fatal(err)
 		}
 
 		if !internal.Chaos {
 			if err := catalogue.EnsureIsClean(); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		}
 
-		repos, err := recipe.ReadReposMetadata(internal.Debug)
+		repos, err := recipe.ReadReposMetadata()
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		barLength := len(repos)
+		var barLength int
+		var logMsg string
 		if recipeName != "" {
 			barLength = 1
+			logMsg = fmt.Sprintf("ensuring %v recipe is cloned & up-to-date", barLength)
+		} else {
+			barLength = len(repos)
+			logMsg = fmt.Sprintf("ensuring %v recipes are cloned & up-to-date, this could take some time...", barLength)
 		}
 
-		if !skipUpdates {
+		if !internal.SkipUpdates {
-			if err := recipe.UpdateRepositories(repos, recipeName, internal.Debug); err != nil {
+			logrus.Warn(logMsg)
-				log.Fatal(err)
+			if err := recipe.UpdateRepositories(repos, recipeName); err != nil {
+				logrus.Fatal(err)
 			}
 		}
 
-		var warnings []string
 		catl := make(recipe.RecipeCatalogue)
-		catlBar := formatter.CreateProgressbar(barLength, i18n.G("collecting catalogue metadata"))
+		catlBar := formatter.CreateProgressbar(barLength, "generating catalogue metadata...")
 		for _, recipeMeta := range repos {
 			if recipeName != "" && recipeName != recipeMeta.Name {
-				if !internal.Debug {
+				catlBar.Add(1)
-					catlBar.Add(1)
-				}
 				continue
 			}
 
-			r := recipe.Get(recipeMeta.Name)
+			versions, err := recipe.GetRecipeVersions(recipeMeta.Name, internal.Offline)
-			versions, warnMsgs, err := r.GetRecipeVersions()
 			if err != nil {
-				warnings = append(warnings, err.Error())
+				logrus.Warn(err)
-			}
-			if len(warnMsgs) > 0 {
-				warnings = append(warnings, warnMsgs...)
 			}
 
-			features, category, warnMsgs, err := recipe.GetRecipeFeaturesAndCategory(r)
+			features, category, err := recipe.GetRecipeFeaturesAndCategory(recipeMeta.Name)
 			if err != nil {
-				warnings = append(warnings, err.Error())
+				logrus.Warn(err)
-			}
-			if len(warnMsgs) > 0 {
-				warnings = append(warnings, warnMsgs...)
 			}
 
 			catl[recipeMeta.Name] = recipe.RecipeMeta{
@@ -169,154 +121,103 @@ your private key and enter your passphrase beforehand.
 				Features:      features,
 			}
 
-			if !internal.Debug {
+			catlBar.Add(1)
-				catlBar.Add(1)
-			}
-		}
-
-		if err := catlBar.Close(); err != nil {
-			log.Fatal(err)
-		}
-
-		var uniqueWarnings []string
-		for _, w := range warnings {
-			if !slices.Contains(uniqueWarnings, w) {
-				uniqueWarnings = append(uniqueWarnings, w)
-			}
-		}
-
-		for _, warnMsg := range uniqueWarnings {
-			log.Warn(warnMsg)
 		}
 
 		recipesJSON, err := json.MarshalIndent(catl, "", "    ")
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		if recipeName == "" {
 			if err := ioutil.WriteFile(config.RECIPES_JSON, recipesJSON, 0764); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		} else {
 			catlFS, err := recipe.ReadRecipeCatalogue(internal.Offline)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			catlFS[recipeName] = catl[recipeName]
 
 			updatedRecipesJSON, err := json.MarshalIndent(catlFS, "", "    ")
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			if err := ioutil.WriteFile(config.RECIPES_JSON, updatedRecipesJSON, 0764); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		}
 
-		log.Info(i18n.G("generated recipe catalogue: %s", config.RECIPES_JSON))
+		logrus.Infof("generated new recipe catalogue in %s", config.RECIPES_JSON)
 
 		cataloguePath := path.Join(config.ABRA_DIR, "catalogue")
-		if publishChanges {
+		if internal.Publish {
 
 			isClean, err := gitPkg.IsClean(cataloguePath)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			if isClean {
 				if !internal.Dry {
-					log.Fatal(i18n.G("no changes discovered in %s, nothing to publish?", cataloguePath))
+					logrus.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)
+				logrus.Fatal(err)
 			}
 
 			repo, err := git.PlainOpen(cataloguePath)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
-			sshURL := fmt.Sprintf(config.TOOLSHED_SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
+			sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
 			if err := gitPkg.CreateRemote(repo, "origin-ssh", sshURL, internal.Dry); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			if err := gitPkg.Push(cataloguePath, "origin-ssh", false, internal.Dry); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		}
 
 		repo, err := git.PlainOpen(cataloguePath)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		head, err := repo.Head()
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		if !internal.Dry && publishChanges {
+		if !internal.Dry && internal.Publish {
 			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))
+			logrus.Infof("new changes published: %s", url)
 		}
 
 		if internal.Dry {
-			log.Info(i18n.G("dry run: no changes published"))
+			logrus.Info("dry run: no changes published")
 		}
+
+		return nil
 	},
 }
 
 // CatalogueCommand defines the `abra catalogue` command and sub-commands.
-var CatalogueCommand = &cobra.Command{
+var CatalogueCommand = cli.Command{
-	// translators: `catalogue` command group
+	Name:        "catalogue",
-	Use: i18n.G("catalogue [cmd] [args] [flags]"),
+	Usage:       "Manage the recipe catalogue",
-	// translators: Short description for `catalogue` command group
+	Aliases:     []string{"c"},
-	Short:   i18n.G("Manage the recipe catalogue"),
+	ArgsUsage:   "<recipe>",
-	Aliases: []string{"c"},
+	Description: "This command helps recipe packagers interact with the recipe catalogue",
-}
+	Subcommands: []cli.Command{
-
+		catalogueGenerateCommand,
-var (
+	},
-	publishChanges bool
-	skipUpdates    bool
-)
-
-func init() {
-	CatalogueGenerateCommand.Flags().BoolVarP(
-		&publishChanges,
-		i18n.G("publish"),
-		i18n.G("p"),
-		false,
-		i18n.G("publish changes to git.coopcloud.tech"),
-	)
-
-	CatalogueGenerateCommand.Flags().BoolVarP(
-		&internal.Dry,
-		i18n.G("dry-run"),
-		i18n.G("r"),
-		false,
-		i18n.G("report changes that would be made"),
-	)
-
-	CatalogueGenerateCommand.Flags().BoolVarP(
-		&skipUpdates,
-		i18n.G("skip-updates"),
-		i18n.G("s"),
-		false,
-		i18n.G("skip updating recipe repositories"),
-	)
-
-	CatalogueGenerateCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
 }

cli/cli.go

@@ -0,0 +1,206 @@
+// Package cli provides the interface for the command-line.
+package cli
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"path"
+
+	"coopcloud.tech/abra/cli/app"
+	"coopcloud.tech/abra/cli/catalogue"
+	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/cli/recipe"
+	"coopcloud.tech/abra/cli/server"
+	"coopcloud.tech/abra/pkg/autocomplete"
+	cataloguePkg "coopcloud.tech/abra/pkg/catalogue"
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/web"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
+)
+
+// AutoCompleteCommand helps people set up auto-complete in their shells
+var AutoCompleteCommand = cli.Command{
+	Name:    "autocomplete",
+	Aliases: []string{"ac"},
+	Usage:   "Configure shell autocompletion (recommended)",
+	Description: `
+Set up auto-completion in your shell by downloading the relevant files and
+laying out what additional information must be loaded. Supported shells are as
+follows: bash, fish, fizsh & zsh.
+
+Example:
+
+    abra autocomplete bash
+`,
+	ArgsUsage: "<shell>",
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+	},
+	Action: func(c *cli.Context) error {
+		shellType := c.Args().First()
+
+		if shellType == "" {
+			internal.ShowSubcommandHelpAndError(c, errors.New("no shell provided"))
+		}
+
+		supportedShells := map[string]bool{
+			"bash":  true,
+			"zsh":   true,
+			"fizsh": true,
+			"fish":  true,
+		}
+
+		if _, ok := supportedShells[shellType]; !ok {
+			logrus.Fatalf("%s is not a supported shell right now, sorry", shellType)
+		}
+
+		if shellType == "fizsh" {
+			shellType = "zsh" // handled the same on the autocompletion side
+		}
+
+		autocompletionDir := path.Join(config.ABRA_DIR, "autocompletion")
+		if err := os.Mkdir(autocompletionDir, 0764); err != nil {
+			if !os.IsExist(err) {
+				logrus.Fatal(err)
+			}
+			logrus.Debugf("%s already created", autocompletionDir)
+		}
+
+		autocompletionFile := path.Join(config.ABRA_DIR, "autocompletion", shellType)
+		if _, err := os.Stat(autocompletionFile); err != nil && os.IsNotExist(err) {
+			url := fmt.Sprintf("https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/autocomplete/%s", shellType)
+			logrus.Infof("fetching %s", url)
+			if err := web.GetFile(autocompletionFile, url); err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		switch shellType {
+		case "bash":
+			fmt.Println(fmt.Sprintf(`
+# Run the following commands to install auto-completion
+sudo mkdir /etc/bash_completion.d/
+sudo cp %s /etc/bash_completion.d/abra
+echo "source /etc/bash_completion.d/abra" >> ~/.bashrc
+# To test, run the following: "abra app <hit tab key>" - you should see command completion!
+`, autocompletionFile))
+		case "zsh":
+			fmt.Println(fmt.Sprintf(`
+# Run the following commands to install auto-completion
+sudo mkdir /etc/zsh/completion.d/
+sudo cp %s /etc/zsh/completion.d/abra
+echo "PROG=abra\n_CLI_ZSH_AUTOCOMPLETE_HACK=1\nsource /etc/zsh/completion.d/abra" >> ~/.zshrc
+# To test, run the following: "abra app <hit tab key>" - you should see command completion!
+`, autocompletionFile))
+		case "fish":
+			fmt.Println(fmt.Sprintf(`
+# Run the following commands to install auto-completion
+sudo mkdir -p /etc/fish/completions
+sudo cp %s /etc/fish/completions/abra
+echo "source /etc/fish/completions/abra" >> ~/.config/fish/config.fish
+# To test, run the following: "abra app <hit tab key>" - you should see command completion!
+`, autocompletionFile))
+		}
+
+		return nil
+	},
+}
+
+// UpgradeCommand upgrades abra in-place.
+var UpgradeCommand = cli.Command{
+	Name:    "upgrade",
+	Aliases: []string{"u"},
+	Usage:   "Upgrade Abra itself",
+	Description: `
+Upgrade Abra in-place with the latest stable or release candidate.
+
+Pass "-r/--rc" to install the latest release candidate. Please bear in mind
+that it may contain catastrophic bugs. Thank you very much for the testing
+efforts!
+`,
+	Flags: []cli.Flag{internal.RCFlag},
+	Action: func(c *cli.Context) error {
+		mainURL := "https://install.abra.coopcloud.tech"
+		cmd := exec.Command("bash", "-c", fmt.Sprintf("wget -q -O- %s | bash", mainURL))
+
+		if internal.RC {
+			releaseCandidateURL := "https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/installer/installer"
+			cmd = exec.Command("bash", "-c", fmt.Sprintf("wget -q -O- %s | bash -s -- --rc", releaseCandidateURL))
+		}
+
+		logrus.Debugf("attempting to run %s", cmd)
+
+		if err := internal.RunCmd(cmd); err != nil {
+			logrus.Fatal(err)
+		}
+
+		return nil
+	},
+}
+
+func newAbraApp(version, commit string) *cli.App {
+	app := &cli.App{
+		Name: "abra",
+		Usage: `The Co-op Cloud command-line utility belt 🎩🐇
+    ____                           ____ _                 _
+   / ___|___         ___  _ __    / ___| | ___  _   _  __| |
+  | |   / _ \ _____ / _ \| '_ \  | |   | |/ _ \| | | |/ _' |
+  | |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |
+   \____\___/       \___/| .__/   \____|_|\___/ \__,_|\__,_|
+                         |_|
+`,
+		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
+		Commands: []cli.Command{
+			app.AppCommand,
+			server.ServerCommand,
+			recipe.RecipeCommand,
+			catalogue.CatalogueCommand,
+			UpgradeCommand,
+			AutoCompleteCommand,
+		},
+		BashComplete: autocomplete.SubcommandComplete,
+	}
+
+	app.EnableBashCompletion = true
+
+	app.Before = func(c *cli.Context) error {
+		paths := []string{
+			config.ABRA_DIR,
+			config.SERVERS_DIR,
+			config.RECIPES_DIR,
+			config.VENDOR_DIR,
+			config.BACKUP_DIR,
+		}
+
+		for _, path := range paths {
+			if err := os.Mkdir(path, 0764); err != nil {
+				if !os.IsExist(err) {
+					logrus.Fatal(err)
+				}
+				continue
+			}
+		}
+
+		if err := cataloguePkg.EnsureCatalogue(); err != nil {
+			logrus.Fatal(err)
+		}
+
+		logrus.Debugf("abra version %s, commit %s", version, commit)
+
+		return nil
+	}
+
+	return app
+}
+
+// RunApp runs CLI abra app.
+func RunApp(version, commit string) {
+	app := newAbraApp(version, commit)
+
+	if err := app.Run(os.Args); err != nil {
+		logrus.Fatal(err)
+	}
+}

cli/complete.go

@@ -1,71 +0,0 @@
-package cli
-
-import (
-	"os"
-	"strings"
-
-	"coopcloud.tech/abra/pkg/i18n"
-	"github.com/spf13/cobra"
-)
-
-// translators: `abra autocomplete` aliases. use a comma separated list of
-// aliases with no spaces in between
-var autocompleteAliases = i18n.G("ac")
-
-var AutocompleteCommand = &cobra.Command{
-	// translators: `autocomplete` command
-	Use:     i18n.G("autocomplete [bash|zsh|fish|powershell]"),
-	Aliases: strings.Split(autocompleteAliases, ","),
-	// translators: Short description for `autocomplete` command
-	Short: i18n.G("Generate autocompletion script"),
-	Long: i18n.G(`To load completions:
-
-Bash:
-  # Load autocompletion for the current Bash session
-  $ source <(abra autocomplete bash)
-
-  # To load autocompletion for each session, execute once:
-  # Linux:
-  $ abra autocomplete bash | sudo tee /etc/bash_completion.d/abra
-  # macOS:
-  $ abra autocomplete bash | sudo tee $(brew --prefix)/etc/bash_completion.d/abra
-
-Zsh:
-  # If shell autocompletion is not already enabled in your environment,
-  # you will need to enable it.  You can execute the following once:
-
-  $ echo "autoload -U compinit; compinit" >> ~/.zshrc
-
-  # To load autocompletions for each session, execute once:
-  $ abra autocomplete zsh > "${fpath[1]}/_abra"
-
-  # You will need to start a new shell for this setup to take effect.
-
-fish:
-  $ abra autocomplete fish | source
-
-  # To load autocompletions for each session, execute once:
-  $ abra autocomplete fish > ~/.config/fish/completions/abra.fish
-
-PowerShell:
-  PS> abra autocomplete powershell | Out-String | Invoke-Expression
-
-  # To load autocompletions for every new session, run:
-  PS> abra autocomplete powershell > abra.ps1
-  # and source this file from your PowerShell profile.`),
-	DisableFlagsInUseLine: true,
-	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-	Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
-	Run: func(cmd *cobra.Command, args []string) {
-		switch args[0] {
-		case "bash":
-			cmd.Root().GenBashCompletion(os.Stdout)
-		case "zsh":
-			cmd.Root().GenZshCompletion(os.Stdout)
-		case "fish":
-			cmd.Root().GenFishCompletion(os.Stdout, true)
-		case "powershell":
-			cmd.Root().GenPowerShellCompletionWithDesc(os.Stdout)
-		}
-	},
-}

cli/internal/backup.go

@@ -1,76 +1,35 @@
 package internal
 
 import (
-	"context"
+	"strings"
-	"errors"
-	"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"
-	"github.com/docker/cli/cli/command"
-	"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"
 )
 
-// RetrieveBackupBotContainer gets the deployed backupbot container.
+// SafeSplit splits up a string into a list of commands safely.
-func RetrieveBackupBotContainer(cl *dockerClient.Client) (types.Container, error) {
+func SafeSplit(s string) []string {
-	ctx := context.Background()
+	split := strings.Split(s, " ")
-	chosenService, err := service.GetServiceByLabel(ctx, cl, config.BackupbotLabel, NoInput)
+
-	if err != nil {
+	var result []string
-		return types.Container{}, errors.New(i18n.G("no backupbot discovered, is it deployed?"))
+	var inquote string
+	var block string
+	for _, i := range split {
+		if inquote == "" {
+			if strings.HasPrefix(i, "'") || strings.HasPrefix(i, "\"") {
+				inquote = string(i[0])
+				block = strings.TrimPrefix(i, inquote) + " "
+			} else {
+				result = append(result, i)
+			}
+		} else {
+			if !strings.HasSuffix(i, inquote) {
+				block += i + " "
+			} else {
+				block += strings.TrimSuffix(i, inquote)
+				inquote = ""
+				result = append(result, block)
+				block = ""
+			}
+		}
 	}
 
-	log.Debug(i18n.G("retrieved %s as backup enabled service", chosenService.Spec.Name))
+	return result
-
-	filters := filters.NewArgs()
-	filters.Add("name", chosenService.Spec.Name)
-	targetContainer, err := containerPkg.GetContainer(
-		ctx,
-		cl,
-		filters,
-		NoInput,
-	)
-	if err != nil {
-		return types.Container{}, err
-	}
-
-	return targetContainer, nil
-}
-
-// RunBackupCmdRemote runs a backup related command on a remote backupbot container.
-func RunBackupCmdRemote(
-	cl *dockerClient.Client,
-	backupCmd string,
-	containerID string,
-	execEnv []string) (io.Writer, error) {
-	execBackupListOpts := containertypes.ExecOptions{
-		AttachStderr: true,
-		AttachStdin:  true,
-		AttachStdout: true,
-		Cmd:          []string{"/usr/bin/backup", "--", backupCmd},
-		Detach:       false,
-		Env:          execEnv,
-		Tty:          true,
-	}
-
-	log.Debug(i18n.G("running backup %s on %s with exec config %v", backupCmd, containerID, execBackupListOpts))
-
-	// FIXME: avoid instantiating a new CLI
-	dcli, err := command.NewDockerCli()
-	if err != nil {
-		return nil, err
-	}
-
-	out, err := container.RunExec(dcli, cl, containerID, &execBackupListOpts)
-	if err != nil {
-		return nil, err
-	}
-
-	return out, nil
 }

cli/internal/cli.go

@@ -1,23 +1,251 @@
 package internal
 
-var (
+import (
-	// NOTE(d1): global
+	"os"
-	Debug   bool
-	NoInput bool
-	Offline bool
-	Help    bool
-	Version bool
 
-	// NOTE(d1): sub-command specific
+	logrusStack "github.com/Gurpartap/logrus-stack"
-	Chaos            bool
+	"github.com/sirupsen/logrus"
-	DeployLatest     bool
+	"github.com/urfave/cli"
-	DontWaitConverge bool
-	Dry              bool
-	Force            bool
-	MachineReadable  bool
-	Major            bool
-	Minor            bool
-	NoDomainChecks   bool
-	Patch            bool
-	ShowUnchanged    bool
 )
+
+// Secrets stores the variable from SecretsFlag
+var Secrets bool
+
+// SecretsFlag turns on/off automatically generating secrets
+var SecretsFlag = &cli.BoolFlag{
+	Name:        "secrets, S",
+	Usage:       "Automatically generate secrets",
+	Destination: &Secrets,
+}
+
+// Pass stores the variable from PassFlag
+var Pass bool
+
+// PassFlag turns on/off storing generated secrets in pass
+var PassFlag = &cli.BoolFlag{
+	Name:        "pass, p",
+	Usage:       "Store the generated secrets in a local pass store",
+	Destination: &Pass,
+}
+
+// PassRemove stores the variable for PassRemoveFlag
+var PassRemove bool
+
+// PassRemoveFlag turns on/off removing generated secrets from pass
+var PassRemoveFlag = &cli.BoolFlag{
+	Name:        "pass, p",
+	Usage:       "Remove generated secrets from a local pass store",
+	Destination: &PassRemove,
+}
+
+// Force force functionality without asking.
+var Force bool
+
+// ForceFlag turns on/off force functionality.
+var ForceFlag = &cli.BoolFlag{
+	Name:        "force, f",
+	Usage:       "Perform action without further prompt. Use with care!",
+	Destination: &Force,
+}
+
+// Chaos engages chaos mode.
+var Chaos bool
+
+// ChaosFlag turns on/off chaos functionality.
+var ChaosFlag = &cli.BoolFlag{
+	Name:        "chaos, C",
+	Usage:       "Proceed with uncommitted recipes changes. Use with care!",
+	Destination: &Chaos,
+}
+
+// Disable tty to run commands from script
+var Tty bool
+
+// TtyFlag turns on/off tty mode.
+var TtyFlag = &cli.BoolFlag{
+	Name:        "tty, T",
+	Usage:       "Disables TTY mode to run this command from a script.",
+	Destination: &Tty,
+}
+
+var NoInput bool
+var NoInputFlag = &cli.BoolFlag{
+	Name:        "no-input, n",
+	Usage:       "Toggle non-interactive mode",
+	Destination: &NoInput,
+}
+
+// Debug stores the variable from DebugFlag.
+var Debug bool
+
+// DebugFlag turns on/off verbose logging down to the DEBUG level.
+var DebugFlag = &cli.BoolFlag{
+	Name:        "debug, d",
+	Destination: &Debug,
+	Usage:       "Show DEBUG messages",
+}
+
+// Offline stores the variable from OfflineFlag.
+var Offline bool
+
+// DebugFlag turns on/off offline mode.
+var OfflineFlag = &cli.BoolFlag{
+	Name:        "offline, o",
+	Destination: &Offline,
+	Usage:       "Prefer offline & filesystem access when possible",
+}
+
+// MachineReadable stores the variable from MachineReadableFlag
+var MachineReadable bool
+
+// MachineReadableFlag turns on/off machine readable output where supported
+var MachineReadableFlag = &cli.BoolFlag{
+	Name:        "machine, m",
+	Destination: &MachineReadable,
+	Usage:       "Output in a machine-readable format (where supported)",
+}
+
+// RC signifies the latest release candidate
+var RC bool
+
+// RCFlag chooses the latest release candidate for install
+var RCFlag = &cli.BoolFlag{
+	Name:        "rc, r",
+	Destination: &RC,
+	Usage:       "Install the latest release candidate",
+}
+
+var Major bool
+var MajorFlag = &cli.BoolFlag{
+	Name:        "major, x",
+	Usage:       "Increase the major part of the version",
+	Destination: &Major,
+}
+
+var Minor bool
+var MinorFlag = &cli.BoolFlag{
+	Name:        "minor, y",
+	Usage:       "Increase the minor part of the version",
+	Destination: &Minor,
+}
+
+var Patch bool
+var PatchFlag = &cli.BoolFlag{
+	Name:        "patch, z",
+	Usage:       "Increase the patch part of the version",
+	Destination: &Patch,
+}
+
+var Dry bool
+var DryFlag = &cli.BoolFlag{
+	Name:        "dry-run, r",
+	Usage:       "Only reports changes that would be made",
+	Destination: &Dry,
+}
+
+var Publish bool
+var PublishFlag = &cli.BoolFlag{
+	Name:        "publish, p",
+	Usage:       "Publish changes to git.coopcloud.tech",
+	Destination: &Publish,
+}
+
+var Domain string
+var DomainFlag = &cli.StringFlag{
+	Name:        "domain, D",
+	Value:       "",
+	Usage:       "Choose a domain name",
+	Destination: &Domain,
+}
+
+var NewAppServer string
+var NewAppServerFlag = &cli.StringFlag{
+	Name:        "server, s",
+	Value:       "",
+	Usage:       "Show apps of a specific server",
+	Destination: &NewAppServer,
+}
+
+var NoDomainChecks bool
+var NoDomainChecksFlag = &cli.BoolFlag{
+	Name:        "no-domain-checks, D",
+	Usage:       "Disable app domain sanity checks",
+	Destination: &NoDomainChecks,
+}
+
+var StdErrOnly bool
+var StdErrOnlyFlag = &cli.BoolFlag{
+	Name:        "stderr, s",
+	Usage:       "Only tail stderr",
+	Destination: &StdErrOnly,
+}
+
+var SinceLogs string
+var SinceLogsFlag = &cli.StringFlag{
+	Name:        "since, S",
+	Value:       "",
+	Usage:       "tail logs since YYYY-MM-DDTHH:MM:SSZ",
+	Destination: &SinceLogs,
+}
+
+var DontWaitConverge bool
+var DontWaitConvergeFlag = &cli.BoolFlag{
+	Name:        "no-converge-checks, c",
+	Usage:       "Don't wait for converge logic checks",
+	Destination: &DontWaitConverge,
+}
+
+var Watch bool
+var WatchFlag = &cli.BoolFlag{
+	Name:        "watch, w",
+	Usage:       "Watch status by polling repeatedly",
+	Destination: &Watch,
+}
+
+var OnlyErrors bool
+var OnlyErrorFlag = &cli.BoolFlag{
+	Name:        "errors, e",
+	Usage:       "Only show errors",
+	Destination: &OnlyErrors,
+}
+
+var SkipUpdates bool
+var SkipUpdatesFlag = &cli.BoolFlag{
+	Name:        "skip-updates, s",
+	Usage:       "Skip updating recipe repositories",
+	Destination: &SkipUpdates,
+}
+
+var AllTags bool
+var AllTagsFlag = &cli.BoolFlag{
+	Name:        "all-tags, a",
+	Usage:       "List all tags, not just upgrades",
+	Destination: &AllTags,
+}
+
+var LocalCmd bool
+var LocalCmdFlag = &cli.BoolFlag{
+	Name:        "local, l",
+	Usage:       "Run command locally",
+	Destination: &LocalCmd,
+}
+
+var RemoteUser string
+var RemoteUserFlag = &cli.StringFlag{
+	Name:        "user, u",
+	Value:       "",
+	Usage:       "User to run command within a service context",
+	Destination: &RemoteUser,
+}
+
+// SubCommandBefore wires up pre-action machinery (e.g. --debug handling).
+func SubCommandBefore(c *cli.Context) error {
+	if Debug {
+		logrus.SetLevel(logrus.DebugLevel)
+		logrus.SetFormatter(&logrus.TextFormatter{})
+		logrus.SetOutput(os.Stderr)
+		logrus.AddHook(logrusStack.StandardHook())
+	}
+
+	return nil
+}

cli/internal/command.go

@@ -3,31 +3,25 @@ package internal
 import (
 	"bufio"
 	"context"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os/exec"
 	"strings"
 
-	appPkg "coopcloud.tech/abra/pkg/app"
+	"coopcloud.tech/abra/pkg/config"
 	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"
-	containertypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	dockerClient "github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/archive"
+	"github.com/sirupsen/logrus"
 )
 
 // RunCmdRemote executes an abra.sh command in the target service
-func RunCmdRemote(
+func RunCmdRemote(cl *dockerClient.Client, app config.App, abraSh, serviceName, cmdName, cmdArgs string) error {
-	cl *dockerClient.Client,
-	app appPkg.App,
-	disableTTY bool,
-	abraSh, serviceName, cmdName, cmdArgs, remoteUser string) error {
 	filters := filters.NewArgs()
 	filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName))
 
@@ -36,7 +30,7 @@ func RunCmdRemote(
 		return err
 	}
 
-	log.Debug(i18n.G("retrieved %s as target container on %s", formatter.ShortenID(targetContainer.ID), app.Server))
+	logrus.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)
@@ -44,7 +38,7 @@ func RunCmdRemote(
 		return err
 	}
 
-	copyOpts := containertypes.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
+	copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
 	if err := cl.CopyToContainer(context.Background(), targetContainer.ID, "/tmp", content, copyOpts); err != nil {
 		return err
 	}
@@ -57,7 +51,7 @@ func RunCmdRemote(
 
 	shell := "/bin/bash"
 	findShell := []string{"test", "-e", shell}
-	execCreateOpts := containertypes.ExecOptions{
+	execCreateOpts := types.ExecConfig{
 		AttachStderr: true,
 		AttachStdin:  true,
 		AttachStdout: true,
@@ -66,8 +60,8 @@ func RunCmdRemote(
 		Tty:          false,
 	}
 
-	if _, err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
+	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))
+		logrus.Infof("%s does not exist for %s, use /bin/sh as fallback", shell, app.Name)
 		shell = "/bin/sh"
 	}
 
@@ -78,22 +72,20 @@ 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, " ")))
+	logrus.Debugf("running command: %s", strings.Join(cmd, " "))
 
-	if remoteUser != "" {
+	if RemoteUser != "" {
-		log.Debug(i18n.G("running command with user %s", remoteUser))
+		logrus.Debugf("running command with user %s", RemoteUser)
-		execCreateOpts.User = remoteUser
+		execCreateOpts.User = RemoteUser
 	}
 
 	execCreateOpts.Cmd = cmd
-
 	execCreateOpts.Tty = true
-	if disableTTY {
+	if Tty {
 		execCreateOpts.Tty = false
-		log.Debug(i18n.G("not requesting a remote TTY"))
 	}
 
-	if _, err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
+	if err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
 		return err
 	}
 
@@ -107,7 +99,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,62 +1,27 @@
 package internal
 
 import (
-	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
-	"sort"
+	"path"
 	"strings"
 
-	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"
-	"github.com/charmbracelet/lipgloss"
 	dockerClient "github.com/docker/docker/client"
+	"github.com/sirupsen/logrus"
 )
 
-var borderStyle = lipgloss.NewStyle().
+// NewVersionOverview shows an upgrade or downgrade overview
-	BorderStyle(lipgloss.ThickBorder()).
+func NewVersionOverview(app config.App, currentVersion, newVersion, releaseNotes string) error {
-	Padding(0, 1, 0, 1).
+	tableCol := []string{"server", "recipe", "config", "domain", "current version", "to be deployed"}
-	MaxWidth(79).
+	table := formatter.CreateTable(tableCol)
-	BorderForeground(lipgloss.Color("63"))
 
-var headerStyle = lipgloss.NewStyle().
-	Underline(true).
-	Bold(true).
-	PaddingBottom(1)
-
-var leftStyle = lipgloss.NewStyle().
-	Bold(true)
-
-var rightStyle = lipgloss.NewStyle()
-
-// horizontal is a JoinHorizontal helper function.
-func horizontal(left, mid, right string) string {
-	return lipgloss.JoinHorizontal(lipgloss.Left, left, mid, right)
-}
-
-func formatComposeFiles(composeFiles string) string {
-	return strings.ReplaceAll(composeFiles, ":", "\n")
-}
-
-// DeployOverview shows a deployment overview
-func DeployOverview(
-	app appPkg.App,
-	deployedVersion string,
-	toDeployVersion string,
-	releaseNotes string,
-	warnMessages []string,
-	secrets []string,
-	configs []string,
-	images []string,
-) error {
 	deployConfig := "compose.yml"
 	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
-		deployConfig = formatComposeFiles(composeFiles)
+		deployConfig = strings.Join(strings.Split(composeFiles, ":"), "\n")
 	}
 
 	server := app.Server
@@ -64,62 +29,14 @@ func DeployOverview(
 		server = "local"
 	}
 
-	domain := app.Domain
+	table.Append([]string{server, app.Recipe, deployConfig, app.Domain, currentVersion, newVersion})
-	if domain == "" {
+	table.Render()
-		domain = config.MISSING_DEFAULT
-	}
 
-	envVersion := app.Recipe.EnvVersionRaw
+	if releaseNotes != "" && newVersion != "" {
-	if envVersion == "" {
+		fmt.Println()
-		envVersion = config.MISSING_DEFAULT
-	}
-
-	rows := [][]string{
-		{i18n.G("DOMAIN"), domain},
-		{i18n.G("RECIPE"), app.Recipe.Name},
-		{i18n.G("SERVER"), server},
-		{i18n.G("CONFIG"), deployConfig},
-		{"", ""},
-		{i18n.G("CURRENT DEPLOYMENT"), formatter.BoldDirtyDefault(deployedVersion)},
-		{i18n.G("ENV VERSION"), formatter.BoldDirtyDefault(envVersion)},
-		{i18n.G("NEW DEPLOYMENT"), formatter.BoldDirtyDefault(toDeployVersion)},
-	}
-
-	if len(images) > 0 {
-		imageRows := [][]string{
-			{"", ""},
-			{i18n.G("IMAGES"), strings.Join(images, "\n")},
-		}
-		rows = append(rows, imageRows...)
-	}
-
-	if len(secrets) > 0 {
-		secretsRows := [][]string{
-			{"", ""},
-			{i18n.G("SECRETS"), strings.Join(secrets, "\n")},
-		}
-		rows = append(rows, secretsRows...)
-	}
-
-	if len(configs) > 0 {
-		configsRows := [][]string{
-			{"", ""},
-			{i18n.G("CONFIGS"), strings.Join(configs, "\n")},
-		}
-		rows = append(rows, configsRows...)
-	}
-
-	deployType := getDeployType(deployedVersion, toDeployVersion)
-	overview := formatter.CreateOverview(i18n.G("%s OVERVIEW", deployType), rows)
-
-	fmt.Println(overview)
-
-	if releaseNotes != "" {
 		fmt.Print(releaseNotes)
-	}
+	} else {
-
+		logrus.Warnf("no release notes available for %s", newVersion)
-	for _, msg := range warnMessages {
-		log.Warn(msg)
 	}
 
 	if NoInput {
@@ -127,126 +44,49 @@ func DeployOverview(
 	}
 
 	response := false
-	prompt := &survey.Confirm{Message: "proceed?"}
+	prompt := &survey.Confirm{
+		Message: "continue with deployment?",
+	}
+
 	if err := survey.AskOne(prompt, &response); err != nil {
 		return err
 	}
 
 	if !response {
-		log.Fatal(i18n.G("deployment cancelled"))
+		logrus.Fatal("exiting as requested")
 	}
 
 	return nil
 }
 
-func getDeployType(currentVersion, newVersion string) string {
+// GetReleaseNotes prints release notes for a recipe version
-	if newVersion == config.MISSING_DEFAULT {
+func GetReleaseNotes(recipeName, version string) (string, error) {
-		return i18n.G("UNDEPLOY")
+	if version == "" {
+		return "", nil
 	}
 
-	if strings.Contains(newVersion, "+U") {
+	fpath := path.Join(config.RECIPES_DIR, recipeName, "release", version)
-		return i18n.G("CHAOS DEPLOY")
+
+	if _, err := os.Stat(fpath); !os.IsNotExist(err) {
+		releaseNotes, err := ioutil.ReadFile(fpath)
+		if err != nil {
+			return "", err
+		}
+		withTitle := fmt.Sprintf("%s release notes:\n%s", version, string(releaseNotes))
+		return withTitle, nil
 	}
 
-	if strings.Contains(currentVersion, "+U") {
+	return "", nil
-		return i18n.G("UNCHAOS DEPLOY")
-	}
-
-	if currentVersion == newVersion {
-		return ("REDEPLOY")
-	}
-
-	if currentVersion == config.MISSING_DEFAULT {
-		return i18n.G("NEW DEPLOY")
-	}
-
-	currentParsed, err := tagcmp.Parse(currentVersion)
-	if err != nil {
-		return i18n.G("DEPLOY")
-	}
-
-	newParsed, err := tagcmp.Parse(newVersion)
-	if err != nil {
-		return i18n.G("DEPLOY")
-	}
-
-	if currentParsed.IsLessThan(newParsed) {
-		return i18n.G("UPGRADE")
-	}
-
-	return i18n.G("DOWNGRADE")
-}
-
-// MoveOverview shows a overview before moving an app to a different server
-func MoveOverview(
-	app appPkg.App,
-	newServer string,
-	secrets []string,
-	volumes []string,
-) {
-	server := app.Server
-	if app.Server == "default" {
-		server = "local"
-	}
-
-	domain := app.Domain
-	if domain == "" {
-		domain = config.MISSING_DEFAULT
-	}
-
-	secretsOverview := strings.Join(secrets, "\n")
-	if len(secrets) == 0 {
-		secretsOverview = config.MISSING_DEFAULT
-	}
-
-	volumesOverview := strings.Join(volumes, "\n")
-	if len(volumes) == 0 {
-		volumesOverview = config.MISSING_DEFAULT
-	}
-
-	rows := [][]string{
-		{i18n.G("DOMAIN"), domain},
-		{i18n.G("RECIPE"), app.Recipe.Name},
-		{i18n.G("OLD SERVER"), server},
-		{i18n.G("NEW SERVER"), newServer},
-		{i18n.G("SECRETS"), secretsOverview},
-		{i18n.G("VOLUMES"), volumesOverview},
-	}
-
-	overview := formatter.CreateOverview(i18n.G("MOVE OVERVIEW"), rows)
-
-	fmt.Println(overview)
-}
-
-func PromptProcced() error {
-	if NoInput {
-		return nil
-	}
-
-	if Dry {
-		return errors.New(i18n.G("dry run"))
-	}
-
-	response := false
-	prompt := &survey.Confirm{Message: i18n.G("proceed?")}
-	if err := survey.AskOne(prompt, &response); err != nil {
-		return err
-	}
-
-	if !response {
-		return errors.New(i18n.G("cancelled"))
-	}
-
-	return nil
 }
 
 // PostCmds parses a string of commands and executes them inside of the respective services
 // the commands string must have the following format:
 // "<service> <command> <arguments>|<service> <command> <arguments>|... "
-func PostCmds(cl *dockerClient.Client, app appPkg.App, commands string) error {
+func PostCmds(cl *dockerClient.Client, app config.App, commands string) error {
-	if _, err := os.Stat(app.Recipe.AbraShPath); err != nil {
+	abraSh := path.Join(config.RECIPES_DIR, app.Recipe, "abra.sh")
+	if _, err := os.Stat(abraSh); 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?", abraSh, app.Name))
 		}
 		return err
 	}
@@ -254,7 +94,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]
@@ -262,13 +102,13 @@ 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))
+		logrus.Infof("running post-command '%s %s' in container %s", cmdName, parsedCmdArgs, targetServiceName)
 
-		if err := EnsureCommand(app.Recipe.AbraShPath, app.Recipe.Name, cmdName); err != nil {
+		if err := EnsureCommand(abraSh, app.Recipe, cmdName); err != nil {
 			return err
 		}
 
-		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
+		serviceNames, err := config.GetAppServiceNames(app.Name)
 		if err != nil {
 			return err
 		}
@@ -281,38 +121,53 @@ 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))
+		logrus.Debugf("running command %s %s within the context of %s_%s", cmdName, parsedCmdArgs, app.StackName(), targetServiceName)
 
-		requestTTY := true
+		Tty = true
-		if err := RunCmdRemote(
+		if err := RunCmdRemote(cl, app, abraSh, targetServiceName, cmdName, parsedCmdArgs); err != nil {
-			cl,
-			app,
-			requestTTY,
-			app.Recipe.AbraShPath, targetServiceName, cmdName, parsedCmdArgs, ""); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-// SortVersionsDesc sorts versions in descending order.
+// DeployOverview shows a deployment overview
-func SortVersionsDesc(versions []string) []string {
+func DeployOverview(app config.App, version, message string) error {
-	var tags []tagcmp.Tag
+	tableCol := []string{"server", "recipe", "config", "domain", "version"}
+	table := formatter.CreateTable(tableCol)
 
-	for _, v := range versions {
+	deployConfig := "compose.yml"
-		parsed, _ := tagcmp.Parse(v) // skips unsupported tags
+	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
-		tags = append(tags, parsed)
+		deployConfig = strings.Join(strings.Split(composeFiles, ":"), "\n")
 	}
 
-	sort.Sort(tagcmp.ByTagDesc(tags))
+	server := app.Server
-
+	if app.Server == "default" {
-	var desc []string
+		server = "local"
-	for _, t := range tags {
-		desc = append(desc, t.String())
 	}
 
-	return desc
+	table.Append([]string{server, app.Recipe, deployConfig, app.Domain, version})
+	table.Render()
+
+	if NoInput {
+		return nil
+	}
+
+	response := false
+	prompt := &survey.Confirm{
+		Message: message,
+	}
+
+	if err := survey.AskOne(prompt, &response); err != nil {
+		return err
+	}
+
+	if !response {
+		logrus.Fatal("exiting as requested")
+	}
+
+	return nil
 }

cli/internal/deploy_test.go

@@ -1,17 +0,0 @@
-package internal
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSortVersionsDesc(t *testing.T) {
-	versions := SortVersionsDesc([]string{
-		"0.2.3+1.2.2",
-		"1.0.0+2.2.2",
-	})
-
-	assert.Equal(t, "1.0.0+2.2.2", versions[0])
-	assert.Equal(t, "0.2.3+1.2.2", versions[1])
-}

cli/internal/ensure.go

@@ -1,11 +0,0 @@
-package internal
-
-import "coopcloud.tech/abra/pkg/recipe"
-
-func GetEnsureContext() recipe.EnsureContext {
-	return recipe.EnsureContext{
-		Chaos,
-		Offline,
-		DeployLatest,
-	}
-}

cli/internal/errors.go

@@ -0,0 +1,18 @@
+package internal
+
+import (
+	"os"
+
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
+)
+
+// ShowSubcommandHelpAndError exits the program on error, logs the error to the
+// terminal, and shows the help command.
+func ShowSubcommandHelpAndError(c *cli.Context, err interface{}) {
+	if err2 := cli.ShowSubcommandHelp(c); err2 != nil {
+		logrus.Error(err2)
+	}
+	logrus.Error(err)
+	os.Exit(1)
+}

cli/internal/list.go

@@ -0,0 +1,10 @@
+package internal
+
+// ReverseStringList reverses a list of a strings. Roll on Go generics.
+func ReverseStringList(strings []string) []string {
+	for i, j := 0, len(strings)-1; i < j; i, j = i+1, j-1 {
+		strings[i], strings[j] = strings[j], strings[i]
+	}
+
+	return strings
+}

cli/internal/recipe.go

@@ -1,21 +1,19 @@
 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"
-	"github.com/distribution/reference"
+	"github.com/docker/distribution/reference"
+	"github.com/sirupsen/logrus"
 )
 
 // PromptBumpType prompts for version bump type
-func PromptBumpType(tagString, latestRelease, changeOverview string) error {
+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
@@ -24,8 +22,6 @@ version.
 
 The latest published version is %s.
 
-%s
-
 Here is a semver cheat sheet (more on https://semver.org):
 
     major: new features/bug fixes, backwards incompatible (e.g 1.0.0 -> 2.0.0).
@@ -40,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, changeOverview))
+`, 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 {
@@ -63,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?"))
+		logrus.Fatal("no version bump type specififed?")
 	}
 
 	return bumpType
@@ -77,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?"))
+		logrus.Fatal("no version bump type specififed?")
 	}
 }
 
@@ -92,11 +88,7 @@ func SetBumpType(bumpType string) {
 func GetMainAppImage(recipe recipe.Recipe) (string, error) {
 	var path string
 
-	config, err := recipe.GetComposeConfig(nil)
+	for _, service := range recipe.Config.Services {
-	if err != nil {
-		return "", err
-	}
-	for _, service := range config.Services {
 		if service.Name == "app" {
 			img, err := reference.ParseNormalizedNamed(service.Image)
 			if err != nil {
@@ -111,7 +103,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

@@ -1,158 +1,153 @@
 package internal
 
 import (
+	"errors"
 	"strings"
 
 	"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"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
 // ValidateRecipe ensures the recipe arg is valid.
-func ValidateRecipe(args []string, cmdName string) recipe.Recipe {
+func ValidateRecipe(c *cli.Context) recipe.Recipe {
-	var recipeName string
+	recipeName := c.Args().First()
-	if len(args) > 0 {
-		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)
+			logrus.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 {
+			logrus.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 {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 	}
 
 	if recipeName == "" {
-		log.Fatal(i18n.G("no recipe name provided"))
+		ShowSubcommandHelpAndError(c, errors.New("no recipe name provided"))
 	}
 
-	if _, ok := knownRecipes[recipeName]; !ok {
+	chosenRecipe, err := recipe.Get(recipeName, Offline)
-		if !strings.Contains(recipeName, "/") {
-			log.Fatal(i18n.G("no recipe '%s' exists?", recipeName))
-		}
-	}
-
-	chosenRecipe := recipe.Get(recipeName)
-	if err := chosenRecipe.EnsureExists(); err != nil {
-		log.Fatal(err)
-	}
-
-	_, err = chosenRecipe.GetComposeConfig(nil)
 	if err != nil {
-		if cmdName == i18n.G("generate") {
+		if c.Command.Name == "generate" {
 			if strings.Contains(err.Error(), "missing a compose") {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
-			log.Warn(err)
+			logrus.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))
+				logrus.Warnf("ensure %s recipe compose.* files include \"version: '3.8'\"", recipeName)
 			}
-			log.Fatal(i18n.G("unable to validate recipe: %s", err))
+			logrus.Fatalf("unable to validate recipe: %s", err)
 		}
 	}
 
-	log.Debug(i18n.G("validated %s as recipe argument", recipeName))
+	logrus.Debugf("validated %s as recipe argument", recipeName)
 
 	return chosenRecipe
 }
 
 // ValidateApp ensures the app name arg is valid.
-func ValidateApp(args []string) app.App {
+func ValidateApp(c *cli.Context) config.App {
-	if len(args) == 0 {
+	appName := c.Args().First()
-		log.Fatal(i18n.G("no app provided"))
-	}
 
-	appName := args[0]
+	if appName == "" {
+		ShowSubcommandHelpAndError(c, errors.New("no app provided"))
+	}
 
 	app, err := app.Get(appName)
 	if err != nil {
-		log.Fatal(err)
+		logrus.Fatal(err)
 	}
 
-	log.Debug(i18n.G("validated %s as app argument", appName))
+	logrus.Debugf("validated %s as app argument", appName)
 
 	return app
 }
 
 // ValidateDomain ensures the domain name arg is valid.
-func ValidateDomain(args []string) string {
+func ValidateDomain(c *cli.Context) string {
-	var domainName string
+	domainName := c.Args().First()
-	if len(args) > 0 {
-		domainName = args[0]
-	}
 
 	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)
+			logrus.Fatal(err)
 		}
 	}
 
 	if domainName == "" {
-		log.Fatal(i18n.G("no domain provided"))
+		ShowSubcommandHelpAndError(c, errors.New("no domain provided"))
 	}
 
-	log.Debug(i18n.G("validated %s as domain argument", domainName))
+	logrus.Debugf("validated %s as domain argument", domainName)
 
 	return domainName
 }
 
-// ValidateServer ensures the server name arg is valid.
+// ValidateSubCmdFlags ensures flag order conforms to correct order
-func ValidateServer(args []string) string {
+func ValidateSubCmdFlags(c *cli.Context) bool {
-	var serverName string
+	for argIdx, arg := range c.Args() {
-	if len(args) > 0 {
+		if !strings.HasPrefix(arg, "--") {
-		serverName = args[0]
+			for _, flag := range c.Args()[argIdx:] {
+				if strings.HasPrefix(flag, "--") {
+					return false
+				}
+			}
+		}
 	}
+	return true
+}
+
+// ValidateServer ensures the server name arg is valid.
+func ValidateServer(c *cli.Context) string {
+	serverName := c.Args().First()
 
 	serverNames, err := config.ReadServerNames()
 	if err != nil {
-		log.Fatal(err)
+		logrus.Fatal(err)
 	}
 
 	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 {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 	}
 
@@ -164,14 +159,14 @@ func ValidateServer(args []string) string {
 	}
 
 	if serverName == "" {
-		log.Fatal(i18n.G("no server provided"))
+		ShowSubcommandHelpAndError(c, errors.New("no server provided"))
 	}
 
 	if !matched {
-		log.Fatal(i18n.G("server doesn't exist?"))
+		ShowSubcommandHelpAndError(c, errors.New("server doesn't exist?"))
 	}
 
-	log.Debug(i18n.G("validated %s as server argument", serverName))
+	logrus.Debugf("validated %s as server argument", serverName)
 
 	return serverName
 }

cli/recipe/diff.go

@@ -1,38 +1,40 @@
 package recipe
 
 import (
-	"strings"
+	"path"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
+	"coopcloud.tech/abra/pkg/config"
 	gitPkg "coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/i18n"
+	"github.com/sirupsen/logrus"
-	"coopcloud.tech/abra/pkg/log"
+	"github.com/urfave/cli"
-	"github.com/spf13/cobra"
 )
 
-// translators: `abra recipe diff` aliases. use a comma separated list of aliases
+var recipeDiffCommand = cli.Command{
-// with no spaces in between
+	Name:        "diff",
-var recipeDiffAliases = i18n.G("d")
+	Usage:       "Show unstaged changes in recipe config",
-
+	Description: "Due to limitations in our underlying Git dependency, this command requires /usr/bin/git.",
-var RecipeDiffCommand = &cobra.Command{
+	Aliases:     []string{"d"},
-	// translators: `recipe diff` command
+	ArgsUsage:   "<recipe>",
-	Use:     i18n.G("diff <recipe> [flags]"),
+	Flags: []cli.Flag{
-	Aliases: strings.Split(recipeDiffAliases, ","),
+		internal.DebugFlag,
-	// translators: Short description for `recipe diff` command
+		internal.NoInputFlag,
-	Short: i18n.G("Show unstaged changes in recipe config"),
-	Long:  i18n.G("This command requires /usr/bin/git."),
-	Args:  cobra.MinimumNArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.RecipeNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		r := internal.ValidateRecipe(args, cmd.Name())
+	BashComplete: autocomplete.RecipeNameComplete,
-		if err := gitPkg.DiffUnstaged(r.Dir); err != nil {
+	Action: func(c *cli.Context) error {
-			log.Fatal(err)
+		recipeName := c.Args().First()
+
+		if recipeName != "" {
+			internal.ValidateRecipe(c)
 		}
+
+		recipeDir := path.Join(config.RECIPES_DIR, recipeName)
+		if err := gitPkg.DiffUnstaged(recipeDir); err != nil {
+			logrus.Fatal(err)
+		}
+
+		return nil
 	},
 }

cli/recipe/fetch.go

@@ -1,142 +1,44 @@
 package recipe
 
 import (
-	"os"
-	"strings"
-
 	"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"
+	"github.com/sirupsen/logrus"
-	gitCfg "github.com/go-git/go-git/v5/config"
+	"github.com/urfave/cli"
-	"github.com/spf13/cobra"
 )
 
-// translators: `abra recipe fetch` aliases. use a comma separated list of aliases
+var recipeFetchCommand = cli.Command{
-// with no spaces in between
+	Name:        "fetch",
-var recipeFetchAliases = i18n.G("f")
+	Usage:       "Fetch recipe(s)",
-
+	Aliases:     []string{"f"},
-var RecipeFetchCommand = &cobra.Command{
+	ArgsUsage:   "[<recipe>]",
-	// translators: `recipe fetch` command
+	Description: "Retrieves all recipes if no <recipe> argument is passed",
-	Use:     i18n.G("fetch [recipe | --all] [flags]"),
+	Flags: []cli.Flag{
-	Aliases: strings.Split(recipeFetchAliases, ","),
+		internal.DebugFlag,
-	// translators: Short description for `recipe fetch` command
+		internal.NoInputFlag,
-	Short: i18n.G("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,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.RecipeNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		var recipeName string
+	BashComplete: autocomplete.RecipeNameComplete,
-		if len(args) > 0 {
+	Action: func(c *cli.Context) error {
-			recipeName = args[0]
+		recipeName := c.Args().First()
-		}
-
-		if recipeName == "" && !fetchAllRecipes {
-			log.Fatal(i18n.G("missing [recipe] or --all/-a"))
-		}
-
-		if recipeName != "" && fetchAllRecipes {
-			log.Fatal(i18n.G("cannot use [recipe] and --all/-a together"))
-		}
 
 		if recipeName != "" {
-			r := recipe.Get(recipeName)
+			internal.ValidateRecipe(c)
-			if _, err := os.Stat(r.Dir); !os.IsNotExist(err) {
-				if !force {
-					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
 		}
 
-		catalogue, err := recipe.ReadRecipeCatalogue(internal.Offline)
+		if err := recipe.EnsureExists(recipeName); err != nil {
-		if err != nil {
+			logrus.Fatal(err)
-			log.Fatal(err)
 		}
 
-		catlBar := formatter.CreateProgressbar(len(catalogue), i18n.G("fetching latest recipes..."))
+		if err := recipe.EnsureUpToDate(recipeName); err != nil {
-		ensureCtx := internal.GetEnsureContext()
+			logrus.Fatal(err)
-		for recipeName := range catalogue {
-			r := recipe.Get(recipeName)
-			if err := r.Ensure(ensureCtx); err != nil {
-				log.Error(err)
-			}
-			catlBar.Add(1)
 		}
+
+		if err := recipe.EnsureLatest(recipeName); err != nil {
+			logrus.Fatal(err)
+		}
+
+		return nil
 	},
 }
-
-var (
-	fetchAllRecipes bool
-	sshRemote       bool
-	force           bool
-)
-
-func init() {
-	RecipeFetchCommand.Flags().BoolVarP(
-		&fetchAllRecipes,
-		i18n.G("all"),
-		i18n.GC("a", "recipe fetch"),
-		false,
-		i18n.G("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

@@ -1,64 +1,63 @@
 package recipe
 
 import (
-	"strings"
+	"fmt"
 
 	"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"
+	recipePkg "coopcloud.tech/abra/pkg/recipe"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra recipe lint` aliases. use a comma separated list of
+var recipeLintCommand = cli.Command{
-// aliases with no spaces in between
+	Name:      "lint",
-var recipeLintAliases = i18n.G("l")
+	Usage:     "Lint a recipe",
-
+	Aliases:   []string{"l"},
-var RecipeLintCommand = &cobra.Command{
+	ArgsUsage: "<recipe>",
-	// translators: `recipe lint` command
+	Flags: []cli.Flag{
-	Use: i18n.G("lint <recipe> [flags]"),
+		internal.DebugFlag,
-	// translators: Short description for `recipe lint` command
+		internal.OnlyErrorFlag,
-	Short:   i18n.G("Lint a recipe"),
+		internal.OfflineFlag,
-	Aliases: strings.Split(recipeLintAliases, ","),
+		internal.NoInputFlag,
-	Args:    cobra.MinimumNArgs(1),
+		internal.ChaosFlag,
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.RecipeNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		recipe := internal.ValidateRecipe(args, cmd.Name())
+	BashComplete: autocomplete.RecipeNameComplete,
+	Action: func(c *cli.Context) error {
+		recipe := internal.ValidateRecipe(c)
 
-		if err := recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := recipePkg.EnsureExists(recipe.Name); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		headers := []string{
+		if !internal.Chaos {
-			i18n.G("ref"),
+			if err := recipePkg.EnsureIsClean(recipe.Name); err != nil {
-			i18n.G("rule"),
+				logrus.Fatal(err)
-			i18n.G("severity"),
+			}
-			i18n.G("satisfied"),
+
-			i18n.G("skipped"),
+			if !internal.Offline {
-			i18n.G("resolve"),
+				if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+
+			if err := recipePkg.EnsureLatest(recipe.Name); err != nil {
+				logrus.Fatal(err)
+			}
 		}
 
-		table, err := formatter.CreateTable()
+		tableCol := []string{"ref", "rule", "severity", "satisfied", "skipped", "resolve"}
-		if err != nil {
+		table := formatter.CreateTable(tableCol)
-			log.Fatal(err)
-		}
-
-		table.Headers(headers...)
 
 		hasError := false
-		var rows [][]string
+		bar := formatter.CreateProgressbar(-1, "running recipe lint rules...")
-		var warnMessages []string
 		for level := range lint.LintRules {
 			for _, rule := range lint.LintRules[level] {
-				if onlyError && rule.Level != "error" {
+				if internal.OnlyErrors && rule.Level != "error" {
-					log.Debug(i18n.G("skipping %s, does not have level \"error\"", rule.Ref))
+					logrus.Debugf("skipping %s, does not have level \"error\"", rule.Ref)
 					continue
 				}
 
@@ -76,10 +75,10 @@ var RecipeLintCommand = &cobra.Command{
 				if !skipped {
 					ok, err := rule.Function(recipe)
 					if err != nil {
-						warnMessages = append(warnMessages, err.Error())
+						logrus.Warn(err)
 					}
 
-					if !ok && rule.Level == i18n.G("error") {
+					if !ok && rule.Level == "error" {
 						hasError = true
 					}
 
@@ -96,54 +95,28 @@ var RecipeLintCommand = &cobra.Command{
 					}
 				}
 
-				row := []string{
+				table.Append([]string{
 					rule.Ref,
 					rule.Description,
 					rule.Level,
 					satisfiedOutput,
 					skippedOutput,
 					rule.HowToResolve,
-				}
+				})
 
-				rows = append(rows, row)
+				bar.Add(1)
-				table.Row(row...)
 			}
 		}
 
-		if len(rows) > 0 {
+		if table.NumLines() > 0 {
-			if err := formatter.PrintTable(table); err != nil {
+			fmt.Println()
-				log.Fatal(err)
+			table.Render()
-			}
-
-			for _, warnMsg := range warnMessages {
-				log.Warn(warnMsg)
-			}
-
-			if hasError {
-				log.Warn(i18n.G("critical errors present in %s config", recipe.Name))
-			}
 		}
+
+		if hasError {
+			logrus.Warn("watch out, some critical errors are present in your recipe config")
+		}
+
+		return nil
 	},
 }
-
-var (
-	onlyError bool
-)
-
-func init() {
-	RecipeLintCommand.Flags().BoolVarP(
-		&internal.Chaos,
-		i18n.G("chaos"),
-		i18n.G("C"),
-		false,
-		i18n.G("ignore uncommitted recipes changes"),
-	)
-
-	RecipeLintCommand.Flags().BoolVarP(
-		&onlyError,
-		i18n.G("error"),
-		i18n.G("e"),
-		false,
-		i18n.G("only show errors"),
-	)
-}

cli/recipe/list.go

@@ -8,53 +8,45 @@ 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"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra recipe list` aliases. use a comma separated list of
+var pattern string
-// aliases with no spaces in between
+var patternFlag = &cli.StringFlag{
-var recipeListAliases = i18n.G("ls")
+	Name:        "pattern, p",
+	Value:       "",
+	Usage:       "Simple string to filter recipes",
+	Destination: &pattern,
+}
 
-var RecipeListCommand = &cobra.Command{
+var recipeListCommand = cli.Command{
-	// translators: `recipe list` command
+	Name:    "list",
-	Use: i18n.G("list"),
+	Usage:   "List available recipes",
-	// translators: Short description for `recipe list` command
+	Aliases: []string{"ls"},
-	Short:   i18n.G("List recipes"),
+	Flags: []cli.Flag{
-	Aliases: strings.Split(recipeListAliases, ","),
+		internal.DebugFlag,
-	Args:    cobra.NoArgs,
+		internal.MachineReadableFlag,
-	Run: func(cmd *cobra.Command, args []string) {
+		patternFlag,
+		internal.OfflineFlag,
+	},
+	Before: internal.SubCommandBefore,
+	Action: func(c *cli.Context) error {
 		catl, err := recipe.ReadRecipeCatalogue(internal.Offline)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err.Error())
 		}
 
 		recipes := catl.Flatten()
 		sort.Sort(recipe.ByRecipeName(recipes))
 
-		table, err := formatter.CreateTable()
+		tableCol := []string{"name", "category", "status", "healthcheck", "backups", "email", "tests", "SSO"}
-		if err != nil {
+		table := formatter.CreateTable(tableCol)
-			log.Fatal(err)
-		}
 
-		headers := []string{
+		len := 0
-			i18n.G("name"),
-			i18n.G("category"),
-			i18n.G("status"),
-			i18n.G("healthcheck"),
-			i18n.G("backups"),
-			i18n.G("email"),
-			i18n.G("tests"),
-			i18n.G("SSO"),
-		}
-
-		table.Headers(headers...)
-
-		var rows [][]string
 		for _, recipe := range recipes {
-			row := []string{
+			tableRow := []string{
 				recipe.Name,
 				recipe.Category,
 				strconv.Itoa(recipe.Features.Status),
@@ -67,50 +59,25 @@ var RecipeListCommand = &cobra.Command{
 
 			if pattern != "" {
 				if strings.Contains(recipe.Name, pattern) {
-					table.Row(row...)
+					table.Append(tableRow)
-					rows = append(rows, row)
+					len++
 				}
 			} else {
-				table.Row(row...)
+				table.Append(tableRow)
-				rows = append(rows, row)
+				len++
 			}
 		}
 
-		if len(rows) > 0 {
+		if table.NumLines() > 0 {
 			if internal.MachineReadable {
-				out, err := formatter.ToJSON(headers, rows)
+				table.SetCaption(false, "")
-				if err != nil {
+				table.JSONRender()
-					log.Fatal(i18n.G("unable to render to JSON: %s", err))
+			} else {
-				}
+				table.SetCaption(true, fmt.Sprintf("total recipes: %v", len))
-				fmt.Println(out)
+				table.Render()
-				return
-			}
-
-			if err := formatter.PrintTable(table); err != nil {
-				log.Fatal(err)
 			}
 		}
+
+		return nil
 	},
 }
-
-var (
-	pattern string
-)
-
-func init() {
-	RecipeListCommand.Flags().BoolVarP(
-		&internal.MachineReadable,
-		i18n.G("machine"),
-		i18n.G("m"),
-		false,
-		i18n.G("print machine-readable output"),
-	)
-
-	RecipeListCommand.Flags().StringVarP(
-		&pattern,
-		i18n.G("pattern"),
-		i18n.G("p"),
-		"",
-		i18n.G("filter by recipe"),
-	)
-}

cli/recipe/new.go

@@ -2,19 +2,18 @@ package recipe
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path"
-	"strings"
 	"text/template"
 
-	"coopcloud.tech/abra/pkg/autocomplete"
+	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/i18n"
+	"github.com/sirupsen/logrus"
-	"coopcloud.tech/abra/pkg/log"
+	"github.com/urfave/cli"
-	"coopcloud.tech/abra/pkg/recipe"
-	"github.com/spf13/cobra"
 )
 
 // recipeMetadata is the recipe metadata for the README.md
@@ -31,67 +30,97 @@ type recipeMetadata struct {
 	SSO         string
 }
 
-// translators: `abra recipe new` aliases. use a comma separated list of
+var recipeNewCommand = cli.Command{
-// aliases with no spaces in between
+	Name:    "new",
-var recipeNewAliases = i18n.G("n")
+	Aliases: []string{"n"},
-
+	Flags: []cli.Flag{
-var RecipeNewCommand = &cobra.Command{
+		internal.DebugFlag,
-	// translators: `recipe new` command
+		internal.NoInputFlag,
-	Use:     i18n.G("new <recipe> [flags]"),
+		internal.OfflineFlag,
-	Aliases: strings.Split(recipeNewAliases, ","),
-	// translators: Short description for `abra recipe new` command
-	Short: i18n.G("Create a new recipe"),
-	Long:  i18n.G(`A community managed recipe template is used.`),
-	Args:  cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.RecipeNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:    internal.SubCommandBefore,
-		recipeName := args[0]
+	Usage:     "Create a new recipe",
+	ArgsUsage: "<recipe>",
+	Description: `
+Create a new recipe.
 
-		r := recipe.Get(recipeName)
+Abra uses the built-in example repository which is available here:
-		if _, err := os.Stat(r.Dir); !os.IsNotExist(err) {
+
-			log.Fatal(i18n.G("%s recipe directory already exists?", r.Dir))
+    https://git.coopcloud.tech/coop-cloud/example
+
+Files within the example repository make use of the Golang templating system
+which Abra uses to inject values into the generated recipe folder (e.g. name of
+recipe and domain in the sample environment config).
+`,
+	Action: func(c *cli.Context) error {
+		recipeName := c.Args().First()
+
+		if recipeName == "" {
+			internal.ShowSubcommandHelpAndError(c, errors.New("no recipe name provided"))
 		}
 
-		url := i18n.G("%s/example.git", config.REPOS_BASE_URL)
+		directory := path.Join(config.RECIPES_DIR, recipeName)
-		if err := git.Clone(r.Dir, url); err != nil {
+		if _, err := os.Stat(directory); !os.IsNotExist(err) {
-			log.Fatal(err)
+			logrus.Fatalf("%s recipe directory already exists?", directory)
 		}
 
-		gitRepo := path.Join(r.Dir, ".git")
+		url := fmt.Sprintf("%s/example.git", config.REPOS_BASE_URL)
+		if err := git.Clone(directory, url); err != nil {
+			logrus.Fatal(err)
+		}
+
+		gitRepo := path.Join(config.RECIPES_DIR, recipeName, ".git")
 		if err := os.RemoveAll(gitRepo); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
-		log.Debug(i18n.G("removed .git repo in %s", gitRepo))
+		logrus.Debugf("removed example git repo in %s", gitRepo)
 
 		meta := newRecipeMeta(recipeName)
 
-		for _, path := range []string{r.ReadmePath, r.SampleEnvPath} {
+		toParse := []string{
+			path.Join(config.RECIPES_DIR, recipeName, "README.md"),
+			path.Join(config.RECIPES_DIR, recipeName, ".env.sample"),
+		}
+		for _, path := range toParse {
 			tpl, err := template.ParseFiles(path)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			var templated bytes.Buffer
 			if err := tpl.Execute(&templated, meta); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
-			if err := os.WriteFile(path, templated.Bytes(), 0o644); err != nil {
+			if err := ioutil.WriteFile(path, templated.Bytes(), 0644); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
+
 		}
 
-		if err := git.Init(r.Dir, true, gitName, gitEmail); err != nil {
+		newGitRepo := path.Join(config.RECIPES_DIR, recipeName)
-			log.Fatal(err)
+		if err := git.Init(newGitRepo, true); err != nil {
+			logrus.Fatal(err)
 		}
 
-		log.Info(i18n.G("new recipe '%s' created: %s", recipeName, path.Join(r.Dir)))
+		fmt.Print(fmt.Sprintf(`
-		log.Info(i18n.G("happy hacking 🎉"))
+Your new %s recipe has been created in %s.
+
+In order to share your recipe, you can upload it the git repository to:
+
+    https://git.coopcloud.tech/coop-cloud/%s
+
+If you're not sure how to do that, come chat with us:
+
+    https://docs.coopcloud.tech/intro/contact
+
+See "abra recipe -h" for additional recipe maintainer commands.
+
+Happy Hacking!
+
+`, recipeName, path.Join(config.RECIPES_DIR, recipeName), recipeName))
+
+		return nil
 	},
 }
 
@@ -110,26 +139,3 @@ func newRecipeMeta(recipeName string) recipeMetadata {
 		SSO:         "No",
 	}
 }
-
-var (
-	gitName  string
-	gitEmail string
-)
-
-func init() {
-	RecipeNewCommand.Flags().StringVarP(
-		&gitName,
-		i18n.G("git-name"),
-		i18n.G("N"),
-		"",
-		i18n.G("Git (user) name to do commits with"),
-	)
-
-	RecipeNewCommand.Flags().StringVarP(
-		&gitEmail,
-		i18n.G("git-email"),
-		i18n.G("e"),
-		"",
-		i18n.G("Git email name to do commits with"),
-	)
-}

cli/recipe/recipe.go

@@ -1,30 +1,36 @@
 package recipe
 
 import (
-	"strings"
+	"github.com/urfave/cli"
-
-	"coopcloud.tech/abra/pkg/i18n"
-	"github.com/spf13/cobra"
 )
 
-// translators: `abra recipe` aliases. use a comma separated list of aliases
-// with no spaces in between
-var recipeAliases = i18n.G("r")
-
 // RecipeCommand defines all recipe related sub-commands.
-var RecipeCommand = &cobra.Command{
+var RecipeCommand = cli.Command{
-	// translators: `recipe` command group
+	Name:      "recipe",
-	Use:     i18n.G("recipe [cmd] [args] [flags]"),
+	Aliases:   []string{"r"},
-	Aliases: strings.Split(recipeAliases, ","),
+	Usage:     "Manage recipes",
-	// translators: Short description for `recipe` command group
+	ArgsUsage: "<recipe>",
-	Short: i18n.G("Manage recipes"),
+	Description: `
-	Long: i18n.G(`A recipe is a blueprint for an app.
+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
-It is a bunch of config files which describe how to deploy and maintain an app.
+Cloud community and you can use Abra to read them, deploy them and create apps
-Recipes are maintained by the Co-op Cloud community and you can use Abra to
+for you.
-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. Abra supports convenient automation for recipe maintainenace, see the
+"abra recipe upgrade", "abra recipe sync" and "abra recipe release" commands.
+`,
+	Subcommands: []cli.Command{
+		recipeFetchCommand,
+		recipeLintCommand,
+		recipeListCommand,
+		recipeNewCommand,
+		recipeReleaseCommand,
+		recipeSyncCommand,
+		recipeUpgradeCommand,
+		recipeVersionCommand,
+		recipeResetCommand,
+		recipeDiffCommand,
+	},
 }

cli/recipe/release.go

@@ -1,42 +1,34 @@
 package recipe
 
 import (
-	"errors"
 	"fmt"
-	"os"
 	"path"
 	"strconv"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
+	"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"
+	recipePkg "coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/tagcmp"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/distribution/reference"
+	"github.com/docker/distribution/reference"
 	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra recipe release` aliases. use a comma separated list of
+var recipeReleaseCommand = cli.Command{
-// aliases with no spaces in between
+	Name:      "release",
-var recipeReleaseAliases = i18n.G("rl")
+	Aliases:   []string{"rl"},
-
+	Usage:     "Release a new recipe version",
-var RecipeReleaseCommand = &cobra.Command{
+	ArgsUsage: "<recipe> [<version>]",
-	// translators: `recipe release` command
+	Description: `
-	Use:     i18n.G("release <recipe> [version] [flags]"),
+Create a new version of a recipe. These versions are then published on the
-	Aliases: strings.Split(recipeReleaseAliases, ","),
+Co-op Cloud recipe catalogue. These versions take the following form:
-	// translators: Short description for `recipe release` command
-	Short: i18n.G("Release a new recipe version"),
-	Long: i18n.G(`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:
 
     a.b.c+x.y.z
 
@@ -50,160 +42,108 @@ recipe updates are properly communicated. I.e. developers of an app might
 publish a minor version but that might lead to changes in the recipe which are
 major and therefore require intervention while doing the upgrade work.
 
-Publish your new release to git.coopcloud.tech with "--publish/-p". This
+Publish your new release to git.coopcloud.tech with "-p/--publish". This
 requires that you have permission to git push to these repositories and have
-your SSH keys configured on your account. Enable ssh-agent and make sure to add
+your SSH keys configured on your account.
-your private key and enter your passphrase beforehand.
+`,
-
+	Flags: []cli.Flag{
-    eval ` + "`ssh-agent`" + `
+		internal.DebugFlag,
-    ssh-add ~/.ssh/<my-ssh-private-key-for-git-coopcloud-tech>`),
+		internal.NoInputFlag,
-	Example: `  # publish release
+		internal.DryFlag,
-  eval ` + "`ssh-agent`" + `
+		internal.MajorFlag,
-  ssh-add ~/.ssh/id_ed25519
+		internal.MinorFlag,
-  abra recipe release gitea -p`,
+		internal.PatchFlag,
-	Args: cobra.RangeArgs(1, 2),
+		internal.PublishFlag,
-	ValidArgsFunction: func(
+		internal.OfflineFlag,
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.RecipeNameComplete()
-		case 1:
-			return autocomplete.RecipeVersionComplete(args[0])
-		default:
-			return nil, cobra.ShellCompDirectiveDefault
-		}
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		recipe := internal.ValidateRecipe(args, cmd.Name())
+	BashComplete: autocomplete.RecipeNameComplete,
+	Action: func(c *cli.Context) error {
+		recipe := internal.ValidateRecipe(c)
 
-		imagesTmp, err := GetImageVersions(recipe)
+		imagesTmp, err := getImageVersions(recipe)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		mainApp, err := internal.GetMainAppImage(recipe)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		mainAppVersion := imagesTmp[mainApp]
 		if mainAppVersion == "" {
-			log.Fatal(i18n.G("main app service version for %s is empty?", recipe.Name))
+			logrus.Fatalf("main app service version for %s is empty?", recipe.Name)
-		}
-
-		var tagString string
-		if len(args) == 2 {
-			tagString = args[1]
 		}
 
+		tagString := c.Args().Get(1)
 		if tagString != "" {
 			if _, err := tagcmp.Parse(tagString); err != nil {
-				log.Fatal(i18n.G("cannot parse %s, invalid tag specified?", tagString))
+				logrus.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"))
+			logrus.Fatal("cannot specify tag and bump type at the same time")
-		}
-
-		repo, err := git.PlainOpen(recipe.Dir)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		preCommitHead, err := repo.Head()
-		if err != nil {
-			log.Fatal(err)
 		}
 
 		if tagString != "" {
 			if err := createReleaseFromTag(recipe, tagString, mainAppVersion); err != nil {
-				if cleanErr := cleanTag(recipe, tagString); cleanErr != nil {
+				logrus.Fatal(err)
-					log.Fatal(cleanErr)
-				}
-				if cleanErr := cleanCommit(recipe, preCommitHead); cleanErr != nil {
-					log.Fatal(cleanErr)
-				}
-				log.Fatal(err)
 			}
 		}
 
 		tags, err := recipe.Tags()
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
-		}
-
-		labelVersion, err := getLabelVersion(recipe, false)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		for _, tag := range tags {
-			previousTagLeftHand := strings.Split(tag, "+")[0]
-			newTagStringLeftHand := strings.Split(labelVersion, "+")[0]
-			if previousTagLeftHand == newTagStringLeftHand {
-				log.Fatal(i18n.G("%s+... conflicts with a previous release: %s", newTagStringLeftHand, tag))
-			}
 		}
 
 		if tagString == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
-			tagString = labelVersion
+			var err error
+			tagString, err = getLabelVersion(recipe, false)
+			if err != nil {
+				logrus.Fatal(err)
+			}
 		}
 
-		isClean, err := gitPkg.IsClean(recipe.Dir)
+		isClean, err := gitPkg.IsClean(recipe.Dir())
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		if !isClean {
-			log.Info(i18n.G("%s currently has these unstaged changes 👇", recipe.Name))
+			logrus.Infof("%s currently has these unstaged changes 👇", recipe.Name)
-			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
+			if err := gitPkg.DiffUnstaged(recipe.Dir()); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		}
 
 		if len(tags) > 0 {
-			log.Warn(i18n.G("previous git tags detected, assuming new semver release"))
+			logrus.Warnf("previous git tags detected, assuming this is a new semver release")
-
 			if err := createReleaseFromPreviousTag(tagString, mainAppVersion, recipe, tags); err != nil {
-				if cleanErr := cleanTag(recipe, tagString); cleanErr != nil {
+				logrus.Fatal(err)
-					log.Fatal(cleanErr)
-				}
-				if cleanErr := cleanCommit(recipe, preCommitHead); cleanErr != nil {
-					log.Fatal(cleanErr)
-				}
-				log.Fatal(err)
 			}
 		} else {
-			log.Warn(i18n.G("no tag specified and no previous tag available for %s, assuming initial release", recipe.Name))
+			logrus.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 cleanErr := cleanTag(recipe, tagString); cleanErr != nil {
+				if cleanUpErr := cleanUpTag(tagString, recipe.Name); err != nil {
-					log.Fatal(cleanErr)
+					logrus.Fatal(cleanUpErr)
 				}
-				if cleanErr := cleanCommit(recipe, preCommitHead); cleanErr != nil {
+				logrus.Fatal(err)
-					log.Fatal(cleanErr)
-				}
-				log.Fatal(err)
 			}
 		}
 
-		return
+		return nil
 	},
 }
 
-// GetImageVersions retrieves image versions for a recipe
+// getImageVersions retrieves image versions for a recipe
-func GetImageVersions(recipe recipe.Recipe) (map[string]string, error) {
+func getImageVersions(recipe recipe.Recipe) (map[string]string, error) {
-	services := make(map[string]string)
+	var services = make(map[string]string)
 
-	config, err := recipe.GetComposeConfig(nil)
-	if err != nil {
-		return nil, err
-	}
 	missingTag := false
-	for _, service := range config.Services {
+	for _, service := range recipe.Config.Services {
 		if service.Image == "" {
 			continue
 		}
@@ -232,7 +172,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
@@ -242,7 +182,8 @@ func GetImageVersions(recipe recipe.Recipe) (map[string]string, error) {
 func createReleaseFromTag(recipe recipe.Recipe, tagString, mainAppVersion string) error {
 	var err error
 
-	repo, err := git.PlainOpen(recipe.Dir)
+	directory := path.Join(config.RECIPES_DIR, recipe.Name)
+	repo, err := git.PlainOpen(directory)
 	if err != nil {
 		return err
 	}
@@ -266,20 +207,16 @@ func createReleaseFromTag(recipe recipe.Recipe, tagString, mainAppVersion string
 		tagString = fmt.Sprintf("%s+%s", tag.String(), mainAppVersion)
 	}
 
-	if err := addReleaseNotes(recipe, tagString); err != nil {
-		return errors.New(i18n.G("failed to add release notes: %s", err.Error()))
-	}
-
 	if err := commitRelease(recipe, tagString); err != nil {
-		return errors.New(i18n.G("failed to commit changes: %s", err.Error()))
+		logrus.Fatal(err)
 	}
 
 	if err := tagRelease(tagString, repo); err != nil {
-		return errors.New(i18n.G("failed to tag release: %s", err.Error()))
+		logrus.Fatal(err)
 	}
 
 	if err := pushRelease(recipe, tagString); err != nil {
-		return errors.New(i18n.G("failed to publish new release: %s", err.Error()))
+		logrus.Fatal(err)
 	}
 
 	return nil
@@ -296,116 +233,30 @@ 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
 }
 
-// addReleaseNotes checks if the release/next release note exists and moves the
-// file to release/<tag>.
-func addReleaseNotes(recipe recipe.Recipe, tag string) error {
-	releaseDir := path.Join(recipe.Dir, "release")
-	if _, err := os.Stat(releaseDir); errors.Is(err, os.ErrNotExist) {
-		if err := os.Mkdir(releaseDir, 0755); err != nil {
-			return err
-		}
-	}
-
-	tagReleaseNotePath := path.Join(releaseDir, tag)
-	if _, err := os.Stat(tagReleaseNotePath); err == nil {
-		// Release note for current tag already exist exists.
-		return nil
-	} else if !errors.Is(err, os.ErrNotExist) {
-		return err
-	}
-
-	var addNextAsReleaseNotes bool
-
-	nextReleaseNotePath := path.Join(releaseDir, "next")
-	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))
-			return nil
-		}
-
-		if !internal.NoInput {
-			prompt := &survey.Confirm{
-				Message: i18n.G("use release note in release/next?"),
-			}
-
-			if err := survey.AskOne(prompt, &addNextAsReleaseNotes); err != nil {
-				return err
-			}
-
-			if !addNextAsReleaseNotes {
-				return nil
-			}
-		}
-
-		if err := os.Rename(nextReleaseNotePath, tagReleaseNotePath); err != nil {
-			return err
-		}
-
-		if err := gitPkg.Add(recipe.Dir, path.Join("release", "next"), internal.Dry); err != nil {
-			return err
-		}
-
-		if err := gitPkg.Add(recipe.Dir, path.Join("release", tag), internal.Dry); err != nil {
-			return err
-		}
-	} else if !errors.Is(err, os.ErrNotExist) {
-		return err
-	}
-
-	// NOTE(d1): No release note exists for the current release. Or, we've
-	// already used release/next as the release note
-	if internal.NoInput || addNextAsReleaseNotes {
-		return nil
-	}
-
-	prompt := &survey.Input{
-		Message: i18n.G("add release note? (leave empty to skip)"),
-	}
-
-	var releaseNote string
-	if err := survey.AskOne(prompt, &releaseNote); err != nil {
-		return err
-	}
-
-	if releaseNote == "" {
-		return nil
-	}
-
-	if err := os.WriteFile(tagReleaseNotePath, []byte(releaseNote), 0o644); err != nil {
-		return err
-	}
-
-	if err := gitPkg.Add(recipe.Dir, path.Join("release", tag), internal.Dry); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func commitRelease(recipe recipe.Recipe, tag string) error {
 	if internal.Dry {
-		log.Debug(i18n.G("dry run: no changes committed"))
+		logrus.Debugf("dry run: no changes committed")
 		return nil
 	}
 
-	isClean, err := gitPkg.IsClean(recipe.Dir)
+	isClean, err := gitPkg.IsClean(recipe.Dir())
 	if err != nil {
 		return err
 	}
 
 	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())
 		}
 	}
 
 	msg := fmt.Sprintf("chore: publish %s release", tag)
-	if err := gitPkg.Commit(recipe.Dir, msg, internal.Dry); err != nil {
+	repoPath := path.Join(config.RECIPES_DIR, recipe.Name)
+	if err := gitPkg.Commit(repoPath, msg, internal.Dry); err != nil {
 		return err
 	}
 
@@ -414,7 +265,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))
+		logrus.Debugf("dry run: no git tag created (%s)", tagString)
 		return nil
 	}
 
@@ -434,47 +285,43 @@ 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))
+	logrus.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"))
+		logrus.Info("dry run: no changes published")
 		return nil
 	}
 
-	if !publish && !internal.NoInput {
+	if !internal.Publish && !internal.NoInput {
 		prompt := &survey.Confirm{
-			Message: i18n.G("publish new release?"),
+			Message: "publish new release?",
 		}
 
-		if err := survey.AskOne(prompt, &publish); err != nil {
+		if err := survey.AskOne(prompt, &internal.Publish); err != nil {
 			return err
 		}
 	}
 
-	if publish {
+	if internal.Publish {
-		if os.Getenv("SSH_AUTH_SOCK") == "" {
-			return errors.New(i18n.G("ssh-agent not found. see \"abra recipe release --help\" and try again"))
-		}
-
 		if err := recipe.Push(internal.Dry); err != nil {
 			return err
 		}
-
+		url := fmt.Sprintf("%s/%s/src/tag/%s", config.REPOS_BASE_URL, recipe.Name, tagString)
-		url := fmt.Sprintf("%s/src/tag/%s", recipe.GitURL, tagString)
+		logrus.Infof("new release published: %s", url)
-		log.Info(i18n.G("new release published: %s", url))
 	} else {
-		log.Info(i18n.G("no -p/--publish passed, not publishing"))
+		logrus.Info("no -p/--publish passed, not publishing")
 	}
 
 	return nil
 }
 
 func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recipe.Recipe, tags []string) error {
-	repo, err := git.PlainOpen(recipe.Dir)
+	directory := path.Join(config.RECIPES_DIR, recipe.Name)
+	repo, err := git.PlainOpen(directory)
 	if err != nil {
 		return err
 	}
@@ -482,7 +329,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")
 		}
 	}
 
@@ -527,159 +374,93 @@ func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recip
 		newTag.Major = strconv.Itoa(now + 1)
 	}
 
+	if tagString == "" {
+		if err := internal.PromptBumpType(tagString, lastGitTag.String()); err != nil {
+			return err
+		}
+	}
+
 	if internal.Major || internal.Minor || internal.Patch {
 		newTag.Metadata = mainAppVersion
 		tagString = newTag.String()
 	}
 
 	if lastGitTag.String() == tagString {
-		return errors.New(i18n.G("latest git tag (%s) and synced label (%s) are the same?", lastGitTag, tagString))
+		logrus.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
 		if err := survey.AskOne(prompt, &ok); err != nil {
-			return err
+			logrus.Fatal(err)
 		}
 
 		if !ok {
-			return errors.New(i18n.G("exiting as requested"))
+			logrus.Fatal("exiting as requested")
 		}
 	}
 
-	if err := addReleaseNotes(recipe, tagString); err != nil {
-		return errors.New(i18n.G("failed to add release notes: %s", err.Error()))
-	}
-
 	if err := commitRelease(recipe, tagString); err != nil {
-		return errors.New(i18n.G("failed to commit changes: %s", err.Error()))
+		logrus.Fatalf("failed to commit changes: %s", err.Error())
 	}
 
 	if err := tagRelease(tagString, repo); err != nil {
-		return errors.New(i18n.G("failed to tag release: %s", err.Error()))
+		logrus.Fatalf("failed to tag release: %s", err.Error())
 	}
 
 	if err := pushRelease(recipe, tagString); err != nil {
-		return errors.New(i18n.G("failed to publish new release: %s", err.Error()))
+		logrus.Fatalf("failed to publish new release: %s", err.Error())
 	}
 
 	return nil
 }
 
-// cleanCommit soft removes the latest release commit. No change are lost the
+// cleanUpTag removes a freshly created tag
-// the commit itself is removed. This is the equivalent of `git reset HEAD~1`.
+func cleanUpTag(tag, recipeName string) error {
-func cleanCommit(recipe recipe.Recipe, head *plumbing.Reference) error {
+	directory := path.Join(config.RECIPES_DIR, recipeName)
-	repo, err := git.PlainOpen(recipe.Dir)
+	repo, err := git.PlainOpen(directory)
 	if err != nil {
-		return errors.New(i18n.G("unable to open repo in %s: %s", recipe.Dir, err))
+		return err
-	}
-
-	worktree, err := repo.Worktree()
-	if err != nil {
-		return errors.New(i18n.G("unable to open work tree in %s: %s", recipe.Dir, err))
-	}
-
-	opts := &git.ResetOptions{Commit: head.Hash(), Mode: git.MixedReset}
-	if err := worktree.Reset(opts); err != nil {
-		return errors.New(i18n.G("unable to soft reset %s: %s", recipe.Dir, err))
-	}
-
-	log.Debug(i18n.G("removed freshly created commit"))
-
-	return nil
-}
-
-// cleanTag removes a freshly created tag
-func cleanTag(recipe recipe.Recipe, tag string) error {
-	repo, err := git.PlainOpen(recipe.Dir)
-	if err != nil {
-		return errors.New(i18n.G("unable to open repo in %s: %s", recipe.Dir, err))
 	}
 
 	if err := repo.DeleteTag(tag); err != nil {
 		if !strings.Contains(err.Error(), "not found") {
-			return errors.New(i18n.G("unable to delete tag %s: %s", tag, err))
+			return err
 		}
 	}
 
-	log.Debug(i18n.G("removed freshly created tag %s", tag))
+	logrus.Debugf("removed freshly created tag %s", tag)
 
 	return nil
 }
 
 func getLabelVersion(recipe recipe.Recipe, prompt bool) (string, error) {
-	initTag, err := recipe.GetVersionLabelLocal()
+	initTag, err := recipePkg.GetVersionLabelLocal(recipe)
 	if err != nil {
 		return "", err
 	}
 
 	if initTag == "" {
-		return "", errors.New(i18n.G("unable to read version for %s from synced label. Did you try running \"abra recipe sync %s\" already?", recipe.Name, recipe.Name))
+		logrus.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))
+	logrus.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)
 		}
 	}
 
 	return initTag, nil
 }
-
-var (
-	publish bool
-)
-
-func init() {
-	RecipeReleaseCommand.Flags().BoolVarP(
-		&internal.Dry,
-		i18n.G("dry-run"),
-		i18n.G("r"),
-		false,
-		i18n.G("report changes that would be made"),
-	)
-
-	RecipeReleaseCommand.Flags().BoolVarP(
-		&internal.Major,
-		i18n.G("major"),
-		i18n.G("x"),
-		false,
-		i18n.G("increase the major part of the version"),
-	)
-
-	RecipeReleaseCommand.Flags().BoolVarP(
-		&internal.Minor,
-		i18n.G("minor"),
-		i18n.G("y"),
-		false,
-		i18n.G("increase the minor part of the version"),
-	)
-
-	RecipeReleaseCommand.Flags().BoolVarP(
-		&internal.Patch,
-		i18n.G("patch"),
-		i18n.G("z"),
-		false,
-		i18n.G("increase the patch part of the version"),
-	)
-
-	RecipeReleaseCommand.Flags().BoolVarP(
-		&publish,
-		i18n.G("publish"),
-		i18n.G("p"),
-		false,
-		i18n.G("publish changes to git.coopcloud.tech"),
-	)
-}

cli/recipe/reset.go

@@ -1,55 +1,56 @@
 package recipe
 
 import (
-	"strings"
+	"path"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
-	"coopcloud.tech/abra/pkg/i18n"
+	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra recipe reset` aliases. use a comma separated list of
+var recipeResetCommand = cli.Command{
-// aliases with no spaces in between
+	Name:        "reset",
-var recipeResetAliases = i18n.G("rs")
+	Usage:       "Remove all unstaged changes from recipe config",
-
+	Description: "WARNING, this will delete your changes. Be Careful.",
-var RecipeResetCommand = &cobra.Command{
+	Aliases:     []string{"rs"},
-	// translators: `recipe reset` command
+	ArgsUsage:   "<recipe>",
-	Use:     i18n.G("reset <recipe> [flags]"),
+	Flags: []cli.Flag{
-	Aliases: strings.Split(recipeResetAliases, ","),
+		internal.DebugFlag,
-	// translators: Short description for `recipe reset` command
+		internal.NoInputFlag,
-	Short: i18n.G("Remove all unstaged changes from recipe config"),
-	Long:  i18n.G("WARNING: this will delete your changes. Be Careful."),
-	Args:  cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.RecipeNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		r := internal.ValidateRecipe(args, cmd.Name())
+	BashComplete: autocomplete.RecipeNameComplete,
+	Action: func(c *cli.Context) error {
+		recipeName := c.Args().First()
 
-		repo, err := git.PlainOpen(r.Dir)
+		if recipeName != "" {
+			internal.ValidateRecipe(c)
+		}
+
+		repoPath := path.Join(config.RECIPES_DIR, recipeName)
+		repo, err := git.PlainOpen(repoPath)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		ref, err := repo.Head()
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		worktree, err := repo.Worktree()
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		opts := &git.ResetOptions{Commit: ref.Hash(), Mode: git.HardReset}
 		if err := worktree.Reset(opts); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
+
+		return nil
 	},
 }

cli/recipe/sync.go

@@ -2,87 +2,73 @@ package recipe
 
 import (
 	"fmt"
+	"path"
 	"strconv"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
-	"coopcloud.tech/abra/pkg/formatter"
+	"coopcloud.tech/abra/pkg/config"
 	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"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra recipe reset` aliases. use a comma separated list of
+var recipeSyncCommand = cli.Command{
-// aliases with no spaces in between
+	Name:      "sync",
-var recipeSyncAliases = i18n.G("s")
+	Aliases:   []string{"s"},
-
+	Usage:     "Sync recipe version label",
-var RecipeSyncCommand = &cobra.Command{
+	ArgsUsage: "<recipe> [<version>]",
-	// translators: `recipe sync` command
+	Flags: []cli.Flag{
-	Use:     i18n.G("sync <recipe> [version] [flags]"),
+		internal.DebugFlag,
-	Aliases: strings.Split(recipeSyncAliases, ","),
+		internal.NoInputFlag,
-	// translators: Short description for `recipe sync` command
+		internal.DryFlag,
-	Short: i18n.G("Sync recipe version label"),
+		internal.MajorFlag,
-	Long: i18n.G(`Generate labels for the main recipe service.
+		internal.MinorFlag,
-
+		internal.PatchFlag,
-By convention, the service named "app" using the following format:
+	},
+	Before: internal.SubCommandBefore,
+	Description: `
+Generate labels for the main recipe service (i.e. by convention, the service
+named "app") which corresponds to the following format:
 
     coop-cloud.${STACK_NAME}.version=<version>
 
-Where [version] can be specifed on the command-line or Abra can attempt to
+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(
+	BashComplete: autocomplete.RecipeNameComplete,
-		cmd *cobra.Command,
+	Action: func(c *cli.Context) error {
-		args []string,
+		recipe := internal.ValidateRecipe(c)
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		switch l := len(args); l {
-		case 0:
-			return autocomplete.RecipeNameComplete()
-		case 1:
-			return autocomplete.RecipeVersionComplete(args[0])
-		default:
-			return nil, cobra.ShellCompDirectiveError
-		}
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		recipe := internal.ValidateRecipe(args, cmd.Name())
 
 		mainApp, err := internal.GetMainAppImage(recipe)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		imagesTmp, err := GetImageVersions(recipe)
+		imagesTmp, err := getImageVersions(recipe)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		mainAppVersion := imagesTmp[mainApp]
 
 		tags, err := recipe.Tags()
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
-		}
-
-		var nextTag string
-		if len(args) == 2 {
-			nextTag = args[1]
 		}
 
+		nextTag := c.Args().Get(1)
 		if len(tags) == 0 && nextTag == "" {
-			log.Warn(i18n.G("no git tags found for %s", recipe.Name))
+			logrus.Warnf("no git tags found for %s", recipe.Name)
 			if internal.NoInput {
-				log.Fatal(i18n.G("unable to continue, input required for initial version"))
+				logrus.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
@@ -102,80 +88,41 @@ 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"},
 			}
 
 			if err := survey.AskOne(edPrompt, &chosenVersion); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			nextTag = fmt.Sprintf("%s+%s", chosenVersion, mainAppVersion)
 		}
 
 		if nextTag == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
-			var changeOverview string
-
-			catl, err := recipePkg.ReadRecipeCatalogue(false)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			versions, err := recipePkg.GetRecipeCatalogueVersions(recipe.Name, catl)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			changesTable, err := formatter.CreateTable()
-			if err != nil {
-				log.Fatal(err)
-			}
-
 			latestRelease := tags[len(tags)-1]
-			changesTable.Headers(i18n.G("SERVICE"), latestRelease, i18n.G("PROPOSED CHANGES"))
+			if err := internal.PromptBumpType("", latestRelease); err != nil {
-
+				logrus.Fatal(err)
-			latestRecipeVersion := versions[len(versions)-1]
-			allRecipeVersions := catl[recipe.Name].Versions
-			for _, recipeVersion := range allRecipeVersions {
-				if serviceVersions, ok := recipeVersion[latestRecipeVersion]; ok {
-					for serviceName := range serviceVersions {
-						serviceMeta := serviceVersions[serviceName]
-
-						existingImageTag := fmt.Sprintf("%s:%s", serviceMeta.Image, serviceMeta.Tag)
-						newImageTag := fmt.Sprintf("%s:%s", serviceMeta.Image, imagesTmp[serviceMeta.Image])
-
-						if existingImageTag == newImageTag {
-							continue
-						}
-
-						changesTable.Row([]string{serviceName, existingImageTag, newImageTag}...)
-					}
-				}
-			}
-
-			changeOverview = changesTable.Render()
-
-			if err := internal.PromptBumpType("", latestRelease, changeOverview); err != nil {
-				log.Fatal(err)
 			}
 		}
 
 		if nextTag == "" {
-			repo, err := git.PlainOpen(recipe.Dir)
+			recipeDir := path.Join(config.RECIPES_DIR, recipe.Name)
+			repo, err := git.PlainOpen(recipeDir)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			var lastGitTag tagcmp.Tag
 			iter, err := repo.Tags()
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			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()))
+					logrus.Fatal("Tag at commit ", ref.Hash(), " is unannotated or otherwise broken. Please fix it.")
 					return err
 				}
 
@@ -192,7 +139,7 @@ likely to change.
 
 				return nil
 			}); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			// bumpType is used to decide what part of the tag should be incremented
@@ -200,7 +147,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"))
+					logrus.Fatal("you can only use one version flag: --major, --minor or --patch")
 				}
 			}
 
@@ -209,14 +156,14 @@ likely to change.
 				if internal.Patch {
 					now, err := strconv.Atoi(newTag.Patch)
 					if err != nil {
-						log.Fatal(err)
+						logrus.Fatal(err)
 					}
 
 					newTag.Patch = strconv.Itoa(now + 1)
 				} else if internal.Minor {
 					now, err := strconv.Atoi(newTag.Minor)
 					if err != nil {
-						log.Fatal(err)
+						logrus.Fatal(err)
 					}
 
 					newTag.Patch = "0"
@@ -224,7 +171,7 @@ likely to change.
 				} else if internal.Major {
 					now, err := strconv.Atoi(newTag.Major)
 					if err != nil {
-						log.Fatal(err)
+						logrus.Fatal(err)
 					}
 
 					newTag.Patch = "0"
@@ -234,67 +181,35 @@ likely to change.
 			}
 
 			newTag.Metadata = mainAppVersion
-			log.Debug(i18n.G("choosing %s as new version for %s", newTag.String(), recipe.Name))
+			logrus.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))
+			logrus.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)
+				logrus.Fatal(err)
 			}
 		} else {
-			log.Info(i18n.G("dry run: not syncing label %s for recipe %s", nextTag, recipe.Name))
+			logrus.Infof("dry run: not syncing label %s for recipe %s", nextTag, recipe.Name)
 		}
 
-		isClean, err := gitPkg.IsClean(recipe.Dir)
+		isClean, err := gitPkg.IsClean(recipe.Dir())
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 		if !isClean {
-			log.Info(i18n.G("%s currently has these unstaged changes 👇", recipe.Name))
+			logrus.Infof("%s currently has these unstaged changes 👇", recipe.Name)
-			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
+			if err := gitPkg.DiffUnstaged(recipe.Dir()); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		}
+
+		return nil
 	},
 }
-
-func init() {
-	RecipeSyncCommand.Flags().BoolVarP(
-		&internal.Dry,
-		i18n.G("dry-run"),
-		i18n.G("r"),
-		false,
-		i18n.G("report changes that would be made"),
-	)
-
-	RecipeSyncCommand.Flags().BoolVarP(
-		&internal.Major,
-		i18n.G("major"),
-		i18n.G("x"),
-		false,
-		i18n.G("increase the major part of the version"),
-	)
-
-	RecipeSyncCommand.Flags().BoolVarP(
-		&internal.Minor,
-		i18n.G("minor"),
-		i18n.G("y"),
-		false,
-		i18n.G("increase the minor part of the version"),
-	)
-
-	RecipeSyncCommand.Flags().BoolVarP(
-		&internal.Patch,
-		i18n.G("patch"),
-		i18n.G("z"),
-		false,
-		i18n.G("increase the patch part of the version"),
-	)
-}

cli/recipe/upgrade.go

@@ -12,15 +12,15 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
+	"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"
 	recipePkg "coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/tagcmp"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/distribution/reference"
+	"github.com/docker/distribution/reference"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
 type imgPin struct {
@@ -28,8 +28,8 @@ type imgPin struct {
 	version tagcmp.Tag
 }
 
-// anUpgrade represents a single service upgrade (as within a recipe), and the
+// anUpgrade represents a single service upgrade (as within a recipe), and the list of tags that it can be upgraded to,
-// list of tags that it can be upgraded to, for serialization purposes.
+// for serialization purposes.
 type anUpgrade struct {
 	Service     string   `json:"service"`
 	Image       string   `json:"image"`
@@ -37,19 +37,14 @@ type anUpgrade struct {
 	UpgradeTags []string `json:"upgrades"`
 }
 
-// translators: `abra recipe upgrade` aliases. use a comma separated list of
+var recipeUpgradeCommand = cli.Command{
-// aliases with no spaces in between
+	Name:    "upgrade",
-var recipeUpgradeAliases = i18n.G("u")
+	Aliases: []string{"u"},
-
+	Usage:   "Upgrade recipe image tags",
-var RecipeUpgradeCommand = &cobra.Command{
+	Description: `
-	// translators: `recipe upgrade` command
+Parse all image tags within the given <recipe> configuration and prompt with
-	Use:     i18n.G("upgrade <recipe> [flags]"),
+more recent tags to upgrade to. It will update the relevant compose file tags
-	Aliases: strings.Split(recipeUpgradeAliases, ","),
+on the local file system.
-	// translators: Short description for `recipe upgrade` command
-	Short: i18n.G("Upgrade recipe image tags"),
-	Long: i18n.G(`Upgrade a given <recipe> configuration.
-
-It will update the relevant compose file tags on the local file system.
 
 Some image tags cannot be parsed because they do not follow some sort of
 semver-like convention. In this case, all possible tags will be listed and it
@@ -59,26 +54,46 @@ 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,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.RecipeNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		recipe := internal.ValidateRecipe(args, cmd.Name())
 
-		if err := recipe.Ensure(internal.GetEnsureContext()); err != nil {
+    abra recipe upgrade
-			log.Fatal(err)
+`,
+	ArgsUsage: "<recipe>",
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+		internal.NoInputFlag,
+		internal.PatchFlag,
+		internal.MinorFlag,
+		internal.MajorFlag,
+		internal.MachineReadableFlag,
+		internal.AllTagsFlag,
+	},
+	Before:       internal.SubCommandBefore,
+	BashComplete: autocomplete.RecipeNameComplete,
+	Action: func(c *cli.Context) error {
+		recipe := internal.ValidateRecipe(c)
+
+		if err := recipePkg.EnsureIsClean(recipe.Name); err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := recipePkg.EnsureExists(recipe.Name); err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := recipePkg.EnsureLatest(recipe.Name); err != nil {
+			logrus.Fatal(err)
 		}
 
 		bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch)
 		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."))
+				logrus.Fatal("you can only use one of: --major, --minor, --patch.")
 			}
 		}
 
@@ -91,25 +106,26 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 
 		// check for versions file and load pinned versions
 		versionsPresent := false
-		versionsPath := path.Join(recipe.Dir, "versions")
+		recipeDir := path.Join(config.RECIPES_DIR, recipe.Name)
-		servicePins := make(map[string]imgPin)
+		versionsPath := path.Join(recipeDir, "versions")
+		var servicePins = make(map[string]imgPin)
 		if _, err := os.Stat(versionsPath); err == nil {
-			log.Debug(i18n.G("found versions file for %s", recipe.Name))
+			logrus.Debugf("found versions file for %s", recipe.Name)
 			file, err := os.Open(versionsPath)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 			scanner := bufio.NewScanner(file)
 			for scanner.Scan() {
 				line := scanner.Text()
 				splitLine := strings.Split(line, " ")
 				if splitLine[0] != "pin" || len(splitLine) != 3 {
-					log.Fatal(i18n.G("malformed version pin specification: %s", line))
+					logrus.Fatalf("malformed version pin specification: %s", line)
 				}
 				pinSlice := strings.Split(splitLine[2], ":")
 				pinTag, err := tagcmp.Parse(pinSlice[1])
 				if err != nil {
-					log.Fatal(err)
+					logrus.Fatal(err)
 				}
 				pin := imgPin{
 					image:   pinSlice[0],
@@ -118,50 +134,45 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 				servicePins[splitLine[1]] = pin
 			}
 			if err := scanner.Err(); err != nil {
-				log.Error(err)
+				logrus.Error(err)
 			}
 			versionsPresent = true
 		} else {
-			log.Debug(i18n.G("did not find versions file for %s", recipe.Name))
+			logrus.Debugf("did not find versions file for %s", recipe.Name)
 		}
 
-		config, err := recipe.GetComposeConfig(nil)
+		for _, service := range recipe.Config.Services {
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		for _, service := range config.Services {
 			img, err := reference.ParseNormalizedNamed(service.Image)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			regVersions, err := client.GetRegistryTags(img)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			image := reference.Path(img)
-			log.Debug(i18n.G("retrieved %s from remote registry for %s", regVersions, image))
+			logrus.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()))
+					logrus.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))
+				logrus.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))
+				logrus.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))
+			logrus.Debugf("parsed %s for %s", tag, service.Name)
 
 			var compatible []tagcmp.Tag
 			for _, regVersion := range regVersions {
@@ -175,18 +186,18 @@ 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))
+			logrus.Debugf("detected potential upgradable tags %s for %s", compatible, service.Name)
 
 			sort.Sort(tagcmp.ByTagDesc(compatible))
 
-			if len(compatible) == 0 && !allTags {
+			if len(compatible) == 0 && !internal.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))
+				logrus.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
 			}
 
 			catlVersions, err := recipePkg.VersionsOfService(recipe.Name, service.Name, internal.Offline)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			compatibleStrings := []string{"skip"}
@@ -202,7 +213,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))
+			logrus.Debugf("detected compatible upgradable tags %s for %s", compatibleStrings, service.Name)
 
 			var upgradeTag string
 			_, ok := servicePins[service.Name]
@@ -219,13 +230,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))
+						logrus.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))
+						logrus.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()))
+					logrus.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 {
@@ -233,7 +244,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 					for _, upTag := range compatible {
 						upElement, err := tag.UpgradeDelta(upTag)
 						if err != nil {
-							return
+							return err
 						}
 						delta := upElement.UpgradeType()
 						if delta <= bumpType {
@@ -242,17 +253,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))
+						logrus.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 {
+					if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) || internal.AllTags {
 						tag := img.(reference.NamedTagged).Tag()
-						if !allTags {
+						if !internal.AllTags {
-							log.Warn(i18n.G("unable to determine versioning semantics of %s, listing all tags", tag))
+							logrus.Warning(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)
@@ -283,12 +294,12 @@ 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,
 						}
 						if err := survey.AskOne(prompt, &upgradeTag); err != nil {
-							log.Fatal(err)
+							logrus.Fatal(err)
 						}
 					}
 				}
@@ -296,14 +307,14 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 			if upgradeTag != "skip" {
 				ok, err := recipe.UpdateTag(image, upgradeTag)
 				if err != nil {
-					log.Fatal(err)
+					logrus.Fatal(err)
 				}
 				if ok {
-					log.Info(i18n.G("tag upgraded from %s to %s for %s", tag.String(), upgradeTag, image))
+					logrus.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))
+					logrus.Warnf("not upgrading %s, skipping as requested", image)
 				}
 			}
 		}
@@ -312,77 +323,33 @@ You may invoke this command in "wizard" mode and be prompted for input.`),
 			if internal.MachineReadable {
 				jsonstring, err := json.Marshal(upgradeList)
 				if err != nil {
-					log.Fatal(err)
+					logrus.Fatal(err)
 				}
 
 				fmt.Println(string(jsonstring))
 
-				return
+				return nil
 			}
 
 			for _, upgrade := range upgradeList {
-				log.Info(i18n.G("can upgrade service: %s, image: %s, tag: %s ::", upgrade.Service, upgrade.Image, upgrade.Tag))
+				logrus.Infof("can upgrade service: %s, image: %s, tag: %s ::\n", upgrade.Service, upgrade.Image, upgrade.Tag)
 				for _, utag := range upgrade.UpgradeTags {
-					log.Infof("    %s", utag)
+					logrus.Infof("    %s\n", utag)
 				}
 			}
 		}
 
-		isClean, err := gitPkg.IsClean(recipe.Dir)
+		isClean, err := gitPkg.IsClean(recipeDir)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 		if !isClean {
-			log.Info(i18n.G("%s currently has these unstaged changes 👇", recipe.Name))
+			logrus.Infof("%s currently has these unstaged changes 👇", recipe.Name)
-			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
+			if err := gitPkg.DiffUnstaged(recipeDir); err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 		}
+
+		return nil
 	},
 }
-
-var (
-	allTags bool
-)
-
-func init() {
-	RecipeUpgradeCommand.Flags().BoolVarP(
-		&internal.Major,
-		i18n.G("major"),
-		i18n.G("x"),
-		false,
-		i18n.G("increase the major part of the version"),
-	)
-
-	RecipeUpgradeCommand.Flags().BoolVarP(
-		&internal.Minor,
-		i18n.G("minor"),
-		i18n.G("y"),
-		false,
-		i18n.G("increase the minor part of the version"),
-	)
-
-	RecipeUpgradeCommand.Flags().BoolVarP(
-		&internal.Patch,
-		i18n.G("patch"),
-		i18n.G("z"),
-		false,
-		i18n.G("increase the patch part of the version"),
-	)
-
-	RecipeUpgradeCommand.Flags().BoolVarP(
-		&internal.MachineReadable,
-		i18n.G("machine"),
-		i18n.G("m"),
-		false,
-		i18n.G("print machine-readable output"),
-	)
-
-	RecipeUpgradeCommand.Flags().BoolVarP(
-		&allTags,
-		i18n.G("all-tags"),
-		i18n.GC("a", "recipe upgrade"),
-		false,
-		i18n.G("list all tags, not just upgrades"),
-	)
-}

cli/recipe/version.go

@@ -3,141 +3,83 @@ package recipe
 import (
 	"fmt"
 	"sort"
-	"strings"
 
 	"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"
+	"github.com/olekukonko/tablewriter"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra recipe versions` aliases. use a comma separated list of aliases
+func sortServiceByName(versions [][]string) func(i, j int) bool {
-// with no spaces in between
+	return func(i, j int) bool {
-var recipeVersionsAliases = i18n.G("v")
+		// NOTE(d1): corresponds to the `tableCol` definition below
+		if versions[i][1] == "app" {
+			return true
+		}
+		return versions[i][1] < versions[j][1]
+	}
+}
 
-var RecipeVersionCommand = &cobra.Command{
+var recipeVersionCommand = cli.Command{
-	// translators: `recipe versions` command
+	Name:        "versions",
-	Use:     i18n.G("versions <recipe> [flags]"),
+	Aliases:     []string{"v"},
-	Aliases: strings.Split(recipeVersionsAliases, ","),
+	Usage:       "List recipe versions",
-	// translators: Short description for `recipe versions` command
+	ArgsUsage:   "<recipe>",
-	Short: i18n.G("List recipe versions"),
+	Description: "Versions are read from the recipe catalogue.",
-	Args:  cobra.ExactArgs(1),
+	Flags: []cli.Flag{
-	ValidArgsFunction: func(
+		internal.DebugFlag,
-		cmd *cobra.Command,
+		internal.OfflineFlag,
-		args []string,
+		internal.NoInputFlag,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
+		internal.MachineReadableFlag,
-		return autocomplete.RecipeNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		var warnMessages []string
+	BashComplete: autocomplete.RecipeNameComplete,
-
+	Action: func(c *cli.Context) error {
-		recipe := internal.ValidateRecipe(args, cmd.Name())
+		recipe := internal.ValidateRecipe(c)
 
 		catl, err := recipePkg.ReadRecipeCatalogue(internal.Offline)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		recipeMeta, ok := catl[recipe.Name]
 		if !ok {
-			warnMessages = append(warnMessages, i18n.G("retrieved versions from local recipe repository"))
+			logrus.Fatalf("%s is not published on the catalogue?", recipe.Name)
-
-			recipeVersions, warnMsg, err := recipe.GetRecipeVersions()
-			if err != nil {
-				warnMessages = append(warnMessages, err.Error())
-			}
-			if len(warnMsg) > 0 {
-				warnMessages = append(warnMessages, warnMsg...)
-			}
-
-			recipeMeta = recipePkg.RecipeMeta{Versions: recipeVersions}
 		}
 
 		if len(recipeMeta.Versions) == 0 {
-			log.Fatal(i18n.G("%s has no published versions?", recipe.Name))
+			logrus.Fatalf("%s has no catalogue published versions?", recipe.Name)
 		}
 
 		for i := len(recipeMeta.Versions) - 1; i >= 0; i-- {
-			table, err := formatter.CreateTable()
+			tableCols := []string{"version", "service", "image", "tag"}
-			if err != nil {
+			table := formatter.CreateTable(tableCols)
-				log.Fatal(err)
-			}
-
-			table.Headers(i18n.G("SERVICE"), i18n.G("IMAGE"), i18n.G("TAG"), i18n.G("VERSION"))
-
 			for version, meta := range recipeMeta.Versions[i] {
-				var allRows [][]string
+				var versions [][]string
-				var rows [][]string
-
 				for service, serviceMeta := range meta {
-					recipeVersion := version
+					versions = append(versions, []string{version, service, serviceMeta.Image, serviceMeta.Tag})
-					if service != "app" {
-						recipeVersion = ""
-					}
-
-					rows = append(rows, []string{
-						service,
-						serviceMeta.Image,
-						serviceMeta.Tag,
-						recipeVersion,
-					})
-
-					allRows = append(allRows, []string{
-						version,
-						service,
-						serviceMeta.Image,
-						serviceMeta.Tag,
-						recipeVersion,
-					})
 				}
 
-				sort.Slice(rows, sortServiceByName(rows))
+				sort.Slice(versions, sortServiceByName(versions))
 
-				table.Rows(rows...)
+				for _, version := range versions {
-
+					table.Append(version)
-				if !internal.MachineReadable {
-					if err := formatter.PrintTable(table); err != nil {
-						log.Fatal(err)
-					}
-					continue
 				}
 
 				if internal.MachineReadable {
-					sort.Slice(allRows, sortServiceByName(allRows))
+					table.JSONRender()
-					headers := []string{i18n.G("VERSION"), i18n.G("SERVICE"), i18n.G("NAME"), i18n.G("TAG")}
+				} else {
-					out, err := formatter.ToJSON(headers, allRows)
+					table.SetAutoMergeCellsByColumnIndex([]int{0})
-					if err != nil {
+					table.SetAlignment(tablewriter.ALIGN_LEFT)
-						log.Fatal(i18n.G("unable to render to JSON: %s", err))
+					table.Render()
-					}
+					fmt.Println()
-					fmt.Println(out)
-					continue
 				}
 			}
 		}
 
-		if !internal.MachineReadable {
+		return nil
-			for _, warnMsg := range warnMessages {
-				log.Warn(warnMsg)
-			}
-		}
 	},
 }
-
-func sortServiceByName(versions [][]string) func(i, j int) bool {
-	return func(i, j int) bool {
-		return versions[i][0] < versions[j][0]
-	}
-}
-
-func init() {
-	RecipeVersionCommand.Flags().BoolVarP(
-		&internal.MachineReadable,
-		i18n.G("machine"),
-		i18n.G("m"),
-		false,
-		i18n.G("print machine-readable output"),
-	)
-}

cli/run.go

@@ -1,315 +0,0 @@
-package cli
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"strings"
-
-	"coopcloud.tech/abra/cli/app"
-	"coopcloud.tech/abra/cli/catalogue"
-	"coopcloud.tech/abra/cli/internal"
-	"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"
-	"github.com/spf13/cobra/doc"
-)
-
-var (
-	// translators: `abra` usage template. please translate only words like
-	// "Aliases" and "Example" and nothing inside the {{ ... }}
-	usageTemplate = i18n.G(`Usage:{{if .Runnable}}
-  {{.UseLine}}{{end}}{{if .HasAvailableSubCommands}}
-  {{.CommandPath}} [command]{{end}}{{if gt (len .Aliases) 0}}
-
-Aliases:
-  {{.NameAndAliases}}{{end}}{{if .HasExample}}
-
-Examples:
-{{.Example}}{{end}}{{if .HasAvailableSubCommands}}
-
-Available Commands:{{range .Commands}}{{if (or .IsAvailableCommand (eq .Name "help"))}}
-  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableLocalFlags}}
-
-Flags:
-{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableInheritedFlags}}
-
-Global Flags:
-{{.InheritedFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasHelpSubCommands}}
-
-Additional help topics:{{range .Commands}}{{if .IsAdditionalHelpTopicCommand}}
-  {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableSubCommands}}
-
-Use "{{.CommandPath}} [command] --help" for more information about a command.{{end}}
-`)
-
-	helpCmd = &cobra.Command{
-		Use: i18n.G("help [command]"),
-		// translators: Short description for `help` command
-		Short: i18n.G("Help about any command"),
-		Long: i18n.G(`Help provides help for any command in the application.
-Simply type abra help [path to command] for full details.`),
-		Run: func(c *cobra.Command, args []string) {
-			cmd, _, e := c.Root().Find(args)
-			if cmd == nil || e != nil {
-				c.Print(i18n.G("unknown help topic %#q\n", args))
-				if err := c.Root().Usage(); err != nil {
-					log.Fatal(err)
-				}
-			} else {
-				cmd.InitDefaultHelpFlag()
-				cmd.InitDefaultVersionFlag()
-				if err := cmd.Help(); err != nil {
-					log.Fatal(err)
-				}
-			}
-		},
-	}
-)
-
-func Run(version, commit string) {
-	rootCmd := &cobra.Command{
-		// translators: `abra` binary name
-		Use: i18n.G("abra [cmd] [args] [flags]"),
-		// translators: Short description for `abra` binary
-		Short: i18n.G("The Co-op Cloud command-line utility belt 🎩🐇"),
-		// translators: Long description for `abra` binary. This needs to be
-		// translated in the same way as the Short description so that everything
-		// matches up
-		Long: i18n.G(`The Co-op Cloud command-line utility belt 🎩🐇
-
-Config:
-  $ABRA_DIR: %s`, config.ABRA_DIR),
-		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
-		ValidArgs: []string{
-			// translators: `abra app` command for autocompletion
-			i18n.G("app"),
-			// translators: `abra autocomplete` command for autocompletion
-			i18n.G("autocomplete"),
-			// translators: `abra catalogue` command for autocompletion
-			i18n.G("catalogue"),
-			// translators: `abra man` command for autocompletion
-			i18n.G("man"),
-			// translators: `abra recipe` command for autocompletion
-			i18n.G("recipe"),
-			// translators: `abra server` command for autocompletion
-			i18n.G("server"),
-			// translators: `abra upgrade` command for autocompletion
-			i18n.G("upgrade"),
-		},
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			dirs := []map[string]os.FileMode{
-				{config.ABRA_DIR: 0764},
-				{config.SERVERS_DIR: 0700},
-				{config.RECIPES_DIR: 0764},
-				{config.LOGS_DIR: 0764},
-			}
-
-			for _, dir := range dirs {
-				for path, perm := range dir {
-					if err := os.Mkdir(path, perm); err != nil {
-						if !os.IsExist(err) {
-							return errors.New(i18n.G("unable to create %s: %s", path, err))
-						}
-						continue
-					}
-				}
-			}
-
-			log.Logger.SetStyles(charmLog.DefaultStyles())
-			charmLog.SetDefault(log.Logger)
-
-			if internal.MachineReadable {
-				log.SetOutput(os.Stderr)
-			}
-
-			if internal.Debug {
-				log.SetLevel(log.DebugLevel)
-				log.SetOutput(os.Stderr)
-				log.SetReportCaller(true)
-			}
-
-			log.Debug(i18n.G(
-				"abra version: %s, commit: %s, lang: %s",
-				version, formatter.SmallSHA(commit), i18n.Locale,
-			))
-
-			return nil
-		},
-	}
-
-	rootCmd.CompletionOptions.DisableDefaultCmd = true
-	rootCmd.SetUsageTemplate(usageTemplate)
-	rootCmd.SetHelpCommand(helpCmd)
-
-	// translators: `abra man` aliases. use a comma separated list of aliases
-	// with no spaces in between
-	manAliases := i18n.G("m")
-
-	manCommand := &cobra.Command{
-		// translators: `man` command
-		Use:     i18n.G("man [flags]"),
-		Aliases: strings.Split(manAliases, ","),
-		// translators: Short description for `man` command
-		Short: i18n.G("Generate manpage"),
-		Example: i18n.G(`  # generate the man pages into /usr/local/share/man/man1
-  abra_path=$(which abra)  # pass abra absolute path to sudo below
-  sudo $abra_path man
-  sudo mandb
-
-  # read the man pages
-  man abra
-  man abra-app-deploy`),
-		Run: func(cmd *cobra.Command, args []string) {
-			header := &doc.GenManHeader{
-				Title:   "ABRA",
-				Section: "1",
-			}
-
-			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))
-			}
-
-			err := doc.GenManTree(rootCmd, header, manDir)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			log.Info(i18n.G("don't forget to run 'sudo mandb'"))
-		},
-	}
-
-	rootCmd.PersistentFlags().BoolVarP(
-		&internal.Debug,
-		"debug",
-		"d",
-		false,
-		i18n.G("show debug messages"),
-	)
-
-	rootCmd.PersistentFlags().BoolVarP(
-		&internal.NoInput,
-		"no-input",
-		"n",
-		false,
-		i18n.G("toggle non-interactive mode"),
-	)
-
-	rootCmd.PersistentFlags().BoolVarP(
-		&internal.Offline,
-		"offline",
-		"o",
-		false,
-		i18n.G("prefer offline & filesystem access"),
-	)
-
-	rootCmd.PersistentFlags().BoolVarP(
-		&internal.Help,
-		i18n.G("help"),
-		i18n.G("h"),
-		false,
-		i18n.G("help for abra"),
-	)
-
-	rootCmd.Flags().BoolVarP(
-		&internal.Version,
-		i18n.G("version"),
-		i18n.G("v"),
-		false,
-		i18n.G("version for abra"),
-	)
-
-	catalogue.CatalogueCommand.AddCommand(
-		catalogue.CatalogueGenerateCommand,
-		catalogue.CatalogueSyncCommand,
-	)
-
-	server.ServerCommand.AddCommand(
-		server.ServerAddCommand,
-		server.ServerListCommand,
-		server.ServerPruneCommand,
-		server.ServerRemoveCommand,
-	)
-
-	recipe.RecipeCommand.AddCommand(
-		recipe.RecipeDiffCommand,
-		recipe.RecipeFetchCommand,
-		recipe.RecipeLintCommand,
-		recipe.RecipeListCommand,
-		recipe.RecipeNewCommand,
-		recipe.RecipeReleaseCommand,
-		recipe.RecipeResetCommand,
-		recipe.RecipeSyncCommand,
-		recipe.RecipeUpgradeCommand,
-		recipe.RecipeVersionCommand,
-	)
-
-	rootCmd.AddCommand(
-		UpgradeCommand,
-		AutocompleteCommand,
-		manCommand,
-		app.AppCommand,
-		catalogue.CatalogueCommand,
-		server.ServerCommand,
-		recipe.RecipeCommand,
-	)
-
-	app.AppCmdCommand.AddCommand(
-		app.AppCmdListCommand,
-	)
-
-	app.AppSecretCommand.AddCommand(
-		app.AppSecretGenerateCommand,
-		app.AppSecretInsertCommand,
-		app.AppSecretRmCommand,
-		app.AppSecretLsCommand,
-	)
-
-	app.AppVolumeCommand.AddCommand(
-		app.AppVolumeListCommand,
-		app.AppVolumeRemoveCommand,
-	)
-
-	app.AppBackupCommand.AddCommand(
-		app.AppBackupListCommand,
-		app.AppBackupDownloadCommand,
-		app.AppBackupCreateCommand,
-		app.AppBackupSnapshotsCommand,
-	)
-
-	app.AppCommand.AddCommand(
-		app.AppBackupCommand,
-		app.AppCheckCommand,
-		app.AppCmdCommand,
-		app.AppConfigCommand,
-		app.AppCpCommand,
-		app.AppDeployCommand,
-		app.AppListCommand,
-		app.AppLogsCommand,
-		app.AppNewCommand,
-		app.AppPsCommand,
-		app.AppRemoveCommand,
-		app.AppRestartCommand,
-		app.AppRestoreCommand,
-		app.AppRollbackCommand,
-		app.AppMoveCommand,
-		app.AppRunCommand,
-		app.AppSecretCommand,
-		app.AppServicesCommand,
-		app.AppUndeployCommand,
-		app.AppUpgradeCommand,
-		app.AppVolumeCommand,
-		app.AppLabelsCommand,
-		app.AppEnvCommand,
-	)
-
-	if err := rootCmd.Execute(); err != nil {
-		os.Exit(1)
-	}
-}

cli/server/add.go

@@ -1,156 +1,51 @@
 package server
 
 import (
+	"errors"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"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"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra server add` aliases. use a comma separated list of
+var local bool
-// aliases with no spaces in between
+var localFlag = &cli.BoolFlag{
-var serverAddAliases = i18n.GC("a", "server add")
+	Name:        "local, l",
-
+	Usage:       "Use local server",
-var ServerAddCommand = &cobra.Command{
+	Destination: &local,
-	// translators: `server add` command
-	Use:     i18n.G("add [[server] | --local] [flags]"),
-	Aliases: strings.Split(serverAddAliases, ","),
-	// translators: Short description for `server add` command
-	Short: i18n.G("Add a new server"),
-	Long: i18n.G(`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
-for each server:
-
-  Host 1312.net 1312
-    Hostname 1312.net
-    User antifa
-    Port 12345
-    IdentityFile ~/.ssh/antifa@somewhere
-
-If "--local" is passed, then Abra assumes that the current local server is
-intended as the target server. This is useful when you want to have your entire
-Co-op Cloud config located on the server itself, and not on your local
-developer machine. The domain is then set to "default".`),
-	Example: i18n.G("  abra server add 1312.net"),
-	Args:    cobra.RangeArgs(0, 1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		if !local {
-			return autocomplete.ServerNameComplete()
-		}
-		return nil, cobra.ShellCompDirectiveDefault
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) > 0 && local {
-			log.Fatal(i18n.G("cannot use [server] and --local together"))
-		}
-
-		if len(args) == 0 && !local {
-			log.Fatal(i18n.G("missing argument or --local/-l flag"))
-		}
-
-		name := "default"
-		if !local {
-			name = internal.ValidateDomain(args)
-		}
-
-		// NOTE(d1): reasonable 5 second timeout for connections which can't
-		// succeed. The connection is attempted twice, so this results in 10
-		// seconds.
-		timeout := client.WithTimeout(5)
-
-		if local {
-			created, err := createServerDir(name)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			log.Debug(i18n.G("attempting to create client for %s", name))
-
-			if _, err := client.New(name, timeout); err != nil {
-				cleanUp(name)
-				log.Fatal(err)
-			}
-
-			if created {
-				log.Info(i18n.G("local server successfully added"))
-			} else {
-				log.Warn(i18n.G("local server already exists"))
-			}
-
-			return
-		}
-
-		_, err := createServerDir(name)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		created, err := newContext(name)
-		if err != nil {
-			cleanUp(name)
-			log.Fatal(i18n.G("unable to create local context: %s", err))
-		}
-
-		log.Debug(i18n.G("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)))
-		}
-
-		if created {
-			log.Info(i18n.G("%s successfully added", name))
-
-			if _, err := dns.EnsureIPv4(name); err != nil {
-				log.Warn(i18n.G("unable to resolve IPv4 for %s", name))
-			}
-
-			return
-		}
-
-		log.Warn(i18n.G("%s already exists", name))
-	},
 }
 
-// cleanUp cleans up the partially created context/client details for a failed
+func cleanUp(domainName string) {
-// "server add" attempt.
+	if domainName != "default" {
-func cleanUp(name string) {
+		logrus.Infof("cleaning up context for %s", domainName)
-	if name != "default" {
+		if err := client.DeleteContext(domainName); err != nil {
-		log.Debug(i18n.G("serverAdd: cleanUp: cleaning up context for %s", name))
+			logrus.Fatal(err)
-		if err := client.DeleteContext(name); err != nil {
-			log.Fatal(err)
 		}
 	}
 
-	serverDir := filepath.Join(config.SERVERS_DIR, name)
+	logrus.Infof("attempting to clean up server directory for %s", domainName)
+
+	serverDir := filepath.Join(config.SERVERS_DIR, domainName)
 	files, err := config.GetAllFilesInDirectory(serverDir)
 	if err != nil {
-		log.Fatal(i18n.G("serverAdd: cleanUp: unable to list files in %s: %s", serverDir, err))
+		logrus.Fatalf("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))
+		logrus.Warnf("aborting clean up of %s because it is not empty", serverDir)
 		return
 	}
 
 	if err := os.RemoveAll(serverDir); err != nil {
-		log.Fatal(i18n.G("serverAdd: cleanUp: failed to remove %s: %s", serverDir, err))
+		logrus.Fatal(err)
 	}
 }
 
@@ -158,54 +53,129 @@ func cleanUp(name string) {
 // Docker manages SSH connection details. These are stored to disk in
 // ~/.docker. Abra can manage this completely for the user, so it's an
 // implementation detail.
-func newContext(name string) (bool, error) {
+func newContext(c *cli.Context, domainName, username, port string) error {
 	store := contextPkg.NewDefaultDockerContextStore()
 	contexts, err := store.Store.List()
 	if err != nil {
-		return false, err
+		return err
 	}
 
 	for _, context := range contexts {
-		if context.Name == name {
+		if context.Name == domainName {
-			log.Debug(i18n.G("context for %s already exists", name))
+			logrus.Debugf("context for %s already exists", domainName)
-			return false, nil
+			return nil
 		}
 	}
 
-	log.Debugf(i18n.G("creating context with domain %s", name))
+	logrus.Debugf("creating context with domain %s, username %s and port %s", domainName, username, port)
 
-	if err := client.CreateContext(name); err != nil {
+	if err := client.CreateContext(domainName, username, port); err != nil {
-		return false, nil
+		return err
 	}
 
-	return true, nil
+	return nil
 }
 
 // createServerDir creates the ~/.abra/servers/... directory for a new server.
-func createServerDir(name string) (bool, error) {
+func createServerDir(domainName string) error {
-	if err := server.CreateServerDir(name); err != nil {
+	if err := server.CreateServerDir(domainName); err != nil {
 		if !os.IsExist(err) {
-			return false, err
+			return err
 		}
-
+		logrus.Debugf("server dir for %s already created", domainName)
-		log.Debug(i18n.G("server dir for %s already created", name))
-
-		return false, nil
 	}
 
-	return true, nil
+	return nil
 }
 
-var (
+var serverAddCommand = cli.Command{
-	local bool
+	Name:    "add",
-)
+	Aliases: []string{"a"},
+	Usage:   "Add a server to your configuration",
+	Description: `
+Add a new server to your configuration so that it can be managed by Abra.
 
-func init() {
+Abra uses the SSH command-line to discover connection details for your server.
-	ServerAddCommand.Flags().BoolVarP(
+It is advised to configure an entry per-host in your ~/.ssh/config for each
-		&local,
+server. For example:
-		i18n.G("local"),
+
-		i18n.G("l"),
+Host example.com
-		false,
+  Hostname example.com
-		i18n.G("use local server"),
+  User exampleUser
-	)
+  Port 12345
+  IdentityFile ~/.ssh/example@somewhere
+
+Abra can then load SSH connection details from this configuratiion with:
+
+    abra server add example.com
+
+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.
+`,
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+		internal.NoInputFlag,
+		localFlag,
+	},
+	Before:    internal.SubCommandBefore,
+	ArgsUsage: "<domain>",
+	Action: func(c *cli.Context) error {
+		if len(c.Args()) > 0 && local || !internal.ValidateSubCmdFlags(c) {
+			err := errors.New("cannot use <domain> and --local together")
+			internal.ShowSubcommandHelpAndError(c, err)
+		}
+
+		var domainName string
+		if local {
+			domainName = "default"
+		} else {
+			domainName = internal.ValidateDomain(c)
+		}
+
+		if local {
+			if err := createServerDir(domainName); err != nil {
+				logrus.Fatal(err)
+			}
+
+			logrus.Infof("attempting to create client for %s", domainName)
+			if _, err := client.New(domainName); err != nil {
+				cleanUp(domainName)
+				logrus.Fatal(err)
+			}
+
+			logrus.Info("local server added")
+
+			return nil
+		}
+
+		if _, err := dns.EnsureIPv4(domainName); err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := createServerDir(domainName); err != nil {
+			logrus.Fatal(err)
+		}
+
+		hostConfig, err := sshPkg.GetHostConfig(domainName)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := newContext(c, domainName, hostConfig.User, hostConfig.Port); err != nil {
+			logrus.Fatal(err)
+		}
+
+		logrus.Infof("attempting to create client for %s", domainName)
+		if _, err := client.New(domainName); err != nil {
+			cleanUp(domainName)
+			logrus.Debugf("failed to construct client for %s, saw %s", domainName, err.Error())
+			logrus.Fatal(sshPkg.Fatal(domainName, err))
+		}
+
+		logrus.Infof("%s added", domainName)
+
+		return nil
+	},
 }

cli/server/list.go

@@ -1,110 +1,110 @@
 package server
 
 import (
-	"fmt"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/config"
-	contextPkg "coopcloud.tech/abra/pkg/context"
+	"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"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra server list` aliases. use a comma separated list of
+var problemsFilter bool
-// aliases with no spaces in between
-var serverListAliases = i18n.G("ls")
 
-var ServerListCommand = &cobra.Command{
+var problemsFilterFlag = &cli.BoolFlag{
-	// translators: `server list` command
+	Name:        "problems, p",
-	Use:     i18n.G("list [flags]"),
+	Usage:       "Show only servers with potential connection problems",
-	Aliases: strings.Split(serverListAliases, ","),
+	Destination: &problemsFilter,
-	// translators: Short description for `server list` command
+}
-	Short: i18n.G("List managed servers"),
+
-	Args:  cobra.NoArgs,
+var serverListCommand = cli.Command{
-	Run: func(cmd *cobra.Command, args []string) {
+	Name:    "list",
-		dockerContextStore := contextPkg.NewDefaultDockerContextStore()
+	Aliases: []string{"ls"},
+	Usage:   "List managed servers",
+	Flags: []cli.Flag{
+		problemsFilterFlag,
+		internal.DebugFlag,
+		internal.MachineReadableFlag,
+		internal.OfflineFlag,
+	},
+	Before: internal.SubCommandBefore,
+	Action: func(c *cli.Context) error {
+		dockerContextStore := context.NewDefaultDockerContextStore()
 		contexts, err := dockerContextStore.Store.List()
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		table, err := formatter.CreateTable()
+		tableColumns := []string{"name", "host", "user", "port"}
-		if err != nil {
+		table := formatter.CreateTable(tableColumns)
-			log.Fatal(err)
-		}
-
-		headers := []string{i18n.G("NAME"), i18n.G("HOST")}
-		table.Headers(headers...)
 
 		serverNames, err := config.ReadServerNames()
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		var rows [][]string
 		for _, serverName := range serverNames {
 			var row []string
-			for _, dockerCtx := range contexts {
+			for _, ctx := range contexts {
-				endpoint, err := contextPkg.GetContextEndpoint(dockerCtx)
+				endpoint, err := context.GetContextEndpoint(ctx)
 				if err != nil && strings.Contains(err.Error(), "does not exist") {
 					// No local context found, we can continue safely
 					continue
 				}
 
-				if dockerCtx.Name == serverName {
+				if ctx.Name == serverName {
 					sp, err := ssh.ParseURL(endpoint)
 					if err != nil {
-						log.Fatal(err)
+						logrus.Fatal(err)
 					}
 
 					if sp.Host == "" {
-						sp.Host = i18n.G("unknown")
+						sp.Host = "unknown"
+					}
+					if sp.User == "" {
+						sp.User = "unknown"
+					}
+					if sp.Port == "" {
+						sp.Port = "unknown"
 					}
 
-					row = []string{serverName, sp.Host}
+					row = []string{serverName, sp.Host, sp.User, sp.Port}
-					rows = append(rows, row)
 				}
 			}
 
 			if len(row) == 0 {
 				if serverName == "default" {
-					row = []string{serverName, i18n.G("local")}
+					row = []string{serverName, "local", "n/a", "n/a"}
 				} else {
-					row = []string{serverName, i18n.G("unknown")}
+					row = []string{serverName, "unknown", "unknown", "unknown"}
 				}
-				rows = append(rows, row)
 			}
 
-			table.Row(row...)
+			if problemsFilter {
+				for _, val := range row {
+					if val == "unknown" {
+						table.Append(row)
+						break
+					}
+				}
+			} else {
+				table.Append(row)
+			}
 		}
 
 		if internal.MachineReadable {
-			out, err := formatter.ToJSON(headers, rows)
+			table.JSONRender()
-			if err != nil {
+		} else {
-				log.Fatal(i18n.G("unable to render to JSON: %s", err))
+			if problemsFilter && table.NumLines() == 0 {
+				logrus.Info("all servers wired up correctly 👏")
+			} else {
+				table.Render()
 			}
-
-			fmt.Println(out)
-
-			return
 		}
 
-		if err := formatter.PrintTable(table); err != nil {
+		return nil
-			log.Fatal(err)
-		}
 	},
 }
-
-func init() {
-	ServerListCommand.Flags().BoolVarP(
-		&internal.MachineReadable,
-		i18n.G("machine"),
-		i18n.G("m"),
-		false,
-		i18n.G("print machine-readable output"),
-	)
-}

cli/server/prune.go

@@ -1,111 +1,103 @@
 package server
 
 import (
-	"strings"
+	"context"
 
 	"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"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
-// translators: `abra server prune` aliases. use a comma separated list of
+var allFilter bool
-// aliases with no spaces in between
-var serverPruneliases = i18n.G("p")
 
-var ServerPruneCommand = &cobra.Command{
+var allFilterFlag = &cli.BoolFlag{
-	// translators: `server prune` command
+	Name:        "all, a",
-	Use:     i18n.G("prune <server> [flags]"),
+	Usage:       "Remove all unused images not just dangling ones",
-	Aliases: strings.Split(serverPruneliases, ","),
+	Destination: &allFilter,
-	// translators: Short description for `server prune` command
+}
-	Short: i18n.G("Prune resources on a server"),
-	Long: i18n.G(`Prunes unused containers, networks, and dangling images.
 
-Use "--volumes/-v" to remove volumes that are not associated with a deployed
+var volumesFilter bool
-app. This can result in unwanted data loss if not used carefully.`),
+
-	Args: cobra.ExactArgs(1),
+var volumesFilterFlag = &cli.BoolFlag{
-	ValidArgsFunction: func(
+	Name:        "volumes, v",
-		cmd *cobra.Command,
+	Usage:       "Prune volumes. This will remove app data, Be Careful!",
-		args []string,
+	Destination: &volumesFilter,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
+}
-		return autocomplete.ServerNameComplete()
+
+var serverPruneCommand = cli.Command{
+	Name:    "prune",
+	Aliases: []string{"p"},
+	Usage:   "Prune a managed server; Runs a docker system prune",
+	Description: `
+Prunes unused containers, networks, and dangling images.
+
+If passing "-v/--volumes" then volumes not connected to a deployed app will
+also be removed. This can result in unwanted data loss if not used carefully.
+	`,
+	ArgsUsage: "[<server>]",
+	Flags: []cli.Flag{
+		allFilterFlag,
+		volumesFilterFlag,
+		internal.DebugFlag,
+		internal.OfflineFlag,
+		internal.NoInputFlag,
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		serverName := internal.ValidateServer(args)
+	BashComplete: autocomplete.ServerNameComplete,
+	Action: func(c *cli.Context) error {
+		serverName := internal.ValidateServer(c)
 
 		cl, err := client.New(serverName)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		var filterArgs filters.Args
+		var args filters.Args
 
-		cr, err := cl.ContainersPrune(cmd.Context(), filterArgs)
+		ctx := context.Background()
+		cr, err := cl.ContainersPrune(ctx, args)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		cntSpaceReclaimed := formatter.ByteCountSI(cr.SpaceReclaimed)
-		log.Info(i18n.G("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed))
+		logrus.Infof("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed)
 
-		nr, err := cl.NetworksPrune(cmd.Context(), filterArgs)
+		nr, err := cl.NetworksPrune(ctx, args)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		log.Info(i18n.G("networks pruned: %d", len(nr.NetworksDeleted)))
+		logrus.Infof("networks pruned: %d", len(nr.NetworksDeleted))
 
 		pruneFilters := filters.NewArgs()
 		if allFilter {
-			log.Debug(i18n.G("removing all images, not only dangling ones"))
+			logrus.Debugf("removing all images, not only dangling ones")
 			pruneFilters.Add("dangling", "false")
 		}
 
-		ir, err := cl.ImagesPrune(cmd.Context(), pruneFilters)
+		ir, err := cl.ImagesPrune(ctx, pruneFilters)
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		imgSpaceReclaimed := formatter.ByteCountSI(ir.SpaceReclaimed)
-		log.Info(i18n.G("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed))
+		logrus.Infof("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed)
 
 		if volumesFilter {
-			vr, err := cl.VolumesPrune(cmd.Context(), filterArgs)
+			vr, err := cl.VolumesPrune(ctx, args)
 			if err != nil {
-				log.Fatal(err)
+				logrus.Fatal(err)
 			}
 
 			volSpaceReclaimed := formatter.ByteCountSI(vr.SpaceReclaimed)
-			log.Info(i18n.G("volumes pruned: %d; space reclaimed: %s", len(vr.VolumesDeleted), volSpaceReclaimed))
+			logrus.Infof("volumes pruned: %d; space reclaimed: %s", len(vr.VolumesDeleted), volSpaceReclaimed)
 		}
 
-		return
+		return nil
 	},
 }
-
-var (
-	allFilter     bool
-	volumesFilter bool
-)
-
-func init() {
-	ServerPruneCommand.Flags().BoolVarP(
-		&allFilter,
-		i18n.G("all"),
-		i18n.GC("a", "server prune"),
-		false,
-		i18n.G("remove all unused images"),
-	)
-
-	ServerPruneCommand.Flags().BoolVarP(
-		&volumesFilter,
-		i18n.G("volumes"),
-		i18n.G("v"),
-		false,
-		i18n.G("remove volumes"),
-	)
-}

cli/server/remove.go

@@ -3,52 +3,46 @@ package server
 import (
 	"os"
 	"path/filepath"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/i18n"
+	"github.com/sirupsen/logrus"
-	"coopcloud.tech/abra/pkg/log"
+	"github.com/urfave/cli"
-	"github.com/spf13/cobra"
 )
 
-// translators: `abra server remove` aliases. use a comma separated list of
+var serverRemoveCommand = cli.Command{
-// aliases with no spaces in between
+	Name:      "remove",
-var serverRemoveAliases = i18n.G("rm")
+	Aliases:   []string{"rm"},
+	ArgsUsage: "<server>",
+	Usage:     "Remove a managed server",
+	Description: `Remove a managed server.
 
-var ServerRemoveCommand = &cobra.Command{
+Abra will remove the internal bookkeeping (~/.abra/servers/...) and underlying
-	// translators: `server remove` command
+client connection context. This server will then be lost in time, like tears in
-	Use:     i18n.G("remove <server> [flags]"),
+rain.
-	Aliases: strings.Split(serverRemoveAliases, ","),
+`,
-	// translators: Short description for `server remove` command
+	Flags: []cli.Flag{
-	Short: i18n.G("Remove a managed server"),
+		internal.DebugFlag,
-	Long: i18n.G(`Remove a managed server.
+		internal.NoInputFlag,
-
+		internal.OfflineFlag,
-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.`),
-	Args: cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.ServerNameComplete()
 	},
-	Run: func(cmd *cobra.Command, args []string) {
+	Before:       internal.SubCommandBefore,
-		serverName := internal.ValidateServer(args)
+	BashComplete: autocomplete.ServerNameComplete,
+	Action: func(c *cli.Context) error {
+		serverName := internal.ValidateServer(c)
 
 		if err := client.DeleteContext(serverName); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
 		if err := os.RemoveAll(filepath.Join(config.SERVERS_DIR, serverName)); err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 
-		log.Info(i18n.G("%s is now lost in time, like tears in rain", serverName))
+		logrus.Infof("server at %s has been lost in time, like tears in rain", serverName)
 
-		return
+		return nil
 	},
 }

cli/server/server.go

@@ -1,21 +1,18 @@
 package server
 
 import (
-	"strings"
+	"github.com/urfave/cli"
-
-	"coopcloud.tech/abra/pkg/i18n"
-	"github.com/spf13/cobra"
 )
 
-// translators: `abra server` aliases. use a comma separated list of aliases
-// with no spaces in between
-var serverAliases = i18n.G("s")
-
 // ServerCommand defines the `abra server` command and its subcommands
-var ServerCommand = &cobra.Command{
+var ServerCommand = cli.Command{
-	// translators: `server` command group
+	Name:    "server",
-	Use:     i18n.G("server [cmd] [args] [flags]"),
+	Aliases: []string{"s"},
-	Aliases: strings.Split(serverAliases, ","),
+	Usage:   "Manage servers",
-	// translators: Short description for `server` command group
+	Subcommands: []cli.Command{
-	Short: i18n.G("Manage servers"),
+		serverAddCommand,
+		serverListCommand,
+		serverRemoveCommand,
+		serverPruneCommand,
+	},
 }

cli/updater/updater.go

@@ -0,0 +1,498 @@
+package updater
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+
+	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/pkg/client"
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/lint"
+	"coopcloud.tech/abra/pkg/recipe"
+	"coopcloud.tech/abra/pkg/upstream/convert"
+	"coopcloud.tech/abra/pkg/upstream/stack"
+	"coopcloud.tech/tagcmp"
+	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
+	dockerclient "github.com/docker/docker/client"
+
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
+)
+
+const SERVER = "localhost"
+
+var majorUpdate bool
+var majorFlag = &cli.BoolFlag{
+	Name:        "major, m",
+	Usage:       "Also check for major updates",
+	Destination: &majorUpdate,
+}
+
+var updateAll bool
+var allFlag = &cli.BoolFlag{
+	Name:        "all, a",
+	Usage:       "Update all deployed apps",
+	Destination: &updateAll,
+}
+
+// Notify checks for available upgrades
+var Notify = cli.Command{
+	Name:    "notify",
+	Aliases: []string{"n"},
+	Usage:   "Check for available upgrades",
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+		majorFlag,
+		internal.OfflineFlag,
+	},
+	Before: internal.SubCommandBefore,
+	Description: `
+It reads the deployed app versions and looks for new versions in the recipe
+catalogue. If a new patch/minor version is available, a notification is
+printed. To include major versions use the --major flag.
+`,
+	Action: func(c *cli.Context) error {
+		cl, err := client.New("default")
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		stacks, err := stack.GetStacks(cl)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		for _, stackInfo := range stacks {
+			stackName := stackInfo.Name
+			recipeName, err := getLabel(cl, stackName, "recipe")
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			if recipeName != "" {
+				_, err = getLatestUpgrade(cl, stackName, recipeName)
+				if err != nil {
+					logrus.Fatal(err)
+				}
+			}
+		}
+
+		return nil
+	},
+}
+
+// UpgradeApp upgrades apps.
+var UpgradeApp = cli.Command{
+	Name:      "upgrade",
+	Aliases:   []string{"u"},
+	Usage:     "Upgrade apps",
+	ArgsUsage: "<stack-name> <recipe>",
+	Flags: []cli.Flag{
+		internal.DebugFlag,
+		internal.ChaosFlag,
+		majorFlag,
+		allFlag,
+		internal.OfflineFlag,
+	},
+	Before: internal.SubCommandBefore,
+	Description: `
+Upgrade an app by specifying its stack name and recipe. By passing "--all"
+instead, every deployed app is upgraded. For each apps with enabled auto
+updates the deployed version is compared with the current recipe catalogue
+version. If a new patch/minor version is available, the app is upgraded. To
+include major versions use the "--major" flag. Don't do that, it will probably
+break things. Only apps that are not deployed with "--chaos" are upgraded, to
+update chaos deployments use the "--chaos" flag. Use it with care.
+`,
+	Action: func(c *cli.Context) error {
+		cl, err := client.New("default")
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if !updateAll {
+			stackName := c.Args().Get(0)
+			recipeName := c.Args().Get(1)
+			err = tryUpgrade(cl, stackName, recipeName)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			return nil
+		}
+
+		stacks, err := stack.GetStacks(cl)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		for _, stackInfo := range stacks {
+			stackName := stackInfo.Name
+			recipeName, err := getLabel(cl, stackName, "recipe")
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			err = tryUpgrade(cl, stackName, recipeName)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+		}
+
+		return nil
+	},
+}
+
+// getLabel reads docker labels from running services in the format of "coop-cloud.${STACK_NAME}.${LABEL}".
+func getLabel(cl *dockerclient.Client, stackName string, label string) (string, error) {
+	filter := filters.NewArgs()
+	filter.Add("label", fmt.Sprintf("%s=%s", convert.LabelNamespace, stackName))
+
+	services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: filter})
+	if err != nil {
+		return "", err
+	}
+
+	for _, service := range services {
+		labelKey := fmt.Sprintf("coop-cloud.%s.%s", stackName, label)
+		if labelValue, ok := service.Spec.Labels[labelKey]; ok {
+			return labelValue, nil
+		}
+	}
+
+	logrus.Debugf("no %s label found for %s", label, stackName)
+
+	return "", nil
+}
+
+// getBoolLabel reads a boolean docker label from running services
+func getBoolLabel(cl *dockerclient.Client, stackName string, label string) (bool, error) {
+	lableValue, err := getLabel(cl, stackName, label)
+	if err != nil {
+		return false, err
+	}
+
+	if lableValue != "" {
+		value, err := strconv.ParseBool(lableValue)
+		if err != nil {
+			return false, err
+		}
+
+		return value, nil
+	}
+
+	logrus.Debugf("Boolean label %s could not be found for %s, set default to false.", label, stackName)
+
+	return false, nil
+}
+
+// getEnv reads env variables from docker services.
+func getEnv(cl *dockerclient.Client, stackName string) (config.AppEnv, error) {
+	envMap := make(map[string]string)
+	filter := filters.NewArgs()
+	filter.Add("label", fmt.Sprintf("%s=%s", convert.LabelNamespace, stackName))
+
+	services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: filter})
+	if err != nil {
+		return nil, err
+	}
+
+	for _, service := range services {
+		envList := service.Spec.TaskTemplate.ContainerSpec.Env
+		for _, envString := range envList {
+			splitString := strings.SplitN(envString, "=", 2)
+			if len(splitString) != 2 {
+				logrus.Debugf("can't separate key from value: %s (this variable is probably unset)", envString)
+				continue
+			}
+			k := splitString[0]
+			v := splitString[1]
+			logrus.Debugf("For %s read env %s with value: %s from docker service", stackName, k, v)
+			envMap[k] = v
+		}
+	}
+
+	return envMap, nil
+}
+
+// getLatestUpgrade returns the latest available version for an app respecting
+// the "--major" flag if it is newer than the currently deployed version.
+func getLatestUpgrade(cl *dockerclient.Client, stackName string, recipeName string) (string, error) {
+	deployedVersion, err := getDeployedVersion(cl, stackName, recipeName)
+	if err != nil {
+		return "", err
+	}
+
+	availableUpgrades, err := getAvailableUpgrades(cl, stackName, recipeName, deployedVersion)
+	if err != nil {
+		return "", err
+	}
+
+	if len(availableUpgrades) == 0 {
+		logrus.Debugf("no available upgrades for %s", stackName)
+		return "", nil
+	}
+
+	var chosenUpgrade string
+	if len(availableUpgrades) > 0 {
+		chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
+		logrus.Infof("%s (%s) can be upgraded from version %s to %s", stackName, recipeName, deployedVersion, chosenUpgrade)
+	}
+
+	return chosenUpgrade, nil
+}
+
+// getDeployedVersion returns the currently deployed version of an app.
+func getDeployedVersion(cl *dockerclient.Client, stackName string, recipeName string) (string, error) {
+	logrus.Debugf("Retrieve deployed version whether %s is already deployed", stackName)
+
+	isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
+	if err != nil {
+		return "", err
+	}
+
+	if !isDeployed {
+		return "", fmt.Errorf("%s is not deployed?", stackName)
+	}
+
+	if deployedVersion == "unknown" {
+		return "", fmt.Errorf("failed to determine deployed version of %s", stackName)
+	}
+
+	return deployedVersion, nil
+}
+
+// getAvailableUpgrades returns all available versions of an app that are newer
+// than the deployed version. It only includes major upgrades if the "--major"
+// flag is set.
+func getAvailableUpgrades(cl *dockerclient.Client, stackName string, recipeName string,
+	deployedVersion string) ([]string, error) {
+	catl, err := recipe.ReadRecipeCatalogue(internal.Offline)
+	if err != nil {
+		return nil, err
+	}
+
+	versions, err := recipe.GetRecipeCatalogueVersions(recipeName, catl)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(versions) == 0 {
+		logrus.Warnf("no published releases for %s in the recipe catalogue?", recipeName)
+		return nil, nil
+	}
+
+	var availableUpgrades []string
+	for _, version := range versions {
+		parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
+		if err != nil {
+			return nil, err
+		}
+
+		parsedVersion, err := tagcmp.Parse(version)
+		if err != nil {
+			return nil, err
+		}
+
+		versionDelta, err := parsedDeployedVersion.UpgradeDelta(parsedVersion)
+		if err != nil {
+			return nil, err
+		}
+
+		if 0 < versionDelta.UpgradeType() && (versionDelta.UpgradeType() < 4 || majorUpdate) {
+			availableUpgrades = append(availableUpgrades, version)
+		}
+	}
+
+	logrus.Debugf("Available updates for %s: %s", stackName, availableUpgrades)
+
+	return availableUpgrades, nil
+}
+
+// processRecipeRepoVersion clones, pulls, checks out the version and lints the
+// recipe repository.
+func processRecipeRepoVersion(recipeName, version string) error {
+	if err := recipe.EnsureExists(recipeName); err != nil {
+		return err
+	}
+
+	if err := recipe.EnsureUpToDate(recipeName); err != nil {
+		return err
+	}
+
+	if err := recipe.EnsureVersion(recipeName, version); err != nil {
+		return err
+	}
+
+	if r, err := recipe.Get(recipeName, internal.Offline); err != nil {
+		return err
+	} else if err := lint.LintForErrors(r); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// mergeAbraShEnv merges abra.sh env vars into the app env vars.
+func mergeAbraShEnv(recipeName string, env config.AppEnv) error {
+	abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, recipeName, "abra.sh")
+	abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
+	if err != nil {
+		return err
+	}
+
+	for k, v := range abraShEnv {
+		logrus.Debugf("read v:%s k: %s", v, k)
+		env[k] = v
+	}
+
+	return nil
+}
+
+// createDeployConfig merges and enriches the compose config for the deployment.
+func createDeployConfig(recipeName string, stackName string, env config.AppEnv) (*composetypes.Config, stack.Deploy, error) {
+	env["STACK_NAME"] = stackName
+
+	deployOpts := stack.Deploy{
+		Namespace:    stackName,
+		Prune:        false,
+		ResolveImage: stack.ResolveImageAlways,
+	}
+
+	composeFiles, err := config.GetComposeFiles(recipeName, env)
+	if err != nil {
+		return nil, deployOpts, err
+	}
+
+	deployOpts.Composefiles = composeFiles
+	compose, err := config.GetAppComposeConfig(stackName, deployOpts, env)
+	if err != nil {
+		return nil, deployOpts, err
+	}
+
+	config.ExposeAllEnv(stackName, compose, env)
+
+	// after the upgrade the deployment won't be in chaos state anymore
+	config.SetChaosLabel(compose, stackName, false)
+	config.SetRecipeLabel(compose, stackName, recipeName)
+	config.SetUpdateLabel(compose, stackName, env)
+
+	return compose, deployOpts, nil
+}
+
+// tryUpgrade performs the upgrade if all the requirements are fulfilled.
+func tryUpgrade(cl *dockerclient.Client, stackName, recipeName string) error {
+	if recipeName == "" {
+		logrus.Debugf("don't update %s due to missing recipe name", stackName)
+		return nil
+	}
+
+	chaos, err := getBoolLabel(cl, stackName, "chaos")
+	if err != nil {
+		return err
+	}
+
+	if chaos && !internal.Chaos {
+		logrus.Debugf("don't update %s due to chaos deployment", stackName)
+		return nil
+	}
+
+	updatesEnabled, err := getBoolLabel(cl, stackName, "autoupdate")
+	if err != nil {
+		return err
+	}
+
+	if !updatesEnabled {
+		logrus.Debugf("don't update %s due to disabled auto updates or missing ENABLE_AUTO_UPDATE env", stackName)
+		return nil
+	}
+
+	upgradeVersion, err := getLatestUpgrade(cl, stackName, recipeName)
+	if err != nil {
+		return err
+	}
+
+	if upgradeVersion == "" {
+		logrus.Debugf("don't update %s due to no new version", stackName)
+		return nil
+	}
+
+	err = upgrade(cl, stackName, recipeName, upgradeVersion)
+
+	return err
+}
+
+// upgrade performs all necessary steps to upgrade an app.
+func upgrade(cl *dockerclient.Client, stackName, recipeName,
+	upgradeVersion string) error {
+	env, err := getEnv(cl, stackName)
+	if err != nil {
+		return err
+	}
+
+	app := config.App{
+		Name:   stackName,
+		Recipe: recipeName,
+		Server: SERVER,
+		Env:    env,
+	}
+
+	if err = processRecipeRepoVersion(recipeName, upgradeVersion); err != nil {
+		return err
+	}
+
+	if err = mergeAbraShEnv(recipeName, app.Env); err != nil {
+		return err
+	}
+
+	compose, deployOpts, err := createDeployConfig(recipeName, stackName, app.Env)
+	if err != nil {
+		return err
+	}
+
+	logrus.Infof("upgrade %s (%s) to version %s", stackName, recipeName, upgradeVersion)
+
+	err = stack.RunDeploy(cl, deployOpts, compose, stackName, true)
+
+	return err
+}
+
+func newAbraApp(version, commit string) *cli.App {
+	app := &cli.App{
+		Name: "kadabra",
+		Usage: `The Co-op Cloud auto-updater
+    ____                           ____ _                 _
+   / ___|___         ___  _ __    / ___| | ___  _   _  __| |
+  | |   / _ \ _____ / _ \| '_ \  | |   | |/ _ \| | | |/ _' |
+  | |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |
+   \____\___/       \___/| .__/   \____|_|\___/ \__,_|\__,_|
+                         |_|
+`,
+		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
+		Commands: []cli.Command{
+			Notify,
+			UpgradeApp,
+		},
+	}
+
+	app.Before = func(c *cli.Context) error {
+		logrus.Debugf("kadabra version %s, commit %s", version, commit)
+		return nil
+	}
+
+	return app
+}
+
+// RunApp runs CLI abra app.
+func RunApp(version, commit string) {
+	app := newAbraApp(version, commit)
+
+	if err := app.Run(os.Args); err != nil {
+		logrus.Fatal(err)
+	}
+}

cli/upgrade.go

@@ -1,64 +0,0 @@
-// Package cli provides the interface for the command-line.
-package cli
-
-import (
-	"fmt"
-	"os/exec"
-	"strings"
-
-	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/i18n"
-	"coopcloud.tech/abra/pkg/log"
-	"github.com/spf13/cobra"
-)
-
-// translators: `abra upgrade` aliases. use a comma separated list of aliases with
-// no spaces in between
-var upgradeAliases = i18n.G("u")
-
-// UpgradeCommand upgrades abra in-place.
-var UpgradeCommand = &cobra.Command{
-	// translators: `upgrade` command
-	Use:     i18n.G("upgrade [flags]"),
-	Aliases: strings.Split(upgradeAliases, ","),
-	// translators: Short description for `upgrade` command
-	Short: i18n.G("Upgrade abra"),
-	Long: i18n.G(`Upgrade abra in-place with the latest stable or release candidate.
-
-By default, the latest stable release is downloaded.
-
-Use "--rc/-r" to install the latest release candidate. Please bear in mind that
-it may contain absolutely catastrophic deal-breaker bugs. Thank you very much
-for the testing efforts 💗`),
-	Example: i18n.G("  abra upgrade --rc"),
-	Args:    cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-		mainURL := "https://install.abra.coopcloud.tech"
-		c := exec.Command("bash", "-c", fmt.Sprintf("wget -q -O- %s | bash", mainURL))
-
-		if releaseCandidate {
-			releaseCandidateURL := "https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/installer/installer"
-			c = exec.Command("bash", "-c", fmt.Sprintf("wget -q -O- %s | bash -s -- --rc", releaseCandidateURL))
-		}
-
-		log.Debugf(i18n.G("attempting to run %s", c))
-
-		if err := internal.RunCmd(c); err != nil {
-			log.Fatal(err)
-		}
-	},
-}
-
-var (
-	releaseCandidate bool
-)
-
-func init() {
-	UpgradeCommand.Flags().BoolVarP(
-		&releaseCandidate,
-		"rc",
-		"r",
-		false,
-		i18n.G("install release candidate (may contain bugs)"),
-	)
-}

cmd/abra/main.go

@@ -19,5 +19,5 @@ func main() {
 		Commit = "       "
 	}
 
-	cli.Run(Version, Commit)
+	cli.RunApp(Version, Commit)
 }

cmd/kadabra/main.go

@@ -0,0 +1,23 @@
+// Package main provides the command-line entrypoint.
+package main
+
+import (
+	"coopcloud.tech/abra/cli/updater"
+)
+
+// Version is the current version of Kadabra.
+var Version string
+
+// Commit is the current git commit of Kadabra.
+var Commit string
+
+func main() {
+	if Version == "" {
+		Version = "dev"
+	}
+	if Commit == "" {
+		Commit = "       "
+	}
+
+	updater.RunApp(Version, Commit)
+}

go.mod

@@ -1,162 +1,120 @@
 module coopcloud.tech/abra
 
-go 1.24.0
+go 1.21
-
-toolchain go1.24.1
 
 require (
-	coopcloud.tech/tagcmp v0.0.0-20250818180036-0ec1b205b5ca
+	coopcloud.tech/tagcmp v0.0.0-20211103052201-885b22f77d52
-	git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c
 	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/charmbracelet/bubbles v0.21.0
+	github.com/Autonomic-Cooperative/godotenv v1.3.1-0.20210731094149-b031ea1211e7
-	github.com/charmbracelet/bubbletea v1.3.10
+	github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4
-	github.com/charmbracelet/lipgloss v1.1.0
+	github.com/docker/cli v24.0.7+incompatible
-	github.com/charmbracelet/log v0.4.2
+	github.com/docker/distribution v2.8.3+incompatible
-	github.com/distribution/reference v0.6.0
+	github.com/docker/docker v24.0.7+incompatible
-	github.com/docker/cli v28.4.0+incompatible
-	github.com/docker/docker v28.4.0+incompatible
 	github.com/docker/go-units v0.5.0
-	github.com/evertras/bubble-table v0.19.2
+	github.com/go-git/go-git/v5 v5.10.0
-	github.com/go-git/go-git/v5 v5.16.2
+	github.com/moby/sys/signal v0.7.0
-	github.com/google/go-cmp v0.7.0
+	github.com/moby/term v0.5.0
-	github.com/leonelquinteros/gotext v1.7.2
+	github.com/olekukonko/tablewriter v0.0.5
-	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
+	github.com/schollz/progressbar/v3 v3.14.0
-	golang.org/x/term v0.35.0
+	github.com/sirupsen/logrus v1.9.3
-	gopkg.in/yaml.v3 v3.0.1
+	gotest.tools/v3 v3.5.1
-	gotest.tools/v3 v3.5.2
 )
 
 require (
-	dario.cat/mergo v1.0.2 // indirect
+	dario.cat/mergo v1.0.0 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/BurntSushi/toml v1.0.0 // indirect
-	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v1.3.0 // indirect
+	github.com/Microsoft/hcsshim v0.9.2 // indirect
-	github.com/atotto/clipboard v0.1.4 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
-	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+	github.com/cloudflare/circl v1.3.3 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
-	github.com/charmbracelet/colorprofile v0.3.2 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
-	github.com/charmbracelet/x/ansi v0.10.2 // indirect
-	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
-	github.com/charmbracelet/x/term v0.2.1 // indirect
-	github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
-	github.com/containerd/errdefs v1.0.0 // indirect
-	github.com/containerd/errdefs/pkg v0.3.0 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
-	github.com/cyphar/filepath-securejoin v0.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/distribution v2.8.3+incompatible // indirect
+	github.com/distribution/reference v0.5.0 // 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.4.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/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-git/go-billy/v5 v5.5.0 // indirect
-	github.com/go-logfmt/logfmt v0.6.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/google/go-cmp v0.5.9 // 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.2 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/kevinburke/ssh_config v1.4.0 // indirect
+	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/compress v1.14.2 // indirect
-	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/mattn/go-localereader v0.0.1 // indirect
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
-	github.com/mattn/go-runewidth v0.0.19 // indirect
+	github.com/miekg/pkcs11 v1.0.3 // 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/moby/docker-image-spec v1.3.1 // indirect
+	github.com/mitchellh/mapstructure v1.4.3 // indirect
-	github.com/moby/go-archive v0.1.0 // indirect
-	github.com/moby/sys/atomicwriter v0.1.0 // indirect
-	github.com/moby/sys/user v0.4.0 // indirect
-	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
-	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/muesli/reflow v0.3.0 // 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/runc v1.1.0 // indirect
-	github.com/opencontainers/runtime-spec v1.1.0 // indirect
+	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/pjbgf/sha1cd v0.5.0 // 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.3.0 // indirect
-	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.17.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/skeema/knownhosts v1.2.0 // indirect
-	github.com/skeema/knownhosts v1.3.1 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/pflag v1.0.10 // 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
+	golang.org/x/crypto v0.14.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	golang.org/x/mod v0.12.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.8.0 // indirect
-	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	golang.org/x/crypto v0.42.0 // indirect
-	golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
-	golang.org/x/net v0.44.0 // indirect
-	golang.org/x/text v0.29.0 // indirect
-	golang.org/x/time v0.13.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 // indirect
-	google.golang.org/grpc v1.75.1 // indirect
-	google.golang.org/protobuf v1.36.9 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 require (
+	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
+	github.com/buger/goterm v1.0.4
+	github.com/containerd/containerd v1.5.9 // indirect
 	github.com/containers/image v3.0.2+incompatible
 	github.com/containers/storage v1.38.2 // indirect
 	github.com/decentral1se/passgen v1.0.1
-	github.com/docker/docker-credential-helpers v0.9.3 // indirect
+	github.com/docker/docker-credential-helpers v0.6.4 // indirect
-	github.com/fvbommel/sortorder v1.1.0 // indirect
+	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
+	github.com/fvbommel/sortorder v1.0.2 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.8
+	github.com/hashicorp/go-retryablehttp v0.7.5
-	github.com/moby/patternmatcher v0.6.0 // indirect
+	github.com/klauspost/pgzip v1.2.6
-	github.com/moby/sys/sequential v0.6.0 // indirect
+	github.com/moby/patternmatcher v0.5.0 // indirect
-	github.com/opencontainers/image-spec v1.1.1 // indirect
+	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/prometheus/client_golang v1.23.2 // indirect
+	github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 // indirect
-	github.com/sergi/go-diff v1.4.0 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
-	github.com/spf13/cobra v1.10.1
+	github.com/sergi/go-diff v1.2.0 // indirect
-	github.com/stretchr/testify v1.11.1
+	github.com/spf13/cobra v1.3.0 // indirect
+	github.com/stretchr/testify v1.8.4
 	github.com/theupdateframework/notary v0.7.0 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
+	github.com/urfave/cli v1.22.9
-	golang.org/x/sys v0.36.0
+	github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b // indirect
+	golang.org/x/sys v0.14.0
 )

pkg/app/app.go

@@ -1,687 +1,42 @@
 package app
 
 import (
-	"bufio"
-	"errors"
-	"fmt"
-	"os"
-	"path"
-	"regexp"
-	"sort"
 	"strings"
 
-	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/envfile"
+	"github.com/sirupsen/logrus"
-	"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"
-
-	"coopcloud.tech/abra/pkg/log"
-	loader "coopcloud.tech/abra/pkg/upstream/stack"
-	composetypes "github.com/docker/cli/cli/compose/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/schollz/progressbar/v3"
 )
 
 // Get retrieves an app
-func Get(appName string) (App, error) {
+func Get(appName string) (config.App, error) {
-	files, err := LoadAppFiles("")
+	files, err := config.LoadAppFiles("")
 	if err != nil {
-		return App{}, err
+		return config.App{}, err
 	}
 
-	app, err := GetApp(files, appName)
+	app, err := config.GetApp(files, appName)
 	if err != nil {
-		return App{}, err
+		return config.App{}, err
 	}
 
-	log.Debug(i18n.G("loaded app %s: %s", appName, app))
+	logrus.Debugf("retrieved %s for %s", app, appName)
 
 	return app, nil
 }
 
-// GetApp loads an apps settings, reading it from file, in preparation to use
+// deployedServiceSpec represents a deployed service of an app.
-// it. It should only be used when ready to use the env file to keep IO
+type deployedServiceSpec struct {
-// operations down.
+	Name    string
-func GetApp(apps AppFiles, name AppName) (App, error) {
+	Version string
-	appFile, exists := apps[name]
-	if !exists {
-		return App{}, errors.New(i18n.G("cannot find app with name %s", name))
-	}
-
-	app, err := ReadAppEnvFile(appFile, name)
-	if err != nil {
-		return App{}, err
-	}
-
-	return app, nil
 }
 
-// GetApps returns a slice of Apps with their env files read from a given
+// VersionSpec represents a deployed app and associated metadata.
-// slice of AppFiles.
+type VersionSpec map[string]deployedServiceSpec
-func GetApps(appFiles AppFiles, recipeFilter string) ([]App, error) {
-	var apps []App
 
-	for name := range appFiles {
+// ParseServiceName parses a $STACK_NAME_$SERVICE_NAME service label.
-		app, err := GetApp(appFiles, name)
+func ParseServiceName(label string) string {
-		if err != nil {
+	idx := strings.LastIndex(label, "_")
-			return nil, err
+	serviceName := label[idx+1:]
-		}
+	logrus.Debugf("parsed %s as service name from %s", serviceName, label)
-
+	return serviceName
-		if recipeFilter != "" {
-			if app.Recipe.Name == recipeFilter {
-				apps = append(apps, app)
-			}
-		} else {
-			apps = append(apps, app)
-		}
-	}
-
-	return apps, nil
-}
-
-// App reprents an app with its env file read into memory
-type App struct {
-	Name   AppName
-	Recipe recipe.Recipe
-	Domain string
-	Env    envfile.AppEnv
-	Server string
-	Path   string
-}
-
-// String outputs a human-friendly string representation.
-func (a App) String() string {
-	out := fmt.Sprintf("{name: %s, ", a.Name)
-	out += fmt.Sprintf("recipe: %s, ", a.Recipe)
-	out += fmt.Sprintf("domain: %s, ", a.Domain)
-	out += fmt.Sprintf("env %s, ", a.Env)
-	out += fmt.Sprintf("server %s, ", a.Server)
-	out += fmt.Sprintf("path %s}", a.Path)
-	return out
-}
-
-// Type aliases to make code hints easier to understand
-
-// AppName is AppName
-type AppName = string
-
-// AppFile represents app env files on disk without reading the contents
-type AppFile struct {
-	Path   string
-	Server string
-}
-
-// AppFiles is a slice of appfiles
-type AppFiles map[AppName]AppFile
-
-// See documentation of config.StackName
-func (a App) StackName() string {
-	if _, exists := a.Env["STACK_NAME"]; exists {
-		return a.Env["STACK_NAME"]
-	}
-
-	stackName := StackName(a.Name)
-
-	a.Env["STACK_NAME"] = stackName
-
-	return stackName
-}
-
-// StackName gets whatever the docker safe (uses the right delimiting
-// character, e.g. "_") stack name is for the app. In general, you don't want
-// to use this to show anything to end-users, you want use a.Name instead.
-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]))
-		stackName = stackName[:config.MAX_SANITISED_APP_NAME_LENGTH]
-	}
-
-	return stackName
-}
-
-// Filters retrieves app filters for querying the container runtime. By default
-// it filters on all services in the app. It is also possible to pass an
-// otional list of service names, which get filtered instead.
-//
-// Due to upstream issues, filtering works different depending on what you're
-// querying. So, for example, secrets don't work with regex! The caller needs
-// to implement their own validation that the right secrets are matched. In
-// order to handle these cases, we provide the `appendServiceNames` /
-// `exactMatch` modifiers.
-func (a App) Filters(appendServiceNames, exactMatch bool, services ...string) (filters.Args, error) {
-	filters := filters.NewArgs()
-	if len(services) > 0 {
-		for _, serviceName := range services {
-			filters.Add("name", ServiceFilter(a.StackName(), serviceName, exactMatch))
-		}
-		return filters, nil
-	}
-
-	// When not appending the service name, just add one filter for the whole
-	// stack.
-	if !appendServiceNames {
-		f := fmt.Sprintf("%s", a.StackName())
-		if exactMatch {
-			f = fmt.Sprintf("^%s", f)
-		}
-		filters.Add("name", f)
-		return filters, nil
-	}
-
-	composeFiles, err := a.Recipe.GetComposeFiles(a.Env)
-	if err != nil {
-		return filters, err
-	}
-
-	opts := stack.Deploy{Composefiles: composeFiles}
-	compose, err := GetAppComposeConfig(a.Recipe.Name, opts, a.Env)
-	if err != nil {
-		return filters, err
-	}
-
-	for _, service := range compose.Services {
-		f := ServiceFilter(a.StackName(), service.Name, exactMatch)
-		filters.Add("name", f)
-	}
-
-	return filters, nil
-}
-
-// ServiceFilter creates a filter string for filtering a service in the docker
-// container runtime. When exact match is true, it uses regex to match the
-// string exactly.
-func ServiceFilter(stack, service string, exact bool) string {
-	if exact {
-		return fmt.Sprintf("^%s_%s", stack, service)
-	}
-	return fmt.Sprintf("%s_%s", stack, service)
-}
-
-// ByServer sort a slice of Apps
-type ByServer []App
-
-func (a ByServer) Len() int      { return len(a) }
-func (a ByServer) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a ByServer) Less(i, j int) bool {
-	return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
-}
-
-// ByServerAndRecipe sort a slice of Apps
-type ByServerAndRecipe []App
-
-func (a ByServerAndRecipe) Len() int      { return len(a) }
-func (a ByServerAndRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a ByServerAndRecipe) Less(i, j int) bool {
-	if a[i].Server == a[j].Server {
-		return strings.ToLower(a[i].Recipe.Name) < strings.ToLower(a[j].Recipe.Name)
-	}
-	return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
-}
-
-// ByRecipe sort a slice of Apps
-type ByRecipe []App
-
-func (a ByRecipe) Len() int      { return len(a) }
-func (a ByRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a ByRecipe) Less(i, j int) bool {
-	return strings.ToLower(a[i].Recipe.Name) < strings.ToLower(a[j].Recipe.Name)
-}
-
-// ByName sort a slice of Apps
-type ByName []App
-
-func (a ByName) Len() int      { return len(a) }
-func (a ByName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a ByName) Less(i, j int) bool {
-	return strings.ToLower(a[i].Name) < strings.ToLower(a[j].Name)
-}
-
-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()))
-	}
-
-	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, nil
-}
-
-// NewApp creates new App object
-func NewApp(env envfile.AppEnv, name string, appFile AppFile) (App, error) {
-	domain := env["DOMAIN"]
-
-	recipeName, exists := env["RECIPE"]
-	if !exists {
-		recipeName, exists = env["TYPE"]
-		if !exists {
-			return App{}, errors.New(i18n.G("%s is missing the TYPE env var?", name))
-		}
-	}
-
-	return App{
-		Name:   name,
-		Domain: domain,
-		Recipe: recipe.Get(recipeName),
-		Env:    env,
-		Server: appFile.Server,
-		Path:   appFile.Path,
-	}, nil
-}
-
-// LoadAppFiles gets all app files for a given set of servers or all servers.
-func LoadAppFiles(servers ...string) (AppFiles, error) {
-	appFiles := make(AppFiles)
-	if len(servers) == 1 {
-		if servers[0] == "" {
-			// Empty servers flag, one string will always be passed
-			var err error
-			servers, err = config.GetAllFoldersInDirectory(config.SERVERS_DIR)
-			if err != nil {
-				return appFiles, err
-			}
-		}
-	}
-
-	log.Debug(i18n.G("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))
-		}
-
-		for _, file := range files {
-			appName := strings.TrimSuffix(file.Name(), ".env")
-			appFilePath := path.Join(config.SERVERS_DIR, server, file.Name())
-			appFiles[appName] = AppFile{
-				Path:   appFilePath,
-				Server: server,
-			}
-		}
-	}
-
-	return appFiles, nil
-}
-
-// GetAppServiceNames retrieves a list of app service names.
-func GetAppServiceNames(appName string) ([]string, error) {
-	var serviceNames []string
-
-	appFiles, err := LoadAppFiles("")
-	if err != nil {
-		return serviceNames, err
-	}
-
-	app, err := GetApp(appFiles, appName)
-	if err != nil {
-		return serviceNames, err
-	}
-
-	composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
-	if err != nil {
-		return serviceNames, err
-	}
-
-	opts := stack.Deploy{Composefiles: composeFiles}
-	compose, err := GetAppComposeConfig(app.Recipe.Name, opts, app.Env)
-	if err != nil {
-		return serviceNames, err
-	}
-
-	for _, service := range compose.Services {
-		serviceNames = append(serviceNames, service.Name)
-	}
-
-	return serviceNames, nil
-}
-
-// GetAppNames retrieves a list of app names.
-func GetAppNames() ([]string, error) {
-	var appNames []string
-
-	appFiles, err := LoadAppFiles("")
-	if err != nil {
-		return appNames, err
-	}
-
-	apps, err := GetApps(appFiles, "")
-	if err != nil {
-		return appNames, err
-	}
-
-	for _, app := range apps {
-		appNames = append(appNames, app.Name)
-	}
-
-	return appNames, nil
-}
-
-// TemplateAppEnvSample copies the example env file for the app into the users
-// env files.
-func TemplateAppEnvSample(r recipe.Recipe, appName, server, domain string) error {
-	envSample, err := os.ReadFile(r.SampleEnvPath)
-	if err != nil {
-		return err
-	}
-
-	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))
-	}
-
-	err = os.WriteFile(appEnvPath, envSample, 0o664)
-	if err != nil {
-		return err
-	}
-
-	read, err := os.ReadFile(appEnvPath)
-	if err != nil {
-		return err
-	}
-
-	newContents := strings.Replace(
-		string(read),
-		fmt.Sprintf("%s.example.com", r.Name),
-		domain,
-		-1,
-	)
-
-	err = os.WriteFile(appEnvPath, []byte(newContents), 0)
-	if err != nil {
-		return err
-	}
-
-	log.Debug(i18n.G("copied & templated %s to %s", r.SampleEnvPath, appEnvPath))
-
-	return nil
-}
-
-// SanitiseAppName makes a app name usable with Docker by replacing illegal
-// characters.
-func SanitiseAppName(name string) string {
-	return strings.ReplaceAll(name, ".", "_")
-}
-
-// GetAppStatuses queries servers to check the deployment status of given apps.
-func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]string, error) {
-	statuses := make(map[string]map[string]string)
-
-	servers := make(map[string]struct{})
-	for _, app := range apps {
-		if _, ok := servers[app.Server]; !ok {
-			servers[app.Server] = struct{}{}
-		}
-	}
-
-	var bar *progressbar.ProgressBar
-	if !MachineReadable {
-		bar = formatter.CreateProgressbar(len(servers), i18n.G("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)
-			ch <- stack.StackStatus{}
-			continue
-		}
-
-		go func(s string) {
-			ch <- stack.GetAllDeployedServices(cl, s)
-			if !MachineReadable {
-				bar.Add(1)
-			}
-		}(server)
-	}
-
-	for range servers {
-		status := <-ch
-		if status.Err != nil {
-			return statuses, status.Err
-		}
-
-		for _, service := range status.Services {
-			result := make(map[string]string)
-			name := service.Spec.Labels[convert.LabelNamespace]
-
-			if _, ok := statuses[name]; !ok {
-				result["status"] = "deployed"
-			}
-
-			labelKey := fmt.Sprintf("coop-cloud.%s.chaos", name)
-			chaos, ok := service.Spec.Labels[labelKey]
-			if ok {
-				result["chaos"] = chaos
-			}
-
-			labelKey = fmt.Sprintf("coop-cloud.%s.chaos-version", name)
-			if chaosVersion, ok := service.Spec.Labels[labelKey]; ok {
-				result["chaosVersion"] = chaosVersion
-			}
-
-			labelKey = fmt.Sprintf("coop-cloud.%s.version", name)
-			if version, ok := service.Spec.Labels[labelKey]; ok {
-				result["version"] = version
-			} else {
-				continue
-			}
-
-			statuses[name] = result
-		}
-	}
-
-	log.Debug(i18n.G("retrieved app statuses: %s", statuses))
-
-	return statuses, nil
-}
-
-// GetAppComposeConfig retrieves a compose specification for a recipe. This
-// specification is the result of a merge of all the compose.**.yml files in
-// the recipe repository.
-func GetAppComposeConfig(recipe string, opts stack.Deploy, appEnv envfile.AppEnv) (*composetypes.Config, error) {
-	compose, err := loader.LoadComposefile(opts, appEnv)
-	if err != nil {
-		return &composetypes.Config{}, err
-	}
-
-	log.Debug(i18n.G("retrieved %s for %s", compose.Filename, recipe))
-
-	return compose, nil
-}
-
-// ExposeAllEnv exposes all env variables to the app container
-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))
-			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))
-				}
-			}
-		}
-	}
-}
-
-func CheckEnv(app App) ([]envfile.EnvVar, error) {
-	var envVars []envfile.EnvVar
-
-	envSample, err := app.Recipe.SampleEnv()
-	if err != nil {
-		return envVars, err
-	}
-
-	var keys []string
-	for key := range envSample {
-		keys = append(keys, key)
-	}
-
-	sort.Strings(keys)
-
-	for _, key := range keys {
-		if _, ok := app.Env[key]; ok {
-			envVars = append(envVars, envfile.EnvVar{Name: key, Present: true})
-		} else {
-			envVars = append(envVars, envfile.EnvVar{Name: key, Present: false})
-		}
-	}
-
-	return envVars, nil
-}
-
-// ReadAbraShCmdNames reads the names of commands.
-func ReadAbraShCmdNames(abraSh string) ([]string, error) {
-	var cmdNames []string
-
-	file, err := os.Open(abraSh)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return cmdNames, nil
-		}
-		return cmdNames, err
-	}
-	defer file.Close()
-
-	cmdNameRegex, err := regexp.Compile(`(\w+)(\(\).*\{)`)
-	if err != nil {
-		return cmdNames, err
-	}
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := scanner.Text()
-		matches := cmdNameRegex.FindStringSubmatch(line)
-		if len(matches) > 0 {
-			cmdNames = append(cmdNames, matches[1])
-		}
-	}
-
-	if len(cmdNames) > 0 {
-		log.Debug(i18n.G("read %s from %s", strings.Join(cmdNames, " "), abraSh))
-	} else {
-		log.Debug(i18n.G("read 0 command names from %s", abraSh))
-	}
-
-	return cmdNames, nil
-}
-
-// Wipe removes the version from the app .env file.
-func (a App) WipeRecipeVersion() error {
-	file, err := os.Open(a.Path)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	var (
-		lines   []string
-		scanner = bufio.NewScanner(file)
-	)
-
-	for scanner.Scan() {
-		line := scanner.Text()
-		if !strings.HasPrefix(line, "RECIPE=") && !strings.HasPrefix(line, "TYPE=") {
-			lines = append(lines, line)
-			continue
-		}
-
-		if strings.HasPrefix(line, "#") {
-			lines = append(lines, line)
-			continue
-		}
-
-		splitted := strings.Split(line, ":")
-		lines = append(lines, splitted[0])
-	}
-
-	if err := scanner.Err(); err != nil {
-		log.Fatal(err)
-	}
-
-	if err := os.WriteFile(a.Path, []byte(strings.Join(lines, "\n")), os.ModePerm); err != nil {
-		log.Fatal(err)
-	}
-
-	log.Debug(i18n.G("version wiped from %s.env", a.Domain))
-
-	return nil
-}
-
-// WriteRecipeVersion writes the recipe version to the app .env file.
-func (a App) WriteRecipeVersion(version string, dryRun bool) error {
-	file, err := os.Open(a.Path)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	var (
-		dirtyVersion string
-		skipped      bool
-		lines        []string
-		scanner      = bufio.NewScanner(file)
-	)
-
-	for scanner.Scan() {
-		line := scanner.Text()
-		if !strings.HasPrefix(line, "RECIPE=") && !strings.HasPrefix(line, "TYPE=") {
-			lines = append(lines, line)
-			continue
-		}
-
-		if strings.HasPrefix(line, "#") {
-			lines = append(lines, line)
-			continue
-		}
-
-		if strings.Contains(line, version) && !a.Recipe.Dirty && !strings.HasSuffix(line, config.DIRTY_DEFAULT) {
-			skipped = true
-			lines = append(lines, line)
-			continue
-		}
-
-		splitted := strings.Split(line, ":")
-
-		line = fmt.Sprintf("%s:%s", splitted[0], version)
-		lines = append(lines, line)
-	}
-
-	if err := scanner.Err(); err != nil {
-		log.Fatal(err)
-	}
-
-	if a.Recipe.Dirty && dirtyVersion != "" {
-		version = dirtyVersion
-	}
-
-	if !dryRun {
-		if err := os.WriteFile(a.Path, []byte(strings.Join(lines, "\n")), os.ModePerm); err != nil {
-			log.Fatal(err)
-		}
-	} else {
-		log.Debug(i18n.G("skipping writing version %s because dry run", version))
-	}
-
-	if !skipped {
-		log.Debug(i18n.G("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))
-	}
-
-	return nil
 }

pkg/app/app_test.go

@@ -1,226 +0,0 @@
-package app_test
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"testing"
-
-	appPkg "coopcloud.tech/abra/pkg/app"
-	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/envfile"
-	"coopcloud.tech/abra/pkg/recipe"
-	testPkg "coopcloud.tech/abra/pkg/test"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/google/go-cmp/cmp"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewApp(t *testing.T) {
-	app, err := appPkg.NewApp(testPkg.ExpectedAppEnv, testPkg.AppName, testPkg.ExpectedAppFile)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(app, testPkg.ExpectedApp) {
-		t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, testPkg.ExpectedApp)
-	}
-}
-
-func TestReadAppEnvFile(t *testing.T) {
-	app, err := appPkg.ReadAppEnvFile(testPkg.ExpectedAppFile, testPkg.AppName)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(app, testPkg.ExpectedApp) {
-		t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, testPkg.ExpectedApp)
-	}
-}
-
-func TestGetApp(t *testing.T) {
-	app, err := appPkg.GetApp(testPkg.ExpectedAppFiles, testPkg.AppName)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(app, testPkg.ExpectedApp) {
-		t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, testPkg.ExpectedApp)
-	}
-}
-
-func TestGetComposeFiles(t *testing.T) {
-	r := recipe.Get("abra-test-recipe")
-	err := r.EnsureExists()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tests := []struct {
-		appEnv       map[string]string
-		composeFiles []string
-	}{
-		{
-			map[string]string{},
-			[]string{
-				fmt.Sprintf("%s/compose.yml", r.Dir),
-			},
-		},
-		{
-			map[string]string{"COMPOSE_FILE": "compose.yml"},
-			[]string{
-				fmt.Sprintf("%s/compose.yml", r.Dir),
-			},
-		},
-		{
-			map[string]string{"COMPOSE_FILE": "compose.extra_secret.yml"},
-			[]string{
-				fmt.Sprintf("%s/compose.extra_secret.yml", r.Dir),
-			},
-		},
-		{
-			map[string]string{"COMPOSE_FILE": "compose.yml:compose.extra_secret.yml"},
-			[]string{
-				fmt.Sprintf("%s/compose.yml", r.Dir),
-				fmt.Sprintf("%s/compose.extra_secret.yml", r.Dir),
-			},
-		},
-	}
-
-	for _, test := range tests {
-		composeFiles, err := r.GetComposeFiles(test.appEnv)
-		if err != nil {
-			t.Fatal(err)
-		}
-		assert.Equal(t, composeFiles, test.composeFiles)
-	}
-}
-
-func TestGetComposeFilesError(t *testing.T) {
-	r := recipe.Get("abra-test-recipe")
-	err := r.EnsureExists()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tests := []struct{ appEnv map[string]string }{
-		{map[string]string{"COMPOSE_FILE": "compose.yml::compose.foo.yml"}},
-		{map[string]string{"COMPOSE_FILE": "doesnt.exist.yml"}},
-	}
-
-	for _, test := range tests {
-		_, err := r.GetComposeFiles(test.appEnv)
-		if err == nil {
-			t.Fatalf("should have failed: %v", test.appEnv)
-		}
-	}
-}
-
-func TestFilters(t *testing.T) {
-	oldDir := config.RECIPES_DIR
-	config.RECIPES_DIR = "./testdata"
-	defer func() {
-		config.RECIPES_DIR = oldDir
-	}()
-
-	app, err := appPkg.NewApp(envfile.AppEnv{
-		"DOMAIN": "test.example.com",
-		"RECIPE": "test-recipe",
-	}, "test_example_com", appPkg.AppFile{
-		Path:   "./testdata/filtertest.end",
-		Server: "local",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f, err := app.Filters(false, false)
-	if err != nil {
-		t.Error(err)
-	}
-	compareFilter(t, f, map[string]map[string]bool{
-		"name": {
-			"test_example_com": true,
-		},
-	})
-
-	f2, err := app.Filters(false, true)
-	if err != nil {
-		t.Error(err)
-	}
-	compareFilter(t, f2, map[string]map[string]bool{
-		"name": {
-			"^test_example_com": true,
-		},
-	})
-
-	f3, err := app.Filters(true, false)
-	if err != nil {
-		t.Error(err)
-	}
-	compareFilter(t, f3, map[string]map[string]bool{
-		"name": {
-			"test_example_com_bar": true,
-			"test_example_com_foo": true,
-		},
-	})
-
-	f4, err := app.Filters(true, true)
-	if err != nil {
-		t.Error(err)
-	}
-	compareFilter(t, f4, map[string]map[string]bool{
-		"name": {
-			"^test_example_com_bar": true,
-			"^test_example_com_foo": true,
-		},
-	})
-
-	f5, err := app.Filters(false, false, "foo")
-	if err != nil {
-		t.Error(err)
-	}
-	compareFilter(t, f5, map[string]map[string]bool{
-		"name": {
-			"test_example_com_foo": true,
-		},
-	})
-}
-
-func compareFilter(t *testing.T, f1 filters.Args, f2 map[string]map[string]bool) {
-	t.Helper()
-	j1, err := f1.MarshalJSON()
-	if err != nil {
-		t.Error(err)
-	}
-	j2, err := json.Marshal(f2)
-	if err != nil {
-		t.Error(err)
-	}
-	if diff := cmp.Diff(string(j2), string(j1)); diff != "" {
-		t.Errorf("filters mismatch (-want +got):\n%s", diff)
-	}
-}
-
-func TestWriteRecipeVersionOverwrite(t *testing.T) {
-	app, err := appPkg.GetApp(testPkg.ExpectedAppFiles, testPkg.AppName)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer t.Cleanup(func() {
-		if err := app.WipeRecipeVersion(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	assert.Equal(t, "", app.Recipe.EnvVersion)
-
-	if err := app.WriteRecipeVersion("foo", false); err != nil {
-		t.Fatal(err)
-	}
-
-	app, err = appPkg.GetApp(testPkg.ExpectedAppFiles, testPkg.AppName)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assert.Equal(t, "foo", app.Recipe.EnvVersion)
-}

pkg/app/compose.go

@@ -1,90 +0,0 @@
-package app
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-
-	"coopcloud.tech/abra/pkg/i18n"
-	"coopcloud.tech/abra/pkg/log"
-	composetypes "github.com/docker/cli/cli/compose/types"
-)
-
-// SetRecipeLabel adds the label 'coop-cloud.${STACK_NAME}.recipe=${RECIPE}' to the app container
-// to signal which recipe is connected to the deployed app
-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))
-			labelKey := fmt.Sprintf("coop-cloud.%s.recipe", stackName)
-			service.Deploy.Labels[labelKey] = recipe
-		}
-	}
-}
-
-// SetChaosLabel adds the label 'coop-cloud.${STACK_NAME}.chaos=true/false' to the app container
-// to signal if the app is deployed in chaos mode
-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))
-			labelKey := fmt.Sprintf("coop-cloud.%s.chaos", stackName)
-			service.Deploy.Labels[labelKey] = strconv.FormatBool(chaos)
-		}
-	}
-}
-
-// SetChaosVersionLabel adds the label 'coop-cloud.${STACK_NAME}.chaos-version=$(GIT_COMMIT)' to the app container
-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))
-			labelKey := fmt.Sprintf("coop-cloud.%s.chaos-version", stackName)
-			service.Deploy.Labels[labelKey] = chaosVersion
-		}
-	}
-}
-
-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))
-			labelKey := fmt.Sprintf("coop-cloud.%s.version", stackName)
-			service.Deploy.Labels[labelKey] = version
-		}
-	}
-}
-
-// GetLabel reads docker labels in the format of "coop-cloud.${STACK_NAME}.${LABEL}" from the local compose files
-func GetLabel(compose *composetypes.Config, stackName string, label string) string {
-	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))
-			if labelValue, ok := service.Deploy.Labels[labelKey]; ok {
-				return labelValue
-			}
-		}
-	}
-	log.Debug(i18n.G("no %s label found for %s", label, stackName))
-	return ""
-}
-
-// GetTimeoutFromLabel reads the timeout value from docker label
-// `coop-cloud.${STACK_NAME}.timeout=...` if present. A value is present if the
-// operator uses a `TIMEOUT=...` in their app env.
-func GetTimeoutFromLabel(compose *composetypes.Config, stackName string) (int, error) {
-	var timeout int
-
-	if timeoutLabel := GetLabel(compose, stackName, "timeout"); timeoutLabel != "" {
-		log.Debug(i18n.G("timeout label: %s", timeoutLabel))
-
-		var err error
-		timeout, err = strconv.Atoi(timeoutLabel)
-		if err != nil {
-			return timeout, errors.New(i18n.G("unable to convert timeout label %s to int: %s", timeoutLabel, err))
-		}
-	}
-
-	return timeout, nil
-}

pkg/app/compose_test.go

@@ -1,62 +0,0 @@
-package app_test
-
-import (
-	"testing"
-
-	appPkg "coopcloud.tech/abra/pkg/app"
-	testPkg "coopcloud.tech/abra/pkg/test"
-	stack "coopcloud.tech/abra/pkg/upstream/stack"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGetTimeoutFromLabel(t *testing.T) {
-	testPkg.MkServerAppRecipe()
-	defer testPkg.RmServerAppRecipe()
-
-	tests := []struct {
-		configuredTimeout string
-		expectedTimeout   int
-	}{
-		{"0", 0},
-		{"DOESNTEXIST", 0}, // NOTE(d1): test when missing from .env
-		{"80", 80},
-		{"120", 120},
-	}
-
-	for _, test := range tests {
-		app, err := appPkg.GetApp(testPkg.ExpectedAppFiles, testPkg.AppName)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if test.configuredTimeout != "DOESNTEXIST" {
-			app.Env["TIMEOUT"] = test.configuredTimeout
-		}
-
-		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		deployOpts := stack.Deploy{
-			Composefiles: composeFiles,
-			Namespace:    app.StackName(),
-			Prune:        false,
-			ResolveImage: stack.ResolveImageAlways,
-			Detach:       false,
-		}
-
-		compose, err := appPkg.GetAppComposeConfig(app.Name, deployOpts, app.Env)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		timeout, err := appPkg.GetTimeoutFromLabel(compose, app.StackName())
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		assert.Equal(t, timeout, test.expectedTimeout)
-	}
-}

pkg/app/testdata/filtertest.env

@@ -1,2 +0,0 @@
-RECIPE=test-recipe
-DOMAIN=test.example.com

pkg/app/testdata/test-recipe/compose.yml

@@ -1,6 +0,0 @@
-version: "3.8"
-services:
-  foo:
-    image: debian
-  bar:
-    image: debian

pkg/autocomplete/autocomplete.go

@@ -1,135 +1,78 @@
 package autocomplete
 
 import (
-	"sort"
+	"fmt"
-	"strings"
 
-	"coopcloud.tech/abra/pkg/app"
+	"coopcloud.tech/abra/pkg/config"
-	appPkg "coopcloud.tech/abra/pkg/app"
-	"coopcloud.tech/abra/pkg/i18n"
 	"coopcloud.tech/abra/pkg/recipe"
-	"github.com/spf13/cobra"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
 )
 
 // AppNameComplete copletes app names.
-func AppNameComplete() ([]string, cobra.ShellCompDirective) {
+func AppNameComplete(c *cli.Context) {
-	appFiles, err := app.LoadAppFiles("")
+	appNames, err := config.GetAppNames()
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		logrus.Warn(err)
-		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
-	var appNames []string
+	if c.NArg() > 0 {
-	for appName := range appFiles {
+		return
-		appNames = append(appNames, appName)
 	}
 
-	return appNames, cobra.ShellCompDirectiveDefault
+	for _, a := range appNames {
-}
+		fmt.Println(a)
-
-func ServiceNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
-	serviceNames, err := app.GetAppServiceNames(appName)
-	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
-		return []string{err}, cobra.ShellCompDirectiveError
 	}
-
-	return serviceNames, cobra.ShellCompDirectiveDefault
 }
 
 // RecipeNameComplete completes recipe names.
-func RecipeNameComplete() ([]string, cobra.ShellCompDirective) {
+func RecipeNameComplete(c *cli.Context) {
-	catl, err := recipe.ReadRecipeCatalogue(true)
+	catl, err := recipe.ReadRecipeCatalogue(false)
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		logrus.Warn(err)
-		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
-	localRecipes, err := recipe.GetRecipesLocal()
+	if c.NArg() > 0 {
-	if err != nil && !strings.Contains(err.Error(), "empty") {
+		return
-		err := i18n.G("autocomplete failed: %s", err)
-		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
-	var recipeNames []string
 	for name := range catl {
-		recipeNames = append(recipeNames, name)
+		fmt.Println(name)
 	}
-
-	for _, recipeLocal := range localRecipes {
-		recipeNames = append(recipeNames, recipeLocal)
-	}
-
-	return recipeNames, cobra.ShellCompDirectiveDefault
-}
-
-// RecipeVersionComplete completes versions for the recipe.
-func RecipeVersionComplete(recipeName string) ([]string, cobra.ShellCompDirective) {
-	catl, err := recipe.ReadRecipeCatalogue(true)
-	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
-		return []string{err}, cobra.ShellCompDirectiveError
-	}
-
-	var recipeVersions []string
-	for _, v := range catl[recipeName].Versions {
-		for v2 := range v {
-			recipeVersions = append(recipeVersions, v2)
-		}
-	}
-
-	return recipeVersions, cobra.ShellCompDirectiveDefault
 }
 
 // ServerNameComplete completes server names.
-func ServerNameComplete() ([]string, cobra.ShellCompDirective) {
+func ServerNameComplete(c *cli.Context) {
-	files, err := app.LoadAppFiles("")
+	files, err := config.LoadAppFiles("")
 	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
+		logrus.Fatal(err)
-		return []string{err}, cobra.ShellCompDirectiveError
+	}
+
+	if c.NArg() > 0 {
+		return
 	}
 
-	var serverNames []string
 	for _, appFile := range files {
-		serverNames = append(serverNames, appFile.Server)
+		fmt.Println(appFile.Server)
 	}
-
-	return serverNames, cobra.ShellCompDirectiveDefault
 }
 
-// CommandNameComplete completes recipe commands.
+// SubcommandComplete completes sub-commands.
-func CommandNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
+func SubcommandComplete(c *cli.Context) {
-	app, err := app.Get(appName)
+	if c.NArg() > 0 {
-	if err != nil {
+		return
-		err := i18n.G("autocomplete failed: %s", err)
-		return []string{err}, cobra.ShellCompDirectiveError
 	}
 
-	cmdNames, err := appPkg.ReadAbraShCmdNames(app.Recipe.AbraShPath)
+	subcmds := []string{
-	if err != nil {
+		"app",
-		err := i18n.G("autocomplete failed: %s", err)
+		"autocomplete",
-		return []string{err}, cobra.ShellCompDirectiveError
+		"catalogue",
+		"recipe",
+		"server",
+		"upgrade",
 	}
 
-	sort.Strings(cmdNames)
+	for _, cmd := range subcmds {
-
+		fmt.Println(cmd)
-	return cmdNames, cobra.ShellCompDirectiveDefault
+	}
-}
-
-// SecretsComplete completes recipe secrets.
-func SecretComplete(recipeName string) ([]string, cobra.ShellCompDirective) {
-	r := recipe.Get(recipeName)
-
-	config, err := r.GetComposeConfig(nil)
-	if err != nil {
-		err := i18n.G("autocomplete failed: %s", err)
-		return []string{err}, cobra.ShellCompDirectiveError
-	}
-
-	var secretNames []string
-	for name := range config.Secrets {
-		secretNames = append(secretNames, name)
-	}
-
-	return secretNames, cobra.ShellCompDirectiveDefault
 }

pkg/catalogue/catalogue.go

@@ -1,7 +1,6 @@
 package catalogue
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path"
@@ -9,21 +8,21 @@ 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"
+	"github.com/sirupsen/logrus"
 )
 
 // EnsureCatalogue ensures that the catalogue is cloned locally & present.
 func EnsureCatalogue() error {
 	catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
 	if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
-		log.Debug(i18n.G("catalogue is missing, retrieving now"))
+		logrus.Warnf("local recipe 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 {
 			return err
 		}
+
+		logrus.Debugf("cloned catalogue repository to %s", catalogueDir)
 	}
 
 	return nil
@@ -37,7 +36,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 +56,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"
+		logrus.Debugf(msg, config.CATALOGUE_DIR)
 		return nil
 	}
 
@@ -81,7 +82,7 @@ func EnsureUpToDate() error {
 		}
 	}
 
-	log.Debug(i18n.G("fetched latest git changes for %s", config.CATALOGUE_DIR))
+	logrus.Debugf("fetched latest git changes for %s", config.CATALOGUE_DIR)
 
 	return nil
 }

pkg/client/client.go

@@ -4,71 +4,37 @@ package client
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"os"
-	"path"
-	"strings"
 	"time"
 
-	"coopcloud.tech/abra/pkg/config"
 	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"
 	"github.com/docker/docker/client"
+	"github.com/sirupsen/logrus"
 )
 
-// Conf is a Docker client configuration.
-type Conf struct {
-	Timeout int
-}
-
-// Opt is a Docker client option.
-type Opt func(c *Conf)
-
-// WithTimeout specifies a timeout for a Docker client.
-func WithTimeout(timeout int) Opt {
-	return func(c *Conf) {
-		c.Timeout = timeout
-	}
-}
-
 // New initiates a new Docker client. New client connections are validated so
 // that we ensure connections via SSH to the daemon can succeed. It takes into
 // account that you may only want the local client and not communicate via SSH.
 // For this use-case, please pass "default" as the contextName.
-func New(serverName string, opts ...Opt) (*client.Client, error) {
+func New(serverName string) (*client.Client, error) {
 	var clientOpts []client.Opt
 
-	ctx, err := GetContext(serverName)
+	if serverName != "default" {
-	if err != nil {
+		context, err := GetContext(serverName)
-		serverDir := path.Join(config.SERVERS_DIR, serverName)
+		if err != nil {
-		if _, err := os.Stat(serverDir); err == nil {
+			return nil, fmt.Errorf("unknown server, run \"abra server add %s\"?", serverName)
-			return nil, errors.New(i18n.G("server missing context, run \"abra server add %s\"?", serverName))
 		}
 
-		return nil, errors.New(i18n.G("unknown server, run \"abra server add %s\"?", serverName))
+		ctxEndpoint, err := contextPkg.GetContextEndpoint(context)
-	}
+		if err != nil {
-
+			return nil, err
-	ctxEndpoint, err := contextPkg.GetContextEndpoint(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	var isUnix bool
-	if strings.Contains(ctxEndpoint, "unix://") {
-		isUnix = true
-	}
-
-	if serverName != "default" && !isUnix {
-		conf := &Conf{}
-
-		for _, opt := range opts {
-			opt(conf)
 		}
 
-		helper, err := commandconnPkg.NewConnectionHelper(ctxEndpoint, conf.Timeout)
+		helper, err := commandconnPkg.NewConnectionHelper(ctxEndpoint)
 		if err != nil {
 			return nil, err
 		}
@@ -99,7 +65,7 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {
 		return nil, err
 	}
 
-	log.Debug(i18n.G("created client for %s", serverName))
+	logrus.Debugf("created client for %s", serverName)
 
 	info, err := cl.Info(context.Background())
 	if err != nil {
@@ -107,11 +73,11 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {
 	}
 
 	if info.Swarm.LocalNodeState == "inactive" {
-		if serverName != "default" && !isUnix {
+		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)
+		} else {
+			return cl, errors.New("swarm mode not enabled on local server?")
 		}
-
-		return cl, errors.New(i18n.G("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,26 +5,28 @@ 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"
 	"github.com/docker/cli/cli/context/docker"
 	contextStore "github.com/docker/cli/cli/context/store"
+	"github.com/sirupsen/logrus"
 )
 
 type Context = contextStore.Metadata
 
-// CreateContext creates a new Docker context.
+func CreateContext(contextName string, user string, port string) error {
-func CreateContext(contextName string) error {
+	host := contextName
-	host := fmt.Sprintf("ssh://%s", contextName)
+	if user != "" {
-
+		host = fmt.Sprintf("%s@%s", user, host)
+	}
+	if port != "" {
+		host = fmt.Sprintf("%s:%s", host, port)
+	}
+	host = fmt.Sprintf("ssh://%s", host)
 	if err := createContext(contextName, host); err != nil {
 		return err
 	}
-
+	logrus.Debugf("created the %s context", contextName)
-	log.Debug(i18n.G("created the %s context", contextName))
-
 	return nil
 }
 
@@ -63,7 +65,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,13 +2,11 @@ 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"
+	"github.com/docker/distribution/reference"
 )
 
 // GetRegistryTags retrieves all tags of an image from a container registry.
@@ -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/secret.go

@@ -7,7 +7,7 @@ import (
 	"github.com/docker/docker/client"
 )
 
-func StoreSecret(cl *client.Client, secretName, secretValue string) error {
+func StoreSecret(cl *client.Client, secretName, secretValue, server string) error {
 	ann := swarm.Annotations{Name: secretName}
 	spec := swarm.SecretSpec{Annotations: ann, Data: []byte(secretValue)}
 
@@ -17,11 +17,3 @@ func StoreSecret(cl *client.Client, secretName, secretValue string) error {
 
 	return nil
 }
-
-func GetSecretNames(secrets []swarm.Secret) []string {
-	var secretNames []string
-	for _, secret := range secrets {
-		secretNames = append(secretNames, secret.Spec.Name)
-	}
-	return secretNames
-}

pkg/client/secret_test.go

@@ -1,58 +0,0 @@
-package client
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGetSecretNames(t *testing.T) {
-	tests := []struct {
-		name        string
-		secrets     []swarm.Secret
-		expected    []string
-		description string
-	}{
-		{
-			name:        "empty secrets list",
-			secrets:     []swarm.Secret{},
-			expected:    nil,
-			description: "should return nil for empty input",
-		},
-		{
-			name: "single secret",
-			secrets: []swarm.Secret{
-				{Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: "database_password"}}},
-			},
-			expected:    []string{"database_password"},
-			description: "should return single secret name",
-		},
-		{
-			name: "multiple secrets",
-			secrets: []swarm.Secret{
-				{Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: "db_password"}}},
-				{Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: "api_key"}}},
-				{Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: "ssl_cert"}}},
-			},
-			expected:    []string{"db_password", "api_key", "ssl_cert"},
-			description: "should return all secret names in order",
-		},
-		{
-			name: "secrets with empty names",
-			secrets: []swarm.Secret{
-				{Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: ""}}},
-				{Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: "valid_name"}}},
-			},
-			expected:    []string{"", "valid_name"},
-			description: "should include empty names if present",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := GetSecretNames(tt.secrets)
-			assert.Equal(t, tt.expected, result, tt.description)
-		})
-	}
-}

pkg/client/volumes.go

@@ -2,18 +2,15 @@ package client
 
 import (
 	"context"
-	"errors"
-	"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"
 	"github.com/docker/docker/client"
 )
 
 func GetVolumes(cl *client.Client, ctx context.Context, server string, fs filters.Args) ([]*volume.Volume, error) {
-	volumeListOKBody, err := cl.VolumeList(ctx, volume.ListOptions{Filters: fs})
+	volumeListOptions := volume.ListOptions{fs}
+	volumeListOKBody, err := cl.VolumeList(ctx, volumeListOptions)
 	volumeList := volumeListOKBody.Volumes
 	if err != nil {
 		return volumeList, err
@@ -32,32 +29,13 @@ func GetVolumeNames(volumes []*volume.Volume) []string {
 	return volumeNames
 }
 
-func RemoveVolumes(cl *client.Client, ctx context.Context, volumeNames []string, force bool, retries int) error {
+func RemoveVolumes(cl *client.Client, ctx context.Context, server string, volumeNames []string, force bool) error {
 	for _, volName := range volumeNames {
-		err := retryFunc(5, func() error {
+		err := cl.VolumeRemove(ctx, volName, force)
-			return cl.VolumeRemove(context.Background(), volName, force)
-		})
 		if err != nil {
-			return errors.New(i18n.G("volume %s: %s", volName, err))
+			return err
 		}
 	}
+
 	return nil
 }
-
-// retryFunc retries the given function for the given retries. After the nth
-// retry it waits (n + 1)^2 seconds before the next retry (starting with n=0).
-// It returns an error if the function still failed after the last retry.
-func retryFunc(retries int, fn func() error) error {
-	for i := 0; i < retries; i++ {
-		err := fn()
-		if err == nil {
-			return nil
-		}
-		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))
-			time.Sleep(sleep * time.Second)
-		}
-	}
-	return errors.New(i18n.G("%d retries failed", retries))
-}

pkg/client/volumes_test.go

@@ -1,26 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestRetryFunc(t *testing.T) {
-	err := retryFunc(1, func() error { return nil })
-	if err != nil {
-		t.Errorf("should not return an error: %s", err)
-	}
-
-	i := 0
-	fn := func() error {
-		i++
-		return fmt.Errorf("oh no, something went wrong!")
-	}
-	err = retryFunc(2, fn)
-	if err == nil {
-		t.Error("should return an error")
-	}
-	if i != 2 {
-		t.Errorf("The function should have been called 1 times, got %d", i)
-	}
-}

pkg/compose/compose.go

@@ -0,0 +1,158 @@
+package compose
+
+import (
+	"fmt"
+	"io/ioutil"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/formatter"
+	"coopcloud.tech/abra/pkg/upstream/stack"
+	loader "coopcloud.tech/abra/pkg/upstream/stack"
+	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/docker/distribution/reference"
+	"github.com/sirupsen/logrus"
+)
+
+// UpdateTag updates an image tag in-place on file system local compose files.
+func UpdateTag(pattern, image, tag, recipeName string) (bool, error) {
+	composeFiles, err := filepath.Glob(pattern)
+	if err != nil {
+		return false, err
+	}
+
+	logrus.Debugf("considering %s config(s) for tag update", strings.Join(composeFiles, ", "))
+
+	for _, composeFile := range composeFiles {
+		opts := stack.Deploy{Composefiles: []string{composeFile}}
+
+		envSamplePath := path.Join(config.RECIPES_DIR, recipeName, ".env.sample")
+		sampleEnv, err := config.ReadEnv(envSamplePath, config.ReadEnvOptions{})
+		if err != nil {
+			return false, err
+		}
+
+		compose, err := loader.LoadComposefile(opts, sampleEnv)
+		if err != nil {
+			return false, err
+		}
+
+		for _, service := range compose.Services {
+			if service.Image == "" {
+				continue // may be a compose.$optional.yml file
+			}
+
+			img, _ := reference.ParseNormalizedNamed(service.Image)
+			if err != nil {
+				return false, err
+			}
+
+			var composeTag string
+			switch img.(type) {
+			case reference.NamedTagged:
+				composeTag = img.(reference.NamedTagged).Tag()
+			default:
+				logrus.Debugf("unable to parse %s, skipping", img)
+				continue
+			}
+
+			composeImage := formatter.StripTagMeta(reference.Path(img))
+
+			logrus.Debugf("parsed %s from %s", composeTag, service.Image)
+
+			if image == composeImage {
+				bytes, err := ioutil.ReadFile(composeFile)
+				if err != nil {
+					return false, err
+				}
+
+				old := fmt.Sprintf("%s:%s", composeImage, composeTag)
+				new := fmt.Sprintf("%s:%s", composeImage, tag)
+				replacedBytes := strings.Replace(string(bytes), old, new, -1)
+
+				logrus.Debugf("updating %s to %s in %s", old, new, compose.Filename)
+
+				if err := ioutil.WriteFile(compose.Filename, []byte(replacedBytes), 0764); err != nil {
+					return false, err
+				}
+			}
+		}
+	}
+
+	return false, nil
+}
+
+// UpdateLabel updates a label in-place on file system local compose files.
+func UpdateLabel(pattern, serviceName, label, recipeName string) error {
+	composeFiles, err := filepath.Glob(pattern)
+	if err != nil {
+		return err
+	}
+
+	logrus.Debugf("considering %s config(s) for label update", strings.Join(composeFiles, ", "))
+
+	for _, composeFile := range composeFiles {
+		opts := stack.Deploy{Composefiles: []string{composeFile}}
+
+		envSamplePath := path.Join(config.RECIPES_DIR, recipeName, ".env.sample")
+		sampleEnv, err := config.ReadEnv(envSamplePath, config.ReadEnvOptions{})
+		if err != nil {
+			return err
+		}
+
+		compose, err := loader.LoadComposefile(opts, sampleEnv)
+		if err != nil {
+			return err
+		}
+
+		serviceExists := false
+		var service composetypes.ServiceConfig
+		for _, s := range compose.Services {
+			if s.Name == serviceName {
+				service = s
+				serviceExists = true
+			}
+		}
+
+		if !serviceExists {
+			continue
+		}
+
+		discovered := false
+		for oldLabel, value := range service.Deploy.Labels {
+			if strings.HasPrefix(oldLabel, "coop-cloud") && strings.Contains(oldLabel, "version") {
+				discovered = true
+
+				bytes, err := ioutil.ReadFile(composeFile)
+				if err != nil {
+					return err
+				}
+
+				old := fmt.Sprintf("coop-cloud.${STACK_NAME}.version=%s", value)
+				replacedBytes := strings.Replace(string(bytes), old, label, -1)
+
+				if old == label {
+					logrus.Warnf("%s is already set, nothing to do?", label)
+					return nil
+				}
+
+				logrus.Debugf("updating %s to %s in %s", old, label, compose.Filename)
+
+				if err := ioutil.WriteFile(compose.Filename, []byte(replacedBytes), 0764); err != nil {
+					return err
+				}
+
+				logrus.Infof("synced label %s to service %s", label, serviceName)
+			}
+		}
+
+		if !discovered {
+			logrus.Warn("no existing label found, automagic insertion not supported yet")
+			logrus.Fatalf("add '- \"%s\"' manually to the 'app' service in %s", label, composeFile)
+		}
+	}
+
+	return nil
+}

pkg/config/abra.go

@@ -1,122 +0,0 @@
-package config
-
-import (
-	"os"
-	"path"
-	"path/filepath"
-
-	"coopcloud.tech/abra/pkg/i18n"
-	"coopcloud.tech/abra/pkg/log"
-	"gopkg.in/yaml.v3"
-)
-
-// LoadAbraConfig returns the abra configuration. It tries to find a abra
-// configuration file (see findAbraConfig for lookup logic). When no
-// configuration was found it returns the default config.
-func LoadAbraConfig() Abra {
-	wd, _ := os.Getwd()
-	configFile := findAbraConfig(wd)
-	if configFile == "" {
-		log.Debug(i18n.G("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))
-		return Abra{}
-	}
-
-	config := 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))
-		return Abra{}
-	}
-	log.Debug(i18n.G("config file loaded from: %s", configFile))
-	config.configPath = filepath.Dir(configFile)
-	return config
-}
-
-// findAbraConfig recursively looks for a abra.y(a)ml file in the given directory.
-// When the file was not found it calls the function again with the parent
-// directory until the home directory is hit. When no abra config was found it
-// returns an empty string.
-func findAbraConfig(dir string) string {
-	dir, err := filepath.Abs(dir)
-	if err != nil {
-		return ""
-	}
-	if dir == os.ExpandEnv("$HOME") || dir == "/" {
-		return ""
-	}
-	p := path.Join(dir, "abra.yaml")
-	if _, err := os.Stat(p); err == nil {
-		return p
-	}
-	p = path.Join(dir, "abra.yml")
-	if _, err := os.Stat(p); err == nil {
-		return p
-	}
-	return findAbraConfig(filepath.Dir(dir))
-}
-
-// Abra defines the configuration file for abra.
-type Abra struct {
-	configPath string
-	AbraDir    string `yaml:"abraDir"`
-}
-
-// GetAbraDir returns the abra dir. It has the following logic:
-// 1. check if $ABRA_DIR is set
-// 2. check if abraDir was set in a config file
-// 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"))
-		return dir
-	}
-	if a.AbraDir != "" {
-		log.Debug(i18n.G("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"))
-	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) GetCatalogueDir() string { return path.Join(a.GetAbraDir(), "catalogue") }
-
-var config = LoadAbraConfig()
-
-var (
-	ABRA_DIR                  = config.GetAbraDir()
-	SERVERS_DIR               = config.GetServersDir()
-	RECIPES_DIR               = config.GetRecipesDir()
-	LOGS_DIR                  = config.GetLogsDir()
-	CATALOGUE_DIR             = config.GetCatalogueDir()
-	RECIPES_JSON              = path.Join(config.GetCatalogueDir(), "recipes.json")
-	REPOS_BASE_URL            = "https://git.coopcloud.tech/coop-cloud"
-	CATALOGUE_JSON_REPO_NAME  = "recipes-catalogue-json"
-	TOOLSHED_SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/toolshed/%s.git"
-	RECIPES_SSH_URL_TEMPLATE  = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git"
-
-	// NOTE(d1): please note, this was done purely out of laziness on our part
-	// AFAICR. it's easy to punt the value into the label because that is what is
-	// expects. it's not particularly useful in terms of UI/UX but hey, nobody
-	// complained yet!
-	CHAOS_DEFAULT = "false"
-
-	DIRTY_DEFAULT = "+U"
-
-	MISSING_DEFAULT = "-"
-
-	UNKNOWN_DEFAULT = "unknown"
-)

pkg/config/abra_test.go

@@ -1,133 +0,0 @@
-package config
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestFindAbraConfig(t *testing.T) {
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-	tests := []struct {
-		Dir    string
-		Config string
-	}{
-		{
-			Dir:    "testdata/abraconfig1",
-			Config: filepath.Join(wd, "testdata/abraconfig1/abra.yaml"),
-		},
-		{
-			Dir:    "testdata/abraconfig1/subdir",
-			Config: filepath.Join(wd, "testdata/abraconfig1/abra.yaml"),
-		},
-		{
-			Dir:    "testdata/abraconfig2",
-			Config: filepath.Join(wd, "testdata/abraconfig2/abra.yml"),
-		},
-		{
-			Dir:    "testdata/abraconfig2/subdir",
-			Config: filepath.Join(wd, "testdata/abraconfig2/abra.yml"),
-		},
-		{
-			Dir:    "testdata",
-			Config: "",
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.Dir, func(t *testing.T) {
-			config := findAbraConfig(tc.Dir)
-			if config != tc.Config {
-				t.Errorf("\nwant: %s\ngot:  %s", tc.Config, config)
-			}
-		})
-	}
-}
-
-func TestLoadAbraConfigGetAbraDir(t *testing.T) {
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-	t.Setenv("ABRA_DIR", "")
-
-	t.Run("default", func(t *testing.T) {
-		cfg := LoadAbraConfig()
-		wantAbraDir := os.ExpandEnv("$HOME/.abra")
-		if cfg.GetAbraDir() != wantAbraDir {
-			t.Errorf("\nwant: %s\ngot:  %s", wantAbraDir, cfg.GetAbraDir())
-		}
-	})
-
-	t.Run("from config file", func(t *testing.T) {
-		t.Cleanup(func() { os.Chdir(wd) })
-		err = os.Chdir(filepath.Join(wd, "testdata/abraconfig1"))
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		cfg := LoadAbraConfig()
-		wantAbraDir := filepath.Join(wd, "testdata/abraconfig1/foobar")
-		if cfg.GetAbraDir() != wantAbraDir {
-			t.Errorf("\nwant: %s\ngot:  %s", wantAbraDir, cfg.GetAbraDir())
-		}
-	})
-
-	t.Run("default when config file is empty", func(t *testing.T) {
-		t.Cleanup(func() { os.Chdir(wd) })
-		err := os.Chdir(filepath.Join(wd, "testdata/abraconfig2"))
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		cfg := LoadAbraConfig()
-		wantAbraDir := os.ExpandEnv("$HOME/.abra")
-		if cfg.GetAbraDir() != wantAbraDir {
-			t.Errorf("\nwant: %s\ngot:  %s", wantAbraDir, cfg.GetAbraDir())
-		}
-	})
-
-	t.Run("from env variable", func(t *testing.T) {
-		t.Setenv("ABRA_DIR", "foo")
-		cfg := LoadAbraConfig()
-		wantAbraDir := "foo"
-		if cfg.GetAbraDir() != wantAbraDir {
-			t.Errorf("\nwant: %s\ngot:  %s", wantAbraDir, cfg.GetAbraDir())
-		}
-	})
-}
-
-func TestLoadAbraConfigServersDir(t *testing.T) {
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-	t.Setenv("ABRA_DIR", "")
-
-	t.Run("default", func(t *testing.T) {
-		cfg := LoadAbraConfig()
-		wantServersDir := os.ExpandEnv("$HOME/.abra/servers")
-		if cfg.GetServersDir() != wantServersDir {
-			t.Errorf("\nwant: %s\ngot:  %s", wantServersDir, cfg.GetServersDir())
-		}
-	})
-
-	t.Run("from config file", func(t *testing.T) {
-		t.Cleanup(func() { os.Chdir(wd) })
-		err = os.Chdir(filepath.Join(wd, "testdata/abraconfig1"))
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		cfg := LoadAbraConfig()
-		log.Println(cfg)
-		wantServersDir := filepath.Join(wd, "testdata/abraconfig1/foobar/servers")
-		if cfg.GetServersDir() != wantServersDir {
-			t.Errorf("\nwant: %s\ngot:  %s", wantServersDir, cfg.GetServersDir())
-		}
-	})
-}

pkg/config/app.go

@@ -0,0 +1,602 @@
+package config
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path"
+	"strconv"
+	"strings"
+
+	"github.com/schollz/progressbar/v3"
+
+	"coopcloud.tech/abra/pkg/client"
+	"coopcloud.tech/abra/pkg/formatter"
+	"coopcloud.tech/abra/pkg/upstream/convert"
+	loader "coopcloud.tech/abra/pkg/upstream/stack"
+	stack "coopcloud.tech/abra/pkg/upstream/stack"
+	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/docker/docker/api/types/filters"
+	"github.com/sirupsen/logrus"
+)
+
+// Type aliases to make code hints easier to understand
+
+// AppEnv is a map of the values in an apps env config
+type AppEnv = map[string]string
+
+// AppName is AppName
+type AppName = string
+
+// AppFile represents app env files on disk without reading the contents
+type AppFile struct {
+	Path   string
+	Server string
+}
+
+// AppFiles is a slice of appfiles
+type AppFiles map[AppName]AppFile
+
+// App reprents an app with its env file read into memory
+type App struct {
+	Name   AppName
+	Recipe string
+	Domain string
+	Env    AppEnv
+	Server string
+	Path   string
+}
+
+// StackName gets whatever the docker safe (uses the right delimiting
+// character, e.g. "_") stack name is for the app. In general, you don't want
+// to use this to show anything to end-users, you want use a.Name instead.
+func (a App) StackName() string {
+	if _, exists := a.Env["STACK_NAME"]; exists {
+		return a.Env["STACK_NAME"]
+	}
+
+	stackName := SanitiseAppName(a.Name)
+
+	if len(stackName) > 45 {
+		logrus.Debugf("trimming %s to %s to avoid runtime limits", stackName, stackName[:45])
+		stackName = stackName[:45]
+	}
+
+	a.Env["STACK_NAME"] = stackName
+
+	return stackName
+}
+
+// Filters retrieves exact app filters for querying the container runtime. Due
+// to upstream issues, filtering works different depending on what you're
+// querying. So, for example, secrets don't work with regex! The caller needs
+// to implement their own validation that the right secrets are matched. In
+// order to handle these cases, we provide the `appendServiceNames` /
+// `exactMatch` modifiers.
+func (a App) Filters(appendServiceNames, exactMatch bool) (filters.Args, error) {
+	filters := filters.NewArgs()
+
+	composeFiles, err := GetComposeFiles(a.Recipe, a.Env)
+	if err != nil {
+		return filters, err
+	}
+
+	opts := stack.Deploy{Composefiles: composeFiles}
+	compose, err := GetAppComposeConfig(a.Recipe, opts, a.Env)
+	if err != nil {
+		return filters, err
+	}
+
+	for _, service := range compose.Services {
+		var filter string
+
+		if appendServiceNames {
+			if exactMatch {
+				filter = fmt.Sprintf("^%s_%s", a.StackName(), service.Name)
+			} else {
+				filter = fmt.Sprintf("%s_%s", a.StackName(), service.Name)
+			}
+		} else {
+			if exactMatch {
+				filter = fmt.Sprintf("^%s", a.StackName())
+			} else {
+				filter = fmt.Sprintf("%s", a.StackName())
+			}
+		}
+
+		filters.Add("name", filter)
+	}
+
+	return filters, nil
+}
+
+// ByServer sort a slice of Apps
+type ByServer []App
+
+func (a ByServer) Len() int      { return len(a) }
+func (a ByServer) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a ByServer) Less(i, j int) bool {
+	return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
+}
+
+// ByServerAndRecipe sort a slice of Apps
+type ByServerAndRecipe []App
+
+func (a ByServerAndRecipe) Len() int      { return len(a) }
+func (a ByServerAndRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a ByServerAndRecipe) Less(i, j int) bool {
+	if a[i].Server == a[j].Server {
+		return strings.ToLower(a[i].Recipe) < strings.ToLower(a[j].Recipe)
+	}
+	return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
+}
+
+// ByRecipe sort a slice of Apps
+type ByRecipe []App
+
+func (a ByRecipe) Len() int      { return len(a) }
+func (a ByRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a ByRecipe) Less(i, j int) bool {
+	return strings.ToLower(a[i].Recipe) < strings.ToLower(a[j].Recipe)
+}
+
+// ByName sort a slice of Apps
+type ByName []App
+
+func (a ByName) Len() int      { return len(a) }
+func (a ByName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a ByName) Less(i, j int) bool {
+	return strings.ToLower(a[i].Name) < strings.ToLower(a[j].Name)
+}
+
+func ReadAppEnvFile(appFile AppFile, name AppName) (App, error) {
+	env, err := ReadEnv(appFile.Path, ReadEnvOptions{})
+	if err != nil {
+		return App{}, fmt.Errorf("env file for %s couldn't be read: %s", name, err.Error())
+	}
+
+	logrus.Debugf("read env %s from %s", env, appFile.Path)
+
+	app, err := NewApp(env, name, appFile)
+	if err != nil {
+		return App{}, fmt.Errorf("env file for %s has issues: %s", name, err.Error())
+	}
+
+	return app, nil
+}
+
+// NewApp creates new App object
+func NewApp(env AppEnv, name string, appFile AppFile) (App, error) {
+	domain := env["DOMAIN"]
+
+	recipe, exists := env["RECIPE"]
+	if !exists {
+		recipe, exists = env["TYPE"]
+		if !exists {
+			return App{}, fmt.Errorf("%s is missing the TYPE env var?", name)
+		}
+	}
+
+	return App{
+		Name:   name,
+		Domain: domain,
+		Recipe: recipe,
+		Env:    env,
+		Server: appFile.Server,
+		Path:   appFile.Path,
+	}, nil
+}
+
+// LoadAppFiles gets all app files for a given set of servers or all servers.
+func LoadAppFiles(servers ...string) (AppFiles, error) {
+	appFiles := make(AppFiles)
+	if len(servers) == 1 {
+		if servers[0] == "" {
+			// Empty servers flag, one string will always be passed
+			var err error
+			servers, err = GetAllFoldersInDirectory(SERVERS_DIR)
+			if err != nil {
+				return appFiles, err
+			}
+		}
+	}
+
+	logrus.Debugf("collecting metadata from %v servers: %s", len(servers), strings.Join(servers, ", "))
+
+	for _, server := range servers {
+		serverDir := path.Join(SERVERS_DIR, server)
+		files, err := GetAllFilesInDirectory(serverDir)
+		if err != nil {
+			return appFiles, fmt.Errorf("server %s doesn't exist? Run \"abra server ls\" to check", server)
+		}
+
+		for _, file := range files {
+			appName := strings.TrimSuffix(file.Name(), ".env")
+			appFilePath := path.Join(SERVERS_DIR, server, file.Name())
+			appFiles[appName] = AppFile{
+				Path:   appFilePath,
+				Server: server,
+			}
+		}
+	}
+
+	return appFiles, nil
+}
+
+// GetApp loads an apps settings, reading it from file, in preparation to use
+// it. It should only be used when ready to use the env file to keep IO
+// operations down.
+func GetApp(apps AppFiles, name AppName) (App, error) {
+	appFile, exists := apps[name]
+	if !exists {
+		return App{}, fmt.Errorf("cannot find app with name %s", name)
+	}
+
+	app, err := ReadAppEnvFile(appFile, name)
+	if err != nil {
+		return App{}, err
+	}
+
+	return app, nil
+}
+
+// GetApps returns a slice of Apps with their env files read from a given
+// slice of AppFiles.
+func GetApps(appFiles AppFiles, recipeFilter string) ([]App, error) {
+	var apps []App
+
+	for name := range appFiles {
+		app, err := GetApp(appFiles, name)
+		if err != nil {
+			return nil, err
+		}
+
+		if recipeFilter != "" {
+			if app.Recipe == recipeFilter {
+				apps = append(apps, app)
+			}
+		} else {
+			apps = append(apps, app)
+		}
+	}
+
+	return apps, nil
+}
+
+// GetAppServiceNames retrieves a list of app service names.
+func GetAppServiceNames(appName string) ([]string, error) {
+	var serviceNames []string
+
+	appFiles, err := LoadAppFiles("")
+	if err != nil {
+		return serviceNames, err
+	}
+
+	app, err := GetApp(appFiles, appName)
+	if err != nil {
+		return serviceNames, err
+	}
+
+	composeFiles, err := GetComposeFiles(app.Recipe, app.Env)
+	if err != nil {
+		return serviceNames, err
+	}
+
+	opts := stack.Deploy{Composefiles: composeFiles}
+	compose, err := GetAppComposeConfig(app.Recipe, opts, app.Env)
+	if err != nil {
+		return serviceNames, err
+	}
+
+	for _, service := range compose.Services {
+		serviceNames = append(serviceNames, service.Name)
+	}
+
+	return serviceNames, nil
+}
+
+// GetAppNames retrieves a list of app names.
+func GetAppNames() ([]string, error) {
+	var appNames []string
+
+	appFiles, err := LoadAppFiles("")
+	if err != nil {
+		return appNames, err
+	}
+
+	apps, err := GetApps(appFiles, "")
+	if err != nil {
+		return appNames, err
+	}
+
+	for _, app := range apps {
+		appNames = append(appNames, app.Name)
+	}
+
+	return appNames, nil
+}
+
+// TemplateAppEnvSample copies the example env file for the app into the users
+// env files.
+func TemplateAppEnvSample(recipeName, appName, server, domain string) error {
+	envSamplePath := path.Join(RECIPES_DIR, recipeName, ".env.sample")
+	envSample, err := ioutil.ReadFile(envSamplePath)
+	if err != nil {
+		return err
+	}
+
+	appEnvPath := path.Join(ABRA_DIR, "servers", server, fmt.Sprintf("%s.env", appName))
+	if _, err := os.Stat(appEnvPath); !os.IsNotExist(err) {
+		return fmt.Errorf("%s already exists?", appEnvPath)
+	}
+
+	err = ioutil.WriteFile(appEnvPath, envSample, 0664)
+	if err != nil {
+		return err
+	}
+
+	read, err := ioutil.ReadFile(appEnvPath)
+	if err != nil {
+		return err
+	}
+
+	newContents := strings.Replace(string(read), recipeName+".example.com", domain, -1)
+
+	err = ioutil.WriteFile(appEnvPath, []byte(newContents), 0)
+	if err != nil {
+		return err
+	}
+
+	logrus.Debugf("copied & templated %s to %s", envSamplePath, appEnvPath)
+
+	return nil
+}
+
+// SanitiseAppName makes a app name usable with Docker by replacing illegal
+// characters.
+func SanitiseAppName(name string) string {
+	return strings.ReplaceAll(name, ".", "_")
+}
+
+// GetAppStatuses queries servers to check the deployment status of given apps.
+func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]string, error) {
+	statuses := make(map[string]map[string]string)
+
+	servers := make(map[string]struct{})
+	for _, app := range apps {
+		if _, ok := servers[app.Server]; !ok {
+			servers[app.Server] = struct{}{}
+		}
+	}
+
+	var bar *progressbar.ProgressBar
+	if !MachineReadable {
+		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 {
+			return statuses, err
+		}
+
+		go func(s string) {
+			ch <- stack.GetAllDeployedServices(cl, s)
+			if !MachineReadable {
+				bar.Add(1)
+			}
+		}(server)
+	}
+
+	for range servers {
+		status := <-ch
+		if status.Err != nil {
+			return statuses, status.Err
+		}
+
+		for _, service := range status.Services {
+			result := make(map[string]string)
+			name := service.Spec.Labels[convert.LabelNamespace]
+
+			if _, ok := statuses[name]; !ok {
+				result["status"] = "deployed"
+			}
+
+			labelKey := fmt.Sprintf("coop-cloud.%s.chaos", name)
+			chaos, ok := service.Spec.Labels[labelKey]
+			if ok {
+				result["chaos"] = chaos
+			}
+
+			labelKey = fmt.Sprintf("coop-cloud.%s.chaos-version", name)
+			if chaosVersion, ok := service.Spec.Labels[labelKey]; ok {
+				result["chaosVersion"] = chaosVersion
+			}
+
+			labelKey = fmt.Sprintf("coop-cloud.%s.autoupdate", name)
+			if autoUpdate, ok := service.Spec.Labels[labelKey]; ok {
+				result["autoUpdate"] = autoUpdate
+			} else {
+				result["autoUpdate"] = "false"
+			}
+
+			labelKey = fmt.Sprintf("coop-cloud.%s.version", name)
+			if version, ok := service.Spec.Labels[labelKey]; ok {
+				result["version"] = version
+			} else {
+				continue
+			}
+
+			statuses[name] = result
+		}
+	}
+
+	logrus.Debugf("retrieved app statuses: %s", statuses)
+
+	return statuses, nil
+}
+
+// ensurePathExists ensures that a path exists.
+func ensurePathExists(path string) error {
+	if _, err := os.Stat(path); err != nil && os.IsNotExist(err) {
+		return err
+	}
+	return nil
+}
+
+// GetComposeFiles gets the list of compose files for an app (or recipe if you
+// don't already have an app) which should be merged into a composetypes.Config
+// while respecting the COMPOSE_FILE env var.
+func GetComposeFiles(recipe string, appEnv AppEnv) ([]string, error) {
+	var composeFiles []string
+
+	composeFileEnvVar, ok := appEnv["COMPOSE_FILE"]
+	if !ok {
+		path := fmt.Sprintf("%s/%s/compose.yml", RECIPES_DIR, recipe)
+		if err := ensurePathExists(path); err != nil {
+			return composeFiles, err
+		}
+		logrus.Debugf("no COMPOSE_FILE detected, loading default: %s", path)
+		composeFiles = append(composeFiles, path)
+		return composeFiles, nil
+	}
+
+	if !strings.Contains(composeFileEnvVar, ":") {
+		path := fmt.Sprintf("%s/%s/%s", RECIPES_DIR, recipe, composeFileEnvVar)
+		if err := ensurePathExists(path); err != nil {
+			return composeFiles, err
+		}
+		logrus.Debugf("COMPOSE_FILE detected, loading %s", path)
+		composeFiles = append(composeFiles, path)
+		return composeFiles, nil
+	}
+
+	numComposeFiles := strings.Count(composeFileEnvVar, ":") + 1
+	envVars := strings.SplitN(composeFileEnvVar, ":", numComposeFiles)
+	if len(envVars) != numComposeFiles {
+		return composeFiles, fmt.Errorf("COMPOSE_FILE (=\"%s\") parsing failed?", composeFileEnvVar)
+	}
+
+	for _, file := range envVars {
+		path := fmt.Sprintf("%s/%s/%s", RECIPES_DIR, recipe, file)
+		if err := ensurePathExists(path); err != nil {
+			return composeFiles, err
+		}
+		composeFiles = append(composeFiles, path)
+	}
+
+	logrus.Debugf("COMPOSE_FILE detected (%s), loading %s", composeFileEnvVar, strings.Join(envVars, ", "))
+	logrus.Debugf("retrieved %s configs for %s", strings.Join(composeFiles, ", "), recipe)
+
+	return composeFiles, nil
+}
+
+// GetAppComposeConfig retrieves a compose specification for a recipe. This
+// specification is the result of a merge of all the compose.**.yml files in
+// the recipe repository.
+func GetAppComposeConfig(recipe string, opts stack.Deploy, appEnv AppEnv) (*composetypes.Config, error) {
+	compose, err := loader.LoadComposefile(opts, appEnv)
+	if err != nil {
+		return &composetypes.Config{}, err
+	}
+
+	logrus.Debugf("retrieved %s for %s", compose.Filename, recipe)
+
+	return compose, nil
+}
+
+// ExposeAllEnv exposes all env variables to the app container
+func ExposeAllEnv(stackName string, compose *composetypes.Config, appEnv AppEnv) {
+	for _, service := range compose.Services {
+		if service.Name == "app" {
+			logrus.Debugf("Add the following environment to the app service config of %s:", stackName)
+			for k, v := range appEnv {
+				_, exists := service.Environment[k]
+				if !exists {
+					value := v
+					service.Environment[k] = &value
+					logrus.Debugf("Add Key: %s Value: %s to %s", k, value, stackName)
+				}
+			}
+		}
+	}
+}
+
+// SetRecipeLabel adds the label 'coop-cloud.${STACK_NAME}.recipe=${RECIPE}' to the app container
+// to signal which recipe is connected to the deployed app
+func SetRecipeLabel(compose *composetypes.Config, stackName string, recipe string) {
+	for _, service := range compose.Services {
+		if service.Name == "app" {
+			logrus.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
+		}
+	}
+}
+
+// SetChaosLabel adds the label 'coop-cloud.${STACK_NAME}.chaos=true/false' to the app container
+// to signal if the app is deployed in chaos mode
+func SetChaosLabel(compose *composetypes.Config, stackName string, chaos bool) {
+	for _, service := range compose.Services {
+		if service.Name == "app" {
+			logrus.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)
+		}
+	}
+}
+
+// SetChaosVersionLabel adds the label 'coop-cloud.${STACK_NAME}.chaos-version=$(GIT_COMMIT)' to the app container
+func SetChaosVersionLabel(compose *composetypes.Config, stackName string, chaosVersion string) {
+	for _, service := range compose.Services {
+		if service.Name == "app" {
+			logrus.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
+		}
+	}
+}
+
+// SetUpdateLabel adds env ENABLE_AUTO_UPDATE as label to enable/disable the
+// auto update process for this app. The default if this variable is not set is to disable
+// the auto update process.
+func SetUpdateLabel(compose *composetypes.Config, stackName string, appEnv AppEnv) {
+	for _, service := range compose.Services {
+		if service.Name == "app" {
+			enable_auto_update, exists := appEnv["ENABLE_AUTO_UPDATE"]
+			if !exists {
+				enable_auto_update = "false"
+			}
+			logrus.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
+		}
+	}
+}
+
+// GetLabel reads docker labels in the format of "coop-cloud.${STACK_NAME}.${LABEL}" from the local compose files
+func GetLabel(compose *composetypes.Config, stackName string, label string) string {
+	for _, service := range compose.Services {
+		if service.Name == "app" {
+			labelKey := fmt.Sprintf("coop-cloud.%s.%s", stackName, label)
+			logrus.Debugf("get label '%s'", labelKey)
+			if labelValue, ok := service.Deploy.Labels[labelKey]; ok {
+				return labelValue
+			}
+		}
+	}
+	logrus.Debugf("no %s label found for %s", label, stackName)
+	return ""
+}
+
+// GetTimeoutFromLabel reads the timeout value from docker label "coop-cloud.${STACK_NAME}.TIMEOUT" and returns 50 as default value
+func GetTimeoutFromLabel(compose *composetypes.Config, stackName string) (int, error) {
+	var timeout = 50 // Default Timeout
+	var err error = nil
+	if timeoutLabel := GetLabel(compose, stackName, "timeout"); timeoutLabel != "" {
+		logrus.Debugf("timeout label: %s", timeoutLabel)
+		timeout, err = strconv.Atoi(timeoutLabel)
+	}
+	return timeout, err
+}

pkg/config/app_test.go

@@ -0,0 +1,108 @@
+package config_test
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/recipe"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewApp(t *testing.T) {
+	app, err := config.NewApp(ExpectedAppEnv, AppName, ExpectedAppFile)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(app, ExpectedApp) {
+		t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, ExpectedApp)
+	}
+}
+
+func TestReadAppEnvFile(t *testing.T) {
+	app, err := config.ReadAppEnvFile(ExpectedAppFile, AppName)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(app, ExpectedApp) {
+		t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, ExpectedApp)
+	}
+}
+
+func TestGetApp(t *testing.T) {
+	app, err := config.GetApp(ExpectedAppFiles, AppName)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(app, ExpectedApp) {
+		t.Fatalf("did not get expected app type. Expected: %s; Got: %s", app, ExpectedApp)
+	}
+}
+
+func TestGetComposeFiles(t *testing.T) {
+	offline := true
+	r, err := recipe.Get("abra-test-recipe", offline)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	tests := []struct {
+		appEnv       map[string]string
+		composeFiles []string
+	}{
+		{
+			map[string]string{},
+			[]string{
+				fmt.Sprintf("%s/%s/compose.yml", config.RECIPES_DIR, r.Name),
+			},
+		},
+		{
+			map[string]string{"COMPOSE_FILE": "compose.yml"},
+			[]string{
+				fmt.Sprintf("%s/%s/compose.yml", config.RECIPES_DIR, r.Name),
+			},
+		},
+		{
+			map[string]string{"COMPOSE_FILE": "compose.extra_secret.yml"},
+			[]string{
+				fmt.Sprintf("%s/%s/compose.extra_secret.yml", config.RECIPES_DIR, r.Name),
+			},
+		},
+		{
+			map[string]string{"COMPOSE_FILE": "compose.yml:compose.extra_secret.yml"},
+			[]string{
+				fmt.Sprintf("%s/%s/compose.yml", config.RECIPES_DIR, r.Name),
+				fmt.Sprintf("%s/%s/compose.extra_secret.yml", config.RECIPES_DIR, r.Name),
+			},
+		},
+	}
+
+	for _, test := range tests {
+		composeFiles, err := config.GetComposeFiles(r.Name, test.appEnv)
+		if err != nil {
+			t.Fatal(err)
+		}
+		assert.Equal(t, composeFiles, test.composeFiles)
+	}
+}
+
+func TestGetComposeFilesError(t *testing.T) {
+	offline := true
+	r, err := recipe.Get("abra-test-recipe", offline)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	tests := []struct{ appEnv map[string]string }{
+		{map[string]string{"COMPOSE_FILE": "compose.yml::compose.foo.yml"}},
+		{map[string]string{"COMPOSE_FILE": "doesnt.exist.yml"}},
+	}
+
+	for _, test := range tests {
+		_, err := config.GetComposeFiles(r.Name, test.appEnv)
+		if err == nil {
+			t.Fatalf("should have failed: %v", test.appEnv)
+		}
+	}
+}

pkg/config/env.go

@@ -1,22 +1,45 @@
 package config
 
 import (
-	"errors"
+	"bufio"
+	"fmt"
 	"io/fs"
 	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
+	"regexp"
+	"sort"
 	"strings"
 
-	"coopcloud.tech/abra/pkg/i18n"
+	"github.com/Autonomic-Cooperative/godotenv"
-	"coopcloud.tech/abra/pkg/log"
+	"github.com/sirupsen/logrus"
 )
 
-const MAX_SANITISED_APP_NAME_LENGTH = 45
+// getBaseDir retrieves the Abra base directory.
-const MAX_DOCKER_SECRET_LENGTH = 64
+func getBaseDir() string {
+	home := os.ExpandEnv("$HOME/.abra")
+	if customAbraDir, exists := os.LookupEnv("ABRA_DIR"); exists && customAbraDir != "" {
+		home = customAbraDir
+	}
+	return home
+}
 
-var BackupbotLabel = "coop-cloud.backupbot.enabled"
+var ABRA_DIR = getBaseDir()
+var SERVERS_DIR = path.Join(ABRA_DIR, "servers")
+var RECIPES_DIR = path.Join(ABRA_DIR, "recipes")
+var VENDOR_DIR = path.Join(ABRA_DIR, "vendor")
+var BACKUP_DIR = path.Join(ABRA_DIR, "backups")
+var CATALOGUE_DIR = path.Join(ABRA_DIR, "catalogue")
+var RECIPES_JSON = path.Join(ABRA_DIR, "catalogue", "recipes.json")
+var REPOS_BASE_URL = "https://git.coopcloud.tech/coop-cloud"
+var CATALOGUE_JSON_REPO_NAME = "recipes-catalogue-json"
+var SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git"
+
+// 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"}
 
 // GetServers retrieves all servers.
 func GetServers() ([]string, error) {
@@ -27,16 +50,48 @@ func GetServers() ([]string, error) {
 		return servers, err
 	}
 
-	var filtered []string
+	logrus.Debugf("retrieved %v servers: %s", len(servers), servers)
-	for _, s := range servers {
+
-		if !strings.HasPrefix(s, ".") {
+	return servers, nil
-			filtered = append(filtered, s)
+}
+
+// ReadEnvOptions modifies the ReadEnv processing of env vars.
+type ReadEnvOptions struct {
+	IncludeModifiers bool
+}
+
+// ContainsEnvVarModifier determines if an env var contains a modifier.
+func ContainsEnvVarModifier(envVar string) bool {
+	for _, mod := range envVarModifiers {
+		if strings.Contains(envVar, fmt.Sprintf("%s=", mod)) {
+			return true
 		}
 	}
+	return false
+}
 
-	log.Debug(i18n.G("retrieved %v servers: %s", len(filtered), filtered))
+// ReadEnv loads an app envivornment into a map.
+func ReadEnv(filePath string, opts ReadEnvOptions) (AppEnv, error) {
+	var envVars AppEnv
 
-	return filtered, nil
+	envVars, err := godotenv.Read(filePath)
+	if err != nil {
+		return nil, err
+	}
+
+	//	for idx, envVar := range envVars {
+	//		if strings.Contains(envVar, "#") {
+	//			if opts.IncludeModifiers && ContainsEnvVarModifier(envVar) {
+	//				continue
+	//			}
+	//			vals := strings.Split(envVar, "#")
+	//			envVars[idx] = strings.TrimSpace(vals[0])
+	//		}
+	//	}
+
+	logrus.Debugf("read %s from %s", envVars, filePath)
+
+	return envVars, nil
 }
 
 // ReadServerNames retrieves all server names.
@@ -47,7 +102,7 @@ func ReadServerNames() ([]string, error) {
 		return nil, err
 	}
 
-	log.Debug(i18n.G("read %s from %s", strings.Join(serverNames, ","), SERVERS_DIR))
+	logrus.Debugf("read %s from %s", strings.Join(serverNames, ","), SERVERS_DIR)
 
 	return serverNames, nil
 }
@@ -71,7 +126,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))
+			logrus.Warningf("broken symlink in your abra config folders: %s", filePath)
 		} else {
 			realFile, err := os.Stat(realPath)
 			if err != nil {
@@ -95,7 +150,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 +159,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))
+				logrus.Warningf("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())
@@ -114,3 +169,119 @@ func GetAllFoldersInDirectory(directory string) ([]string, error) {
 
 	return folders, nil
 }
+
+// ReadAbraShEnvVars reads env vars from an abra.sh recipe file.
+func ReadAbraShEnvVars(abraSh string) (map[string]string, error) {
+	envVars := make(map[string]string)
+
+	file, err := os.Open(abraSh)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return envVars, nil
+		}
+		return envVars, err
+	}
+	defer file.Close()
+
+	exportRegex, err := regexp.Compile(`^export\s+(\w+=\w+)`)
+	if err != nil {
+		return envVars, err
+	}
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		txt := scanner.Text()
+		if exportRegex.MatchString(txt) {
+			splitVals := strings.Split(txt, "export ")
+			envVarDef := splitVals[len(splitVals)-1]
+			keyVal := strings.Split(envVarDef, "=")
+			if len(keyVal) != 2 {
+				return envVars, fmt.Errorf("couldn't parse %s", txt)
+			}
+			envVars[keyVal[0]] = keyVal[1]
+		}
+	}
+
+	if len(envVars) > 0 {
+		logrus.Debugf("read %s from %s", envVars, abraSh)
+	} else {
+		logrus.Debugf("read 0 env var exports from %s", abraSh)
+	}
+
+	return envVars, nil
+}
+
+type EnvVar struct {
+	Name    string
+	Present bool
+}
+
+func CheckEnv(app App) ([]EnvVar, error) {
+	var envVars []EnvVar
+
+	envSamplePath := path.Join(RECIPES_DIR, app.Recipe, ".env.sample")
+	if _, err := os.Stat(envSamplePath); err != nil {
+		if os.IsNotExist(err) {
+			return envVars, fmt.Errorf("%s does not exist?", envSamplePath)
+		}
+		return envVars, err
+	}
+
+	envSample, err := ReadEnv(envSamplePath, ReadEnvOptions{})
+	if err != nil {
+		return envVars, err
+	}
+
+	var keys []string
+	for key := range envSample {
+		keys = append(keys, key)
+	}
+
+	sort.Strings(keys)
+
+	for _, key := range keys {
+		if _, ok := app.Env[key]; ok {
+			envVars = append(envVars, EnvVar{Name: key, Present: true})
+		} else {
+			envVars = append(envVars, EnvVar{Name: key, Present: false})
+		}
+	}
+
+	return envVars, nil
+}
+
+// ReadAbraShCmdNames reads the names of commands.
+func ReadAbraShCmdNames(abraSh string) ([]string, error) {
+	var cmdNames []string
+
+	file, err := os.Open(abraSh)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return cmdNames, nil
+		}
+		return cmdNames, err
+	}
+	defer file.Close()
+
+	cmdNameRegex, err := regexp.Compile(`(\w+)(\(\).*\{)`)
+	if err != nil {
+		return cmdNames, err
+	}
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		matches := cmdNameRegex.FindStringSubmatch(line)
+		if len(matches) > 0 {
+			cmdNames = append(cmdNames, matches[1])
+		}
+	}
+
+	if len(cmdNames) > 0 {
+		logrus.Debugf("read %s from %s", strings.Join(cmdNames, " "), abraSh)
+	} else {
+		logrus.Debugf("read 0 command names from %s", abraSh)
+	}
+
+	return cmdNames, nil
+}

pkg/config/env_test.go

@@ -0,0 +1,272 @@
+package config_test
+
+import (
+	"fmt"
+	"os"
+	"path"
+	"reflect"
+	"slices"
+	"strings"
+	"testing"
+
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/recipe"
+)
+
+var TestFolder = os.ExpandEnv("$PWD/../../tests/resources/test_folder")
+var ValidAbraConf = os.ExpandEnv("$PWD/../../tests/resources/valid_abra_config")
+
+// make sure these are in alphabetical order
+var TFolders = []string{"folder1", "folder2"}
+var TFiles = []string{"bar.env", "foo.env"}
+
+var AppName = "ecloud"
+var ServerName = "evil.corp"
+
+var ExpectedAppEnv = config.AppEnv{
+	"DOMAIN": "ecloud.evil.corp",
+	"RECIPE": "ecloud",
+}
+
+var ExpectedApp = config.App{
+	Name:   AppName,
+	Recipe: ExpectedAppEnv["RECIPE"],
+	Domain: ExpectedAppEnv["DOMAIN"],
+	Env:    ExpectedAppEnv,
+	Path:   ExpectedAppFile.Path,
+	Server: ExpectedAppFile.Server,
+}
+
+var ExpectedAppFile = config.AppFile{
+	Path:   path.Join(ValidAbraConf, "servers", ServerName, AppName+".env"),
+	Server: ServerName,
+}
+
+var ExpectedAppFiles = map[string]config.AppFile{
+	AppName: ExpectedAppFile,
+}
+
+func TestGetAllFoldersInDirectory(t *testing.T) {
+	folders, err := config.GetAllFoldersInDirectory(TestFolder)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(folders, TFolders) {
+		t.Fatalf("did not get expected folders. Expected: (%s), Got: (%s)", strings.Join(TFolders, ","), strings.Join(folders, ","))
+	}
+}
+
+func TestGetAllFilesInDirectory(t *testing.T) {
+	files, err := config.GetAllFilesInDirectory(TestFolder)
+	if err != nil {
+		t.Fatal(err)
+	}
+	var fileNames []string
+	for _, file := range files {
+		fileNames = append(fileNames, file.Name())
+	}
+	if !reflect.DeepEqual(fileNames, TFiles) {
+		t.Fatalf("did not get expected files. Expected: (%s), Got: (%s)", strings.Join(TFiles, ","), strings.Join(fileNames, ","))
+	}
+}
+
+func TestReadEnv(t *testing.T) {
+	env, err := config.ReadEnv(ExpectedAppFile.Path, config.ReadEnvOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(env, ExpectedAppEnv) {
+		t.Fatalf(
+			"did not get expected application settings. Expected: DOMAIN=%s RECIPE=%s; Got: DOMAIN=%s RECIPE=%s",
+			ExpectedAppEnv["DOMAIN"],
+			ExpectedAppEnv["RECIPE"],
+			env["DOMAIN"],
+			env["RECIPE"],
+		)
+	}
+}
+
+func TestReadAbraShEnvVars(t *testing.T) {
+	offline := true
+	r, err := recipe.Get("abra-test-recipe", offline)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, r.Name, "abra.sh")
+	abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(abraShEnv) == 0 {
+		t.Error("at least one env var should be exported")
+	}
+
+	if _, ok := abraShEnv["INNER_FOO"]; ok {
+		t.Error("INNER_FOO should not be exported")
+	}
+
+	if _, ok := abraShEnv["INNER_BAZ"]; ok {
+		t.Error("INNER_BAZ should not be exported")
+	}
+
+	if _, ok := abraShEnv["OUTER_FOO"]; !ok {
+		t.Error("OUTER_FOO should be exported")
+	}
+}
+
+func TestReadAbraShCmdNames(t *testing.T) {
+	offline := true
+	r, err := recipe.Get("abra-test-recipe", offline)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, r.Name, "abra.sh")
+	cmdNames, err := config.ReadAbraShCmdNames(abraShPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(cmdNames) == 0 {
+		t.Error("at least one command name should be found")
+	}
+
+	expectedCmdNames := []string{"test_cmd", "test_cmd_args"}
+	for _, cmdName := range expectedCmdNames {
+		if !slices.Contains(cmdNames, cmdName) {
+			t.Fatalf("%s should have been found in %s", cmdName, abraShPath)
+		}
+	}
+}
+
+func TestCheckEnv(t *testing.T) {
+	offline := true
+	r, err := recipe.Get("abra-test-recipe", offline)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
+	envSample, err := config.ReadEnv(envSamplePath, config.ReadEnvOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	app := config.App{
+		Name:   "test-app",
+		Recipe: r.Name,
+		Domain: "example.com",
+		Env:    envSample,
+		Path:   "example.com.env",
+		Server: "example.com",
+	}
+
+	envVars, err := config.CheckEnv(app)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, envVar := range envVars {
+		if !envVar.Present {
+			t.Fatalf("%s should be present", envVar.Name)
+		}
+	}
+}
+
+func TestCheckEnvError(t *testing.T) {
+	offline := true
+	r, err := recipe.Get("abra-test-recipe", offline)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
+	envSample, err := config.ReadEnv(envSamplePath, config.ReadEnvOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	delete(envSample, "DOMAIN")
+
+	app := config.App{
+		Name:   "test-app",
+		Recipe: r.Name,
+		Domain: "example.com",
+		Env:    envSample,
+		Path:   "example.com.env",
+		Server: "example.com",
+	}
+
+	envVars, err := config.CheckEnv(app)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, envVar := range envVars {
+		if envVar.Name == "DOMAIN" && envVar.Present {
+			t.Fatalf("%s should not be present", envVar.Name)
+		}
+	}
+}
+
+func TestContainsEnvVarModifier(t *testing.T) {
+	if ok := config.ContainsEnvVarModifier("FOO=bar # bing"); ok {
+		t.Fatal("FOO contains no env var modifier")
+	}
+
+	if ok := config.ContainsEnvVarModifier("FOO=bar # length=3"); !ok {
+		t.Fatal("FOO contains an env var modifier (length)")
+	}
+}
+
+func TestEnvVarCommentsRemoved(t *testing.T) {
+	offline := true
+	r, err := recipe.Get("abra-test-recipe", offline)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
+	envSample, err := config.ReadEnv(envSamplePath, config.ReadEnvOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	envVar, exists := envSample["WITH_COMMENT"]
+	if !exists {
+		t.Fatal("WITH_COMMENT env var should be present in .env.sample")
+	}
+
+	if strings.Contains(envVar, "should be removed") {
+		t.Fatalf("comment from '%s' should be removed", envVar)
+	}
+
+	envVar, exists = envSample["SECRET_TEST_PASS_TWO_VERSION"]
+	if !exists {
+		t.Fatal("WITH_COMMENT env var should be present in .env.sample")
+	}
+
+	if strings.Contains(envVar, "length") {
+		t.Fatal("comment from env var SECRET_TEST_PASS_TWO_VERSION should have been removed")
+	}
+}
+
+func TestEnvVarModifiersIncluded(t *testing.T) {
+	offline := true
+	r, err := recipe.Get("abra-test-recipe", offline)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
+	envSample, err := config.ReadEnv(envSamplePath, config.ReadEnvOptions{IncludeModifiers: true})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !strings.Contains(envSample["SECRET_TEST_PASS_TWO_VERSION"], "length") {
+		t.Fatal("comment from env var SECRET_TEST_PASS_TWO_VERSION should not be removed")
+	}
+}

pkg/config/testdata/abraconfig1/abra.yaml

@@ -1 +0,0 @@
-abraDir: foobar