Fix rollback and tests that check help text

Signed-off-by: João Pereira <joaod@vmware.com>
cloudfoundry · Aug 7, 2024 · 07fd1bd · 07fd1bd
1 parent a1ba45e
commit 07fd1bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/command/v7/rollback_command.go b/command/v7/rollback_command.go
@@ -128,7 +128,7 @@ func (cmd RollbackCommand) Execute(args []string) error {
 
 func (cmd RollbackCommand) ValidateFlags() error {
 	switch {
-	case cmd.MaxInFlight < 1:
+	case cmd.MaxInFlight < -1 || cmd.MaxInFlight == 0:
 		return translatableerror.IncorrectUsageError{Message: "--max-in-flight must be greater than or equal to 1"}
 	}
 

diff --git a/integration/v7/isolated/restage_command_test.go b/integration/v7/isolated/restage_command_test.go
@@ -31,7 +31,7 @@ var _ = Describe("restage command", func() {
 				Eventually(session).Should(Say("ALIAS:"))
 				Eventually(session).Should(Say("rg"))
 				Eventually(session).Should(Say("OPTIONS:"))
-				Eventually(session).Should(Say("--strategy      Deployment strategy can be canary, rolling or null"))
+				Eventually(session).Should(Say(`--strategy\s+Deployment strategy can be canary, rolling or null`))
 				Eventually(session).Should(Say("--max-in-flight"))
 				Eventually(session).Should(Say("--no-wait       Exit when the first instance of the web process is healthy"))
 				Eventually(session).Should(Say("ENVIRONMENT:"))

diff --git a/integration/v7/isolated/restart_command_test.go b/integration/v7/isolated/restart_command_test.go
@@ -51,8 +51,8 @@ var _ = Describe("restart command", func() {
 				Eventually(session).Should(Say("ALIAS:"))
 				Eventually(session).Should(Say("rs"))
 				Eventually(session).Should(Say("OPTIONS:"))
-				Eventually(session).Should(Say("--strategy      Deployment strategy can be canary, rolling or null."))
-				Eventually(session).Should(Say("--no-wait       Exit when the first instance of the web process is healthy"))
+				Eventually(session).Should(Say(`--strategy\s+Deployment strategy can be canary, rolling or null.`))
+				Eventually(session).Should(Say(`--no-wait\s+Exit when the first instance of the web process is healthy`))
 				Eventually(session).Should(Say("--max-in-flight"))
 				Eventually(session).Should(Say("ENVIRONMENT:"))
 				Eventually(session).Should(Say(`CF_STAGING_TIMEOUT=15\s+Max wait time for staging, in minutes`))