From 2dca602c0bed1eae95a7750b0f5e83681eead50a Mon Sep 17 00:00:00 2001
From: decentral1se <lukewm@riseup.net>
Date: Thu, 14 Oct 2021 01:22:54 +0200
Subject: [PATCH 1/2] fix: error handling in deploy

---
 cli/app/deploy.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cli/app/deploy.go b/cli/app/deploy.go
index 42ba1399..83c3393e 100644
--- a/cli/app/deploy.go
+++ b/cli/app/deploy.go
@@ -61,11 +61,15 @@ upgrade <app>" command. You may pass "--force" to re-deploy the same version.
 			if len(versions) > 0 {
 				version = versions[len(versions)-1]
 				logrus.Infof("choosing '%s' as version to deploy", version)
-				recipe.EnsureVersion(app.Type, version)
+				if err := recipe.EnsureVersion(app.Type, version); err != nil {
+					logrus.Fatal(err)
+				}
 			} else {
 				version = "latest commit"
 				logrus.Warning("no versions detected, using latest commit")
-				recipe.EnsureLatest(app.Type)
+				if err := recipe.EnsureLatest(app.Type); err != nil {
+					logrus.Fatal(err)
+				}
 			}
 		}
 
-- 
2.47.2


From 875255fd8c81a4c465a05883b4bab4732bb159b1 Mon Sep 17 00:00:00 2001
From: decentral1se <lukewm@riseup.net>
Date: Thu, 14 Oct 2021 01:23:04 +0200
Subject: [PATCH 2/2] feat: add upgrade command

---
 cli/app/app.go     |   1 +
 cli/app/upgrade.go | 137 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 cli/app/upgrade.go

diff --git a/cli/app/app.go b/cli/app/app.go
index d906879f..24781630 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -19,6 +19,7 @@ to scaling apps up and spinning them down.
 		appNewCommand,
 		appConfigCommand,
 		appDeployCommand,
+		appUpgradeCommand,
 		appUndeployCommand,
 		appBackupCommand,
 		appRestoreCommand,
diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go
new file mode 100644
index 00000000..40a6907a
--- /dev/null
+++ b/cli/app/upgrade.go
@@ -0,0 +1,137 @@
+package app
+
+import (
+	"fmt"
+
+	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/pkg/catalogue"
+	"coopcloud.tech/abra/pkg/client"
+	stack "coopcloud.tech/abra/pkg/client/stack"
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/recipe"
+	"coopcloud.tech/tagcmp"
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli/v2"
+)
+
+var appUpgradeCommand = &cli.Command{
+	Name:      "upgrade",
+	Aliases:   []string{"u"},
+	Usage:     "Upgrade an app",
+	ArgsUsage: "<app>",
+	Description: `
+This command supports upgrading an app. You can use it to choose and roll out a
+new upgrade to an existing app. This command specifically supports changing the
+version of running apps, as opposed to "abra app deploy <app>". This action
+could be destructive, please ensure you have a copy of your app data beforehand
+- see "abra app backup <app>" for more.
+`,
+	Action: func(c *cli.Context) error {
+		app := internal.ValidateApp(c)
+		stackName := app.StackName()
+
+		cl, err := client.New(app.Server)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		logrus.Debugf("checking whether '%s' is already deployed", stackName)
+
+		isDeployed, deployedVersion, err := stack.IsDeployed(c.Context, cl, stackName)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if deployedVersion == "" {
+			logrus.Fatal("failed to determine version of deployed '%s'", app.Name)
+		}
+
+		if !isDeployed {
+			logrus.Fatal("'%s' is not deployed?", app.Name)
+		}
+
+		versions, err := catalogue.GetRecipeCatalogueVersions(app.Type)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		var availableUpgrades []string
+		for _, version := range versions {
+			parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			parsedVersion, err := tagcmp.Parse(version)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			if parsedVersion.IsGreaterThan(parsedDeployedVersion) {
+				availableUpgrades = append(availableUpgrades, version)
+			}
+		}
+
+		if len(availableUpgrades) == 0 {
+			logrus.Fatal("no available upgrades, you're on latest")
+		}
+
+		var chosenUpgrade string
+		prompt := &survey.Select{
+			Message: "Please select an upgrade:",
+			Options: availableUpgrades,
+		}
+		if err := survey.AskOne(prompt, &chosenUpgrade); err != nil {
+			return err
+		}
+
+		if err := recipe.EnsureVersion(app.Type, chosenUpgrade); err != nil {
+			logrus.Fatal(err)
+		}
+
+		abraShPath := fmt.Sprintf("%s/%s/%s", config.APPS_DIR, app.Type, "abra.sh")
+		abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		for k, v := range abraShEnv {
+			app.Env[k] = v
+		}
+
+		composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		deployOpts := stack.Deploy{
+			Composefiles: composeFiles,
+			Namespace:    stackName,
+			Prune:        false,
+			ResolveImage: stack.ResolveImageAlways,
+		}
+		compose, err := config.GetAppComposeConfig(app.Name, deployOpts, app.Env)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := DeployOverview(app, chosenUpgrade); err != nil {
+			logrus.Fatal(err)
+		}
+
+		if err := stack.RunDeploy(cl, deployOpts, compose); err != nil {
+			logrus.Fatal(err)
+		}
+
+		return nil
+	},
+	BashComplete: func(c *cli.Context) {
+		appNames, err := config.GetAppNames()
+		if err != nil {
+			logrus.Warn(err)
+		}
+		if c.NArg() > 0 {
+			return
+		}
+		for _, a := range appNames {
+			fmt.Println(a)
+		}
+	},
+}
-- 
2.47.2