Print max-in-flight value alongside deployment status [main] (#3098)

* Deduplicate tests from previous merge

Co-authored-by: Greg Weresch <[email protected]>

* Print max-in-flight value as part of deployment information in process table

when it is set to non-default value (currently 1)

Co-authored-by: Greg Weresch <[email protected]>

* Fix flakey tests that look for output from cf app

- these tests depend on a short-lived state

Co-authored-by: Greg Weresch <[email protected]>

* Apply suggestions from code review

Co-authored-by: João Pereira <[email protected]>

* Refactor app summary displayer tests to use Say instead of MatchRegexp

Co-authored-by: Greg Weresch <[email protected]>

---------

Co-authored-by: Greg Weresch <[email protected]>
Co-authored-by: João Pereira <[email protected]>

Author: 3 people

api/cloudcontroller/ccv3/constant/deployment.go

@@ -31,3 +31,5 @@ const (
 	DeploymentStatusValueActive    DeploymentStatusValue = "ACTIVE"
 	DeploymentStatusValueFinalized DeploymentStatusValue = "FINALIZED"
 )
+
+const DeploymentMaxInFlightDefaultValue int = 1

command/v7/shared/app_summary_displayer.go

@@ -162,6 +162,12 @@ func (display AppSummaryDisplayer) displayProcessTable(summary v7action.Detailed
 	if summary.Deployment.StatusValue == constant.DeploymentStatusValueActive {
 		display.UI.DisplayNewline()
 		display.UI.DisplayText(display.getDeploymentStatusText(summary))
+
+		var maxInFlight = summary.Deployment.Options.MaxInFlight
+		if maxInFlight > 0 && maxInFlight != constant.DeploymentMaxInFlightDefaultValue {
+			display.UI.DisplayText(fmt.Sprintf("max-in-flight: %d", maxInFlight))
+		}
+
 		if summary.Deployment.Strategy == constant.DeploymentStrategyCanary && summary.Deployment.StatusReason == constant.DeploymentStatusReasonPaused {
 			display.UI.DisplayNewline()
 			display.UI.DisplayText(fmt.Sprintf("Please run `cf continue-deployment %s` to promote the canary deployment, or `cf cancel-deployment %s` to rollback to the previous version.", summary.Application.Name, summary.Application.Name))
@@ -171,25 +177,15 @@ func (display AppSummaryDisplayer) displayProcessTable(summary v7action.Detailed
 
 func (display AppSummaryDisplayer) getDeploymentStatusText(summary v7action.DetailedApplicationSummary) string {
 	var lastStatusChangeTime = display.getLastStatusChangeTime(summary)
-
 	if lastStatusChangeTime != "" {
 		return fmt.Sprintf("%s deployment currently %s (since %s)",
 			cases.Title(language.English, cases.NoLower).String(string(summary.Deployment.Strategy)),
 			summary.Deployment.StatusReason,
 			lastStatusChangeTime)
 	} else {
-		var sb strings.Builder
-		sb.WriteString(fmt.Sprintf("%s deployment currently %s.",
+		return fmt.Sprintf("%s deployment currently %s.",
 			cases.Title(language.English, cases.NoLower).String(string(summary.Deployment.Strategy)),
-			summary.Deployment.StatusReason))
-
-		if summary.Deployment.Strategy == constant.DeploymentStrategyCanary && summary.Deployment.StatusReason == constant.DeploymentStatusReasonPaused {
-			sb.WriteString("\n")
-			sb.WriteString(fmt.Sprintf(
-				"Please run `cf continue-deployment %s` to promote the canary deployment, or `cf cancel-deployment %s` to rollback to the previous version.",
-				summary.Application.Name, summary.Application.Name))
-		}
-		return sb.String()
+			summary.Deployment.StatusReason)
 	}
 }