Merge branch 'v8' into dependabot/go_modules/v8/dependencies-22afe3916f

Samze · web-flow · commit 161d9df39813 · 2025-03-20T09:36:10.000-06:00
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -5,7 +5,6 @@ on:
     tags:
       - "v9.*"
       - "v8.*"
-      - "v7.*"
   pull_request:
     types:
       - opened
@@ -15,7 +14,6 @@ on:
       - main
       - v9
       - v8
-      - v7
     paths-ignore:
       - "doc/**"
       - ".gitpod.yml"
diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml
@@ -56,12 +56,10 @@ on:
   push:
     tags:
       - "v8.*"
-      - "v7.*"
   pull_request_target:
     branches:
       - main
       - v8
-      - v7
     paths-ignore:
       - "doc/**"
       - ".gitpod.yml"
diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
@@ -13,13 +13,11 @@ on:
     tags:
       - "v9.*"
       - "v8.*"
-      - "v7.*"
   pull_request:
     branches:
       - main
       - v9
       - v8
-      - v7
     paths-ignore:
       - "doc/**"
       - ".gitpod.yml"
diff --git a/.github/workflows/util-code-quality.yml b/.github/workflows/util-code-quality.yml
@@ -6,7 +6,6 @@ on:
     branches:
       - main
       - v8
-      - v7
   schedule:
     - cron: '45 5 * * *'
 
diff --git a/actor/v7action/deployment.go b/actor/v7action/deployment.go
@@ -29,7 +29,7 @@ func (actor Actor) GetLatestActiveDeploymentForApp(appGUID string) (resources.De
 		return resources.Deployment{}, Warnings(warnings), actionerror.ActiveDeploymentNotFoundError{}
 	}
 
-	return resources.Deployment(ccDeployments[0]), Warnings(warnings), nil
+	return ccDeployments[0], Warnings(warnings), nil
 }
 
 func (actor Actor) CancelDeployment(deploymentGUID string) (Warnings, error) {
diff --git a/api/cloudcontroller/ccv3/application_test.go b/api/cloudcontroller/ccv3/application_test.go
@@ -217,7 +217,6 @@ var _ = Describe("Application", func() {
 			})
 
 			When("lifecycle type buildpack is provided", func() {
-
 				When("other buildpacks are provided", func() {
 					BeforeEach(func() {
 						appBytes = []byte(`{"lifecycle":{"data":{"buildpacks":["some-buildpack"]},"type":"buildpack"}}`)
diff --git a/api/cloudcontroller/ccv3/deployment_test.go b/api/cloudcontroller/ccv3/deployment_test.go
@@ -339,7 +339,13 @@ var _ = Describe("Deployment", func() {
 					"strategy": "canary",
 					"status": {
 						"value": "FINALIZED",
-						"reason": "SUPERSEDED"
+						"reason": "SUPERSEDED",
+						"canary": {
+							"steps": {
+								"current": 4,
+								"total": 5
+							}
+   						}
 					},
 					"droplet": {
  					  "guid": "some-droplet-guid"
@@ -374,6 +380,8 @@ var _ = Describe("Deployment", func() {
 				Expect(deployment.StatusValue).To(Equal(constant.DeploymentStatusValueFinalized))
 				Expect(deployment.StatusReason).To(Equal(constant.DeploymentStatusReasonSuperseded))
 				Expect(deployment.Strategy).To(Equal(constant.DeploymentStrategyCanary))
+				Expect(deployment.CanaryStatus.Steps.CurrentStep).To(Equal(4))
+				Expect(deployment.CanaryStatus.Steps.TotalSteps).To(Equal(5))
 			})
 		})
 
diff --git a/command/v7/push_command.go b/command/v7/push_command.go
@@ -579,7 +579,7 @@ func (cmd PushCommand) ValidateFlags() error {
 	case cmd.Strategy.Name != constant.DeploymentStrategyDefault && cmd.MaxInFlight != nil && *cmd.MaxInFlight < 1:
 		return translatableerror.IncorrectUsageError{Message: "--max-in-flight must be greater than or equal to 1"}
 	case len(cmd.InstanceSteps) > 0 && cmd.Strategy.Name != constant.DeploymentStrategyCanary:
-		return translatableerror.ArgumentCombinationError{Args: []string{"--instance-steps", "--strategy=canary"}}
+		return translatableerror.ArgumentCombinationError{Args: []string{"--instance-steps", "--strategy=rolling or --strategy not provided"}}
 	case len(cmd.InstanceSteps) > 0 && !cmd.validateInstanceSteps():
 		return translatableerror.ParseArgumentError{ArgumentName: "--instance-steps", ExpectedType: "list of weights"}
 	}
diff --git a/command/v7/push_command_test.go b/command/v7/push_command_test.go
@@ -1438,7 +1438,7 @@ var _ = Describe("push Command", func() {
 			},
 			translatableerror.ArgumentCombinationError{
 				Args: []string{
-					"--instance-steps", "--strategy=canary",
+					"--instance-steps", "--strategy=rolling or --strategy not provided",
 				}}),
 	)
 })
diff --git a/command/v7/shared/app_summary_displayer.go b/command/v7/shared/app_summary_displayer.go
@@ -161,10 +161,17 @@ func (display AppSummaryDisplayer) displayProcessTable(summary v7action.Detailed
 		if maxInFlight > 0 {
 			maxInFlightRow = append(maxInFlightRow, display.UI.TranslateText("max-in-flight:"), strconv.Itoa(maxInFlight))
 		}
+		var canaryStepsRow []string
+		if summary.Deployment.CanaryStatus.Steps.TotalSteps > 0 {
+			stepStatus := summary.Deployment.CanaryStatus.Steps
+			canaryStepsRow = []string{display.UI.TranslateText("canary-steps:"), fmt.Sprintf("%d/%d", stepStatus.CurrentStep, stepStatus.TotalSteps)}
+
+		}
 
 		keyValueTable := [][]string{
 			{display.UI.TranslateText("strategy:"), strings.ToLower(string(summary.Deployment.Strategy))},
 			maxInFlightRow,
+			canaryStepsRow,
 		}
 
 		display.UI.DisplayKeyValueTable("", keyValueTable, ui.DefaultTableSpacePadding)
diff --git a/command/v7/shared/app_summary_displayer_test.go b/command/v7/shared/app_summary_displayer_test.go
@@ -848,9 +848,15 @@ var _ = Describe("app summary displayer", func() {
 						BeforeEach(func() {
 							summary = v7action.DetailedApplicationSummary{
 								Deployment: resources.Deployment{
-									Strategy:         constant.DeploymentStrategyCanary,
-									StatusValue:      constant.DeploymentStatusValueActive,
-									StatusReason:     constant.DeploymentStatusReasonDeploying,
+									Strategy:     constant.DeploymentStrategyCanary,
+									StatusValue:  constant.DeploymentStatusValueActive,
+									StatusReason: constant.DeploymentStatusReasonDeploying,
+									CanaryStatus: resources.CanaryStatus{
+										Steps: resources.CanaryStepStatus{
+											CurrentStep: 2,
+											TotalSteps:  5,
+										},
+									},
 									LastStatusChange: LastStatusChangeTimeString,
 									Options: resources.DeploymentOpts{
 										MaxInFlight: 2,
@@ -868,15 +874,25 @@ var _ = Describe("app summary displayer", func() {
 						It("displays max-in-flight value", func() {
 							Expect(testUI.Out).To(Say(`max-in-flight:   2`))
 						})
+
+						It("displays the step the deployment is currently in", func() {
+							Expect(testUI.Out).To(Say(`canary-steps:    2/5`))
+						})
 					})
 
 					When("max-in-flight value is default", func() {
 						BeforeEach(func() {
 							summary = v7action.DetailedApplicationSummary{
 								Deployment: resources.Deployment{
-									Strategy:         constant.DeploymentStrategyCanary,
-									StatusValue:      constant.DeploymentStatusValueActive,
-									StatusReason:     constant.DeploymentStatusReasonDeploying,
+									Strategy:     constant.DeploymentStrategyCanary,
+									StatusValue:  constant.DeploymentStatusValueActive,
+									StatusReason: constant.DeploymentStatusReasonDeploying,
+									CanaryStatus: resources.CanaryStatus{
+										Steps: resources.CanaryStepStatus{
+											CurrentStep: 2,
+											TotalSteps:  5,
+										},
+									},
 									LastStatusChange: LastStatusChangeTimeString,
 									Options: resources.DeploymentOpts{
 										MaxInFlight: maxInFlightDefaultValue,
@@ -904,9 +920,15 @@ var _ = Describe("app summary displayer", func() {
 									},
 								},
 								Deployment: resources.Deployment{
-									Strategy:         constant.DeploymentStrategyCanary,
-									StatusValue:      constant.DeploymentStatusValueActive,
-									StatusReason:     constant.DeploymentStatusReasonPaused,
+									Strategy:     constant.DeploymentStrategyCanary,
+									StatusValue:  constant.DeploymentStatusValueActive,
+									StatusReason: constant.DeploymentStatusReasonPaused,
+									CanaryStatus: resources.CanaryStatus{
+										Steps: resources.CanaryStepStatus{
+											CurrentStep: 2,
+											TotalSteps:  5,
+										},
+									},
 									LastStatusChange: LastStatusChangeTimeString,
 									Options: resources.DeploymentOpts{
 										MaxInFlight: 2,
@@ -935,9 +957,15 @@ var _ = Describe("app summary displayer", func() {
 									},
 								},
 								Deployment: resources.Deployment{
-									Strategy:         constant.DeploymentStrategyCanary,
-									StatusValue:      constant.DeploymentStatusValueActive,
-									StatusReason:     constant.DeploymentStatusReasonPaused,
+									Strategy:     constant.DeploymentStrategyCanary,
+									StatusValue:  constant.DeploymentStatusValueActive,
+									StatusReason: constant.DeploymentStatusReasonPaused,
+									CanaryStatus: resources.CanaryStatus{
+										Steps: resources.CanaryStepStatus{
+											CurrentStep: 2,
+											TotalSteps:  5,
+										},
+									},
 									LastStatusChange: LastStatusChangeTimeString,
 									Options: resources.DeploymentOpts{
 										MaxInFlight: maxInFlightDefaultValue,
@@ -960,9 +988,15 @@ var _ = Describe("app summary displayer", func() {
 						BeforeEach(func() {
 							summary = v7action.DetailedApplicationSummary{
 								Deployment: resources.Deployment{
-									Strategy:         constant.DeploymentStrategyCanary,
-									StatusValue:      constant.DeploymentStatusValueActive,
-									StatusReason:     constant.DeploymentStatusReasonCanceling,
+									Strategy:     constant.DeploymentStrategyCanary,
+									StatusValue:  constant.DeploymentStatusValueActive,
+									StatusReason: constant.DeploymentStatusReasonCanceling,
+									CanaryStatus: resources.CanaryStatus{
+										Steps: resources.CanaryStepStatus{
+											CurrentStep: 2,
+											TotalSteps:  5,
+										},
+									},
 									LastStatusChange: LastStatusChangeTimeString,
 									Options: resources.DeploymentOpts{
 										MaxInFlight: 2,
diff --git a/integration/v7/isolated/app_command_test.go b/integration/v7/isolated/app_command_test.go
@@ -286,6 +286,7 @@ applications:
 							session1 := helpers.CF("app", appName)
 							Eventually(session1).Should(Say("Active deployment with status PAUSED"))
 							Eventually(session1).Should(Say("strategy:        canary"))
+							Expect(session1).To(Say("canary-steps:    1/1"))
 							Eventually(session1).Should(Exit(0))
 						})
 					})
diff --git a/integration/v7/isolated/continue_deployment_test.go b/integration/v7/isolated/continue_deployment_test.go
@@ -89,15 +89,31 @@ var _ = Describe("Continue Deployment", func() {
 
 		Context("when the continue is successful", func() {
 			When("There is a canary deployment", func() {
-				It("succeeds", func() {
-					helpers.WithHelloWorldApp(func(appDir string) {
-						helpers.CF("push", appName, "-p", appDir, "--strategy=canary").Wait()
+				When("instance steps are provided", func() {
+					It("displays the number of steps", func() {
+						helpers.WithHelloWorldApp(func(appDir string) {
+							helpers.CF("push", appName, "-p", appDir, "--strategy=canary", "--instance-steps", "10,20,30,70", "-i", "5").Wait()
+						})
+
+						session := helpers.CF("app", appName)
+						Eventually(session).Should(Say("canary-steps:    1/4"))
+						session = helpers.CF("continue-deployment", appName)
+						Eventually(session).Should(Say("canary-steps:    2/4"))
+						Eventually(session).Should(Exit(0))
 					})
+				})
+
+				When("instance steps are NOT provided", func() {
+					It("succeeds", func() {
+						helpers.WithHelloWorldApp(func(appDir string) {
+							helpers.CF("push", appName, "-p", appDir, "--strategy=canary").Wait()
+						})
 
-					session := helpers.CF("continue-deployment", appName)
-					Eventually(session).Should(Say(fmt.Sprintf("Continuing deployment for app %s in org %s / space %s as %s...", appName, orgName, spaceName, userName)))
-					Eventually(session).Should(Say(fmt.Sprintf(`TIP: Run 'cf app %s' to view app status.`, appName)))
-					Eventually(session).Should(Exit(0))
+						session := helpers.CF("continue-deployment", appName)
+						Eventually(session).Should(Say(fmt.Sprintf("Continuing deployment for app %s in org %s / space %s as %s...", appName, orgName, spaceName, userName)))
+						Eventually(session).Should(Say(fmt.Sprintf(`TIP: Run 'cf app %s' to view app status.`, appName)))
+						Eventually(session).Should(Exit(0))
+					})
 				})
 			})
 		})
diff --git a/integration/v7/push/canary_push_test.go b/integration/v7/push/canary_push_test.go
@@ -34,7 +34,7 @@ var _ = Describe("push with --strategy canary", func() {
 			It("pushes the app and creates a new deployment and notes the max-in-flight value", func() {
 				helpers.WithHelloWorldApp(func(appDir string) {
 					session := helpers.CustomCF(helpers.CFEnv{WorkingDirectory: appDir},
-						PushCommandName, appName, "--strategy", "canary",
+						PushCommandName, appName, "--strategy", "canary", "--instance-steps=10,60",
 					)
 
 					Eventually(session).Should(Exit(0))
@@ -55,6 +55,7 @@ var _ = Describe("push with --strategy canary", func() {
 					Expect(session).To(Say("Active deployment with status PAUSED"))
 					Expect(session).To(Say("strategy:        canary"))
 					Expect(session).To(Say("max-in-flight:   1"))
+					Expect(session).To(Say("canary-steps:    1/2"))
 					Expect(session).To(Say("Please run `cf continue-deployment %s` to promote the canary deployment, or `cf cancel-deployment %s` to rollback to the previous version.", appName, appName))
 					Expect(session).To(Exit(0))
 				})
@@ -86,6 +87,7 @@ var _ = Describe("push with --strategy canary", func() {
 					Expect(session).To(Say("Active deployment with status PAUSED"))
 					Expect(session).To(Say("strategy:        canary"))
 					Expect(session).To(Say("max-in-flight:   2"))
+					Expect(session).To(Say("canary-steps:    1/1"))
 					Expect(session).To(Say("Please run `cf continue-deployment %s` to promote the canary deployment, or `cf cancel-deployment %s` to rollback to the previous version.", appName, appName))
 					Expect(session).To(Exit(0))
 				})
diff --git a/resources/deployment_resource.go b/resources/deployment_resource.go
@@ -12,6 +12,7 @@ type Deployment struct {
 	State            constant.DeploymentState
 	StatusValue      constant.DeploymentStatusValue
 	StatusReason     constant.DeploymentStatusReason
+	CanaryStatus     CanaryStatus
 	LastStatusChange string
 	Options          DeploymentOpts
 	RevisionGUID     string
@@ -78,6 +79,15 @@ func (d Deployment) MarshalJSON() ([]byte, error) {
 	return json.Marshal(ccDeployment)
 }
 
+type CanaryStepStatus struct {
+	CurrentStep int `json:"current"`
+	TotalSteps  int `json:"total"`
+}
+
+type CanaryStatus struct {
+	Steps CanaryStepStatus `json:"steps"`
+}
+
 // UnmarshalJSON helps unmarshal a Cloud Controller Deployment response.
 func (d *Deployment) UnmarshalJSON(data []byte) error {
 	var ccDeployment struct {
@@ -89,8 +99,9 @@ func (d *Deployment) UnmarshalJSON(data []byte) error {
 			Details struct {
 				LastStatusChange string `json:"last_status_change"`
 			}
-			Value  constant.DeploymentStatusValue  `json:"value"`
-			Reason constant.DeploymentStatusReason `json:"reason"`
+			Value        constant.DeploymentStatusValue  `json:"value"`
+			Reason       constant.DeploymentStatusReason `json:"reason"`
+			CanaryStatus CanaryStatus                    `json:"canary,omitempty"`
 		} `json:"status"`
 		Droplet      Droplet                     `json:"droplet,omitempty"`
 		NewProcesses []Process                   `json:"new_processes,omitempty"`
@@ -109,6 +120,7 @@ func (d *Deployment) UnmarshalJSON(data []byte) error {
 	d.State = ccDeployment.State
 	d.StatusValue = ccDeployment.Status.Value
 	d.StatusReason = ccDeployment.Status.Reason
+	d.CanaryStatus = ccDeployment.Status.CanaryStatus
 	d.LastStatusChange = ccDeployment.Status.Details.LastStatusChange
 	d.DropletGUID = ccDeployment.Droplet.GUID
 	d.NewProcesses = ccDeployment.NewProcesses

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func (actor Actor) GetLatestActiveDeploymentForApp(appGUID string) (resources.De`
`29`	`29`	`return resources.Deployment{}, Warnings(warnings), actionerror.ActiveDeploymentNotFoundError{}`
`30`	`30`	`}`
`31`	`31`
`32`		`- return resources.Deployment(ccDeployments[0]), Warnings(warnings), nil`
	`32`	`+ return ccDeployments[0], Warnings(warnings), nil`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (actor Actor) CancelDeployment(deploymentGUID string) (Warnings, error) {`
Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ func (cmd PushCommand) ValidateFlags() error {`
`579`	`579`	`case cmd.Strategy.Name != constant.DeploymentStrategyDefault && cmd.MaxInFlight != nil && *cmd.MaxInFlight < 1:`
`580`	`580`	`return translatableerror.IncorrectUsageError{Message: "--max-in-flight must be greater than or equal to 1"}`
`581`	`581`	`case len(cmd.InstanceSteps) > 0 && cmd.Strategy.Name != constant.DeploymentStrategyCanary:`
`582`		`- return translatableerror.ArgumentCombinationError{Args: []string{"--instance-steps", "--strategy=canary"}}`
	`582`	`+ return translatableerror.ArgumentCombinationError{Args: []string{"--instance-steps", "--strategy=rolling or --strategy not provided"}}`
`583`	`583`	`case len(cmd.InstanceSteps) > 0 && !cmd.validateInstanceSteps():`
`584`	`584`	`return translatableerror.ParseArgumentError{ArgumentName: "--instance-steps", ExpectedType: "list of weights"}`
`585`	`585`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1438,7 +1438,7 @@ var _ = Describe("push Command", func() {`
`1438`	`1438`	`},`
`1439`	`1439`	`translatableerror.ArgumentCombinationError{`
`1440`	`1440`	`Args: []string{`
`1441`		`- "--instance-steps", "--strategy=canary",`
	`1441`	`+ "--instance-steps", "--strategy=rolling or --strategy not provided",`
`1442`	`1442`	`}}),`
`1443`	`1443`	`)`
`1444`	`1444`	`})`