cf push to use deployment scale options for rolling and canary deployments (cloudfoundry#3535)

Author: prkalle

actor/v7pushaction/actor.go

@@ -14,12 +14,12 @@ type Actor struct {
 	SharedActor SharedActor
 	V7Actor     V7Actor
 
-	PreparePushPlanSequence   []UpdatePushPlanFunc
-	ChangeApplicationSequence func(plan PushPlan) []ChangeApplicationFunc
-	TransformManifestSequence []HandleFlagOverrideFunc
-
-	startWithProtocol *regexp.Regexp
-	urlValidator      *regexp.Regexp
+	PreparePushPlanSequence                []UpdatePushPlanFunc
+	ChangeApplicationSequence              func(plan PushPlan) []ChangeApplicationFunc
+	TransformManifestSequence              []HandleFlagOverrideFunc
+	TransformManifestSequenceForDeployment []HandleFlagOverrideFunc
+	startWithProtocol                      *regexp.Regexp
+	urlValidator                           *regexp.Regexp
 }
 
 const ProtocolRegexp = "^https?://|^tcp://"
@@ -69,7 +69,12 @@ func NewActor(v3Actor V7Actor, sharedActor SharedActor) *Actor {
 		HandleAppPathOverride,
 		HandleDropletPathOverride,
 	}
-
+	actor.TransformManifestSequenceForDeployment = []HandleFlagOverrideFunc{
+		HandleInstancesOverrideForDeployment,
+		HandleMemoryOverrideForDeployment,
+		HandleDiskOverrideForDeployment,
+		HandleLogRateLimitOverrideForDeployment,
+	}
 	actor.PreparePushPlanSequence = []UpdatePushPlanFunc{
 		SetDefaultBitsPathForPushPlan,
 		SetupDropletPathForPushPlan,

actor/v7pushaction/actor_test.go

@@ -29,4 +29,15 @@ var _ = Describe("Actor", func() {
 			))
 		})
 	})
+
+	Describe("TransformManifestSequenceForDeployment", func() {
+		It("is a list of functions for preparing the push plan", func() {
+			Expect(actor.TransformManifestSequenceForDeployment).To(matchers.MatchFuncsByName(
+				HandleInstancesOverrideForDeployment,
+				HandleMemoryOverrideForDeployment,
+				HandleDiskOverrideForDeployment,
+				HandleLogRateLimitOverrideForDeployment,
+			))
+		})
+	})
 })

actor/v7pushaction/create_deployment_for_push_plan.go

@@ -25,6 +25,11 @@ func (actor Actor) CreateDeploymentForApplication(pushPlan PushPlan, eventStream
 		}
 	}
 
+	dep.Options.Instances = pushPlan.Instances
+	dep.Options.MemoryInMB = pushPlan.MemoryInMB
+	dep.Options.DiskInMB = pushPlan.DiskInMB
+	dep.Options.LogRateLimitInBPS = pushPlan.LogRateLimitInBPS
+
 	deploymentGUID, warnings, err := actor.V7Actor.CreateDeployment(dep)
 
 	if err != nil {

actor/v7pushaction/create_deployment_for_push_plan_test.go

@@ -8,6 +8,7 @@ import (
 	"code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes"
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
 	"code.cloudfoundry.org/cli/resources"
+	"code.cloudfoundry.org/cli/types"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -122,6 +123,10 @@ var _ = Describe("CreateDeploymentForApplication()", func() {
 				)
 				paramPlan.Strategy = "rolling"
 				paramPlan.MaxInFlight = 10
+				paramPlan.Instances = types.NullInt{IsSet: true, Value: 3}
+				paramPlan.MemoryInMB = types.NullUint64{IsSet: true, Value: 10}
+				paramPlan.DiskInMB = types.NullUint64{IsSet: true, Value: 20}
+				paramPlan.LogRateLimitInBPS = types.NullInt{IsSet: true, Value: 30}
 			})
 
 			It("waits for the app to start", func() {
@@ -135,7 +140,12 @@ var _ = Describe("CreateDeploymentForApplication()", func() {
 				dep := fakeV7Actor.CreateDeploymentArgsForCall(0)
 				Expect(dep).To(Equal(resources.Deployment{
 					Strategy: "rolling",
-					Options:  resources.DeploymentOpts{MaxInFlight: 10},
+					Options: resources.DeploymentOpts{MaxInFlight: 10,
+						Instances:         types.NullInt{IsSet: true, Value: 3},
+						MemoryInMB:        types.NullUint64{IsSet: true, Value: 10},
+						DiskInMB:          types.NullUint64{IsSet: true, Value: 20},
+						LogRateLimitInBPS: types.NullInt{IsSet: true, Value: 30},
+					},
 					Relationships: resources.Relationships{
 						constant.RelationshipTypeApplication: resources.Relationship{GUID: "some-app-guid"},
 					},

actor/v7pushaction/handle_deployment_scale_flag_overrides.go

@@ -0,0 +1,22 @@
+package v7pushaction
+
+import (
+	"code.cloudfoundry.org/cli/util/manifestparser"
+)
+
+func (actor Actor) HandleDeploymentScaleFlagOverrides(
+	baseManifest manifestparser.Manifest,
+	flagOverrides FlagOverrides,
+) (manifestparser.Manifest, error) {
+	newManifest := baseManifest
+
+	for _, transformPlan := range actor.TransformManifestSequenceForDeployment {
+		var err error
+		newManifest, err = transformPlan(newManifest, flagOverrides)
+		if err != nil {
+			return manifestparser.Manifest{}, err
+		}
+	}
+
+	return newManifest, nil
+}

actor/v7pushaction/handle_deployment_scale_flag_overrides_test.go

@@ -0,0 +1,46 @@
+package v7pushaction_test
+
+import (
+	. "code.cloudfoundry.org/cli/actor/v7pushaction"
+	"code.cloudfoundry.org/cli/util/manifestparser"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("HandleDeploymentScaleFlagOverrides", func() {
+	var (
+		pushActor           *Actor
+		baseManifest        manifestparser.Manifest
+		flagOverrides       FlagOverrides
+		transformedManifest manifestparser.Manifest
+		executeErr          error
+
+		testFuncCallCount int
+	)
+
+	testTransformManifestFunc := func(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) {
+		testFuncCallCount += 1
+		return manifest, nil
+	}
+
+	BeforeEach(func() {
+		baseManifest = manifestparser.Manifest{}
+		flagOverrides = FlagOverrides{}
+		testFuncCallCount = 0
+
+		pushActor, _, _ = getTestPushActor()
+		pushActor.TransformManifestSequenceForDeployment = []HandleFlagOverrideFunc{
+			testTransformManifestFunc,
+		}
+	})
+
+	JustBeforeEach(func() {
+		transformedManifest, executeErr = pushActor.HandleDeploymentScaleFlagOverrides(baseManifest, flagOverrides)
+	})
+
+	It("calls each transform-manifest-for-deployment function", func() {
+		Expect(testFuncCallCount).To(Equal(1))
+		Expect(executeErr).NotTo(HaveOccurred())
+		Expect(transformedManifest).To(Equal(baseManifest))
+	})
+})

actor/v7pushaction/handle_disk_override.go

@@ -1,11 +1,38 @@
 package v7pushaction
 
 import (
+	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
 	"code.cloudfoundry.org/cli/command/translatableerror"
 	"code.cloudfoundry.org/cli/util/manifestparser"
 )
 
 func HandleDiskOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) {
+	if overrides.Strategy != "" {
+		return manifest, nil
+	}
+
+	if overrides.Disk != "" {
+		if manifest.ContainsMultipleApps() {
+			return manifest, translatableerror.CommandLineArgsWithMultipleAppsError{}
+		}
+
+		webProcess := manifest.GetFirstAppWebProcess()
+		if webProcess != nil {
+			webProcess.DiskQuota = overrides.Disk
+		} else {
+			app := manifest.GetFirstApp()
+			app.DiskQuota = overrides.Disk
+		}
+	}
+
+	return manifest, nil
+}
+
+func HandleDiskOverrideForDeployment(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) {
+	if overrides.Strategy != constant.DeploymentStrategyRolling && overrides.Strategy != constant.DeploymentStrategyCanary {
+		return manifest, nil
+	}
+
 	if overrides.Disk != "" {
 		if manifest.ContainsMultipleApps() {
 			return manifest, translatableerror.CommandLineArgsWithMultipleAppsError{}