From 2da26852c6ee2a4ba05cdd40f64fee83b7bff9cd Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Wed, 8 Feb 2023 19:08:40 +0100
Subject: [PATCH] resolve some small issues

---
 cli/updater/updater.go      | 26 +++++++++++++-------------
 pkg/upstream/stack/stack.go |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cli/updater/updater.go b/cli/updater/updater.go
index 1dce0c70..bbd31862 100644
--- a/cli/updater/updater.go
+++ b/cli/updater/updater.go
@@ -105,21 +105,22 @@ var UpgradeApp = cli.Command{
 			if err != nil {
 				logrus.Fatal(err)
 			}
-		} else {
-			stacks, err := stack.GetStacks(cl)
+			return nil
+		}
+
+		stacks, err := stack.GetStacks(cl)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		for _, stackInfo := range stacks {
+			stackName := stackInfo.Name
+			recipeName, err := getLabel(cl, stackName, "recipe")
 			if err != nil {
 				logrus.Fatal(err)
 			}
-			for _, stackInfo := range stacks {
-				stackName := stackInfo.Name
-				recipeName, err := getLabel(cl, stackName, "recipe")
-				if err != nil {
-					logrus.Fatal(err)
-				}
-				err = tryUpgrade(cl, stackName, recipeName)
-				if err != nil {
-					logrus.Fatal(err)
-				}
+			err = tryUpgrade(cl, stackName, recipeName)
+			if err != nil {
+				logrus.Fatal(err)
 			}
 		}
 		return nil
@@ -309,7 +310,6 @@ func mergeAbraShEnv(recipeName string, env config.AppEnv) error {
 
 // createDeployConfig merges and enriches the compose config for the deployment
 func createDeployConfig(recipeName string, stackName string, env config.AppEnv) (*composetypes.Config, stack.Deploy, error) {
-	// Workaround, is there a better way?
 	env["STACK_NAME"] = stackName
 
 	deployOpts := stack.Deploy{
diff --git a/pkg/upstream/stack/stack.go b/pkg/upstream/stack/stack.go
index 27d2ee6c..c2a9ee10 100644
--- a/pkg/upstream/stack/stack.go
+++ b/pkg/upstream/stack/stack.go
@@ -486,7 +486,7 @@ If a service is failing to even start, try smoke out the error with:
 	}
 }
 
-// FIXME: Copypasta from https://github.com/docker/cli/blob/master/cli/command/stack/swarm/list.go because I could't import "github.com/docker/cli/cli/command/stack/swarm"
+// Copypasta from https://github.com/docker/cli/blob/master/cli/command/stack/swarm/list.go
 // GetStacks lists the swarm stacks.
 func GetStacks(cl *dockerClient.Client) ([]*formatter.Stack, error) {
 	services, err := cl.ServiceList(