Fix rollback that was not setting the correct values on the deployment

Signed-off-by: João Pereira <joao.pereira@broadcom.com>

Author: joaopapereira

command/v7/shared/app_stager.go

@@ -122,16 +122,17 @@ func (stager *Stager) StartApp(app resources.Application, space configv3.Space,
 			Strategy:      opts.Strategy,
 			Relationships: resources.Relationships{constant.RelationshipTypeApplication: resources.Relationship{GUID: app.GUID}},
 		}
+
+		if opts.Strategy == constant.DeploymentStrategyCanary && len(opts.CanarySteps) > 0 {
+			dep.Options = resources.DeploymentOpts{CanaryDeploymentOptions: resources.CanaryDeploymentOptions{Steps: opts.CanarySteps}}
+		}
 		switch opts.AppAction {
 		case constant.ApplicationRollingBack:
 			dep.RevisionGUID = resourceGuid
 			dep.Options.MaxInFlight = opts.MaxInFlight
 			deploymentGUID, warnings, err = stager.Actor.CreateDeployment(dep)
 		default:
 			dep.DropletGUID = resourceGuid
-			if opts.Strategy == constant.DeploymentStrategyCanary && len(opts.CanarySteps) > 0 {
-				dep.Options = resources.DeploymentOpts{CanaryDeploymentOptions: resources.CanaryDeploymentOptions{Steps: opts.CanarySteps}}
-			}
 			dep.Options.MaxInFlight = opts.MaxInFlight
 			deploymentGUID, warnings, err = stager.Actor.CreateDeployment(dep)
 		}

command/v7/shared/app_stager_test.go

@@ -539,6 +539,24 @@ var _ = Describe("app stager", func() {
 				})
 			})
 
+			When("the app action is rollback", func() {
+				BeforeEach(func() {
+					appAction = constant.ApplicationRollingBack
+					strategy = constant.DeploymentStrategyCanary
+					canaryWeightSteps = []resources.CanaryStep{{InstanceWeight: 1}, {InstanceWeight: 2}}
+					app = resources.Application{GUID: "app-guid", Name: "app-name", State: constant.ApplicationStarted}
+				})
+
+				It("displays output for each step of starting", func() {
+					Expect(executeErr).To(BeNil())
+
+					Expect(fakeActor.CreateDeploymentCallCount()).To(Equal(1))
+					deployment := fakeActor.CreateDeploymentArgsForCall(0)
+					Expect(deployment.Strategy).To(Equal(constant.DeploymentStrategyCanary))
+					Expect(deployment.Options.CanaryDeploymentOptions.Steps).To(Equal(canaryWeightSteps))
+				})
+			})
+
 			When("the app action is restarting", func() {
 				It("displays output for each step of restarting", func() {
 					Expect(executeErr).To(BeNil())