From 1a8dca98040939cc580fd42fa121c92aecc6fdef Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Mon, 8 Jul 2024 00:45:03 +0200
Subject: [PATCH] fix(deploy): only output when actually waiting

---
 pkg/upstream/stack/stack.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/upstream/stack/stack.go b/pkg/upstream/stack/stack.go
index b864ecca..7731635f 100644
--- a/pkg/upstream/stack/stack.go
+++ b/pkg/upstream/stack/stack.go
@@ -208,16 +208,23 @@ func deployCompose(ctx context.Context, cl *dockerClient.Client, opts Deploy, co
 		return err
 	}
 
-	serviceIDs, err := deployServices(ctx, cl, services, namespace, opts.SendRegistryAuth, opts.ResolveImage, appName, dontWait)
+	serviceIDs, err := deployServices(ctx, cl, services, namespace, opts.SendRegistryAuth, opts.ResolveImage)
 	if err != nil {
 		return err
 	}
 
+	if dontWait {
+		log.Warn("skipping converge logic checks")
+		return nil
+	}
+
 	log.Infof("waiting for %s to deploy... please hold 🤚", appName)
+
 	if err := waitOnServices(ctx, cl, serviceIDs, appName); err == nil {
 		log.Infof("successfully deployed %s", appName)
 	}
-	return err
+
+	return nil
 }
 
 func getServicesDeclaredNetworks(serviceConfigs []composetypes.ServiceConfig) map[string]struct{} {
@@ -332,9 +339,7 @@ func deployServices(
 	services map[string]swarm.ServiceSpec,
 	namespace convert.Namespace,
 	sendAuth bool,
-	resolveImage string,
-	appName string,
-	dontWait bool) ([]string, error) {
+	resolveImage string) ([]string, error) {
 	existingServices, err := GetStackServices(ctx, cl, namespace.Name())
 	if err != nil {
 		return nil, err
@@ -417,11 +422,6 @@ func deployServices(
 		}
 	}
 
-	if dontWait {
-		log.Warn("skipping converge logic checks")
-		return nil, nil
-	}
-
 	return serviceIDs, nil
 }