Canary Deployment Changes

actor/v7action/application.go

@@ -298,9 +298,9 @@ func (actor Actor) PollStart(app resources.Application, noWait bool, handleInsta
 	}
 }
 
-// PollStartForRolling polls a deploying application's processes until some are started. It does the same thing as PollStart, except it accounts for rolling deployments and whether
+// PollStartForDeployment polls a deploying application's processes until some are started. It does the same thing as PollStart, except it accounts for rolling/canary deployments and whether
 // they have failed or been canceled during polling.
-func (actor Actor) PollStartForRolling(app resources.Application, deploymentGUID string, noWait bool, handleInstanceDetails func(string)) (Warnings, error) {
+func (actor Actor) PollStartForDeployment(app resources.Application, deploymentGUID string, noWait bool, handleInstanceDetails func(string)) (Warnings, error) {
 	var (
 		deployment  resources.Deployment
 		processes   []resources.Process
@@ -321,7 +321,7 @@ func (actor Actor) PollStartForRolling(app resources.Application, deploymentGUID
 			}
 			return allWarnings, actionerror.StartupTimeoutError{Name: app.Name}
 		case <-timer.C():
-			if !isDeployed(deployment) {
+			if !isDeployProcessed(deployment) {
 				ccDeployment, warnings, err := actor.getDeployment(deploymentGUID)
 				allWarnings = append(allWarnings, warnings...)
 				if err != nil {
@@ -335,7 +335,7 @@ func (actor Actor) PollStartForRolling(app resources.Application, deploymentGUID
 				}
 			}
 
-			if noWait || isDeployed(deployment) {
+			if noWait || isDeployProcessed(deployment) {
 				stopPolling, warnings, err := actor.PollProcesses(processes, handleInstanceDetails)
 				allWarnings = append(allWarnings, warnings...)
 				if stopPolling || err != nil {
@@ -348,7 +348,12 @@ func (actor Actor) PollStartForRolling(app resources.Application, deploymentGUID
 	}
 }
 
-func isDeployed(d resources.Deployment) bool {
+func isDeployProcessed(d resources.Deployment) bool {
+	if d.Strategy == constant.DeploymentStrategyCanary {
+		return d.StatusValue == constant.DeploymentStatusValueActive && d.StatusReason == constant.DeploymentStatusReasonPaused ||
+			d.StatusValue == constant.DeploymentStatusValueFinalized && d.StatusReason == constant.DeploymentStatusReasonDeployed
+	}
+
 	return d.StatusValue == constant.DeploymentStatusValueFinalized && d.StatusReason == constant.DeploymentStatusReasonDeployed
 }
 
@@ -439,7 +444,7 @@ func (actor Actor) getProcesses(deployment resources.Deployment, appGUID string,
 
 	// if the deployment is deployed we know web are all running and PollProcesses will see those as stable
 	// so just getting all processes is equivalent to just getting non-web ones and polling those
-	if isDeployed(deployment) {
+	if isDeployProcessed(deployment) {
 		processes, warnings, err := actor.CloudControllerClient.GetApplicationProcesses(appGUID)
 		if err != nil {
 			return processes, Warnings(warnings), err

actor/v7action/application_summary_test.go

@@ -628,6 +628,33 @@ var _ = Describe("Application Summary Actions", func() {
 									})
 								})
 							})
+
+							When("the deployment strategy is canary", func() {
+								When("the deployment is paused", func() {
+									BeforeEach(func() {
+										fakeCloudControllerClient.GetDeploymentsReturns(
+											[]resources.Deployment{
+												{
+													GUID:         "some-deployment-guid",
+													Strategy:     "canary",
+													StatusValue:  "ACTIVE",
+													StatusReason: "PAUSED",
+												},
+											},
+											nil,
+											nil,
+										)
+									})
+									It("returns the deployment information", func() {
+										Expect(summary.Deployment).To(Equal(resources.Deployment{
+											GUID:         "some-deployment-guid",
+											Strategy:     "canary",
+											StatusValue:  "ACTIVE",
+											StatusReason: "PAUSED",
+										}))
+									})
+								})
+							})
 						})
 
 						When("the deployment is not active", func() {