.drone.yml

@@ -3,17 +3,27 @@ kind: pipeline
 name: coopcloud.tech/abra
 steps:
   - name: make check
-    image: golang:1.19
+    image: golang:1.17
     commands:
       - make check
 
+  - name: make static
+    image: golang:1.17
+    ignore: true # until we decide we all want this check
+    environment:
+      STATIC_CHECK_URL: honnef.co/go/tools/cmd/staticcheck
+      STATIC_CHECK_VERSION: v0.2.0
+    commands:
+      - go install $STATIC_CHECK_URL@$STATIC_CHECK_VERSION
+      - make static
+
   - name: make build
-    image: golang:1.19
+    image: golang:1.17
     commands:
       - make build
 
   - name: make test
-    image: golang:1.19
+    image: golang:1.17
     commands:
       - make test
 
@@ -45,7 +55,7 @@ steps:
       event: tag
 
   - name: release
-    image: golang:1.19
+    image: golang:1.17
     environment:
       GITEA_TOKEN:
         from_secret: goreleaser_gitea_token

.goreleaser.yml

@@ -7,6 +7,7 @@ gitea_urls:
 before:
   hooks:
     - go mod tidy
+    - go generate ./...
 builds:
   - env:
       - CGO_ENABLED=0
@@ -14,15 +15,6 @@ builds:
     goos:
       - linux
       - darwin
-    goarch:
-      - 386
-      - amd64
-      - arm
-      - arm64
-    goarm:
-      - 5
-      - 6
-      - 7
     ldflags:
       - "-X 'main.Commit={{ .Commit }}'"
       - "-X 'main.Version={{ .Version }}'"
@@ -39,10 +31,8 @@ changelog:
   sort: desc
   filters:
     exclude:
-      - "^Merge"
-      - "^Revert"
       - "^WIP:"
-      - "^chore(deps):"
       - "^style:"
       - "^test:"
       - "^tests:"
+      - "^Revert"

AUTHORS.md

@@ -1,11 +0,0 @@
-# authors
-
-> If you're looking at this and you hack on `abra` and you're not listed here,
-> please do add yourself! This is a community project, let's show some :heart:
-
-- 3wordchant
-- decentral1se
-- frando
-- kawaiipunk
-- knoflook
-- roxxers

LICENSE

@@ -1,15 +0,0 @@
-Abra: The Co-op Cloud utility belt
-Copyright (C) 2022  Co-op Cloud <helo@coopcloud.tech>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.

Makefile

@@ -5,7 +5,7 @@ LDFLAGS := "-X 'main.Commit=$(COMMIT)'"
 DIST_LDFLAGS := $(LDFLAGS)" -s -w"
 export GOPRIVATE=coopcloud.tech
 
-all: format check build test
+all: format check static build test
 
 run:
 	@go run -ldflags=$(LDFLAGS) $(ABRA)
@@ -28,6 +28,9 @@ format:
 check:
 	@test -z $$(gofmt -l .) || (echo "gofmt: formatting issue - run 'make format' to resolve" && exit 1)
 
+static:
+	@staticcheck $(ABRA)
+
 test:
 	@go test ./... -cover -v
 

README.md

@@ -1,12 +1,73 @@
-# `abra`
+# abra
+
+> https://coopcloud.tech
 
 [![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/coop-cloud/abra)](https://goreportcard.com/report/git.coopcloud.tech/coop-cloud/abra)
 
 The Co-op Cloud utility belt 🎩🐇
 
-<a href="https://github.com/egonelbre/gophers"><img align="right" width="150" src="https://github.com/egonelbre/gophers/raw/master/.thumb/sketch/adventure/poking-fire.png"/></a>
+`abra` is a command-line tool for managing your own [Co-op Cloud](https://coopcloud.tech). It can provision new servers, create apps, deploy them and a whole lot of other things. Please see [docs.coopcloud.tech](https://docs.coopcloud.tech) for more extensive documentation.
 
-`abra` is our flagship client & command-line tool which has been developed specifically in the context of the Co-op Cloud project for the purpose of making the day-to-day operations of [operators](https://docs.coopcloud.tech/operators/) and [maintainers](https://docs.coopcloud.tech/maintainers/) pleasant & convenient. It is libre software, written in [Go](https://go.dev) and maintained and extended by the community :heart:
+## Quick install
 
-Please see [docs.coopcloud.tech/abra](https://docs.coopcloud.tech/abra) for help on install, upgrade, hacking, troubleshooting & more!
+```bash
+curl https://install.abra.autonomic.zone | bash
+```
+
+Or using the latest release candidate (extra experimental!):
+
+```bash
+curl https://install.abra.autonomic.zone | bash -s -- --rc
+```
+
+Source for this script is in [scripts/installer/installer](./scripts/installer/installer).
+
+## Hacking
+
+### Getting started
+
+Install [direnv](https://direnv.net), run `cp .envrc.sample .envrc`, then run `direnv allow` in this directory. This will set coopcloud repos as private due to [this bug.](https://git.coopcloud.tech/coop-cloud/coopcloud.tech/issues/20#issuecomment-8201). Or you can run `go env -w GOPRIVATE=coopcloud.tech` but I'm not sure how persistent this is.
+
+Install [Go >= 1.16](https://golang.org/doc/install) and then:
+
+- `make build` to build
+- `./abra` to run commands
+- `make test` will run tests
+- `make install` will install it to `$GOPATH/bin`
+- `go get <package>` and `go mod tidy` to add a new dependency
+
+Our [Drone CI configuration](.drone.yml) runs a number of sanity on each pushed commit. See the [Makefile](./Makefile) for more handy targets.
+
+Please use the [conventional commit format](https://www.conventionalcommits.org/en/v1.0.0/) for your commits so we can automate our change log.
+
+### Versioning
+
+We use [goreleaser](https://goreleaser.com) to help us automate releases. We use [semver](https://semver.org) for versioning all releases of the tool. While we are still in the public alpha release phase, we will maintain a `0.y.z-alpha` format. Change logs are generated from our commit logs. We are still working this out and aim to refine our release praxis as we go.
+
+For developers, while using this `-alpha` format, the `y` part is the "major" version part. So, if you make breaking changes, you increment that and _not_ the `x` part. So, if you're on `0.1.0-alpha`, then you'd go to `0.1.1-alpha` for a backwards compatible change and `0.2.0-alpha` for a backwards incompatible change.
+
+### Making a new release
+
+- Change `ABRA_VERSION` to match the new tag in [`scripts`](./scripts/installer/installer) (use [semver](https://semver.org))
+- Commit that change (e.g. `git commit -m 'chore: publish next tag x.y.z-alpha'`)
+- Make a new tag (e.g. `git tag -a x.y.z-alpha`)
+- Push the new tag (e.g. `git push && git push --tags`)
+- Wait until the build finishes on [build.coopcloud.tech](https://build.coopcloud.tech/coop-cloud/abra)
+- Deploy the new installer script (e.g. `cd ./scripts/installer && make`)
+- Check the release worked, (e.g. `abra upgrade; abra -v`)
+
+### Fork maintenance
+
+#### `godotenv`
+
+We maintain a fork of [godotenv](https://github.com/Autonomic-Cooperative/godotenv) for two features:
+
+1. multi-line env var support
+2. inline comment parsing
+
+You can upgrade the version here by running `go get github.com/Autonomic-Cooperative/godotenv@<commit>` where `<commit>` is the latest commit you want to pin to. At time of writing, `go get github.com/Autonomic-Cooperative/godotenv@b031ea1211e7fd297af4c7747ffb562ebe00cd33` is the command you want to run to maintain the above functionality.
+
+#### `docker/client`
+
+A number of modules in [pkg/upstream](./pkg/upstream) are copy/pasta'd from the upstream [docker/docker/client](https://pkg.go.dev/github.com/docker/docker/client). We had to do this because upstream are not exposing their API as public.

cli/app/app.go

@@ -8,8 +8,8 @@ var AppCommand = cli.Command{
 	Name:        "app",
 	Aliases:     []string{"a"},
 	Usage:       "Manage apps",
-	ArgsUsage:   "<domain>",
+	ArgsUsage:   "<app>",
-	Description: "Functionality for managing the life cycle of your apps",
+	Description: "This command provides functionality for managing the life cycle of your apps",
 	Subcommands: []cli.Command{
 		appNewCommand,
 		appConfigCommand,
@@ -29,8 +29,5 @@ var AppCommand = cli.Command{
 		appVolumeCommand,
 		appVersionCommand,
 		appErrorsCommand,
-		appCmdCommand,
-		appBackupCommand,
-		appRestoreCommand,
 	},
 }

cli/app/backup.go

@@ -1,389 +0,0 @@
-package app
-
-import (
-	"archive/tar"
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"coopcloud.tech/abra/cli/internal"
-	"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/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"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/system"
-	"github.com/klauspost/pgzip"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
-)
-
-type backupConfig struct {
-	preHookCmd  string
-	postHookCmd string
-	backupPaths []string
-}
-
-var appBackupCommand = cli.Command{
-	Name:      "backup",
-	Aliases:   []string{"bk"},
-	Usage:     "Run app backup",
-	ArgsUsage: "<domain> [<service>]",
-	Flags: []cli.Flag{
-		internal.DebugFlag,
-	},
-	Before:       internal.SubCommandBefore,
-	BashComplete: autocomplete.AppNameComplete,
-	Description: `
-Run an app backup.
-
-A backup command and pre/post hook commands are defined in the recipe
-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 := recipe.Get(app.Recipe)
-		if 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
-				}
-			}
-		}
-
-		serviceName := c.Args().Get(1)
-		if serviceName != "" {
-			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(app, serviceName, backupConfig); err != nil {
-				logrus.Fatal(err)
-			}
-		} else {
-			for serviceName, backupConfig := range backupConfigs {
-				logrus.Infof("running backup for the %s service", serviceName)
-
-				if err := runBackup(app, serviceName, backupConfig); err != nil {
-					logrus.Fatal(err)
-				}
-			}
-		}
-
-		return nil
-	},
-}
-
-// runBackup does the actual backup logic.
-func runBackup(app config.App, serviceName string, bkConfig backupConfig) error {
-	if len(bkConfig.backupPaths) == 0 {
-		return fmt.Errorf("backup paths are empty for %s?", serviceName)
-	}
-
-	cl, err := client.New(app.Server)
-	if err != nil {
-		return err
-	}
-
-	// FIXME: avoid instantiating a new CLI
-	dcli, err := command.NewDockerCli()
-	if err != nil {
-		return err
-	}
-
-	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 {
-		timestamp := strconv.Itoa(time.Now().Nanosecond())
-		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 {
-			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())
-		}
-
-		tempBackupPaths = append(tempBackupPaths, localBackupPath)
-	}
-
-	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,
-		}
-
-		if err := container.RunExec(dcli, cl, targetContainer.ID, &postHookExecOpts); err != nil {
-			return err
-		}
-
-		logrus.Infof("succesfully ran %s post-hook command: %s", fullServiceName, bkConfig.postHookCmd)
-	}
-
-	return nil
-}
-
-func copyToFile(outfile string, r io.Reader) error {
-	tmpFile, err := system.TempFileSequential(filepath.Dir(outfile), ".tar_temp")
-	if err != nil {
-		return err
-	}
-
-	tmpPath := tmpFile.Name()
-
-	_, err = io.Copy(tmpFile, r)
-	tmpFile.Close()
-
-	if err != nil {
-		os.Remove(tmpPath)
-		return err
-	}
-
-	if err = os.Rename(tmpPath, outfile); err != nil {
-		os.Remove(tmpPath)
-		return err
-	}
-
-	return nil
-}
-
-func cleanupTempArchives(tarPaths []string) error {
-	for _, tarPath := range tarPaths {
-		if err := os.RemoveAll(tarPath); err != nil {
-			return err
-		}
-
-		logrus.Debugf("remove temporary archive file %s", tarPath)
-	}
-
-	return nil
-}
-
-func mergeArchives(tarPaths []string, serviceName string) error {
-	var out io.Writer
-	var cout *pgzip.Writer
-
-	timestamp := strconv.Itoa(time.Now().Nanosecond())
-	localBackupPath := filepath.Join(config.BACKUP_DIR, fmt.Sprintf("%s_%s.tar.gz", serviceName, timestamp))
-
-	fout, err := os.Create(localBackupPath)
-	if err != nil {
-		return fmt.Errorf("Failed to open %s: %s", localBackupPath, err)
-	}
-
-	defer fout.Close()
-	out = fout
-
-	cout = pgzip.NewWriter(out)
-	out = cout
-
-	tw := tar.NewWriter(out)
-
-	for _, tarPath := range tarPaths {
-		if err := addTar(tw, tarPath); err != nil {
-			return fmt.Errorf("failed to merge %s: %v", tarPath, err)
-		}
-	}
-
-	if err := tw.Close(); err != nil {
-		return fmt.Errorf("failed to close tar writer %v", err)
-	}
-
-	if cout != nil {
-		if err := cout.Flush(); err != nil {
-			return fmt.Errorf("failed to flush: %s", err)
-		} else if err = cout.Close(); err != nil {
-			return fmt.Errorf("failed to close compressed writer: %s", err)
-		}
-	}
-
-	logrus.Infof("backed up %s to %s", serviceName, localBackupPath)
-
-	return nil
-}
-
-func addTar(tw *tar.Writer, pth string) (err error) {
-	var tr *tar.Reader
-	var rc io.ReadCloser
-	var hdr *tar.Header
-
-	if tr, rc, err = openTarFile(pth); err != nil {
-		return
-	}
-
-	for {
-		if hdr, err = tr.Next(); err != nil {
-			if err == io.EOF {
-				err = nil
-			}
-			break
-		}
-		if err = tw.WriteHeader(hdr); err != nil {
-			break
-		} else if _, err = io.Copy(tw, tr); err != nil {
-			break
-		}
-	}
-	if err == nil {
-		err = rc.Close()
-	} 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

@@ -14,17 +14,18 @@ import (
 
 var appCheckCommand = cli.Command{
 	Name:      "check",
-	Aliases:   []string{"chk"},
+	Aliases:   []string{"c"},
 	Usage:     "Check if app is configured correctly",
-	ArgsUsage: "<domain>",
+	ArgsUsage: "<service>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
 
-		envSamplePath := path.Join(config.RECIPES_DIR, app.Recipe, ".env.sample")
+		envSamplePath := path.Join(config.RECIPES_DIR, app.Type, ".env.sample")
 		if _, err := os.Stat(envSamplePath); err != nil {
 			if os.IsNotExist(err) {
 				logrus.Fatalf("%s does not exist?", envSamplePath)

cli/app/cmd.go

@@ -1,244 +0,0 @@
-package app
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"strings"
-
-	"coopcloud.tech/abra/cli/internal"
-	"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/formatter"
-	"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"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
-)
-
-var appCmdCommand = cli.Command{
-	Name:    "command",
-	Aliases: []string{"cmd"},
-	Usage:   "Run app commands",
-	Description: `
-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". Arguments can be passed into these functions
-using the "-- <args>" syntax.
-
-Example:
-
-  abra app cmd example.com app create_user -- me@example.com
-`,
-	ArgsUsage: "<domain> [<service>] <command> [-- <args>]",
-	Flags: []cli.Flag{
-		internal.DebugFlag,
-		internal.LocalCmdFlag,
-		internal.RemoteUserFlag,
-	},
-	BashComplete: autocomplete.AppNameComplete,
-	Before:       internal.SubCommandBefore,
-	Action: func(c *cli.Context) error {
-		app := internal.ValidateApp(c)
-
-		if internal.LocalCmd && internal.RemoteUser != "" {
-			internal.ShowSubcommandHelpAndError(c, errors.New("cannot use --local & --user together"))
-		}
-
-		hasCmdArgs, parsedCmdArgs := parseCmdArgs(c.Args(), internal.LocalCmd)
-
-		abraSh := path.Join(config.RECIPES_DIR, app.Recipe, "abra.sh")
-		if _, err := os.Stat(abraSh); err != nil {
-			if os.IsNotExist(err) {
-				logrus.Fatalf("%s does not exist for %s?", abraSh, app.Name)
-			}
-			logrus.Fatal(err)
-		}
-
-		if internal.LocalCmd {
-			cmdName := c.Args().Get(1)
-			if err := 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 {
-				exportEnv = exportEnv + fmt.Sprintf("%s='%s'; ", k, v)
-			}
-			var sourceAndExec string
-			if hasCmdArgs {
-				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, abraSh, cmdName, parsedCmdArgs)
-			} else {
-				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, abraSh, cmdName)
-			}
-
-			shell := "/bin/bash"
-			if _, err := os.Stat(shell); errors.Is(err, os.ErrNotExist) {
-				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 {
-				logrus.Fatal(err)
-			}
-		} else {
-			targetServiceName := c.Args().Get(1)
-
-			cmdName := c.Args().Get(2)
-			if err := 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")
-			}
-
-			if err := runCmdRemote(app, abraSh, targetServiceName, cmdName, parsedCmdArgs); err != nil {
-				logrus.Fatal(err)
-			}
-		}
-
-		return nil
-	},
-}
-
-func parseCmdArgs(args []string, isLocal bool) (bool, string) {
-	var (
-		parsedCmdArgs string
-		hasCmdArgs    bool
-	)
-
-	if isLocal {
-		if len(args) > 2 {
-			return true, fmt.Sprintf("%s ", strings.Join(args[2:], " "))
-		}
-	} else {
-		if len(args) > 3 {
-			return true, fmt.Sprintf("%s ", strings.Join(args[3:], " "))
-		}
-	}
-
-	return hasCmdArgs, parsedCmdArgs
-}
-
-func ensureCommand(abraSh, recipeName, execCmd string) error {
-	bytes, err := ioutil.ReadFile(abraSh)
-	if err != nil {
-		return err
-	}
-
-	if !strings.Contains(string(bytes), execCmd) {
-		return fmt.Errorf("%s doesn't have a %s function", recipeName, execCmd)
-	}
-
-	return nil
-}
-
-func runCmdRemote(app config.App, abraSh, serviceName, cmdName, cmdArgs string) error {
-	cl, err := client.New(app.Server)
-	if err != nil {
-		return err
-	}
-
-	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
-	}
-
-	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)
-	if err != nil {
-		return err
-	}
-
-	copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
-	if err := cl.CopyToContainer(context.Background(), targetContainer.ID, "/tmp", content, copyOpts); err != nil {
-		return err
-	}
-
-	// FIXME: avoid instantiating a new CLI
-	dcli, err := command.NewDockerCli()
-	if err != nil {
-		return err
-	}
-
-	shell := "/bin/bash"
-	findShell := []string{"test", "-e", shell}
-	execCreateOpts := types.ExecConfig{
-		AttachStderr: true,
-		AttachStdin:  true,
-		AttachStdout: true,
-		Cmd:          findShell,
-		Detach:       false,
-		Tty:          false,
-	}
-
-	if err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
-		logrus.Infof("%s does not exist for %s, use /bin/sh as fallback", shell, app.Name)
-		shell = "/bin/sh"
-	}
-
-	var cmd []string
-	if cmdArgs != "" {
-		cmd = []string{shell, "-c", fmt.Sprintf("TARGET=%s; APP_NAME=%s; STACK_NAME=%s; . /tmp/abra.sh; %s %s", serviceName, app.Name, app.StackName(), cmdName, cmdArgs)}
-	} else {
-		cmd = []string{shell, "-c", fmt.Sprintf("TARGET=%s; APP_NAME=%s; STACK_NAME=%s; . /tmp/abra.sh; %s", serviceName, app.Name, app.StackName(), cmdName)}
-	}
-
-	logrus.Debugf("running command: %s", strings.Join(cmd, " "))
-
-	if internal.RemoteUser != "" {
-		logrus.Debugf("running command with user %s", internal.RemoteUser)
-		execCreateOpts.User = internal.RemoteUser
-	}
-
-	execCreateOpts.Cmd = cmd
-	execCreateOpts.Tty = true
-
-	if err := container.RunExec(dcli, cl, targetContainer.ID, &execCreateOpts); err != nil {
-		return err
-	}
-
-	return nil
-}

cli/app/cmd_test.go

@@ -1,31 +0,0 @@
-package app
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestParseCmdArgs(t *testing.T) {
-	tests := []struct {
-		input          []string
-		shouldParse    bool
-		expectedOutput string
-	}{
-		// `--` 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/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 "},
-	}
-
-	for _, test := range tests {
-		ok, parsed := parseCmdArgs(test.input, false)
-		if ok != test.shouldParse {
-			t.Fatalf("[%s] should not parse", strings.Join(test.input, " "))
-		}
-		if parsed != test.expectedOutput {
-			t.Fatalf("%s does not match %s", parsed, test.expectedOutput)
-		}
-	}
-}

cli/app/config.go

@@ -15,11 +15,11 @@ import (
 
 var appConfigCommand = cli.Command{
 	Name:    "config",
-	Aliases:   []string{"cfg"},
+	Aliases: []string{"c"},
 	Usage:   "Edit app config",
-	ArgsUsage: "<domain>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Action: func(c *cli.Context) error {

cli/app/cp.go

@@ -22,7 +22,7 @@ import (
 var appCpCommand = cli.Command{
 	Name:      "cp",
 	Aliases:   []string{"c"},
-	ArgsUsage: "<domain> <src> <dst>",
+	ArgsUsage: "<src> <dst>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
@@ -30,15 +30,16 @@ var appCpCommand = cli.Command{
 	Before: internal.SubCommandBefore,
 	Usage:  "Copy files to/from a running app service",
 	Description: `
-Copy files to and from any app service file system.
+This command supports copying files to and from any app service file system.
 
 If you want to copy a myfile.txt to the root of the app service:
 
-    abra app cp <domain> myfile.txt app:/
+    abra app cp <app> 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 .
+		abra app cp <app> app:/myfile.txt .
+
 `,
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
@@ -105,15 +106,25 @@ func configureAndCp(
 	dstPath string,
 	service string,
 	isToContainer bool) error {
+	appFiles, err := config.LoadAppFiles("")
+	if err != nil {
+		logrus.Fatal(err)
+	}
+
+	appEnv, err := config.GetApp(appFiles, app.Name)
+	if err != nil {
+		logrus.Fatal(err)
+	}
+
 	cl, err := client.New(app.Server)
 	if err != nil {
 		logrus.Fatal(err)
 	}
 
 	filters := filters.NewArgs()
-	filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service))
+	filters.Add("name", fmt.Sprintf("%s_%s", appEnv.StackName(), service))
 
-	container, err := container.GetContainer(context.Background(), cl, filters, internal.NoInput)
+	container, err := container.GetContainer(context.Background(), cl, filters, true)
 	if err != nil {
 		logrus.Fatal(err)
 	}
@@ -146,6 +157,5 @@ func configureAndCp(
 			logrus.Fatal(err)
 		}
 	}
-
 	return nil
 }

cli/app/deploy.go

@@ -10,7 +10,6 @@ var appDeployCommand = cli.Command{
 	Name:    "deploy",
 	Aliases: []string{"d"},
 	Usage:   "Deploy an app",
-	ArgsUsage: "<domain>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
@@ -21,8 +20,9 @@ var appDeployCommand = cli.Command{
 	},
 	Before: internal.SubCommandBefore,
 	Description: `
-Deploy an app. It does not support incrementing the version of a deployed app,
+This command deploys an app. It does not support incrementing the version of a
-for this you need to look at the "abra app upgrade <domain>" command.
+deployed app, for this you need to look at the "abra app upgrade <app>"
+command.
 
 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.

cli/app/errors.go

@@ -2,7 +2,6 @@ package app
 
 import (
 	"context"
-	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -23,9 +22,8 @@ import (
 var appErrorsCommand = cli.Command{
 	Name:  "errors",
 	Usage: "List errors for a deployed app",
-	ArgsUsage: "<domain>",
 	Description: `
-List errors for a deployed app.
+This command lists 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
@@ -42,13 +40,15 @@ 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
+This command is best accompanied by "abra app logs <app>" 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.NoInputFlag,
 		internal.WatchFlag,
 	},
 	Before:       internal.SubCommandBefore,
@@ -89,15 +89,14 @@ the logs.
 }
 
 func checkErrors(c *cli.Context, cl *dockerClient.Client, app config.App) error {
-	recipe, err := recipe.Get(app.Recipe)
+	recipe, err := recipe.Get(app.Type)
 	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))
+		filters.Add("name", service.Name)
-
 		containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters})
 		if err != nil {
 			return err

cli/app/list.go

@@ -22,12 +22,12 @@ var statusFlag = &cli.BoolFlag{
 	Destination: &status,
 }
 
-var appRecipe string
+var appType string
-var recipeFlag = &cli.StringFlag{
+var typeFlag = &cli.StringFlag{
-	Name:        "recipe, r",
+	Name:        "type, t",
 	Value:       "",
-	Usage:       "Show apps of a specific recipe",
+	Usage:       "Show apps of a specific type",
-	Destination: &appRecipe,
+	Destination: &appType,
 }
 
 var listAppServer string
@@ -62,8 +62,8 @@ var appListCommand = cli.Command{
 	Aliases: []string{"ls"},
 	Usage:   "List all managed apps",
 	Description: `
-Read the local file system listing of apps and servers (e.g. ~/.abra/) to
+This command looks at your local file system listing of apps and servers (e.g.
-generate a report of all your apps.
+in ~/.abra/) to generate a report of all your apps.
 
 By passing the "--status/-S" flag, you can query all your servers for the
 actual live deployment status. Depending on how many servers you manage, this
@@ -71,9 +71,10 @@ can take some time.
 	`,
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 		statusFlag,
 		listAppServerFlag,
-		recipeFlag,
+		typeFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Action: func(c *cli.Context) error {
@@ -87,7 +88,7 @@ can take some time.
 			logrus.Fatal(err)
 		}
 
-		sort.Sort(config.ByServerAndRecipe(apps))
+		sort.Sort(config.ByServerAndType(apps))
 
 		statuses := make(map[string]map[string]string)
 		var catl recipe.RecipeCatalogue
@@ -122,14 +123,14 @@ can take some time.
 			var ok bool
 			if stats, ok = allStats[app.Server]; !ok {
 				stats = serverStatus{}
-				if appRecipe == "" {
+				if appType == "" {
 					// count server, no filtering
 					totalServersCount++
 				}
 			}
 
-			if app.Recipe == appRecipe || appRecipe == "" {
+			if app.Type == appType || appType == "" {
-				if appRecipe != "" {
+				if appType != "" {
 					// only count server if matches filter
 					totalServersCount++
 				}
@@ -160,7 +161,7 @@ can take some time.
 
 					var newUpdates []string
 					if version != "unknown" {
-						updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
+						updates, err := recipe.GetRecipeCatalogueVersions(app.Type, catl)
 						if err != nil {
 							logrus.Fatal(err)
 						}
@@ -197,7 +198,7 @@ can take some time.
 				}
 
 				appStats.server = app.Server
-				appStats.recipe = app.Recipe
+				appStats.recipe = app.Type
 				appStats.appName = app.Name
 				appStats.domain = app.Domain
 
@@ -215,7 +216,7 @@ can take some time.
 
 			serverStat := allStats[app.Server]
 
-			tableCol := []string{"recipe", "domain"}
+			tableCol := []string{"recipe", "domain", "app name"}
 			if status {
 				tableCol = append(tableCol, []string{"status", "version", "upgrade"}...)
 			}
@@ -223,7 +224,7 @@ can take some time.
 			table := formatter.CreateTable(tableCol)
 
 			for _, appStat := range serverStat.apps {
-				tableRow := []string{appStat.recipe, appStat.domain}
+				tableRow := []string{appStat.recipe, appStat.domain, appStat.appName}
 				if status {
 					tableRow = append(tableRow, []string{appStat.status, appStat.version, appStat.upgrade}...)
 				}

cli/app/logs.go

@@ -29,12 +29,9 @@ var logOpts = types.ContainerLogsOptions{
 }
 
 // stackLogs lists logs for all stack services
-func stackLogs(c *cli.Context, app config.App, client *dockerClient.Client) {
+func stackLogs(c *cli.Context, stackName string, client *dockerClient.Client) {
-	filters, err := app.Filters(true, false)
+	filters := filters.NewArgs()
-	if err != nil {
+	filters.Add("name", stackName)
-		logrus.Fatal(err)
-	}
-
 	serviceOpts := types.ServiceListOptions{Filters: filters}
 	services, err := client.ServiceList(context.Background(), serviceOpts)
 	if err != nil {
@@ -70,11 +67,12 @@ func stackLogs(c *cli.Context, app config.App, client *dockerClient.Client) {
 var appLogsCommand = cli.Command{
 	Name:      "logs",
 	Aliases:   []string{"l"},
-	ArgsUsage: "<domain> [<service>]",
+	ArgsUsage: "[<service>]",
 	Usage:     "Tail app logs",
 	Flags: []cli.Flag{
 		internal.StdErrOnlyFlag,
 		internal.DebugFlag,
+		internal.NoInputFlag,
 	},
 	Before:       internal.SubCommandBefore,
 	BashComplete: autocomplete.AppNameComplete,
@@ -88,8 +86,8 @@ var appLogsCommand = cli.Command{
 
 		serviceName := c.Args().Get(1)
 		if serviceName == "" {
-			logrus.Debugf("tailing logs for all %s services", app.Recipe)
+			logrus.Debugf("tailing logs for all %s services", app.Type)
-			stackLogs(c, app, cl)
+			stackLogs(c, app.StackName(), cl)
 		} else {
 			logrus.Debugf("tailing logs for %s", serviceName)
 			if err := tailServiceLogs(c, cl, app, serviceName); err != nil {
@@ -104,7 +102,6 @@ var appLogsCommand = cli.Command{
 func tailServiceLogs(c *cli.Context, cl *dockerClient.Client, app config.App, serviceName string) error {
 	filters := filters.NewArgs()
 	filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), serviceName))
-
 	chosenService, err := service.GetService(context.Background(), cl, filters, internal.NoInput)
 	if err != nil {
 		logrus.Fatal(err)

cli/app/new.go

@@ -7,11 +7,11 @@ import (
 )
 
 var appNewDescription = `
-Take a recipe and uses it to create a new app. This new app configuration is
+This command takes a recipe and uses it to create a new app. This new app
-stored in your ~/.abra directory under the appropriate server.
+configuration is stored in your ~/.abra directory under the appropriate server.
 
 This command does not deploy your app for you. You will need to run "abra app
-deploy <domain>" to do so.
+deploy <app>" to do so.
 
 You can see what recipes are available (i.e. values for the <recipe> argument)
 by running "abra recipe ls".
@@ -36,11 +36,12 @@ var appNewCommand = cli.Command{
 		internal.NoInputFlag,
 		internal.NewAppServerFlag,
 		internal.DomainFlag,
+		internal.NewAppNameFlag,
 		internal.PassFlag,
 		internal.SecretsFlag,
 	},
 	Before:       internal.SubCommandBefore,
-	ArgsUsage:    "[<recipe>]",
+	ArgsUsage:    "<recipe>",
 	Action:       internal.NewAction,
 	BashComplete: autocomplete.RecipeNameComplete,
 }

cli/app/ps.go

@@ -15,6 +15,7 @@ import (
 	"github.com/buger/goterm"
 	dockerFormatter "github.com/docker/cli/cli/command/formatter"
 	"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"
@@ -24,11 +25,11 @@ var appPsCommand = cli.Command{
 	Name:        "ps",
 	Aliases:     []string{"p"},
 	Usage:       "Check app status",
-	ArgsUsage:   "<domain>",
+	Description: "This command shows a more detailed status output of a specific deployed app.",
-	Description: "Show a more detailed status output of a specific deployed app",
 	Flags: []cli.Flag{
 		internal.WatchFlag,
 		internal.DebugFlag,
+		internal.NoInputFlag,
 	},
 	Before:       internal.SubCommandBefore,
 	BashComplete: autocomplete.AppNameComplete,
@@ -66,10 +67,8 @@ var appPsCommand = cli.Command{
 
 // showPSOutput renders ps output.
 func showPSOutput(c *cli.Context, app config.App, cl *dockerClient.Client) {
-	filters, err := app.Filters(true, true)
+	filters := filters.NewArgs()
-	if err != nil {
+	filters.Add("name", app.StackName())
-		logrus.Fatal(err)
-	}
 
 	containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters})
 	if err != nil {

cli/app/remove.go

@@ -11,6 +11,7 @@ import (
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
@@ -20,14 +21,13 @@ var Volumes bool
 
 // VolumesFlag is used to specify if volumes should be deleted when deleting an app
 var VolumesFlag = &cli.BoolFlag{
-	Name:        "volumes, V",
+	Name:        "volumes",
 	Destination: &Volumes,
 }
 
 var appRemoveCommand = cli.Command{
 	Name:    "remove",
 	Aliases: []string{"rm"},
-	ArgsUsage: "<domain>",
 	Usage:   "Remove an already undeployed app",
 	Flags: []cli.Flag{
 		VolumesFlag,
@@ -39,7 +39,7 @@ var appRemoveCommand = cli.Command{
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
 
-		if !internal.Force && !internal.NoInput {
+		if !internal.Force {
 			response := false
 			prompt := &survey.Confirm{
 				Message: fmt.Sprintf("about to remove %s, are you sure?", app.Name),
@@ -62,14 +62,11 @@ var appRemoveCommand = cli.Command{
 			logrus.Fatal(err)
 		}
 		if isDeployed {
-			logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
+			logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s \" or pass --force", app.Name, app.Name)
-		}
-
-		fs, err := app.Filters(false, false)
-		if err != nil {
-			logrus.Fatal(err)
 		}
 
+		fs := filters.NewArgs()
+		fs.Add("name", app.StackName())
 		secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: fs})
 		if err != nil {
 			logrus.Fatal(err)
@@ -86,7 +83,7 @@ var appRemoveCommand = cli.Command{
 		if len(secrets) > 0 {
 			var secretNamesToRemove []string
 
-			if !internal.Force && !internal.NoInput {
+			if !internal.Force {
 				secretsPrompt := &survey.MultiSelect{
 					Message: "which secrets do you want to remove?",
 					Help:    "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
@@ -99,10 +96,6 @@ var appRemoveCommand = cli.Command{
 				}
 			}
 
-			if internal.Force || internal.NoInput {
-				secretNamesToRemove = secretNames
-			}
-
 			for _, name := range secretNamesToRemove {
 				err := cl.SecretRemove(context.Background(), secrets[name])
 				if err != nil {
@@ -114,11 +107,6 @@ var appRemoveCommand = cli.Command{
 			logrus.Info("no secrets to remove")
 		}
 
-		fs, err = app.Filters(false, true)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
 		volumeListOKBody, err := cl.VolumeList(context.Background(), fs)
 		volumeList := volumeListOKBody.Volumes
 		if err != nil {
@@ -133,7 +121,7 @@ var appRemoveCommand = cli.Command{
 		if len(vols) > 0 {
 			if Volumes {
 				var removeVols []string
-				if !internal.Force && !internal.NoInput {
+				if !internal.Force {
 					volumesPrompt := &survey.MultiSelect{
 						Message: "which volumes do you want to remove?",
 						Help:    "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
@@ -145,7 +133,6 @@ var appRemoveCommand = cli.Command{
 						logrus.Fatal(err)
 					}
 				}
-
 				for _, vol := range removeVols {
 					err := cl.VolumeRemove(context.Background(), vol, internal.Force) // last argument is for force removing
 					if err != nil {

cli/app/restart.go

@@ -18,9 +18,10 @@ var appRestartCommand = cli.Command{
 	Name:      "restart",
 	Aliases:   []string{"re"},
 	Usage:     "Restart an app",
-	ArgsUsage: "<domain>",
+	ArgsUsage: "<service>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 	},
 	Before:       internal.SubCommandBefore,
 	Description:  `This command restarts a service within a deployed app.`,

cli/app/restore.go

@@ -1,201 +0,0 @@
-package app
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-
-	"coopcloud.tech/abra/cli/internal"
-	"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/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"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
-)
-
-type restoreConfig struct {
-	preHookCmd  string
-	postHookCmd string
-}
-
-var appRestoreCommand = cli.Command{
-	Name:      "restore",
-	Aliases:   []string{"rs"},
-	Usage:     "Run app restore",
-	ArgsUsage: "<domain> <service> <file>",
-	Flags: []cli.Flag{
-		internal.DebugFlag,
-	},
-	Before:       internal.SubCommandBefore,
-	BashComplete: autocomplete.AppNameComplete,
-	Description: `
-Run an app restore.
-
-Pre/post hook commands are defined in the recipe configuration. Abra reads this
-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.
-
-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)
-
-		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)
-			}
-		}
-
-		recipe, err := recipe.Get(app.Recipe)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
-		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{}
-		}
-		if err := runRestore(app, backupPath, serviceName, rsConfig); err != nil {
-			logrus.Fatal(err)
-		}
-
-		return nil
-	},
-}
-
-// runRestore does the actual restore logic.
-func runRestore(app config.App, backupPath, serviceName string, rsConfig restoreConfig) error {
-	cl, err := client.New(app.Server)
-	if err != nil {
-		return err
-	}
-
-	// FIXME: avoid instantiating a new CLI
-	dcli, err := command.NewDockerCli()
-	if err != nil {
-		return err
-	}
-
-	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 rsConfig.preHookCmd != "" {
-		splitCmd := internal.SafeSplit(rsConfig.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 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
-	}
-
-	// we use absolute paths so tar knows what to do. it will restore files
-	// according to the paths set in the compresed 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

@@ -22,13 +22,12 @@ var appRollbackCommand = cli.Command{
 	Name:      "rollback",
 	Aliases:   []string{"rl"},
 	Usage:     "Roll an app back to a previous version",
-	ArgsUsage: "<domain>",
+	ArgsUsage: "<app>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
 		internal.ForceFlag,
 		internal.ChaosFlag,
-		internal.NoDomainChecksFlag,
 		internal.DontWaitConvergeFlag,
 	},
 	Before: internal.SubCommandBefore,
@@ -51,12 +50,12 @@ recipes.
 		stackName := app.StackName()
 
 		if !internal.Chaos {
-			if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
+			if err := recipe.EnsureUpToDate(app.Type); err != nil {
 				logrus.Fatal(err)
 			}
 		}
 
-		r, err := recipe.Get(app.Recipe)
+		r, err := recipe.Get(app.Type)
 		if err != nil {
 			logrus.Fatal(err)
 		}
@@ -86,13 +85,13 @@ recipes.
 			logrus.Fatal(err)
 		}
 
-		versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
+		versions, err := recipe.GetRecipeCatalogueVersions(app.Type, catl)
 		if err != nil {
 			logrus.Fatal(err)
 		}
 
 		if len(versions) == 0 && !internal.Chaos {
-			logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Recipe)
+			logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Type)
 		}
 
 		var availableDowngrades []string
@@ -126,7 +125,7 @@ recipes.
 
 		var chosenDowngrade string
 		if !internal.Chaos {
-			if internal.Force || internal.NoInput {
+			if internal.Force {
 				chosenDowngrade = availableDowngrades[0]
 				logrus.Debugf("choosing %s as version to downgrade to (--force)", chosenDowngrade)
 			} else {
@@ -141,7 +140,7 @@ recipes.
 		}
 
 		if !internal.Chaos {
-			if err := recipe.EnsureVersion(app.Recipe, chosenDowngrade); err != nil {
+			if err := recipe.EnsureVersion(app.Type, chosenDowngrade); err != nil {
 				logrus.Fatal(err)
 			}
 		}
@@ -149,13 +148,13 @@ recipes.
 		if internal.Chaos {
 			logrus.Warn("chaos mode engaged")
 			var err error
-			chosenDowngrade, err = recipe.ChaosVersion(app.Recipe)
+			chosenDowngrade, err = recipe.ChaosVersion(app.Type)
 			if err != nil {
 				logrus.Fatal(err)
 			}
 		}
 
-		abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
+		abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Type, "abra.sh")
 		abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
 		if err != nil {
 			logrus.Fatal(err)
@@ -164,7 +163,7 @@ recipes.
 			app.Env[k] = v
 		}
 
-		composeFiles, err := config.GetAppComposeFiles(app.Recipe, app.Env)
+		composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
 		if err != nil {
 			logrus.Fatal(err)
 		}

cli/app/run.go

@@ -19,14 +19,14 @@ import (
 
 var user string
 var userFlag = &cli.StringFlag{
-	Name:        "user, u",
+	Name:        "user",
 	Value:       "",
 	Destination: &user,
 }
 
 var noTTY bool
 var noTTYFlag = &cli.BoolFlag{
-	Name:        "no-tty, t",
+	Name:        "no-tty",
 	Destination: &noTTY,
 }
 
@@ -35,11 +35,12 @@ var appRunCommand = cli.Command{
 	Aliases: []string{"r"},
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 		noTTYFlag,
 		userFlag,
 	},
 	Before:       internal.SubCommandBefore,
-	ArgsUsage:    "<domain> <service> <args>...",
+	ArgsUsage:    "<service> <args>...",
 	Usage:        "Run a command in a service container",
 	BashComplete: autocomplete.AppNameComplete,
 	Action: func(c *cli.Context) error {
@@ -59,11 +60,11 @@ var appRunCommand = cli.Command{
 		}
 
 		serviceName := c.Args().Get(1)
-		stackAndServiceName := fmt.Sprintf("^%s_%s", app.StackName(), serviceName)
+		stackAndServiceName := fmt.Sprintf("%s_%s", app.StackName(), serviceName)
 		filters := filters.NewArgs()
 		filters.Add("name", stackAndServiceName)
 
-		targetContainer, err := containerPkg.GetContainer(context.Background(), cl, filters, false)
+		targetContainer, err := containerPkg.GetContainer(context.Background(), cl, filters, true)
 		if err != nil {
 			logrus.Fatal(err)
 		}

cli/app/secret.go

@@ -10,11 +10,10 @@ 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"
 	"coopcloud.tech/abra/pkg/secret"
 	"github.com/docker/docker/api/types"
-	dockerClient "github.com/docker/docker/client"
+	"github.com/docker/docker/api/types/filters"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
@@ -26,22 +25,15 @@ var allSecretsFlag = &cli.BoolFlag{
 	Usage:       "Generate all secrets",
 }
 
-var rmAllSecrets bool
-var rmAllSecretsFlag = &cli.BoolFlag{
-	Name:        "all, a",
-	Destination: &rmAllSecrets,
-	Usage:       "Remove all secrets",
-}
-
 var appSecretGenerateCommand = cli.Command{
 	Name:      "generate",
 	Aliases:   []string{"g"},
 	Usage:     "Generate secrets",
-	ArgsUsage: "<domain> <secret> <version>",
+	ArgsUsage: "<secret> <version>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
-		allSecretsFlag,
+		internal.NoInputFlag,
-		internal.PassFlag,
+		allSecretsFlag, internal.PassFlag,
 	},
 	Before:       internal.SubCommandBefore,
 	BashComplete: autocomplete.AppNameComplete,
@@ -70,10 +62,8 @@ var appSecretGenerateCommand = cli.Command{
 				parsed := secret.ParseSecretEnvVarName(sec)
 				if secretName == parsed {
 					secretsToCreate[sec] = secretVersion
-					matches = true
 				}
 			}
-
 			if !matches {
 				logrus.Fatalf("%s doesn't exist in the env config?", secretName)
 			}
@@ -86,7 +76,7 @@ var appSecretGenerateCommand = cli.Command{
 
 		if internal.Pass {
 			for name, data := range secretVals {
-				if err := secret.PassInsertSecret(data, name, app.Name, app.Server); err != nil {
+				if err := secret.PassInsertSecret(data, name, app.StackName(), app.Server); err != nil {
 					logrus.Fatal(err)
 				}
 			}
@@ -115,10 +105,11 @@ var appSecretInsertCommand = cli.Command{
 	Usage:   "Insert secret",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 		internal.PassFlag,
 	},
 	Before:       internal.SubCommandBefore,
-	ArgsUsage:    "<domain> <secret-name> <version> <data>",
+	ArgsUsage:    "<app> <secret-name> <version> <data>",
 	BashComplete: autocomplete.AppNameComplete,
 	Description: `
 This command inserts a secret into an app environment.
@@ -148,10 +139,8 @@ Example:
 			logrus.Fatal(err)
 		}
 
-		logrus.Infof("%s successfully stored on server", secretName)
-
 		if internal.Pass {
-			if err := secret.PassInsertSecret(data, name, app.Name, app.Server); err != nil {
+			if err := secret.PassInsertSecret(data, name, app.StackName(), app.Server); err != nil {
 				logrus.Fatal(err)
 			}
 		}
@@ -160,25 +149,6 @@ Example:
 	},
 }
 
-// secretRm removes a secret.
-func secretRm(cl *dockerClient.Client, app config.App, secretName, parsed string) error {
-	if err := cl.SecretRemove(context.Background(), secretName); err != nil {
-		return err
-	}
-
-	logrus.Infof("deleted %s successfully from server", secretName)
-
-	if internal.PassRemove {
-		if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
-			return err
-		}
-
-		logrus.Infof("deleted %s successfully from local pass store", secretName)
-	}
-
-	return nil
-}
-
 var appSecretRmCommand = cli.Command{
 	Name:    "remove",
 	Aliases: []string{"rm"},
@@ -186,28 +156,27 @@ var appSecretRmCommand = cli.Command{
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
-		rmAllSecretsFlag,
+		allSecretsFlag, internal.PassFlag,
-		internal.PassRemoveFlag,
 	},
 	Before:       internal.SubCommandBefore,
-	ArgsUsage:    "<domain> [<secret-name>]",
+	ArgsUsage:    "<app> <secret-name>",
 	BashComplete: autocomplete.AppNameComplete,
 	Description: `
-This command removes app secrets.
+This command removes a secret from an app environment.
 
 Example:
 
     abra app secret remove myapp db_pass
+
 `,
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
-		secrets := secret.ReadSecretEnvVars(app.Env)
 
-		if c.Args().Get(1) != "" && rmAllSecrets {
+		if c.Args().Get(1) != "" && allSecrets {
 			internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
 		}
 
-		if c.Args().Get(1) == "" && !rmAllSecrets {
+		if c.Args().Get(1) == "" && !allSecrets {
 			internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
 		}
 
@@ -216,57 +185,47 @@ Example:
 			logrus.Fatal(err)
 		}
 
-		filters, err := app.Filters(false, false)
+		filters := filters.NewArgs()
-		if err != nil {
+		filters.Add("name", app.StackName())
-			logrus.Fatal(err)
-		}
-
 		secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: filters})
 		if err != nil {
 			logrus.Fatal(err)
 		}
 
-		remoteSecretNames := make(map[string]bool)
-		for _, cont := range secretList {
-			remoteSecretNames[cont.Spec.Annotations.Name] = true
-		}
-
-		match := false
 		secretToRm := c.Args().Get(1)
-		for sec := range secrets {
+		for _, cont := range secretList {
-			secretName := secret.ParseSecretEnvVarName(sec)
+			secretName := cont.Spec.Annotations.Name
+			parsed := secret.ParseGeneratedSecretName(secretName, app)
+			if allSecrets {
+				if err := cl.SecretRemove(context.Background(), secretName); err != nil {
+					logrus.Fatal(err)
+				}
+				logrus.Infof("deleted %s successfully from server", secretName)
 
-			secVal, err := secret.ParseSecretEnvVarValue(secrets[sec])
+				if internal.Pass {
-			if err != nil {
+					if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
 						logrus.Fatal(err)
 					}
 
-			secretRemoteName := fmt.Sprintf("%s_%s_%s", app.StackName(), secretName, secVal.Version)
+					logrus.Infof("deleted %s successfully from local pass store", secretName)
-			if _, ok := remoteSecretNames[secretRemoteName]; ok {
-				if secretToRm != "" {
-					if secretName == secretToRm {
-						if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
-							logrus.Fatal(err)
-						}
-
-						return nil
 				}
 			} else {
-					match = true
+				if parsed == secretToRm {
-
+					if err := cl.SecretRemove(context.Background(), secretName); err != nil {
-					if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
 						logrus.Fatal(err)
 					}
-				}
+
-			}
+					logrus.Infof("deleted %s successfully from server", secretName)
+
+					if internal.Pass {
+						if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
+							logrus.Fatal(err)
 						}
 
-		if !match && secretToRm != "" {
+						logrus.Infof("deleted %s successfully from local pass store", secretName)
-			logrus.Fatalf("%s doesn't exist on server?", secretToRm)
+					}
+				}
 			}
-
-		if !match {
-			logrus.Fatal("no secrets to remove?")
 		}
 
 		return nil
@@ -278,6 +237,7 @@ var appSecretLsCommand = cli.Command{
 	Aliases: []string{"ls"},
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Usage:  "List all secrets",
@@ -293,11 +253,8 @@ var appSecretLsCommand = cli.Command{
 			logrus.Fatal(err)
 		}
 
-		filters, err := app.Filters(false, false)
+		filters := filters.NewArgs()
-		if err != nil {
+		filters.Add("name", app.StackName())
-			logrus.Fatal(err)
-		}
-
 		secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: filters})
 		if err != nil {
 			logrus.Fatal(err)
@@ -338,7 +295,7 @@ var appSecretCommand = cli.Command{
 	Name:      "secret",
 	Aliases:   []string{"s"},
 	Usage:     "Manage app secrets",
-	ArgsUsage: "<domain>",
+	ArgsUsage: "<command>",
 	Subcommands: []cli.Command{
 		appSecretGenerateCommand,
 		appSecretInsertCommand,

cli/app/undeploy.go

@@ -14,7 +14,6 @@ import (
 var appUndeployCommand = cli.Command{
 	Name:    "undeploy",
 	Aliases: []string{"un"},
-	ArgsUsage: "<domain>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,

cli/app/upgrade.go

@@ -21,22 +21,21 @@ var appUpgradeCommand = cli.Command{
 	Name:      "upgrade",
 	Aliases:   []string{"up"},
 	Usage:     "Upgrade an app",
-	ArgsUsage: "<domain>",
+	ArgsUsage: "<app>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
 		internal.ForceFlag,
 		internal.ChaosFlag,
 		internal.NoDomainChecksFlag,
-		internal.DontWaitConvergeFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Description: `
-Upgrade an app. You can use it to choose and roll out a new upgrade to an
+This command supports upgrading an app. You can use it to choose and roll out a
-existing app.
+new upgrade to an existing app.
 
 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
+opposed to "abra app deploy <app>" which will not change the version of a
 deployed app.
 
 You may pass "--force/-f" to upgrade to the same version again. This can be
@@ -54,12 +53,12 @@ recipes.
 		stackName := app.StackName()
 
 		if !internal.Chaos {
-			if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
+			if err := recipe.EnsureUpToDate(app.Type); err != nil {
 				logrus.Fatal(err)
 			}
 		}
 
-		r, err := recipe.Get(app.Recipe)
+		r, err := recipe.Get(app.Type)
 		if err != nil {
 			logrus.Fatal(err)
 		}
@@ -89,17 +88,17 @@ recipes.
 			logrus.Fatal(err)
 		}
 
-		versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
+		versions, err := recipe.GetRecipeCatalogueVersions(app.Type, catl)
 		if err != nil {
 			logrus.Fatal(err)
 		}
 
 		if len(versions) == 0 && !internal.Chaos {
-			logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Recipe)
+			logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Type)
 		}
 
 		var availableUpgrades []string
-		if deployedVersion == "unknown" {
+		if deployedVersion == "uknown" {
 			availableUpgrades = versions
 			logrus.Warnf("failed to determine version of deployed %s", app.Name)
 		}
@@ -129,7 +128,7 @@ recipes.
 
 		var chosenUpgrade string
 		if len(availableUpgrades) > 0 && !internal.Chaos {
-			if internal.Force || internal.NoInput {
+			if internal.Force {
 				chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
 				logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
 			} else {
@@ -146,13 +145,13 @@ recipes.
 		// 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
-		releaseNotes, err := internal.GetReleaseNotes(app.Recipe, chosenUpgrade)
+		releaseNotes, err := internal.GetReleaseNotes(app.Type, chosenUpgrade)
 		if err != nil {
 			return err
 		}
 
 		if !internal.Chaos {
-			if err := recipe.EnsureVersion(app.Recipe, chosenUpgrade); err != nil {
+			if err := recipe.EnsureVersion(app.Type, chosenUpgrade); err != nil {
 				logrus.Fatal(err)
 			}
 		}
@@ -160,13 +159,13 @@ recipes.
 		if internal.Chaos {
 			logrus.Warn("chaos mode engaged")
 			var err error
-			chosenUpgrade, err = recipe.ChaosVersion(app.Recipe)
+			chosenUpgrade, err = recipe.ChaosVersion(app.Type)
 			if err != nil {
 				logrus.Fatal(err)
 			}
 		}
 
-		abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
+		abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Type, "abra.sh")
 		abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
 		if err != nil {
 			logrus.Fatal(err)
@@ -175,7 +174,7 @@ recipes.
 			app.Env[k] = v
 		}
 
-		composeFiles, err := config.GetAppComposeFiles(app.Recipe, app.Env)
+		composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
 		if err != nil {
 			logrus.Fatal(err)
 		}

cli/app/version.go

@@ -33,7 +33,6 @@ func getImagePath(image string) (string, error) {
 var appVersionCommand = cli.Command{
 	Name:    "version",
 	Aliases: []string{"v"},
-	ArgsUsage: "<domain>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
@@ -41,9 +40,9 @@ var appVersionCommand = cli.Command{
 	Before: internal.SubCommandBefore,
 	Usage:  "Show app versions",
 	Description: `
-Show all information about versioning related to a deployed app. This includes
+This command shows all information about versioning related to a deployed app.
-the individual image names, tags and digests. But also the Co-op Cloud recipe
+This includes the individual image names, tags and digests. But also the Co-op
-version.
+Cloud recipe version.
 `,
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
@@ -69,7 +68,7 @@ version.
 			logrus.Fatalf("%s is not deployed?", app.Name)
 		}
 
-		recipeMeta, err := recipe.GetRecipeMeta(app.Recipe)
+		recipeMeta, err := recipe.GetRecipeMeta(app.Type)
 		if err != nil {
 			logrus.Fatal(err)
 		}

cli/app/volume.go

@@ -15,7 +15,6 @@ import (
 var appVolumeListCommand = cli.Command{
 	Name:    "list",
 	Aliases: []string{"ls"},
-	ArgsUsage: "<domain>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
@@ -26,20 +25,18 @@ var appVolumeListCommand = cli.Command{
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
 
-		filters, err := app.Filters(false, true)
+		volumeList, err := client.GetVolumes(context.Background(), app.Server, app.Name)
 		if err != nil {
 			logrus.Fatal(err)
 		}
 
-		volumeList, err := client.GetVolumes(context.Background(), app.Server, filters)
+		table := formatter.CreateTable([]string{"driver", "volume name"})
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
-		table := formatter.CreateTable([]string{"name", "created", "mounted"})
 		var volTable [][]string
 		for _, volume := range volumeList {
-			volRow := []string{volume.Name, volume.CreatedAt, volume.Mountpoint}
+			volRow := []string{
+				volume.Driver,
+				volume.Name,
+			}
 			volTable = append(volTable, volRow)
 		}
 
@@ -61,15 +58,15 @@ var appVolumeRemoveCommand = cli.Command{
 	Description: `
 This command supports removing 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.
+undeploy <app>" 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" will select all volumes for removal. Be careful.
 `,
-	ArgsUsage: "<domain>",
+	ArgsUsage: "<app>",
 	Aliases:   []string{"rm"},
 	Flags: []cli.Flag{
 		internal.DebugFlag,
@@ -80,19 +77,14 @@ Passing "--force/-f" will select all volumes for removal. Be careful.
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
 
-		filters, err := app.Filters(false, true)
+		volumeList, err := client.GetVolumes(context.Background(), app.Server, app.Name)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
-		volumeList, err := client.GetVolumes(context.Background(), app.Server, filters)
 		if err != nil {
 			logrus.Fatal(err)
 		}
 		volumeNames := client.GetVolumeNames(volumeList)
 
 		var volumesToRemove []string
-		if !internal.Force && !internal.NoInput {
+		if !internal.Force {
 			volumesPrompt := &survey.MultiSelect{
 				Message: "which volumes do you want to remove?",
 				Help:    "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
@@ -103,9 +95,7 @@ Passing "--force/-f" will select all volumes for removal. Be careful.
 			if err := survey.AskOne(volumesPrompt, &volumesToRemove); err != nil {
 				logrus.Fatal(err)
 			}
-		}
+		} else {
-
-		if internal.Force || internal.NoInput {
 			volumesToRemove = volumeNames
 		}
 
@@ -125,7 +115,7 @@ var appVolumeCommand = cli.Command{
 	Name:      "volume",
 	Aliases:   []string{"vl"},
 	Usage:     "Manage app volumes",
-	ArgsUsage: "<domain>",
+	ArgsUsage: "<command>",
 	Subcommands: []cli.Command{
 		appVolumeListCommand,
 		appVolumeRemoveCommand,

cli/catalogue/catalogue.go

@@ -48,9 +48,7 @@ var CatalogueSkipList = map[string]bool{
 	"outline-with-patch":    true,
 	"pyabra":                true,
 	"radicle-seed-node":     true,
-	"recipes-catalogue-json": true,
+	"recipes":               true,
-	"recipes-wishlist":       true,
-	"recipes.coopcloud.tech": true,
 	"stack-ssh-deploy":      true,
 	"swarm-cronjob":         true,
 	"tagcmp":                true,
@@ -68,17 +66,18 @@ var catalogueGenerateCommand = cli.Command{
 		internal.PublishFlag,
 		internal.DryFlag,
 		internal.SkipUpdatesFlag,
+		internal.RegistryUsernameFlag,
+		internal.RegistryPasswordFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Description: `
-Generate a new copy of the recipe catalogue which can be found on:
+This command generates a new copy of the recipe catalogue which can be found on:
 
-    https://recipes.coopcloud.tech (website that humans read)
+    https://recipes.coopcloud.tech
-    https://recipes.coopcloud.tech/recipes.json (JSON that Abra reads)
 
 It polls the entire git.coopcloud.tech/coop-cloud/... recipe repository
-listing, parses README.md and git tags to produce recipe metadata which is
+listing, parses README.md and git tags of those repositories to produce recipe
-loaded into the catalogue JSON file.
+metadata and produces a recipes JSON file.
 
 It is possible to generate new metadata for a single recipe by passing
 <recipe>. The existing local catalogue will be updated, not overwritten.
@@ -95,7 +94,7 @@ keys configured on your account.
 	Action: func(c *cli.Context) error {
 		recipeName := c.Args().First()
 		if recipeName != "" {
-			internal.ValidateRecipe(c, true)
+			internal.ValidateRecipe(c)
 		}
 
 		repos, err := recipe.ReadReposMetadata()
@@ -133,9 +132,13 @@ keys configured on your account.
 				continue
 			}
 
-			versions, err := recipe.GetRecipeVersions(recipeMeta.Name)
+			versions, err := recipe.GetRecipeVersions(
+				recipeMeta.Name,
+				internal.RegistryUsername,
+				internal.RegistryPassword,
+			)
 			if err != nil {
-				logrus.Warn(err)
+				logrus.Fatal(err)
 			}
 
 			features, category, err := recipe.GetRecipeFeaturesAndCategory(recipeMeta.Name)
@@ -212,7 +215,7 @@ keys configured on your account.
 				logrus.Fatal(err)
 			}
 
-			sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
+			sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, "recipes")
 			if err := gitPkg.CreateRemote(repo, "origin-ssh", sshURL, internal.Dry); err != nil {
 				logrus.Fatal(err)
 			}
@@ -233,7 +236,7 @@ keys configured on your account.
 		}
 
 		if !internal.Dry && internal.Publish {
-			url := fmt.Sprintf("%s/%s/commit/%s", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME, head.Hash())
+			url := fmt.Sprintf("%s/recipes/commit/%s", config.REPOS_BASE_URL, head.Hash())
 			logrus.Infof("new changes published: %s", url)
 		}
 

cli/cli.go

@@ -14,7 +14,6 @@ import (
 	"coopcloud.tech/abra/cli/recipe"
 	"coopcloud.tech/abra/cli/record"
 	"coopcloud.tech/abra/cli/server"
-	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/web"
 	"github.com/sirupsen/logrus"
@@ -27,17 +26,25 @@ var AutoCompleteCommand = cli.Command{
 	Aliases: []string{"ac"},
 	Usage:   "Configure shell autocompletion (recommended)",
 	Description: `
-Set up auto-completion in your shell by downloading the relevant files and
+This command helps set up autocompletion in your shell by downloading the
-laying out what additional information must be loaded. Supported shells are as
+relevant autocompletion files and laying out what additional information must
-follows: bash, fish, fizsh & zsh.
+be loaded.
 
 Example:
 
     abra autocomplete bash
+
+Supported shells are as follows:
+
+		fizsh
+		zsh
+    bash
+
 `,
 	ArgsUsage: "<shell>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 	},
 	Action: func(c *cli.Context) error {
 		shellType := c.Args().First()
@@ -50,7 +57,6 @@ Example:
 			"bash":  true,
 			"zsh":   true,
 			"fizsh": true,
-			"fish":  true,
 		}
 
 		if _, ok := supportedShells[shellType]; !ok {
@@ -81,27 +87,19 @@ Example:
 		switch shellType {
 		case "bash":
 			fmt.Println(fmt.Sprintf(`
-# Run the following commands to install auto-completion
+# Run the following commands to install autocompletion
 sudo mkdir /etc/bash_completion.d/
 sudo cp %s /etc/bash_completion.d/abra
 echo "source /etc/bash_completion.d/abra" >> ~/.bashrc
-# And finally run "abra app ps <hit tab key>" to test things are working, you should see app domains listed!
+# And finally run "abra app ps <hit tab key>" to test things are working, you should see app names listed!
 `, autocompletionFile))
 		case "zsh":
 			fmt.Println(fmt.Sprintf(`
-# Run the following commands to install auto-completion
+# Run the following commands to install autocompletion
 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
-# And finally run "abra app ps <hit tab key>" to test things are working, you should see app domains listed!
+# And finally run "abra app ps <hit tab key>" to test things are working, you should see app names listed!
-`, 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
-# And finally run "abra app ps <hit tab key>" to test things are working, you should see app domains listed!
 `, autocompletionFile))
 		}
 
@@ -115,11 +113,13 @@ var UpgradeCommand = cli.Command{
 	Aliases: []string{"u"},
 	Usage:   "Upgrade Abra itself",
 	Description: `
-Upgrade Abra in-place with the latest stable or release candidate.
+This command allows you to upgrade Abra in-place with the latest stable or
+release candidate.
 
-Pass "-r/--rc" to install the latest release candidate. Please bear in mind
+If you would like to install the latest release candidate, please pass the
-that it may contain catastrophic bugs. Thank you very much for the testing
+"--rc" option. Please bear in mind that the latest release candidate may have
-efforts!
+some catastrophic bugs contained in it. In any case, thank you very much for
+the testing efforts!
 `,
 	Flags: []cli.Flag{internal.RCFlag},
 	Action: func(c *cli.Context) error {
@@ -162,7 +162,16 @@ func newAbraApp(version, commit string) *cli.App {
 			UpgradeCommand,
 			AutoCompleteCommand,
 		},
-		BashComplete: autocomplete.SubcommandComplete,
+		Authors: []cli.Author{
+			// If you're looking at this and you hack on Abra and you're not listed
+			// here, please do add yourself! This is a community project, let's show
+			// some love
+			{Name: "3wordchant"},
+			{Name: "decentral1se"},
+			{Name: "kawaiipunk"},
+			{Name: "knoflook"},
+			{Name: "roxxers"},
+		},
 	}
 
 	app.EnableBashCompletion = true
@@ -173,7 +182,6 @@ func newAbraApp(version, commit string) *cli.App {
 			path.Join(config.SERVERS_DIR),
 			path.Join(config.RECIPES_DIR),
 			path.Join(config.VENDOR_DIR),
-			path.Join(config.BACKUP_DIR),
 		}
 
 		for _, path := range paths {

cli/internal/backup.go

@@ -1,35 +0,0 @@
-package internal
-
-import (
-	"strings"
-)
-
-// SafeSplit splits up a string into a list of commands safely.
-func SafeSplit(s string) []string {
-	split := strings.Split(s, " ")
-
-	var result []string
-	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 = ""
-			}
-		}
-	}
-
-	return result
-}

cli/internal/cli.go

@@ -13,7 +13,7 @@ var Secrets bool
 
 // SecretsFlag turns on/off automatically generating secrets
 var SecretsFlag = &cli.BoolFlag{
-	Name:        "secrets, S",
+	Name:        "secrets, ss",
 	Usage:       "Automatically generate secrets",
 	Destination: &Secrets,
 }
@@ -28,14 +28,14 @@ var PassFlag = &cli.BoolFlag{
 	Destination: &Pass,
 }
 
-// PassRemove stores the variable for PassRemoveFlag
+// Context is temp
-var PassRemove bool
+var Context string
 
-// PassRemoveFlag turns on/off removing generated secrets from pass
+// ContextFlag is temp
-var PassRemoveFlag = &cli.BoolFlag{
+var ContextFlag = &cli.StringFlag{
-	Name:        "pass, p",
+	Name:        "context, c",
-	Usage:       "Remove generated secrets from a local pass store",
+	Value:       "",
-	Destination: &PassRemove,
+	Destination: &Context,
 }
 
 // Force force functionality without asking.
@@ -53,7 +53,7 @@ var Chaos bool
 
 // ChaosFlag turns on/off chaos functionality.
 var ChaosFlag = &cli.BoolFlag{
-	Name:        "chaos, C",
+	Name:        "chaos, ch",
 	Usage:       "Deploy uncommitted recipes changes. Use with care!",
 	Destination: &Chaos,
 }
@@ -79,7 +79,7 @@ var NoInputFlag = &cli.BoolFlag{
 var DNSType string
 
 var DNSTypeFlag = &cli.StringFlag{
-	Name:        "record-type, rt",
+	Name:        "type, t",
 	Value:       "",
 	Usage:       "Domain name record type (e.g. A)",
 	Destination: &DNSType,
@@ -88,7 +88,7 @@ var DNSTypeFlag = &cli.StringFlag{
 var DNSName string
 
 var DNSNameFlag = &cli.StringFlag{
-	Name:        "record-name, rn",
+	Name:        "name, n",
 	Value:       "",
 	Usage:       "Domain name record name (e.g. mysubdomain)",
 	Destination: &DNSName,
@@ -97,7 +97,7 @@ var DNSNameFlag = &cli.StringFlag{
 var DNSValue string
 
 var DNSValueFlag = &cli.StringFlag{
-	Name:        "record-value, rv",
+	Name:        "value, v",
 	Value:       "",
 	Usage:       "Domain name record value (e.g. 192.168.1.1)",
 	Destination: &DNSValue,
@@ -105,7 +105,7 @@ var DNSValueFlag = &cli.StringFlag{
 
 var DNSTTL string
 var DNSTTLFlag = &cli.StringFlag{
-	Name:        "record-ttl, rl",
+	Name:        "ttl, T",
 	Value:       "600s",
 	Usage:       "Domain name TTL value (seconds)",
 	Destination: &DNSTTL,
@@ -114,7 +114,7 @@ var DNSTTLFlag = &cli.StringFlag{
 var DNSPriority int
 
 var DNSPriorityFlag = &cli.IntFlag{
-	Name:        "record-priority, rp",
+	Name:        "priority, P",
 	Value:       10,
 	Usage:       "Domain name priority value",
 	Destination: &DNSPriority,
@@ -248,35 +248,35 @@ var RC bool
 
 // RCFlag chooses the latest release candidate for install
 var RCFlag = &cli.BoolFlag{
-	Name:        "rc, r",
+	Name:        "rc",
 	Destination: &RC,
 	Usage:       "Insatll the latest release candidate",
 }
 
 var Major bool
 var MajorFlag = &cli.BoolFlag{
-	Name:        "major, x",
+	Name:        "major, ma, x",
 	Usage:       "Increase the major part of the version",
 	Destination: &Major,
 }
 
 var Minor bool
 var MinorFlag = &cli.BoolFlag{
-	Name:        "minor, y",
+	Name:        "minor, mi, y",
 	Usage:       "Increase the minor part of the version",
 	Destination: &Minor,
 }
 
 var Patch bool
 var PatchFlag = &cli.BoolFlag{
-	Name:        "patch, z",
+	Name:        "patch, pa, z",
 	Usage:       "Increase the patch part of the version",
 	Destination: &Patch,
 }
 
 var Dry bool
 var DryFlag = &cli.BoolFlag{
-	Name:        "dry-run, r",
+	Name:        "dry-run, dr",
 	Usage:       "Only reports changes that would be made",
 	Destination: &Dry,
 }
@@ -290,7 +290,7 @@ var PublishFlag = &cli.BoolFlag{
 
 var Domain string
 var DomainFlag = &cli.StringFlag{
-	Name:        "domain, D",
+	Name:        "domain, dn",
 	Value:       "",
 	Usage:       "Choose a domain name",
 	Destination: &Domain,
@@ -304,9 +304,17 @@ var NewAppServerFlag = &cli.StringFlag{
 	Destination: &NewAppServer,
 }
 
+var NewAppName string
+var NewAppNameFlag = &cli.StringFlag{
+	Name:        "app-name, a",
+	Value:       "",
+	Usage:       "Choose an app name",
+	Destination: &NewAppName,
+}
+
 var NoDomainChecks bool
 var NoDomainChecksFlag = &cli.BoolFlag{
-	Name:        "no-domain-checks, D",
+	Name:        "no-domain-checks, nd",
 	Usage:       "Disable app domain sanity checks",
 	Destination: &NoDomainChecks,
 }
@@ -320,7 +328,7 @@ var StdErrOnlyFlag = &cli.BoolFlag{
 
 var DontWaitConverge bool
 var DontWaitConvergeFlag = &cli.BoolFlag{
-	Name:        "no-converge-checks, c",
+	Name:        "no-converge-checks, nc",
 	Usage:       "Don't wait for converge logic checks",
 	Destination: &DontWaitConverge,
 }
@@ -346,6 +354,24 @@ var SkipUpdatesFlag = &cli.BoolFlag{
 	Destination: &SkipUpdates,
 }
 
+var RegistryUsername string
+var RegistryUsernameFlag = &cli.StringFlag{
+	Name:        "username, user",
+	Value:       "",
+	Usage:       "Registry username",
+	EnvVar:      "REGISTRY_USERNAME",
+	Destination: &RegistryUsername,
+}
+
+var RegistryPassword string
+var RegistryPasswordFlag = &cli.StringFlag{
+	Name:        "password, pass",
+	Value:       "",
+	Usage:       "Registry password",
+	EnvVar:      "REGISTRY_PASSWORD",
+	Destination: &RegistryUsername,
+}
+
 var AllTags bool
 var AllTagsFlag = &cli.BoolFlag{
 	Name:        "all-tags, a",
@@ -353,21 +379,6 @@ var AllTagsFlag = &cli.BoolFlag{
 	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,
-}
-
 // SSHFailMsg is a hopefully helpful SSH failure message
 var SSHFailMsg = `
 Woops, Abra is unable to connect to connect to %s.
@@ -417,24 +428,6 @@ Good luck!
 
 `
 
-var ServerAddFailMsg = `
-Failed to add server %s.
-
-This could be caused by two things.
-
-Abra isn't picking up your SSH configuration or you need to specify it on the
-command-line (e.g you use a non-standard port or username to connect). Run
-"server add" with "-d/--debug" to learn more about what Abra is doing under the
-hood.
-
-Docker is not installed on your server. You can pass "-p/--provision" to
-install Docker and initialise Docker Swarm mode. See help output for "server
-add"
-
-See "abra server add -h" for more.
-
-`
-
 // SubCommandBefore wires up pre-action machinery (e.g. --debug handling).
 func SubCommandBefore(c *cli.Context) error {
 	if Debug {

cli/internal/deploy.go

@@ -26,12 +26,12 @@ func DeployAction(c *cli.Context) error {
 	app := ValidateApp(c)
 
 	if !Chaos {
-		if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
+		if err := recipe.EnsureUpToDate(app.Type); err != nil {
 			logrus.Fatal(err)
 		}
 	}
 
-	r, err := recipe.Get(app.Recipe)
+	r, err := recipe.Get(app.Type)
 	if err != nil {
 		logrus.Fatal(err)
 	}
@@ -66,24 +66,24 @@ func DeployAction(c *cli.Context) error {
 		if err != nil {
 			logrus.Fatal(err)
 		}
-		versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
+		versions, err := recipe.GetRecipeCatalogueVersions(app.Type, catl)
 		if err != nil {
 			logrus.Fatal(err)
 		}
 		if len(versions) > 0 {
 			version = versions[len(versions)-1]
 			logrus.Debugf("choosing %s as version to deploy", version)
-			if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
+			if err := recipe.EnsureVersion(app.Type, version); err != nil {
 				logrus.Fatal(err)
 			}
 		} else {
-			head, err := git.GetRecipeHead(app.Recipe)
+			head, err := git.GetRecipeHead(app.Type)
 			if err != nil {
 				logrus.Fatal(err)
 			}
 			version = formatter.SmallSHA(head.String())
 			logrus.Warn("no versions detected, using latest commit")
-			if err := recipe.EnsureLatest(app.Recipe); err != nil {
+			if err := recipe.EnsureLatest(app.Type); err != nil {
 				logrus.Fatal(err)
 			}
 		}
@@ -91,13 +91,13 @@ func DeployAction(c *cli.Context) error {
 
 	if version == "unknown" && !Chaos {
 		logrus.Debugf("choosing %s as version to deploy", version)
-		if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
+		if err := recipe.EnsureVersion(app.Type, version); err != nil {
 			logrus.Fatal(err)
 		}
 	}
 
 	if version != "unknown" && !Chaos {
-		if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
+		if err := recipe.EnsureVersion(app.Type, version); err != nil {
 			logrus.Fatal(err)
 		}
 	}
@@ -105,13 +105,13 @@ func DeployAction(c *cli.Context) error {
 	if Chaos {
 		logrus.Warnf("chaos mode engaged")
 		var err error
-		version, err = recipe.ChaosVersion(app.Recipe)
+		version, err = recipe.ChaosVersion(app.Type)
 		if err != nil {
 			logrus.Fatal(err)
 		}
 	}
 
-	abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
+	abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Type, "abra.sh")
 	abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
 	if err != nil {
 		logrus.Fatal(err)
@@ -120,7 +120,7 @@ func DeployAction(c *cli.Context) error {
 		app.Env[k] = v
 	}
 
-	composeFiles, err := config.GetAppComposeFiles(app.Recipe, app.Env)
+	composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
 	if err != nil {
 		logrus.Fatal(err)
 	}
@@ -141,6 +141,11 @@ func DeployAction(c *cli.Context) error {
 
 	if !NoDomainChecks {
 		domainName := app.Env["DOMAIN"]
+		ipv4, err := dns.EnsureIPv4(domainName)
+		if err != nil || ipv4 == "" {
+			logrus.Fatalf("could not find an IP address assigned to %s?", domainName)
+		}
+
 		if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
 			logrus.Fatal(err)
 		}
@@ -157,7 +162,7 @@ func DeployAction(c *cli.Context) error {
 
 // DeployOverview shows a deployment overview
 func DeployOverview(app config.App, version, message string) error {
-	tableCol := []string{"server", "recipe", "config", "domain", "version"}
+	tableCol := []string{"server", "compose", "domain", "app name", "version"}
 	table := formatter.CreateTable(tableCol)
 
 	deployConfig := "compose.yml"
@@ -170,7 +175,7 @@ func DeployOverview(app config.App, version, message string) error {
 		server = "local"
 	}
 
-	table.Append([]string{server, app.Recipe, deployConfig, app.Domain, version})
+	table.Append([]string{server, deployConfig, app.Domain, app.Name, version})
 	table.Render()
 
 	if NoInput {
@@ -195,7 +200,7 @@ func DeployOverview(app config.App, version, message string) error {
 
 // NewVersionOverview shows an upgrade or downgrade overview
 func NewVersionOverview(app config.App, currentVersion, newVersion, releaseNotes string) error {
-	tableCol := []string{"server", "recipe", "config", "domain", "current version", "to be deployed"}
+	tableCol := []string{"server", "compose", "domain", "app name", "current version", "to be deployed"}
 	table := formatter.CreateTable(tableCol)
 
 	deployConfig := "compose.yml"
@@ -208,12 +213,12 @@ func NewVersionOverview(app config.App, currentVersion, newVersion, releaseNotes
 		server = "local"
 	}
 
-	table.Append([]string{server, app.Recipe, deployConfig, app.Domain, currentVersion, newVersion})
+	table.Append([]string{server, deployConfig, app.Domain, app.Name, currentVersion, newVersion})
 	table.Render()
 
 	if releaseNotes == "" {
 		var err error
-		releaseNotes, err = GetReleaseNotes(app.Recipe, newVersion)
+		releaseNotes, err = GetReleaseNotes(app.Type, newVersion)
 		if err != nil {
 			return err
 		}

cli/internal/new.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"path"
 
-	"coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/recipe"
@@ -12,7 +11,6 @@ import (
 	"coopcloud.tech/abra/pkg/secret"
 	"coopcloud.tech/abra/pkg/ssh"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/olekukonko/tablewriter"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
@@ -25,7 +23,7 @@ var RecipeName string
 
 // createSecrets creates all secrets for a new app.
 func createSecrets(sanitisedAppName string) (AppSecrets, error) {
-	appEnvPath := path.Join(config.ABRA_DIR, "servers", NewAppServer, fmt.Sprintf("%s.env", Domain))
+	appEnvPath := path.Join(config.ABRA_DIR, "servers", NewAppServer, fmt.Sprintf("%s.env", NewAppName))
 	appEnv, err := config.ReadEnv(appEnvPath)
 	if err != nil {
 		return nil, err
@@ -40,7 +38,7 @@ func createSecrets(sanitisedAppName string) (AppSecrets, error) {
 	if Pass {
 		for secretName := range secrets {
 			secretValue := secrets[secretName]
-			if err := secret.PassInsertSecret(secretValue, secretName, Domain, NewAppServer); err != nil {
+			if err := secret.PassInsertSecret(secretValue, secretName, sanitisedAppName, NewAppServer); err != nil {
 				return nil, err
 			}
 		}
@@ -67,31 +65,6 @@ func ensureDomainFlag(recipe recipe.Recipe, server string) error {
 	return nil
 }
 
-// promptForSecrets asks if we should generate secrets for a new app.
-func promptForSecrets(appName string) error {
-	app, err := app.Get(appName)
-	if err != nil {
-		return err
-	}
-
-	secretEnvVars := secret.ReadSecretEnvVars(app.Env)
-	if len(secretEnvVars) == 0 {
-		logrus.Debugf("%s has no secrets to generate, skipping...", app.Recipe)
-		return nil
-	}
-
-	if !Secrets && !NoInput {
-		prompt := &survey.Confirm{
-			Message: "Generate app secrets?",
-		}
-		if err := survey.AskOne(prompt, &Secrets); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ensureServerFlag checks if the server flag was used. if not, asks the user for it.
 func ensureServerFlag() error {
 	servers, err := config.GetServers()
@@ -116,9 +89,28 @@ func ensureServerFlag() error {
 	return nil
 }
 
+// ensureServerFlag checks if the AppName flag was used. if not, asks the user for it.
+func ensureAppNameFlag() error {
+	if NewAppName == "" && !NoInput {
+		prompt := &survey.Input{
+			Message: "Specify app name:",
+			Default: Domain,
+		}
+		if err := survey.AskOne(prompt, &NewAppName); err != nil {
+			return err
+		}
+	}
+
+	if NewAppName == "" {
+		return fmt.Errorf("no app name provided")
+	}
+
+	return nil
+}
+
 // NewAction is the new app creation logic
 func NewAction(c *cli.Context) error {
-	recipe := ValidateRecipeWithPrompt(c, false)
+	recipe := ValidateRecipeWithPrompt(c)
 
 	if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
 		logrus.Fatal(err)
@@ -132,45 +124,48 @@ func NewAction(c *cli.Context) error {
 		logrus.Fatal(err)
 	}
 
-	sanitisedAppName := config.SanitiseAppName(Domain)
+	if err := ensureAppNameFlag(); err != nil {
-	logrus.Debugf("%s sanitised as %s for new app", Domain, sanitisedAppName)
-
-	if err := config.TemplateAppEnvSample(recipe.Name, Domain, NewAppServer, Domain); err != nil {
 		logrus.Fatal(err)
 	}
 
-	if err := promptForSecrets(Domain); err != nil {
+	sanitisedAppName := config.SanitiseAppName(NewAppName)
+	if len(sanitisedAppName) > 45 {
+		logrus.Fatalf("%s cannot be longer than 45 characters", sanitisedAppName)
+	}
+	logrus.Debugf("%s sanitised as %s for new app", NewAppName, sanitisedAppName)
+
+	if err := config.TemplateAppEnvSample(recipe.Name, NewAppName, NewAppServer, Domain); err != nil {
 		logrus.Fatal(err)
 	}
 
-	var secrets AppSecrets
-	var secretTable *tablewriter.Table
 	if Secrets {
 		if err := ssh.EnsureHostKey(NewAppServer); err != nil {
 			logrus.Fatal(err)
 		}
 
-		var err error
+		secrets, err := createSecrets(sanitisedAppName)
-		secrets, err = createSecrets(sanitisedAppName)
 		if err != nil {
 			logrus.Fatal(err)
 		}
 
 		secretCols := []string{"Name", "Value"}
-		secretTable = formatter.CreateTable(secretCols)
+		secretTable := formatter.CreateTable(secretCols)
 		for secret := range secrets {
 			secretTable.Append([]string{secret, secrets[secret]})
 		}
 
+		if len(secrets) > 0 {
+			defer secretTable.Render()
+		}
 	}
 
 	if NewAppServer == "default" {
 		NewAppServer = "local"
 	}
 
-	tableCol := []string{"server", "recipe", "domain"}
+	tableCol := []string{"server", "type", "domain", "app name"}
 	table := formatter.CreateTable(tableCol)
-	table.Append([]string{NewAppServer, recipe.Name, Domain})
+	table.Append([]string{NewAppServer, recipe.Name, Domain, NewAppName})
 
 	fmt.Println("")
 	fmt.Println(fmt.Sprintf("A new %s app has been created! Here is an overview:", recipe.Name))
@@ -178,19 +173,11 @@ func NewAction(c *cli.Context) error {
 	table.Render()
 	fmt.Println("")
 	fmt.Println("You can configure this app by running the following:")
-	fmt.Println(fmt.Sprintf("\n    abra app config %s", Domain))
+	fmt.Println(fmt.Sprintf("\n    abra app config %s", NewAppName))
 	fmt.Println("")
 	fmt.Println("You can deploy this app by running the following:")
-	fmt.Println(fmt.Sprintf("\n    abra app deploy %s", Domain))
+	fmt.Println(fmt.Sprintf("\n    abra app deploy %s", NewAppName))
 	fmt.Println("")
 
-	if len(secrets) > 0 {
-		fmt.Println("Here are your generated secrets:")
-		fmt.Println("")
-		secretTable.Render()
-		fmt.Println("")
-		logrus.Warn("generated secrets are not shown again, please take note of them *now*")
-	}
-
 	return nil
 }

cli/internal/recipe.go

@@ -11,7 +11,7 @@ import (
 )
 
 // PromptBumpType prompts for version bump type
-func PromptBumpType(tagString, latestRelease string) error {
+func PromptBumpType(tagString string) error {
 	if (!Major && !Minor && !Patch) && tagString == "" {
 		fmt.Printf(`
 You need to make a decision about what kind of an update this new recipe
@@ -20,8 +20,6 @@ migration work or take care of some breaking changes? This can be signaled in
 the version you specify on the recipe deploy label and is called a semantic
 version.
 
-The latest published version is %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).
@@ -36,7 +34,7 @@ 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)
+`)
 
 		var chosenBumpType string
 		prompt := &survey.Select{

cli/internal/validate.go

@@ -19,7 +19,7 @@ import (
 var AppName string
 
 // ValidateRecipe ensures the recipe arg is valid.
-func ValidateRecipe(c *cli.Context, ensureLatest bool) recipe.Recipe {
+func ValidateRecipe(c *cli.Context) recipe.Recipe {
 	recipeName := c.Args().First()
 
 	if recipeName == "" {
@@ -38,12 +38,6 @@ func ValidateRecipe(c *cli.Context, ensureLatest bool) recipe.Recipe {
 		}
 	}
 
-	if ensureLatest {
-		if err := recipe.EnsureLatest(recipeName); err != nil {
-			logrus.Fatal(err)
-		}
-	}
-
 	logrus.Debugf("validated %s as recipe argument", recipeName)
 
 	return chosenRecipe
@@ -51,7 +45,7 @@ func ValidateRecipe(c *cli.Context, ensureLatest bool) recipe.Recipe {
 
 // ValidateRecipeWithPrompt ensures a recipe argument is present before
 // validating, asking for input if required.
-func ValidateRecipeWithPrompt(c *cli.Context, ensureLatest bool) recipe.Recipe {
+func ValidateRecipeWithPrompt(c *cli.Context) recipe.Recipe {
 	recipeName := c.Args().First()
 
 	if recipeName == "" && !NoInput {
@@ -105,12 +99,6 @@ func ValidateRecipeWithPrompt(c *cli.Context, ensureLatest bool) recipe.Recipe {
 		logrus.Fatal(err)
 	}
 
-	if ensureLatest {
-		if err := recipe.EnsureLatest(recipeName); err != nil {
-			logrus.Fatal(err)
-		}
-	}
-
 	logrus.Debugf("validated %s as recipe argument", recipeName)
 
 	return chosenRecipe
@@ -134,7 +122,7 @@ func ValidateApp(c *cli.Context) config.App {
 		logrus.Fatal(err)
 	}
 
-	if err := recipe.EnsureExists(app.Recipe); err != nil {
+	if err := recipe.EnsureExists(app.Type); err != nil {
 		logrus.Fatal(err)
 	}
 
@@ -148,7 +136,7 @@ func ValidateApp(c *cli.Context) config.App {
 }
 
 // ValidateDomain ensures the domain name arg is valid.
-func ValidateDomain(c *cli.Context) string {
+func ValidateDomain(c *cli.Context) (string, error) {
 	domainName := c.Args().First()
 
 	if domainName == "" && !NoInput {
@@ -157,7 +145,7 @@ func ValidateDomain(c *cli.Context) string {
 			Default: "example.com",
 		}
 		if err := survey.AskOne(prompt, &domainName); err != nil {
-			logrus.Fatal(err)
+			return domainName, err
 		}
 	}
 
@@ -167,7 +155,7 @@ func ValidateDomain(c *cli.Context) string {
 
 	logrus.Debugf("validated %s as domain argument", domainName)
 
-	return domainName
+	return domainName, nil
 }
 
 // ValidateSubCmdFlags ensures flag order conforms to correct order
@@ -185,12 +173,12 @@ func ValidateSubCmdFlags(c *cli.Context) bool {
 }
 
 // ValidateServer ensures the server name arg is valid.
-func ValidateServer(c *cli.Context) string {
+func ValidateServer(c *cli.Context) (string, error) {
 	serverName := c.Args().First()
 
 	serverNames, err := config.ReadServerNames()
 	if err != nil {
-		logrus.Fatal(err)
+		return serverName, err
 	}
 
 	if serverName == "" && !NoInput {
@@ -199,28 +187,17 @@ func ValidateServer(c *cli.Context) string {
 			Options: serverNames,
 		}
 		if err := survey.AskOne(prompt, &serverName); err != nil {
-			logrus.Fatal(err)
+			return serverName, err
 		}
 	}
 
-	matched := false
-	for _, name := range serverNames {
-		if name == serverName {
-			matched = true
-		}
-	}
-
-	if !matched {
-		ShowSubcommandHelpAndError(c, errors.New("server doesn't exist?"))
-	}
-
 	if serverName == "" {
 		ShowSubcommandHelpAndError(c, errors.New("no server provided"))
 	}
 
 	logrus.Debugf("validated %s as server argument", serverName)
 
-	return serverName
+	return serverName, nil
 }
 
 // EnsureDNSProvider ensures a DNS provider is chosen.

cli/recipe/lint.go

@@ -19,12 +19,13 @@ var recipeLintCommand = cli.Command{
 	ArgsUsage: "<recipe>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 		internal.OnlyErrorFlag,
 	},
 	Before:       internal.SubCommandBefore,
 	BashComplete: autocomplete.RecipeNameComplete,
 	Action: func(c *cli.Context) error {
-		recipe := internal.ValidateRecipe(c, true)
+		recipe := internal.ValidateRecipe(c)
 
 		if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
 			logrus.Fatal(err)

cli/recipe/list.go

@@ -27,6 +27,7 @@ var recipeListCommand = cli.Command{
 	Aliases: []string{"ls"},
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 		patternFlag,
 	},
 	Before: internal.SubCommandBefore,

cli/recipe/new.go

@@ -41,9 +41,9 @@ var recipeNewCommand = cli.Command{
 	Usage:     "Create a new recipe",
 	ArgsUsage: "<recipe>",
 	Description: `
-Create a new recipe.
+This command creates a new recipe.
 
-Abra uses the built-in example repository which is available here:
+Abra uses our built-in example repository which is available here:
 
     https://git.coopcloud.tech/coop-cloud/example
 
@@ -111,7 +111,7 @@ In order to share your recipe, you can upload it the git repository to:
 
 If you're not sure how to do that, come chat with us:
 
-    https://docs.coopcloud.tech/intro/contact
+    https://docs.coopcloud.tech/contact
 
 See "abra recipe -h" for additional recipe maintainer commands.
 

cli/recipe/recipe.go

@@ -13,8 +13,7 @@ var RecipeCommand = cli.Command{
 	Description: `
 A recipe is a blueprint for an app. It is a bunch of config files which
 describe how to deploy and maintain an app. Recipes are maintained by the Co-op
-Cloud community and you can use Abra to read them, deploy them and create apps
+Cloud community and you can use Abra to read them and create apps for you.
-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

cli/recipe/release.go

@@ -27,16 +27,17 @@ var recipeReleaseCommand = cli.Command{
 	Usage:     "Release a new recipe version",
 	ArgsUsage: "<recipe> [<version>]",
 	Description: `
-Create a new version of a recipe. These versions are then published on the
+This command is used to specify a new version of a recipe. These versions are
-Co-op Cloud recipe catalogue. These versions take the following form:
+then published on the Co-op Cloud recipe catalogue. These versions take the
+following form:
 
     a.b.c+x.y.z
 
-Where the "a.b.c" part is a semantic version determined by the maintainer. The
+Where the "a.b.c" part is a semantic version determined by the maintainer. And
-"x.y.z" part is the image tag of the recipe "app" service (the main container
+the "x.y.z" part is the image tag of the recipe "app" service (the main
-which contains the software to be used, by naming convention).
+container which contains the software to be used).
 
-We maintain a semantic versioning scheme ("a.b.c") alongside the recipe
+We maintain a semantic versioning scheme ("a.b.c") alongside the libre app
 versioning scheme ("x.y.z") in order to maximise the chances that the nature of
 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
@@ -58,7 +59,7 @@ your SSH keys configured on your account.
 	Before:       internal.SubCommandBefore,
 	BashComplete: autocomplete.RecipeNameComplete,
 	Action: func(c *cli.Context) error {
-		recipe := internal.ValidateRecipeWithPrompt(c, false)
+		recipe := internal.ValidateRecipeWithPrompt(c)
 
 		imagesTmp, err := getImageVersions(recipe)
 		if err != nil {
@@ -321,6 +322,12 @@ func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recip
 	}
 
 	var lastGitTag tagcmp.Tag
+	if tagString == "" {
+		if err := internal.PromptBumpType(tagString); err != nil {
+			return err
+		}
+	}
+
 	for _, tag := range tags {
 		parsed, err := tagcmp.Parse(tag)
 		if err != nil {
@@ -361,12 +368,6 @@ 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()
@@ -392,15 +393,15 @@ func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recip
 	}
 
 	if err := commitRelease(recipe, tagString); err != nil {
-		logrus.Fatalf("failed to commit changes: %s", err.Error())
+		logrus.Fatal(err)
 	}
 
 	if err := tagRelease(tagString, repo); err != nil {
-		logrus.Fatalf("failed to tag release: %s", err.Error())
+		logrus.Fatal(err)
 	}
 
 	if err := pushRelease(recipe, tagString); err != nil {
-		logrus.Fatalf("failed to publish new release: %s", err.Error())
+		logrus.Fatal(err)
 	}
 
 	return nil

cli/recipe/sync.go

@@ -31,8 +31,8 @@ var recipeSyncCommand = cli.Command{
 	},
 	Before: internal.SubCommandBefore,
 	Description: `
-Generate labels for the main recipe service (i.e. by convention, the service
+This command will generate labels for the main recipe service (i.e. by
-named "app") which corresponds to the following format:
+convention, the service named 'app') which corresponds to the following format:
 
     coop-cloud.${STACK_NAME}.version=<version>
 
@@ -41,7 +41,7 @@ auto-generate it for you. The <recipe> configuration will be updated on the
 local file system.
 `,
 	Action: func(c *cli.Context) error {
-		recipe := internal.ValidateRecipeWithPrompt(c, false)
+		recipe := internal.ValidateRecipeWithPrompt(c)
 
 		mainApp, err := internal.GetMainAppImage(recipe)
 		if err != nil {
@@ -95,8 +95,7 @@ likely to change.
 		}
 
 		if nextTag == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
-			latestRelease := tags[len(tags)-1]
+			if err := internal.PromptBumpType(""); err != nil {
-			if err := internal.PromptBumpType("", latestRelease); err != nil {
 				logrus.Fatal(err)
 			}
 		}

cli/recipe/upgrade.go

@@ -31,9 +31,9 @@ var recipeUpgradeCommand = cli.Command{
 	Aliases: []string{"u"},
 	Usage:   "Upgrade recipe image tags",
 	Description: `
-Parse all image tags within the given <recipe> configuration and prompt with
+This command reads and attempts to parse all image tags within the given
-more recent tags to upgrade to. It will update the relevant compose file tags
+<recipe> configuration and prompt with more recent tags to upgrade to. It will
-on the local file system.
+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
@@ -46,6 +46,7 @@ interface.
 You may invoke this command in "wizard" mode and be prompted for input:
 
     abra recipe upgrade
+
 `,
 	BashComplete: autocomplete.RecipeNameComplete,
 	ArgsUsage:    "<recipe>",
@@ -59,11 +60,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
 	},
 	Before: internal.SubCommandBefore,
 	Action: func(c *cli.Context) error {
-		recipe := internal.ValidateRecipeWithPrompt(c, true)
+		recipe := internal.ValidateRecipeWithPrompt(c)
-
-		if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
-			logrus.Fatal(err)
-		}
 
 		bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch)
 		if bumpType != 0 {
@@ -116,13 +113,13 @@ You may invoke this command in "wizard" mode and be prompted for input:
 				logrus.Fatal(err)
 			}
 
-			regVersions, err := client.GetRegistryTags(img)
+			image := reference.Path(img)
+			regVersions, err := client.GetRegistryTags(image)
 			if err != nil {
 				logrus.Fatal(err)
 			}
-
-			image := reference.Path(img)
 			logrus.Debugf("retrieved %s from remote registry for %s", regVersions, image)
+
 			image = formatter.StripTagMeta(image)
 
 			switch img.(type) {
@@ -145,7 +142,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
 
 			var compatible []tagcmp.Tag
 			for _, regVersion := range regVersions {
-				other, err := tagcmp.Parse(regVersion)
+				other, err := tagcmp.Parse(regVersion.Name)
 				if err != nil {
 					continue // skip tags that cannot be parsed
 				}
@@ -235,7 +232,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
 						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)
+							compatibleStrings = append(compatibleStrings, regVersion.Name)
 						}
 					}
 

cli/recipe/version.go

@@ -16,11 +16,12 @@ var recipeVersionCommand = cli.Command{
 	ArgsUsage: "<recipe>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 	},
 	Before:       internal.SubCommandBefore,
 	BashComplete: autocomplete.RecipeNameComplete,
 	Action: func(c *cli.Context) error {
-		recipe := internal.ValidateRecipe(c, false)
+		recipe := internal.ValidateRecipe(c)
 
 		catalogue, err := recipePkg.ReadRecipeCatalogue()
 		if err != nil {

cli/record/list.go

@@ -21,12 +21,13 @@ var RecordListCommand = cli.Command{
 	ArgsUsage: "<zone>",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 		internal.DNSProviderFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Description: `
-List all domain name records managed by a 3rd party provider for a specific
+This command lists all domain name records managed by a 3rd party provider for
-zone.
+a specific zone.
 
 You must specify a zone (e.g. example.com) under which your domain name records
 are listed. This zone must already be created on your provider account.

cli/record/new.go

@@ -33,7 +33,7 @@ var RecordNewCommand = cli.Command{
 	},
 	Before: internal.SubCommandBefore,
 	Description: `
-Create a new domain name record for a specific zone.
+This command creates a new domain name record for a specific zone.
 
 You must specify a zone (e.g. example.com) under which your domain name records
 are listed. This zone must already be created on your provider account.
@@ -45,6 +45,7 @@ Example:
 You may also invoke this command in "wizard" mode and be prompted for input:
 
     abra record new
+
 `,
 	Action: func(c *cli.Context) error {
 		zone, err := internal.EnsureZoneArgument(c)

cli/record/record.go

@@ -11,9 +11,9 @@ var RecordCommand = cli.Command{
 	Aliases:   []string{"rc"},
 	ArgsUsage: "<record>",
 	Description: `
-Manage domain name records via 3rd party providers such as Gandi DNS. It
+This command supports managing domain name records via 3rd party providers such
-supports listing, creating and removing all types of records that you might
+as Gandi DNS. It supports listing, creating and removing all types of records
-need for managing Co-op Cloud apps.
+that you might need for managing Co-op Cloud apps.
 
 The following providers are supported:
 
@@ -28,6 +28,7 @@ library documentation for more. It supports many existing providers and allows
 to implement new provider support easily.
 
     https://pkg.go.dev/github.com/libdns/libdns
+
 `,
 	Subcommands: []cli.Command{
 		RecordListCommand,

cli/record/remove.go

@@ -30,7 +30,7 @@ var RecordRemoveCommand = cli.Command{
 	},
 	Before: internal.SubCommandBefore,
 	Description: `
-Remove a domain name record for a specific zone.
+This command removes a domain name record for a specific zone.
 
 It uses the type of record and name to match existing records and choose one
 for deletion. You must specify a zone (e.g. example.com) under which your

cli/server/add.go

@@ -28,8 +28,8 @@ import (
 var (
 	dockerInstallMsg = `
 A docker installation cannot be found on %s. This is a required system
-dependency for running Co-op Cloud apps on your server. If you would like, Abra
+dependency for running Co-op Cloud on your server. If you would like, Abra can
-can attempt to install Docker for you using the upstream non-interactive
+attempt to install Docker for you using the upstream non-interactive
 installation script.
 
 See the following documentation for more:
@@ -41,6 +41,7 @@ such purposes. Docker stable is now installed by default by this script. The
 source for this script can be seen here:
 
     https://github.com/docker/docker-install
+
 `
 )
 
@@ -60,7 +61,7 @@ var provisionFlag = &cli.BoolFlag{
 
 var sshAuth string
 var sshAuthFlag = &cli.StringFlag{
-	Name:        "ssh-auth, s",
+	Name:        "ssh-auth, sh",
 	Value:       "identity-file",
 	Usage:       "Select SSH authentication method (identity-file, password)",
 	Destination: &sshAuth,
@@ -68,7 +69,7 @@ var sshAuthFlag = &cli.StringFlag{
 
 var askSudoPass bool
 var askSudoPassFlag = &cli.BoolFlag{
-	Name:        "ask-sudo-pass, a",
+	Name:        "ask-sudo-pass, as",
 	Usage:       "Ask for sudo password",
 	Destination: &askSudoPass,
 }
@@ -246,7 +247,7 @@ Abra was unable to bootstrap Docker, see below for logs:
 
 %s
 
-If nothing works, you can try running the Docker install script manually on your server:
+If nothing works, you try running the Docker install script manually on your server:
 
     wget -O- https://get.docker.com | bash
 
@@ -276,7 +277,7 @@ Abra was unable to bootstrap Docker, see below for logs:
 
 %s
 
-This could be due to several reasons. One of the most common is that your
+This could be due to a number of things but one of the most common is that your
 server user account does not have sudo access, and if it does, you need to pass
 "--ask-sudo-pass" in order to supply Abra with your password.
 
@@ -370,28 +371,40 @@ var serverAddCommand = cli.Command{
 	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. This
+This command adds a new server to your configuration so that it can be managed
-command can also provision your server ("--provision/-p") with a Docker
+by Abra. This can be useful when you already have a server provisioned and want
-installation so that it is capable of hosting Co-op Cloud apps.
+to start running Abra commands against it. 
 
-Abra will default to expecting that you have a running ssh-agent and are using
+This command can also provision your server ("--provision/-p") so that it is
-SSH keys to connect to your new server. Abra will also read your SSH config
+capable of hosting Co-op Cloud apps. Abra will default to expecting that you
-(matching "Host" as <domain>). SSH connection details precedence follows as
+have a running ssh-agent and are using SSH keys to connect to your new server.
-such: command-line > SSH config > guessed defaults.
+Abra will also read your SSH config (matching "Host" as <domain>). SSH
+connection details precedence follows as such: command-line > SSH config >
+guessed defaults.
 
 If you have no SSH key configured for this host and are instead using password
 authentication, you may pass "--ssh-auth password" to have Abra ask you for the
 password. "--ask-sudo-pass" may be passed if you run your provisioning commands
 via sudo privilege escalation.
 
-The <domain> argument must be a publicy accessible domain name which points to
+If "--local" is passed, then Abra assumes that the current local server is
-your server. You should have working SSH access to this server already, Abra
+intended as the target server. This is useful when you want to have your entire
-will assume port 22 and will use your current system username to make an
+Co-op Cloud config located on the server itself, and not on your local
-initial connection. You can use the <user> and <port> arguments to adjust this.
+developer machine.
 
 Example:
 
-    abra server add varia.zone glodemodem 12345 -p
+    abra server add --local
+
+Otherwise, you may specify a remote server. The <domain> argument must be a
+publicy accessible domain name which points to your server. You should have SSH
+access to this server, Abra will assume port 22 and will use your current
+system username to make an initial connection. You can use the <user> and
+<port> arguments to adjust this.
+
+Example:
+
+    abra server add --provision varia.zone glodemodem 12345
 
 Abra will construct the following SSH connection and Docker context:
 
@@ -399,10 +412,9 @@ Abra will construct the following SSH connection and Docker context:
 
 All communication between Abra and the server will use this SSH connection.
 
-If "--local" is passed, then Abra assumes that the current local server is
+In this example, Abra will install Docker and initialise swarm mode.
-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
+You may omit flags to avoid performing this provisioning logic.
-developer machine.
 `,
 	Flags: []cli.Flag{
 		internal.DebugFlag,
@@ -425,8 +437,6 @@ developer machine.
 			internal.ShowSubcommandHelpAndError(c, err)
 		}
 
-		domainName := internal.ValidateDomain(c)
-
 		if local {
 			if err := newLocalServer(c, "default"); err != nil {
 				logrus.Fatal(err)
@@ -434,6 +444,11 @@ developer machine.
 			return nil
 		}
 
+		domainName, err := internal.ValidateDomain(c)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
 		username := c.Args().Get(1)
 		if username == "" {
 			systemUser, err := user.Current()
@@ -458,17 +473,14 @@ developer machine.
 
 		cl, err := newClient(c, domainName)
 		if err != nil {
-			cleanUp(domainName)
+			logrus.Fatal(err)
-			logrus.Debugf("failed to construct client for %s, saw %s", domainName, err.Error())
-			logrus.Fatalf(fmt.Sprintf(internal.ServerAddFailMsg, domainName))
 		}
 
 		if provision {
 			logrus.Debugf("attempting to construct SSH client for %s", domainName)
 			sshCl, err := ssh.New(domainName, sshAuth, username, port)
 			if err != nil {
-				cleanUp(domainName)
+				logrus.Fatal(err)
-				logrus.Fatalf(fmt.Sprintf(internal.ServerAddFailMsg, domainName))
 			}
 			defer sshCl.Close()
 			logrus.Debugf("successfully created SSH client for %s", domainName)
@@ -483,7 +495,7 @@ developer machine.
 
 		if _, err := cl.Info(context.Background()); err != nil {
 			cleanUp(domainName)
-			logrus.Fatalf(fmt.Sprintf(internal.ServerAddFailMsg, domainName))
+			logrus.Fatalf("couldn't make a remote docker connection to %s? use --provision/-p to attempt to install", domainName)
 		}
 
 		return nil

cli/server/list.go

@@ -18,6 +18,7 @@ var serverListCommand = cli.Command{
 	Usage:   "List managed servers",
 	Flags: []cli.Flag{
 		internal.DebugFlag,
+		internal.NoInputFlag,
 	},
 	Before: internal.SubCommandBefore,
 	Action: func(c *cli.Context) error {

cli/server/new.go

@@ -99,10 +99,9 @@ You can access this new VPS via SSH using the following command:
     ssh root@%s
 
 Please note, this server is not managed by Abra yet (i.e. "abra server ls" will
-not list this server)! You will need to assign a domain name record (manually
+not list this server)! You will need to assign a domain name record ("abra
-or by using "abra record new") and add the server to your Abra configuration
+record new") and add the server to your Abra configuration ("abra server add")
-("abra server add") to have a working server that you can deploy Co-op Cloud
+to have a working server that you can deploy Co-op Cloud apps to.
-apps to.
 
 When setting up domain name records, you probably want to set up the following
 2 A records. This supports deploying apps to your root domain (e.g.
@@ -111,6 +110,7 @@ bar.example.com).
 
     @  1800 IN A %s
     *  1800 IN A %s
+
 	`,
 		internal.HetznerCloudName, ip, rootPassword,
 		ip, ip, ip,
@@ -181,10 +181,9 @@ address. You can learn all about how to get SSH access to your new Capsul on:
     %s/about-ssh
 
 Please note, this server is not managed by Abra yet (i.e. "abra server ls" will
-not list this server)! You will need to assign a domain name record (manually
+not list this server)! You will need to assign a domain name record ("abra
-or by using "abra record new") and add the server to your Abra configuration
+record new") and add the server to your Abra configuration ("abra server add")
-("abra server add") to have a working server that you can deploy Co-op Cloud
+to have a working server that you can deploy Co-op Cloud apps to.
-apps to.
 
 When setting up domain name records, you probably want to set up the following
 2 A records. This supports deploying apps to your root domain (e.g.
@@ -193,6 +192,7 @@ bar.example.com).
 
     @  1800 IN A <your-capsul-ip>
     *  1800 IN A <your-capsul-ip>
+
 	`, internal.CapsulName, resp.ID, internal.CapsulInstanceURL))
 
 	return nil
@@ -203,7 +203,7 @@ var serverNewCommand = cli.Command{
 	Aliases: []string{"n"},
 	Usage:   "Create a new server using a 3rd party provider",
 	Description: `
-Create a new server via a 3rd party provider.
+This command creates a new server via a 3rd party provider.
 
 The following providers are supported:
 
@@ -217,11 +217,16 @@ You may invoke this command in "wizard" mode and be prompted for input:
 API tokens are read from the environment if specified, e.g.
 
     export HCLOUD_TOKEN=...
+
+Where "$provider_TOKEN" is the expected env var format.
 `,
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		internal.NoInputFlag,
+
 		internal.ServerProviderFlag,
+		internal.DebugFlag,
+		internal.NoInputFlag,
 
 		// Capsul
 		internal.CapsulInstanceURLFlag,

cli/server/remove.go

@@ -104,7 +104,7 @@ var serverRemoveCommand = cli.Command{
 	ArgsUsage: "[<server>]",
 	Usage:     "Remove a managed server",
 	Description: `
-Remova a server from Abra management.
+This command removes a server from Abra management.
 
 Depending on whether you used a 3rd party provider to create this server ("abra
 server new"), you can also destroy the virtual server as well. Pass
@@ -126,24 +126,21 @@ like tears in rain.
 	},
 	Before: internal.SubCommandBefore,
 	Action: func(c *cli.Context) error {
-		serverName := internal.ValidateServer(c)
+		serverName := c.Args().Get(1)
-
+		if serverName != "" {
-		warnMsg := `Did not pass -s/--server for actual server deletion, prompting!
+			var err error
-
+			serverName, err = internal.ValidateServer(c)
-Abra doesn't currently know if it helped you create this server with one of the
+			if err != nil {
-3rd party integrations (e.g. Capsul). You have a choice here to actually,
+				logrus.Fatal(err)
-really and finally destroy this server using those integrations. If you want to
+			}
-do this, choose Yes.
+		}
-
-If you just want to remove the server config files & context, choose No.
-`
 
 		if !rmServer {
-			logrus.Warn(fmt.Sprintf(warnMsg))
+			logrus.Warn("did not pass -s/--server for actual server deletion, prompting")
 
 			response := false
 			prompt := &survey.Confirm{
-				Message: "delete actual live server?",
+				Message: "prompt to actual server deletion?",
 			}
 			if err := survey.AskOne(prompt, &response); err != nil {
 				logrus.Fatal(err)
@@ -167,8 +164,10 @@ If you just want to remove the server config files & context, choose No.
 					logrus.Fatal(err)
 				}
 			}
+
 		}
 
+		if serverName != "" {
 			if err := client.DeleteContext(serverName); err != nil {
 				logrus.Fatal(err)
 			}
@@ -178,6 +177,7 @@ If you just want to remove the server config files & context, choose No.
 			}
 
 			logrus.Infof("server at %s has been lost in time, like tears in rain", serverName)
+		}
 
 		return nil
 	},

cli/server/server.go

@@ -10,12 +10,13 @@ var ServerCommand = cli.Command{
 	Aliases: []string{"s"},
 	Usage:   "Manage servers",
 	Description: `
-Create, manage and remove servers using 3rd party integrations. 
+These commands support creating, managing and removing servers using 3rd party
+integrations. 
 
 Servers can be created from scratch using the "abra server new" command. If you
 already have a server, you can add it to your configuration using "abra server
 add". Abra can provision servers so that they are ready to deploy Co-op Cloud
-recipes, see available flags on "abra server add" for more.
+apps, see available flags on "server add" for more.
 `,
 	Subcommands: []cli.Command{
 		serverNewCommand,

go.mod

@@ -4,51 +4,46 @@ go 1.16
 
 require (
 	coopcloud.tech/tagcmp v0.0.0-20211103052201-885b22f77d52
-	github.com/AlecAivazis/survey/v2 v2.3.6
+	github.com/AlecAivazis/survey/v2 v2.3.2
 	github.com/Autonomic-Cooperative/godotenv v1.3.1-0.20210731094149-b031ea1211e7
 	github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4
-	github.com/docker/cli v20.10.21+incompatible
+	github.com/docker/cli v20.10.12+incompatible
-	github.com/docker/distribution v2.8.1+incompatible
+	github.com/docker/distribution v2.7.1+incompatible
-	github.com/docker/docker v20.10.21+incompatible
+	github.com/docker/docker v20.10.12+incompatible
-	github.com/docker/go-units v0.5.0
+	github.com/docker/go-units v0.4.0
 	github.com/go-git/go-git/v5 v5.4.2
-	github.com/hetznercloud/hcloud-go v1.37.0
+	github.com/hetznercloud/hcloud-go v1.33.1
-	github.com/moby/sys/signal v0.7.0
+	github.com/moby/sys/signal v0.6.0
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
-	github.com/schollz/progressbar/v3 v3.12.1
+	github.com/schollz/progressbar/v3 v3.8.5
-	github.com/sirupsen/logrus v1.9.0
+	github.com/schultz-is/passgen v1.0.1
-	gotest.tools/v3 v3.4.0
+	github.com/sirupsen/logrus v1.8.1
+	gotest.tools/v3 v3.1.0
 )
 
 require (
 	coopcloud.tech/libcapsul v0.0.0-20211022074848-c35e78fe3f3e
-	github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3 // indirect
+	github.com/Microsoft/hcsshim v0.8.21 // indirect
-	github.com/buger/goterm v1.0.4
+	github.com/buger/goterm v1.0.3
-	github.com/containerd/containerd v1.5.9 // indirect
+	github.com/containerd/containerd v1.5.5 // 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.6.4 // indirect
 	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
 	github.com/fvbommel/sortorder v1.0.2 // indirect
-	github.com/gliderlabs/ssh v0.3.5
+	github.com/gliderlabs/ssh v0.3.3
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.1
+	github.com/hashicorp/go-retryablehttp v0.7.0
-	github.com/kevinburke/ssh_config v1.2.0
+	github.com/kevinburke/ssh_config v1.1.0
-	github.com/klauspost/pgzip v1.2.5
 	github.com/libdns/gandi v1.0.2
 	github.com/libdns/libdns v0.2.1
 	github.com/moby/sys/mount v0.2.0 // indirect
-	github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/opencontainers/runc v1.0.2 // indirect
-	github.com/spf13/cobra v1.3.0 // indirect
 	github.com/theupdateframework/notary v0.7.0 // indirect
-	github.com/urfave/cli v1.22.9
+	github.com/urfave/cli v1.22.5
-	github.com/xanzy/ssh-agent v0.3.1 // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b // indirect
+	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
-	golang.org/x/crypto v0.3.0
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
-	golang.org/x/sys v0.2.0
 )

pkg/autocomplete/autocomplete.go

@@ -40,24 +40,3 @@ func RecipeNameComplete(c *cli.Context) {
 		fmt.Println(name)
 	}
 }
-
-// SubcommandComplete completes subcommands.
-func SubcommandComplete(c *cli.Context) {
-	if c.NArg() > 0 {
-		return
-	}
-
-	subcmds := []string{
-		"app",
-		"autocomplete",
-		"catalogue",
-		"recipe",
-		"record",
-		"server",
-		"upgrade",
-	}
-
-	for _, cmd := range subcmds {
-		fmt.Println(cmd)
-	}
-}

pkg/client/client.go

@@ -27,11 +27,7 @@ func New(contextName string) (*client.Client, error) {
 			return nil, err
 		}
 
-		helper, err := commandconnPkg.NewConnectionHelper(ctxEndpoint)
+		helper := commandconnPkg.NewConnectionHelper(ctxEndpoint)
-		if err != nil {
-			return nil, err
-		}
-
 		httpClient := &http.Client{
 			// No tls, no proxy
 			Transport: &http.Transport{

pkg/client/registry.go

@@ -1,57 +1,193 @@
 package client
 
 import (
-	"context"
+	"encoding/base64"
+	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"net/http"
 	"strings"
 
-	"github.com/containers/image/docker"
+	"coopcloud.tech/abra/pkg/web"
-	"github.com/containers/image/types"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/client"
+	"github.com/hashicorp/go-retryablehttp"
 	"github.com/sirupsen/logrus"
 )
 
-// GetRegistryTags retrieves all tags of an image from a container registry.
+type RawTag struct {
-func GetRegistryTags(img reference.Named) ([]string, error) {
+	Layer string
-	var tags []string
+	Name  string
-
-	ref, err := docker.ParseReference(fmt.Sprintf("//%s", img))
-	if err != nil {
-		return tags, fmt.Errorf("failed to parse image %s, saw: %s", img, err.Error())
 }
 
-	ctx := context.Background()
+type RawTags []RawTag
-	tags, err = docker.GetRepositoryTags(ctx, &types.SystemContext{}, ref)
+
-	if err != nil {
+var registryURL = "https://registry.hub.docker.com/v1/repositories/%s/tags"
+
+func GetRegistryTags(image string) (RawTags, error) {
+	var tags RawTags
+
+	tagsUrl := fmt.Sprintf(registryURL, image)
+	if err := web.ReadJSON(tagsUrl, &tags); err != nil {
 		return tags, err
 	}
 
 	return tags, nil
 }
 
-// GetTagDigest retrieves an image digest from a container registry.
+func basicAuth(username, password string) string {
-func GetTagDigest(cl *client.Client, image reference.Named) (string, error) {
+	auth := username + ":" + password
-	target := fmt.Sprintf("//%s", reference.Path(image))
+	return base64.StdEncoding.EncodeToString([]byte(auth))
-
-	ref, err := docker.ParseReference(target)
-	if err != nil {
-		return "", fmt.Errorf("failed to parse image %s, saw: %s", image, err.Error())
 }
 
-	ctx := context.Background()
+// getRegv2Token retrieves a registry v2 authentication token.
-	img, err := ref.NewImage(ctx, nil)
+func getRegv2Token(cl *client.Client, image reference.Named, registryUsername, registryPassword string) (string, error) {
-	if err != nil {
+	img := reference.Path(image)
-		logrus.Debugf("failed to query remote registry for %s, saw: %s", image, err.Error())
+	tokenURL := "https://auth.docker.io/token"
-		return "", fmt.Errorf("unable to read digest for %s", image)
+	values := fmt.Sprintf("service=registry.docker.io&scope=repository:%s:pull", img)
-	}
-	defer img.Close()
 
-	digest := img.ConfigInfo().Digest.String()
+	fullURL := fmt.Sprintf("%s?%s", tokenURL, values)
+	req, err := retryablehttp.NewRequest("GET", fullURL, nil)
+	if err != nil {
+		return "", err
+	}
+
+	if registryUsername != "" && registryPassword != "" {
+		logrus.Debugf("using registry log in credentials for token request")
+		auth := basicAuth(registryUsername, registryPassword)
+		req.Header.Add("Authorization", fmt.Sprintf("Basic %s", auth))
+	}
+
+	client := web.NewHTTPRetryClient()
+	res, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		_, err := ioutil.ReadAll(res.Body)
+		if err != nil {
+			return "", err
+		}
+	}
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return "", nil
+	}
+
+	tokenRes := struct {
+		AccessToken string `json:"access_token"`
+		Expiry      int    `json:"expires_in"`
+		Issued      string `json:"issued_at"`
+		Token       string `json:"token"`
+	}{}
+
+	if err := json.Unmarshal(body, &tokenRes); err != nil {
+		return "", err
+	}
+
+	return tokenRes.Token, nil
+}
+
+// GetTagDigest retrieves an image digest from a v2 registry
+func GetTagDigest(cl *client.Client, image reference.Named, registryUsername, registryPassword string) (string, error) {
+	img := reference.Path(image)
+	tag := image.(reference.NamedTagged).Tag()
+	manifestURL := fmt.Sprintf("https://index.docker.io/v2/%s/manifests/%s", img, tag)
+
+	req, err := retryablehttp.NewRequest("GET", manifestURL, nil)
+	if err != nil {
+		return "", err
+	}
+
+	token, err := getRegv2Token(cl, image, registryUsername, registryPassword)
+	if err != nil {
+		return "", err
+	}
+
+	if token == "" {
+		return "", fmt.Errorf("unable to retrieve registry token?")
+	}
+
+	req.Header = http.Header{
+		"Accept": []string{
+			"application/vnd.docker.distribution.manifest.v2+json",
+			"application/vnd.docker.distribution.manifest.list.v2+json",
+		},
+		"Authorization": []string{fmt.Sprintf("Bearer %s", token)},
+	}
+
+	client := web.NewHTTPRetryClient()
+	res, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		_, err := ioutil.ReadAll(res.Body)
+		if err != nil {
+			return "", err
+		}
+	}
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return "", err
+	}
+
+	registryResT1 := struct {
+		SchemaVersion int
+		MediaType     string
+		Manifests     []struct {
+			MediaType string
+			Size      int
+			Digest    string
+			Platform  struct {
+				Architecture string
+				Os           string
+			}
+		}
+	}{}
+
+	registryResT2 := struct {
+		SchemaVersion int
+		MediaType     string
+		Config        struct {
+			MediaType string
+			Size      int
+			Digest    string
+		}
+		Layers []struct {
+			MediaType string
+			Size      int
+			Digest    string
+		}
+	}{}
+
+	if err := json.Unmarshal(body, &registryResT1); err != nil {
+		return "", err
+	}
+
+	var digest string
+	for _, manifest := range registryResT1.Manifests {
+		if string(manifest.Platform.Architecture) == "amd64" {
+			digest = strings.Split(manifest.Digest, ":")[1][:7]
+		}
+	}
 
 	if digest == "" {
-		return digest, fmt.Errorf("unable to read digest for %s", image)
+		if err := json.Unmarshal(body, &registryResT2); err != nil {
+			return "", err
+		}
+		digest = strings.Split(registryResT2.Config.Digest, ":")[1][:7]
 	}
 
-	return strings.Split(digest, ":")[1][:7], nil
+	if digest == "" {
+		return "", fmt.Errorf("Unable to retrieve amd64 digest for %s", image)
+	}
+
+	return digest, nil
 }

pkg/client/volumes.go

@@ -5,18 +5,23 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/sirupsen/logrus"
 )
 
-func GetVolumes(ctx context.Context, server string, fs filters.Args) ([]*types.Volume, error) {
+func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Volume, error) {
+
 	cl, err := New(server)
 	if err != nil {
 		return nil, err
 	}
 
+	fs := filters.NewArgs()
+	fs.Add("name", appName)
+
 	volumeListOKBody, err := cl.VolumeList(ctx, fs)
 	volumeList := volumeListOKBody.Volumes
 	if err != nil {
-		return volumeList, err
+		logrus.Fatal(err)
 	}
 
 	return volumeList, nil
@@ -24,11 +29,9 @@ func GetVolumes(ctx context.Context, server string, fs filters.Args) ([]*types.V
 
 func GetVolumeNames(volumes []*types.Volume) []string {
 	var volumeNames []string
-
 	for _, vol := range volumes {
 		volumeNames = append(volumeNames, vol.Name)
 	}
-
 	return volumeNames
 }
 
@@ -37,13 +40,12 @@ func RemoveVolumes(ctx context.Context, server string, volumeNames []string, for
 	if err != nil {
 		return err
 	}
-
 	for _, volName := range volumeNames {
 		err := cl.VolumeRemove(ctx, volName, force)
 		if err != nil {
 			return err
 		}
 	}
-
 	return nil
+
 }

pkg/config/app.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+	"html/template"
 	"io/ioutil"
 	"os"
 	"path"
@@ -12,7 +13,6 @@ import (
 	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"
 )
 
@@ -36,7 +36,7 @@ type AppFiles map[AppName]AppFile
 // App reprents an app with its env file read into memory
 type App struct {
 	Name   AppName
-	Recipe string
+	Type   string
 	Domain string
 	Env    AppEnv
 	Server string
@@ -52,59 +52,12 @@ func (a App) StackName() string {
 	}
 
 	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
+// SORTING TYPES
-// 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 := GetAppComposeFiles(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
@@ -115,25 +68,25 @@ 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
+// ByServerAndType sort a slice of Apps
-type ByServerAndRecipe []App
+type ByServerAndType []App
 
-func (a ByServerAndRecipe) Len() int      { return len(a) }
+func (a ByServerAndType) Len() int      { return len(a) }
-func (a ByServerAndRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a ByServerAndType) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a ByServerAndRecipe) Less(i, j int) bool {
+func (a ByServerAndType) 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].Type) < strings.ToLower(a[j].Type)
 	}
 	return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
 }
 
-// ByRecipe sort a slice of Apps
+// ByType sort a slice of Apps
-type ByRecipe []App
+type ByType []App
 
-func (a ByRecipe) Len() int      { return len(a) }
+func (a ByType) Len() int      { return len(a) }
-func (a ByRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a ByType) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a ByRecipe) Less(i, j int) bool {
+func (a ByType) Less(i, j int) bool {
-	return strings.ToLower(a[i].Recipe) < strings.ToLower(a[j].Recipe)
+	return strings.ToLower(a[i].Type) < strings.ToLower(a[j].Type)
 }
 
 // ByName sort a slice of Apps
@@ -165,18 +118,15 @@ func readAppEnvFile(appFile AppFile, name AppName) (App, error) {
 func newApp(env AppEnv, name string, appFile AppFile) (App, error) {
 	domain := env["DOMAIN"]
 
-	recipe, exists := env["RECIPE"]
+	appType, exists := env["TYPE"]
 	if !exists {
-		recipe, exists = env["TYPE"]
+		return App{}, fmt.Errorf("%s is missing the TYPE env var", name)
-		if !exists {
-			return App{}, fmt.Errorf("%s is missing the RECIPE env var", name)
-		}
 	}
 
 	return App{
 		Name:   name,
 		Domain: domain,
-		Recipe: recipe,
+		Type:   appType,
 		Env:    env,
 		Server: appFile.Server,
 		Path:   appFile.Path,
@@ -263,13 +213,13 @@ func GetAppServiceNames(appName string) ([]string, error) {
 		return serviceNames, err
 	}
 
-	composeFiles, err := GetAppComposeFiles(app.Recipe, app.Env)
+	composeFiles, err := GetAppComposeFiles(app.Type, app.Env)
 	if err != nil {
 		return serviceNames, err
 	}
 
 	opts := stack.Deploy{Composefiles: composeFiles}
-	compose, err := GetAppComposeConfig(app.Recipe, opts, app.Env)
+	compose, err := GetAppComposeConfig(app.Type, opts, app.Env)
 	if err != nil {
 		return serviceNames, err
 	}
@@ -320,15 +270,18 @@ func TemplateAppEnvSample(recipeName, appName, server, domain string) error {
 		return err
 	}
 
-	read, err := ioutil.ReadFile(appEnvPath)
+	file, err := os.OpenFile(appEnvPath, os.O_RDWR, 0664)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	tpl, err := template.ParseFiles(appEnvPath)
 	if err != nil {
 		return err
 	}
 
-	newContents := strings.Replace(string(read), recipeName+".example.com", domain, -1)
+	if err := tpl.Execute(file, struct{ Name string }{recipeName}); err != nil {
-
-	err = ioutil.WriteFile(appEnvPath, []byte(newContents), 0)
-	if err != nil {
 		return err
 	}
 

pkg/config/env.go

@@ -16,12 +16,10 @@ import (
 
 var ABRA_DIR = os.ExpandEnv("$HOME/.abra")
 var SERVERS_DIR = path.Join(ABRA_DIR, "servers")
-var RECIPES_DIR = path.Join(ABRA_DIR, "recipes")
+var RECIPES_DIR = path.Join(ABRA_DIR, "apps")
 var VENDOR_DIR = path.Join(ABRA_DIR, "vendor")
-var BACKUP_DIR = path.Join(ABRA_DIR, "backups")
 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"
 
 // GetServers retrieves all servers.

pkg/config/env_test.go

@@ -20,12 +20,12 @@ var serverName = "evil.corp"
 
 var expectedAppEnv = AppEnv{
 	"DOMAIN": "ecloud.evil.corp",
-	"RECIPE": "ecloud",
+	"TYPE":   "ecloud",
 }
 
 var expectedApp = App{
 	Name:   appName,
-	Recipe: expectedAppEnv["RECIPE"],
+	Type:   expectedAppEnv["TYPE"],
 	Domain: expectedAppEnv["DOMAIN"],
 	Env:    expectedAppEnv,
 	Path:   expectedAppFile.Path,
@@ -74,11 +74,11 @@ func TestReadEnv(t *testing.T) {
 	}
 	if !reflect.DeepEqual(env, expectedAppEnv) {
 		t.Fatalf(
-			"did not get expected application settings. Expected: DOMAIN=%s RECIPE=%s; Got: DOMAIN=%s RECIPE=%s",
+			"did not get expected application settings. Expected: DOMAIN=%s TYPE=%s; Got: DOMAIN=%s TYPE=%s",
 			expectedAppEnv["DOMAIN"],
-			expectedAppEnv["RECIPE"],
+			expectedAppEnv["TYPE"],
 			env["DOMAIN"],
-			env["RECIPE"],
+			env["TYPE"],
 		)
 	}
 }

pkg/container/container.go

@@ -13,10 +13,10 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// GetContainer retrieves a container. If noInput is false and the retrievd
+// GetContainer retrieves a container. If prompt is true and the retrievd count
-// count of containers does not match 1, then a prompt is presented to let the
+// of containers does not match 1, then a prompt is presented to let the user
-// user choose. A count of 0 is handled gracefully.
+// choose. A count of 0 is handled gracefully.
-func GetContainer(c context.Context, cl *client.Client, filters filters.Args, noInput bool) (types.Container, error) {
+func GetContainer(c context.Context, cl *client.Client, filters filters.Args, prompt bool) (types.Container, error) {
 	containerOpts := types.ContainerListOptions{Filters: filters}
 	containers, err := cl.ContainerList(c, containerOpts)
 	if err != nil {
@@ -37,7 +37,7 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, no
 			containersRaw = append(containersRaw, fmt.Sprintf("%s (created %v)", trimmed, created))
 		}
 
-		if noInput {
+		if !prompt {
 			err := fmt.Errorf("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " "))
 			return types.Container{}, err
 		}

pkg/dns/common.go

@@ -47,6 +47,8 @@ func EnsureIPv4(domainName string) (string, error) {
 		},
 	}
 
+	logrus.Debugf("created DNS resolver via %s", freifunkDNS)
+
 	ctx := context.Background()
 	ips, err := resolver.LookupIPAddr(ctx, domainName)
 	if err != nil {
@@ -58,17 +60,13 @@ func EnsureIPv4(domainName string) (string, error) {
 	}
 
 	ipv4 = ips[0].IP.To4().String()
-	logrus.Debugf("%s points to %s (resolver: %s)", domainName, ipv4, freifunkDNS)
+	logrus.Debugf("discovered the following ipv4 addr: %s", ipv4)
 
 	return ipv4, nil
 }
 
 // EnsureDomainsResolveSameIPv4 ensures that domains resolve to the same ipv4 address
 func EnsureDomainsResolveSameIPv4(domainName, server string) (string, error) {
-	if server == "default" || server == "local" {
-		return "", nil
-	}
-
 	var ipv4 string
 
 	domainIPv4, err := EnsureIPv4(domainName)

pkg/git/branch.go

@@ -5,25 +5,6 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 )
 
-// Check if a branch exists in a repo.
-// Use this and not repository.Branch(), because the latter does not
-// actually check for existing branches.
-// See https://github.com/go-git/go-git/issues/518
-func HasBranch(repository *git.Repository, name string) bool {
-	var exist bool
-	if iter, err := repository.Branches(); err == nil {
-		iterFunc := func(reference *plumbing.Reference) error {
-			if name == reference.Name().Short() {
-				exist = true
-				return nil
-			}
-			return nil
-		}
-		_ = iter.ForEach(iterFunc)
-	}
-	return exist
-}
-
 // GetCurrentBranch retrieves the current branch of a repository
 func GetCurrentBranch(repository *git.Repository) (string, error) {
 	branchRefs, err := repository.Branches()

pkg/lint/recipe.go

@@ -78,13 +78,6 @@ var LintRules = map[string][]LintRule{
 			HowToResolve: "fill out all the metadata",
 			Function:     LintMetadataFilledIn,
 		},
-		{
-			Ref:          "R013",
-			Level:        "warn",
-			Description:  "git.coopcloud.tech repo exists",
-			HowToResolve: "upload your recipe to git.coopcloud.tech/coop-cloud/...",
-			Function:     LintHasRecipeRepo,
-		},
 	},
 	"error": {
 		{
@@ -122,6 +115,13 @@ var LintRules = map[string][]LintRule{
 			HowToResolve: "vendor config versions in an abra.sh",
 			Function:     LintAbraShVendors,
 		},
+		{
+			Ref:          "R013",
+			Level:        "error",
+			Description:  "git.coopcloud.tech repo exists",
+			HowToResolve: "upload your recipe to git.coopcloud.tech/coop-cloud/...",
+			Function:     LintHasRecipeRepo,
+		},
 	},
 }
 

pkg/recipe/recipe.go

@@ -26,7 +26,7 @@ import (
 )
 
 // RecipeCatalogueURL is the only current recipe catalogue available.
-const RecipeCatalogueURL = "https://recipes.coopcloud.tech/recipes.json"
+const RecipeCatalogueURL = "https://apps.coopcloud.tech"
 
 // ReposMetadataURL is the recipe repository metadata
 const ReposMetadataURL = "https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos"
@@ -232,12 +232,8 @@ func Get(recipeName string) (Recipe, error) {
 
 	meta, err := GetRecipeMeta(recipeName)
 	if err != nil {
-		if strings.Contains(err.Error(), "does not exist") {
-			meta = RecipeMeta{}
-		} else {
 		return Recipe{}, err
 	}
-	}
 
 	return Recipe{
 		Name:   recipeName,
@@ -359,7 +355,7 @@ func EnsureLatest(recipeName string) error {
 		return err
 	}
 
-	branch, err := GetDefaultBranch(repo, recipeName)
+	branch, err := gitPkg.GetCurrentBranch(repo)
 	if err != nil {
 		return err
 	}
@@ -572,7 +568,7 @@ func EnsureUpToDate(recipeName string) error {
 	}
 
 	if !isClean {
-		return fmt.Errorf("%s (%s) has locally unstaged changes? please commit/remove your changes before proceeding", recipeName, recipeDir)
+		return fmt.Errorf("%s has locally unstaged changes", recipeName)
 	}
 
 	repo, err := git.PlainOpen(recipeDir)
@@ -619,15 +615,11 @@ func EnsureUpToDate(recipeName string) error {
 func GetDefaultBranch(repo *git.Repository, recipeName string) (plumbing.ReferenceName, error) {
 	recipeDir := path.Join(config.RECIPES_DIR, recipeName)
 
-	meta, _ := GetRecipeMeta(recipeName)
-	if meta.DefaultBranch != "" {
-		return plumbing.ReferenceName(fmt.Sprintf("refs/heads/%s", meta.DefaultBranch)), nil
-	}
-
 	branch := "master"
-	if !gitPkg.HasBranch(repo, "master") {
+	if _, err := repo.Branch("master"); err != nil {
-		if !gitPkg.HasBranch(repo, "main") {
+		if _, err := repo.Branch("main"); err != nil {
-			return "", fmt.Errorf("failed to select default branch in %s", recipeDir)
+			logrus.Debugf("failed to select branch in %s", recipeDir)
+			return "", err
 		}
 		branch = "main"
 	}
@@ -697,7 +689,7 @@ func recipeCatalogueFSIsLatest() (bool, error) {
 		return false, nil
 	}
 
-	logrus.Debug("file system cached recipe catalogue is up-to-date")
+	logrus.Debug("file system cached recipe catalogue is now up-to-date")
 
 	return true, nil
 }
@@ -716,12 +708,14 @@ func ReadRecipeCatalogue() (RecipeCatalogue, error) {
 	}
 
 	if !recipeFSIsLatest {
+		logrus.Debugf("reading recipe catalogue from web to get latest")
 		if err := readRecipeCatalogueWeb(&recipes); err != nil {
 			return nil, err
 		}
 		return recipes, nil
 	}
 
+	logrus.Debugf("reading recipe catalogue from file system cache to get latest")
 	if err := readRecipeCatalogueFS(&recipes); err != nil {
 		return nil, err
 	}
@@ -803,7 +797,8 @@ func GetRecipeMeta(recipeName string) (RecipeMeta, error) {
 
 	recipeMeta, ok := catl[recipeName]
 	if !ok {
-		return RecipeMeta{}, fmt.Errorf("recipe %s does not exist?", recipeName)
+		err := fmt.Errorf("recipe %s does not exist?", recipeName)
+		return RecipeMeta{}, err
 	}
 
 	if err := EnsureExists(recipeName); err != nil {
@@ -928,7 +923,7 @@ func ReadReposMetadata() (RepoCatalogue, error) {
 }
 
 // GetRecipeVersions retrieves all recipe versions.
-func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
+func GetRecipeVersions(recipeName, registryUsername, registryPassword string) (RecipeVersions, error) {
 	versions := RecipeVersions{}
 
 	recipeDir := path.Join(config.RECIPES_DIR, recipeName)
@@ -942,7 +937,7 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
 
 	worktree, err := repo.Worktree()
 	if err != nil {
-		return versions, err
+		logrus.Fatal(err)
 	}
 
 	gitTags, err := repo.Tags()
@@ -972,9 +967,9 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
 			return err
 		}
 
-		cl, err := client.New("default") // only required for container registry calls
+		cl, err := client.New("default") // only required for docker.io registry calls
 		if err != nil {
-			return err
+			logrus.Fatal(err)
 		}
 
 		queryCache := make(map[reference.Named]string)
@@ -1002,19 +997,18 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
 			var exists bool
 			var digest string
 			if digest, exists = queryCache[img]; !exists {
-				logrus.Debugf("cache miss: querying for image: %s, tag: %s", path, tag)
+				logrus.Debugf("looking up image: %s from %s", img, path)
-
 				var err error
-				digest, err = client.GetTagDigest(cl, img)
+				digest, err = client.GetTagDigest(cl, img, registryUsername, registryPassword)
 				if err != nil {
 					logrus.Warn(err)
-					digest = "unknown"
+					continue
 				}
-
+				logrus.Debugf("queried for image: %s, tag: %s, digest: %s", path, tag, digest)
 				queryCache[img] = digest
-				logrus.Debugf("cached insert: %s, tag: %s, digest: %s", path, tag, digest)
+				logrus.Debugf("cached image: %s, tag: %s, digest: %s", path, tag, digest)
 			} else {
-				logrus.Debugf("cache hit: image: %s, tag: %s, digest: %s", path, tag, digest)
+				logrus.Debugf("reading image: %s, tag: %s, digest: %s from cache", path, tag, digest)
 			}
 
 			versionMeta[service.Name] = ServiceMeta{
@@ -1060,7 +1054,7 @@ func GetRecipeCatalogueVersions(recipeName string, catl RecipeCatalogue) ([]stri
 func EnsureCatalogue() error {
 	catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
 	if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
-		url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME)
+		url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "recipes")
 		if err := gitPkg.Clone(catalogueDir, url); err != nil {
 			return err
 		}

pkg/secret/secret.go

@@ -8,11 +8,10 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"sync"
 
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
-	"github.com/decentral1se/passgen"
+	"github.com/schultz-is/passgen"
 	"github.com/sirupsen/logrus"
 )
 
@@ -120,32 +119,23 @@ func ParseSecretEnvVarValue(secret string) (secretValue, error) {
 func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (map[string]string, error) {
 	secrets := make(map[string]string)
 
-	var mutex sync.Mutex
-	var wg sync.WaitGroup
 	ch := make(chan error, len(secretEnvVars))
 	for secretEnvVar := range secretEnvVars {
-		wg.Add(1)
-
 		go func(s string) {
-			defer wg.Done()
-
 			secretName := ParseSecretEnvVarName(s)
 			secretValue, err := ParseSecretEnvVarValue(secretEnvVars[s])
 			if err != nil {
 				ch <- err
 				return
 			}
-
 			secretRemoteName := fmt.Sprintf("%s_%s_%s", appName, secretName, secretValue.Version)
 			logrus.Debugf("attempting to generate and store %s on %s", secretRemoteName, server)
-
 			if secretValue.Length > 0 {
 				passwords, err := GeneratePasswords(1, uint(secretValue.Length))
 				if err != nil {
 					ch <- err
 					return
 				}
-
 				if err := client.StoreSecret(secretRemoteName, passwords[0], server); err != nil {
 					if strings.Contains(err.Error(), "AlreadyExists") {
 						logrus.Warnf("%s already exists, moving on...", secretRemoteName)
@@ -155,9 +145,6 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
 					}
 					return
 				}
-
-				mutex.Lock()
-				defer mutex.Unlock()
 				secrets[secretName] = passwords[0]
 			} else {
 				passphrases, err := GeneratePassphrases(1)
@@ -165,7 +152,6 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
 					ch <- err
 					return
 				}
-
 				if err := client.StoreSecret(secretRemoteName, passphrases[0], server); err != nil {
 					if strings.Contains(err.Error(), "AlreadyExists") {
 						logrus.Warnf("%s already exists, moving on...", secretRemoteName)
@@ -175,17 +161,12 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
 					}
 					return
 				}
-
-				mutex.Lock()
-				defer mutex.Unlock()
 				secrets[secretName] = passphrases[0]
 			}
 			ch <- nil
 		}(secretEnvVar)
 	}
 
-	wg.Wait()
-
 	for range secretEnvVars {
 		err := <-ch
 		if err != nil {

pkg/test/test.go

@@ -1,38 +0,0 @@
-package test
-
-import (
-	"log"
-	"os"
-
-	"github.com/sirupsen/logrus"
-)
-
-// RmServerAppRecipe deletes the test server / app / recipe.
-func RmServerAppRecipe() {
-	testAppLink := os.ExpandEnv("$HOME/.abra/servers/foo.com")
-	if err := os.Remove(testAppLink); err != nil {
-		logrus.Fatal(err)
-	}
-
-	testRecipeLink := os.ExpandEnv("$HOME/.abra/recipes/test")
-	if err := os.Remove(testRecipeLink); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// MkServerAppRecipe symlinks the test server / app / recipe.
-func MkServerAppRecipe() {
-	RmServerAppRecipe()
-
-	testAppDir := os.ExpandEnv("$PWD/../../tests/resources/testapp")
-	testAppLink := os.ExpandEnv("$HOME/.abra/servers/foo.com")
-	if err := os.Symlink(testAppDir, testAppLink); err != nil {
-		log.Fatal(err)
-	}
-
-	testRecipeDir := os.ExpandEnv("$PWD/../../tests/resources/testrecipe")
-	testRecipeLink := os.ExpandEnv("$HOME/.abra/recipes/test")
-	if err := os.Symlink(testRecipeDir, testRecipeLink); err != nil {
-		log.Fatal(err)
-	}
-}

pkg/upstream/commandconn/connection.go

@@ -67,13 +67,13 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*connhelper.Conne
 	return nil, err
 }
 
-func NewConnectionHelper(daemonURL string) (*connhelper.ConnectionHelper, error) {
+func NewConnectionHelper(daemonURL string) *connhelper.ConnectionHelper {
 	helper, err := GetConnectionHelper(daemonURL)
 	if err != nil {
-		return nil, err
+		logrus.Fatal(err)
 	}
 
-	return helper, nil
+	return helper
 }
 
 func getDockerEndpoint(host string) (docker.Endpoint, error) {

pkg/upstream/convert/service.go

@@ -420,12 +420,6 @@ func convertServiceSecrets(
 			return nil, err
 		}
 
-		// NOTE(d1): strip # length=... modifiers
-		if strings.Contains(obj.Name, "#") {
-			vals := strings.Split(obj.Name, "#")
-			obj.Name = strings.TrimSpace(vals[0])
-		}
-
 		file := swarm.SecretReferenceFileTarget(obj.File)
 		refs = append(refs, &swarm.SecretReference{
 			File:       &file,

pkg/upstream/stack/loader.go

@@ -35,21 +35,16 @@ func LoadComposefile(opts Deploy, appEnv map[string]string) (*composetypes.Confi
 		return nil, err
 	}
 
-	recipeName, exists := appEnv["RECIPE"]
-	if !exists {
-		recipeName, _ = appEnv["TYPE"]
-	}
-
 	unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
 	if len(unsupportedProperties) > 0 {
 		logrus.Warnf("%s: ignoring unsupported options: %s",
-			recipeName, strings.Join(unsupportedProperties, ", "))
+			appEnv["TYPE"], strings.Join(unsupportedProperties, ", "))
 	}
 
 	deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
 	if len(deprecatedProperties) > 0 {
 		logrus.Warnf("%s: ignoring deprecated options: %s",
-			recipeName, propertyWarnings(deprecatedProperties))
+			appEnv["TYPE"], propertyWarnings(deprecatedProperties))
 	}
 	return config, nil
 }

renovate.json

@@ -1,6 +1,3 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-  "ignoreDeps": [
-    "github.com/urfave/cli"
-  ]
 }

scripts/autocomplete/fish

@@ -1,7 +0,0 @@
-function complete_abra_args
-    set -l cmd (commandline -poc) --generate-bash-completion
-    $cmd
-end
-complete -c abra -f -n "not __fish_seen_subcommand_from -h --help -v --version complete_abra_args" -a "(complete_abra_args)"
-complete -c abra -f -s h -l help -d 'show help'
-complete -c abra -f -s v -l version -d 'print the version'

scripts/installer/installer

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-ABRA_VERSION="0.5.1-beta"
+ABRA_VERSION="0.3.0-alpha"
 ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$ABRA_VERSION"
-RC_VERSION="0.5.1-beta"
+RC_VERSION="0.4.0-alpha-rc6"
 RC_VERSION_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$RC_VERSION"
 
 for arg in "$@"; do
@@ -44,17 +44,8 @@ function install_abra_release {
     exit 1
   fi
 
-  ARCH=$(uname -m)
+
-  if [[ $ARCH =~ "aarch64" ]]; then
+  PLATFORM=$(uname -s | tr '[:upper:]' '[:lower:]')_$(uname -m)
-      ARCH="arm64"
-  elif [[ $ARCH =~ "armv5l" ]]; then
-      ARCH="armv5"
-  elif [[ $ARCH =~ "armv6l" ]]; then
-      ARCH="armv6"
-  elif [[ $ARCH =~ "armv7l" ]]; then
-      ARCH="armv7"
-  fi
-  PLATFORM=$(uname -s | tr '[:upper:]' '[:lower:]')_$ARCH
   FILENAME="abra_"$ABRA_VERSION"_"$PLATFORM""
   sed_command_rel='s/.*"assets":\[\{[^]]*"name":"'$FILENAME'"[^}]*"browser_download_url":"([^"]*)".*\].*/\1/p'
   sed_command_checksums='s/.*"assets":\[\{[^\]*"name":"checksums.txt"[^}]*"browser_download_url":"([^"]*)".*\].*/\1/p'

scripts/release/upx.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-upx ./dist/abra_*/abra

tests/integration/.abra/servers/server1/gitea1.env

@@ -0,0 +1 @@
+TYPE=gitea

tests/integration/.abra/servers/server1/wp1.env

@@ -0,0 +1 @@
+TYPE=wordpress

tests/integration/.abra/servers/server2/wp2.env

@@ -0,0 +1 @@
+TYPE=wordpress

tests/integration/.gitignore

@@ -1 +0,0 @@
-logs

tests/integration/Dockerfile

@@ -0,0 +1,7 @@
+FROM debian:bullseye-slim
+
+RUN apt update && apt install -y wget curl git;
+
+RUN git config --global user.email "integration-tests@coopcloud.tech";
+
+RUN git config --global user.name "integration-tests";

tests/integration/README.md

@@ -1,28 +1,4 @@
 # integration tests
 
-> You need to be a member of Autonomic Co-op to run these tests, sorry!
+- `cp .envrc.sample .envrc` (fill out values && `direnv allow`)
-
+- `TARGET=install.sh make` (ensure `docker context use default`)
-`testfunctions.sh` contains the functions necessary to save and manipulate
-logs. Run `test_all.sh logdir` to run tests specified in that file and save the
-logs to `logdir`.
-
-When creating new tests, make sure the test command is a one-liner (you can use
-`;` to separate commands). Include `testfunctions.sh` and then write your tests
-like this:
-
-```
-run_test '$ABRA other stuff here'
-```
-
-By default, the testing script will ask after every command if the execution
-succeeded. If you reply `n`, it will log the test in the `logdir`. If you want
-all tests to run without questions, run `export logall=yes` before executing
-the test script.
-
-To run tests, you'll need to prepare your environment:
-
-```
-cp .envrc.sample .envrc # fill out values...
-direnv allow
-./test_all.sh logs
-```

tests/integration/app.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
-source ./testfunctions.sh
 source ./common.sh
 
-run_test '$ABRA app ls'
+echo "all apps, all servers"
+$ABRA app ls
+printf "\\n\\n\\n"
 
-run_test '$ABRA app ls --status'
+echo "all wordpress apps, all servers"
+$ABRA app ls --type wordpress
+printf "\\n\\n\\n"
 
-run_test '$ABRA app ls --type wordpress'
+echo "all wordpress apps, only server2"
-
+$ABRA app ls --type wordpress --server server2
-run_test '$ABRA app ls --type wordpress --server swarm.autonomic.zone'
+printf "\\n\\n\\n"
-
-run_test '$ABRA app ls --type wordpress --server swarm.autonomic.zone --status'

tests/integration/autocomplete.sh

@@ -1,12 +1,9 @@
 #!/bin/bash
 
-source ./testfunctions.sh
 source ./common.sh
 
-run_test '$ABRA autocomplete bash'
+$ABRA autocomplete bash
 
-run_test '$ABRA autocomplete fizsh'
+$ABRA autocomplete fizsh
 
-run_test '$ABRA autocomplete zsh'
+$ABRA autocomplete zsh
-
-run_test '$ABRA autocomplete fish'

tests/integration/catalogue.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-source ./testfunctions.sh
 source ./common.sh
 
-run_test '$ABRA catalogue generate'
+$ABRA catalogue generate --debug
 
-run_test '$ABRA catalogue generate gitea'
+$ABRA catalogue generate gitea --debug

tests/integration/cmd.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-source ./testfunctions.sh
-source ./common.sh
-
-create_server_app_recipe
-
-run_test '$ABRA app cmd foo.com test --local'
-
-run_test '$ABRA app cmd foo.com test --local -- foo'
-
-run_test '$ABRA app cmd foo.com test --local -- foo bar baz'
-
-clean_server_app_recipe

tests/integration/common.sh

@@ -2,19 +2,16 @@
 
 set -e
 
-create_server_app_recipe() {
-  ln -srf ../resources/testapp ~/.abra/servers/foo.com
-  ln -srf ../resources/testrecipe ~/.abra/recipes
-}
-
-clean_server_app_recipe() {
-  unlink ~/.abra/servers/foo.com
-  unlink ~/.abra/recipes/testrecipe
-}
-
 function init() {
-  ABRA="$(pwd)/../../abra"
+  ABRA="$HOME/.local/bin/abra"
+  INSTALLER_URL="https://install.abra.coopcloud.tech"
+
+  for arg in "$@"; do
+    if [ "$arg" == "--dev" ]; then
+      ABRA="/src/abra"
       INSTALLER_URL="https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/installer/installer"
+    fi
+  done
 
   export PATH=$PATH:$HOME/.local/bin
 

tests/integration/install.sh

@@ -1,12 +1,15 @@
 #!/bin/bash
 
-source ./testfunctions.sh
 source ./common.sh
 
-run_test 'wget -O- https://install.abra.autonomic.zone | bash; ~/.local/bin/abra -v'
+wget -O- https://install.abra.autonomic.zone | bash
+~/.local/bin/abra -v
 
-run_test 'wget -O- https://install.abra.autonomic.zone | bash -s -- --rc; ~/.local/bin/abra -v'
+wget -O- https://install.abra.autonomic.zone | bash -s -- --rc
+~/.local/bin/abra -v
 
-run_test '$ABRA upgrade; ~/.local/bin/abra -v'
+$ABRA upgrade
+~/.local/bin/abra -v
 
-run_test '$ABRA upgrade --rc; ~/.local/bin/abra -v'
+$ABRA upgrade --rc
+~/.local/bin/abra -v

tests/integration/makefile

@@ -0,0 +1,11 @@
+default:
+	@docker run \
+		-v $$(pwd)/../../:/src \
+		-v $$(pwd)/.abra:/root/.abra \
+		--env-file .envrc \
+		decentral1se/abra-int:latest \
+		sh -c '\
+			echo "Running $(TARGET)..."; \
+			cd /src/tests/integration; \
+			bash "$(TARGET)" -- --dev \
+		'

tests/integration/recipe.sh

@@ -1,14 +1,12 @@
 #!/bin/bash
 
-source ./testfunctions.sh
 source ./common.sh
 
-run_test '$ABRA recipe new testrecipe'
+$ABRA recipe new testrecipe
 
-run_test '$ABRA recipe list'
+$ABRA recipe list
+$ABRA recipe list -p cloud
 
-run_test '$ABRA recipe list --pattern cloud'
+$ABRA recipe versions peertube
 
-run_test '$ABRA recipe versions peertube'
+$ABRA recipe lint gitea
-
-run_test '$ABRA recipe lint gitea'

tests/integration/records.sh

@@ -1,21 +1,9 @@
 #!/bin/bash
 
-source ./testfunctions.sh
 source ./common.sh
 
-run_test "$ABRA record new \
+$ABRA record new -p gandi -t A -n int-core -v 192.157.2.21 coopcloud.tech
-          --provider gandi \
-          --record-type A \
-          --record-name integration-tests \
-          --record-value 192.157.2.21 \
-          --no-input coopcloud.tech \
-         "
 
-run_test '$ABRA record list --provider gandi coopcloud.tech'
+$ABRA record list -p gandi coopcloud.tech | grep -q int-core
 
-run_test "$ABRA record rm \
+$ABRA -n record rm -p gandi -t A -n int-core coopcloud.tech
-          --provider gandi \
-          --record-type A \
-          --record-name integration-tests \
-          --no-input coopcloud.tech
-         "

tests/integration/server.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-source ./testfunctions.sh
 source ./common.sh
 
-run_test '$ABRA server new --provider hetzner-cloud --hetzner-name integration-tests --no-input'
+$ABRA -n server new -p hetzner-cloud --hn int-core
 
-run_test '$ABRA server ls'
+$ABRA server ls | grep -q int-core
 
-run_test '$ABRA server rm --provider hetzner-cloud --hetzner-name int-core --server --no-input'
+$ABRA -n server rm -s -p hetzner-cloud --hn int-core

tests/integration/test_all.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-if [ -z $1 ]; then
-    echo "usage: ./test_all.sh logdir"
-    exit
-fi
-
-res_dir=$1/
-if [[ ! -d "$res_dir" ]]; then
-    mkdir "$res_dir"
-fi
-
-# Usage: run_test [number] [name] [command]
-run_test () {
-    logfile="$res_dir/$1-$2.log"
-    echo $logfile
-}
-
-testScripts=("app.sh" "autocomplete.sh" "catalogue.sh" "install.sh" "recipe.sh" "records.sh" "server.sh", "cmd.sh")
-
-for i in "${testScripts[@]}"; do
-    cmd="./$i $res_dir${i/sh/log}"
-    eval $cmd
-done

tests/integration/testfunctions.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-if [ -z $1 ]; then
-    logfile=/dev/null
-else
-    logfile=$1
-fi
-
-if [ -z $logall ]; then
-    logall=no
-fi
-
-run_test () {
-    if [ -z "$@" ]; then
-        echo "run_test needs a command to run"
-    else
-        tempLogfile=$(mktemp)
-        cmd=$(eval echo "$@")
-        echo -e "\\n------------ INPUT -------------------" | tee -a $tempLogfile
-        echo "$" "$cmd"  | tee -a $tempLogfile
-        echo "------------ OUTPUT ------------------" | tee -a $tempLogfile
-        eval $cmd 2>&1 | tee -a $tempLogfile
-        if [ $logall = "yes" ]; then
-            cat $tempLogfile >> $logfile
-            echo -e "\\n\\n" >> $logfile
-        else
-            read -N 1 -p "Did the test pass? [y/n]: " pass
-            if [ $pass = 'n' ]; then
-                cat $tempLogfile >> $logfile
-                echo -e "\\n\\n" >> $logfile
-            fi
-        fi
-        rm $tempLogfile
-    fi
-}

tests/manual/manual.md

@@ -0,0 +1,40 @@
+# manual test plan
+
+## recipe publish
+
+- `abra recipe upgrade <recipe>`
+  - `cd ~/.abra/apps/<recipe>/ && git diff` to ensure changes made
+
+- `abra recipe sync <recipe>`
+  - `cd ~/.abra/apps/<recipe>/ && git diff` to ensure changes made
+
+- `abra recipe release <recipe> --dry-run`
+  - prompts should be correct, read what `abra` asks you carefully
+
+## deploy, upgrade, rollback
+
+- `abra app deploy --chaos <app>`
+- `abra app deploy --force <app>`
+- `abra app deploy <app>`
+- `abra app rollback <app>`
+- `abra app upgrade <app>`
+
+## app day-to-day ops
+
+- `abra app check <app>`
+- `abra app config <app>`
+- `abra app cp <app>`
+- `abra app errors -w <app>`
+- `abra app logs <app>`
+- `abra app ls --status <app>`
+- `abra app new --secrets <recipe>`
+- `abra app ps <app>`
+- `abra app remove <app>`
+- `abra app restart <app>`
+- `abra app run <app>`
+- `abra app secret generate --all`
+- `abra app secret insert <app> foo v1 bar`
+- `abra app secret ls <app>`
+- `abra app secret remove <app> foo`
+- `abra app volume ls <app>`
+- `abra app volume remove --force <app>`

tests/resources/testapp/foo.com.env

@@ -1 +0,0 @@
-TYPE=test

tests/resources/testapp/testapp

@@ -1 +0,0 @@
-.

tests/resources/testrecipe/abra.sh

@@ -1,5 +0,0 @@
-test(){
-  echo "1: $1"
-  echo "2: $2"
-  echo "all: $@"
-}

tests/resources/testrecipe/compose.yml

@@ -1,5 +0,0 @@
----
-version: "3.8"
-
-services:
-  app: []