From f39e186b666b15a2bdf33bd8dca329e53c78ff3d Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sat, 12 Mar 2022 16:15:20 +0100
Subject: [PATCH] fix: match Force/NoInput where needed

---
 cli/app/remove.go   | 3 ++-
 cli/app/rollback.go | 2 +-
 cli/app/upgrade.go  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cli/app/remove.go b/cli/app/remove.go
index aaad9d57..2c09cc97 100644
--- a/cli/app/remove.go
+++ b/cli/app/remove.go
@@ -126,7 +126,7 @@ var appRemoveCommand = cli.Command{
 		if len(vols) > 0 {
 			if Volumes {
 				var removeVols []string
-				if !internal.Force {
+				if !internal.Force && !internal.NoInput {
 					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",
@@ -138,6 +138,7 @@ 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 {
diff --git a/cli/app/rollback.go b/cli/app/rollback.go
index e404976c..36d3c365 100644
--- a/cli/app/rollback.go
+++ b/cli/app/rollback.go
@@ -126,7 +126,7 @@ recipes.
 
 		var chosenDowngrade string
 		if !internal.Chaos {
-			if internal.Force {
+			if internal.Force || internal.NoInput {
 				chosenDowngrade = availableDowngrades[0]
 				logrus.Debugf("choosing %s as version to downgrade to (--force)", chosenDowngrade)
 			} else {
diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go
index 59fb9b6e..1516f41a 100644
--- a/cli/app/upgrade.go
+++ b/cli/app/upgrade.go
@@ -129,7 +129,7 @@ recipes.
 
 		var chosenUpgrade string
 		if len(availableUpgrades) > 0 && !internal.Chaos {
-			if internal.Force {
+			if internal.Force || internal.NoInput {
 				chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
 				logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
 			} else {