Push and scale app log rate limit

actor/v7action/space_quota.go

@@ -31,6 +31,7 @@ func (actor Actor) CreateSpaceQuota(spaceQuotaName string, orgGuid string, limit
 				TotalMemory:       limits.TotalMemoryInMB,
 				InstanceMemory:    limits.PerProcessMemoryInMB,
 				TotalAppInstances: limits.TotalInstances,
+				TotalLogVolume:    limits.TotalLogVolume,
 			},
 			Services: resources.ServiceLimit{
 				TotalServiceInstances: limits.TotalServiceInstances,
@@ -137,6 +138,7 @@ func (actor Actor) UpdateSpaceQuota(currentName, orgGUID, newName string, limits
 				TotalMemory:       limits.TotalMemoryInMB,
 				InstanceMemory:    limits.PerProcessMemoryInMB,
 				TotalAppInstances: limits.TotalInstances,
+				TotalLogVolume:    limits.TotalLogVolume,
 			},
 			Services: resources.ServiceLimit{
 				TotalServiceInstances: limits.TotalServiceInstances,

actor/v7action/space_quota_test.go

@@ -151,6 +151,7 @@ var _ = Describe("Space Quota Actions", func() {
 					TotalServiceInstances: &types.NullInt{IsSet: true, Value: 6},
 					TotalRoutes:           &types.NullInt{IsSet: true, Value: 8},
 					TotalReservedPorts:    &types.NullInt{IsSet: true, Value: 9},
+					TotalLogVolume:        &types.NullInt{IsSet: true, Value: 10},
 				}
 			})
 
@@ -167,6 +168,7 @@ var _ = Describe("Space Quota Actions", func() {
 							TotalMemory:       &types.NullInt{IsSet: true, Value: 2},
 							InstanceMemory:    &types.NullInt{IsSet: true, Value: 3},
 							TotalAppInstances: &types.NullInt{IsSet: true, Value: 4},
+							TotalLogVolume:    &types.NullInt{IsSet: true, Value: 10},
 						},
 						Services: resources.ServiceLimit{
 							TotalServiceInstances: &types.NullInt{IsSet: true, Value: 6},
@@ -201,6 +203,7 @@ var _ = Describe("Space Quota Actions", func() {
 							TotalMemory:       &types.NullInt{Value: 0, IsSet: true},
 							InstanceMemory:    nil,
 							TotalAppInstances: nil,
+							TotalLogVolume:    nil,
 						},
 						Services: resources.ServiceLimit{
 							TotalServiceInstances: &types.NullInt{Value: 0, IsSet: true},
@@ -244,6 +247,7 @@ var _ = Describe("Space Quota Actions", func() {
 					TotalServiceInstances: &types.NullInt{Value: -1, IsSet: true},
 					TotalRoutes:           &types.NullInt{Value: -1, IsSet: true},
 					TotalReservedPorts:    &types.NullInt{Value: -1, IsSet: true},
+					TotalLogVolume:        &types.NullInt{Value: -1, IsSet: true},
 				}
 				ccv3Quota = resources.SpaceQuota{
 					Quota: resources.Quota{
@@ -252,6 +256,7 @@ var _ = Describe("Space Quota Actions", func() {
 							TotalMemory:       &types.NullInt{Value: 0, IsSet: false},
 							InstanceMemory:    &types.NullInt{Value: 0, IsSet: false},
 							TotalAppInstances: &types.NullInt{Value: 0, IsSet: false},
+							TotalLogVolume:    &types.NullInt{Value: 0, IsSet: false},
 						},
 						Services: resources.ServiceLimit{
 							TotalServiceInstances: &types.NullInt{Value: 0, IsSet: false},
@@ -607,6 +612,7 @@ var _ = Describe("Space Quota Actions", func() {
 				PaidServicesAllowed:   &trueValue,
 				TotalRoutes:           &types.NullInt{Value: 6, IsSet: true},
 				TotalReservedPorts:    &types.NullInt{Value: 5, IsSet: true},
+				TotalLogVolume:        &types.NullInt{Value: 512, IsSet: true},
 			}
 
 			fakeCloudControllerClient.GetSpaceQuotasReturns(
@@ -652,6 +658,7 @@ var _ = Describe("Space Quota Actions", func() {
 							TotalMemory:       nil,
 							InstanceMemory:    nil,
 							TotalAppInstances: nil,
+							TotalLogVolume:    nil,
 						},
 						Services: resources.ServiceLimit{
 							TotalServiceInstances: nil,
@@ -699,6 +706,7 @@ var _ = Describe("Space Quota Actions", func() {
 					TotalServiceInstances: &types.NullInt{Value: -1, IsSet: true},
 					TotalRoutes:           &types.NullInt{Value: -1, IsSet: true},
 					TotalReservedPorts:    &types.NullInt{Value: -1, IsSet: true},
+					TotalLogVolume:        &types.NullInt{Value: -1, IsSet: true},
 				}
 
 				ccv3Quota = resources.SpaceQuota{
@@ -708,6 +716,7 @@ var _ = Describe("Space Quota Actions", func() {
 							TotalMemory:       &types.NullInt{Value: 0, IsSet: false},
 							InstanceMemory:    &types.NullInt{Value: 0, IsSet: false},
 							TotalAppInstances: &types.NullInt{Value: 0, IsSet: false},
+							TotalLogVolume:    &types.NullInt{Value: 0, IsSet: false},
 						},
 						Services: resources.ServiceLimit{
 							TotalServiceInstances: &types.NullInt{Value: 0, IsSet: false},
@@ -754,6 +763,7 @@ var _ = Describe("Space Quota Actions", func() {
 							TotalMemory:       &types.NullInt{Value: 2048, IsSet: true},
 							InstanceMemory:    &types.NullInt{Value: 1024, IsSet: true},
 							TotalAppInstances: &types.NullInt{Value: 0, IsSet: false},
+							TotalLogVolume:    &types.NullInt{Value: 512, IsSet: true},
 						},
 						Services: resources.ServiceLimit{
 							TotalServiceInstances: &types.NullInt{Value: 0, IsSet: true},
@@ -802,6 +812,7 @@ var _ = Describe("Space Quota Actions", func() {
 							TotalMemory:       &types.NullInt{Value: 2048, IsSet: true},
 							InstanceMemory:    &types.NullInt{Value: 1024, IsSet: true},
 							TotalAppInstances: &types.NullInt{Value: 0, IsSet: false},
+							TotalLogVolume:    &types.NullInt{Value: 512, IsSet: true},
 						},
 						Services: resources.ServiceLimit{
 							TotalServiceInstances: &types.NullInt{Value: 0, IsSet: true},

actor/v7pushaction/actor.go

@@ -50,6 +50,7 @@ func NewActor(v3Actor V7Actor, sharedActor SharedActor) *Actor {
 		HandleHealthCheckTimeoutOverride,
 		HandleMemoryOverride,
 		HandleDiskOverride,
+		HandleLogRateLimitOverride,
 		HandleNoRouteOverride,
 		HandleRandomRouteOverride,
 		HandleTaskOverride,

actor/v7pushaction/handle_log_rate_limit_override.go

@@ -0,0 +1,24 @@
+package v7pushaction
+
+import (
+	"code.cloudfoundry.org/cli/command/translatableerror"
+	"code.cloudfoundry.org/cli/util/manifestparser"
+)
+
+func HandleLogRateLimitOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) {
+	if overrides.LogRateLimit != "" {
+		if manifest.ContainsMultipleApps() {
+			return manifest, translatableerror.CommandLineArgsWithMultipleAppsError{}
+		}
+
+		webProcess := manifest.GetFirstAppWebProcess()
+		if webProcess != nil {
+			webProcess.LogRateLimit = overrides.LogRateLimit
+		} else {
+			app := manifest.GetFirstApp()
+			app.LogRateLimit = overrides.LogRateLimit
+		}
+	}
+
+	return manifest, nil
+}

actor/v7pushaction/handle_log_rate_limit_override_test.go

@@ -0,0 +1,149 @@
+package v7pushaction_test
+
+import (
+	"code.cloudfoundry.org/cli/command/translatableerror"
+	"code.cloudfoundry.org/cli/util/manifestparser"
+
+	. "code.cloudfoundry.org/cli/actor/v7pushaction"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("HandleLogRateLimitOverride", func() {
+	var (
+		originalManifest    manifestparser.Manifest
+		transformedManifest manifestparser.Manifest
+		overrides           FlagOverrides
+		executeErr          error
+	)
+
+	BeforeEach(func() {
+		originalManifest = manifestparser.Manifest{}
+		overrides = FlagOverrides{}
+	})
+
+	JustBeforeEach(func() {
+		transformedManifest, executeErr = HandleLogRateLimitOverride(originalManifest, overrides)
+	})
+
+	When("log rate limit is not set on a flag override", func() {
+		BeforeEach(func() {
+			originalManifest.Applications = []manifestparser.Application{
+				{
+					Processes: []manifestparser.Process{
+						{Type: "web"},
+						{Type: "worker", LogRateLimit: "1B"},
+					},
+				},
+			}
+		})
+
+		It("does not change the manifest", func() {
+			Expect(executeErr).ToNot(HaveOccurred())
+			Expect(transformedManifest.Applications).To(ConsistOf(
+				manifestparser.Application{
+					Processes: []manifestparser.Process{
+						{Type: "web"},
+						{Type: "worker", LogRateLimit: "1B"},
+					},
+				},
+			))
+		})
+	})
+
+	When("manifest web process does not specify log rate limit", func() {
+		BeforeEach(func() {
+			overrides.LogRateLimit = "64K"
+
+			originalManifest.Applications = []manifestparser.Application{
+				{
+					Processes: []manifestparser.Process{
+						{Type: "web"},
+					},
+				},
+			}
+		})
+
+		It("changes the log rate limit of the web process in the manifest", func() {
+			Expect(executeErr).ToNot(HaveOccurred())
+			Expect(transformedManifest.Applications).To(ConsistOf(
+				manifestparser.Application{
+					Processes: []manifestparser.Process{
+						{Type: "web", LogRateLimit: "64K"},
+					},
+				},
+			))
+		})
+	})
+
+	When("manifest app has only non-web processes", func() {
+		BeforeEach(func() {
+			overrides.LogRateLimit = "32B"
+
+			originalManifest.Applications = []manifestparser.Application{
+				{
+					Processes: []manifestparser.Process{
+						{Type: "worker"},
+					},
+				},
+			}
+		})
+
+		It("changes the log rate limit of the app in the manifest", func() {
+			Expect(executeErr).ToNot(HaveOccurred())
+			Expect(transformedManifest.Applications).To(ConsistOf(
+				manifestparser.Application{
+					LogRateLimit: "32B",
+					Processes: []manifestparser.Process{
+						{Type: "worker"},
+					},
+				},
+			))
+		})
+	})
+
+	When("manifest app has web and non-web processes", func() {
+		BeforeEach(func() {
+			overrides.LogRateLimit = "4MB"
+
+			originalManifest.Applications = []manifestparser.Application{
+				{
+					Processes: []manifestparser.Process{
+						{Type: "worker"},
+						{Type: "web"},
+					},
+					LogRateLimit: "1GB",
+				},
+			}
+		})
+
+		It("changes the log rate limit of the web process in the manifest", func() {
+			Expect(executeErr).ToNot(HaveOccurred())
+			Expect(transformedManifest.Applications).To(ConsistOf(
+				manifestparser.Application{
+					Processes: []manifestparser.Process{
+						{Type: "worker"},
+						{Type: "web", LogRateLimit: "4MB"},
+					},
+					LogRateLimit: "1GB",
+				},
+			))
+		})
+	})
+
+	When("there are multiple apps in the manifest", func() {
+		BeforeEach(func() {
+			overrides.LogRateLimit = "64M"
+
+			originalManifest.Applications = []manifestparser.Application{
+				{},
+				{},
+			}
+		})
+
+		It("returns an error", func() {
+			Expect(executeErr).To(MatchError(translatableerror.CommandLineArgsWithMultipleAppsError{}))
+		})
+	})
+})

actor/v7pushaction/handle_memory_override.go

@@ -1,7 +1,6 @@
 package v7pushaction
 
 import (
-	//"code.cloudfoundry.org/cli/command/translatableerror"
 	"code.cloudfoundry.org/cli/command/translatableerror"
 	"code.cloudfoundry.org/cli/util/manifestparser"
 )

actor/v7pushaction/push_plan.go

@@ -59,6 +59,7 @@ type FlagOverrides struct {
 	Vars                []template.VarKV
 	NoManifest          bool
 	Task                bool
+	LogRateLimit        string
 }
 
 func (state PushPlan) String() string {

command/v7/create_space_quota_command.go

@@ -17,8 +17,10 @@ type CreateSpaceQuotaCommand struct {
 	TotalRoutes           flag.IntegerLimit           `short:"r" description:"Total number of routes. -1 represents an unlimited amount. (Default: 0)."`
 	TotalReservedPorts    flag.IntegerLimit           `long:"reserved-route-ports" description:"Maximum number of routes that may be created with ports. -1 represents an unlimited amount. (Default: 0)."`
 	TotalServiceInstances flag.IntegerLimit           `short:"s" description:"Total number of service instances. -1 represents an unlimited amount. (Default: 0)."`
-	usage                 interface{}                 `usage:"CF_NAME create-space-quota QUOTA [-m TOTAL_MEMORY] [-i INSTANCE_MEMORY] [-r ROUTES] [-s SERVICE_INSTANCES] [-a APP_INSTANCES] [--allow-paid-service-plans] [--reserved-route-ports RESERVED_ROUTE_PORTS]"`
-	relatedCommands       interface{}                 `related_commands:"create-space, space-quotas, set-space-quota"`
+	TotalLogVolume        flag.BytesWithUnlimited     `short:"l" description:"Total log volume per second all processes can have, in bytes (e.g. 128B, 4K, 1M). -1 represents an unlimited amount. (Default: -1)."`
+
+	usage           interface{} `usage:"CF_NAME create-space-quota QUOTA [-m TOTAL_MEMORY] [-i INSTANCE_MEMORY] [-r ROUTES] [-s SERVICE_INSTANCES] [-a APP_INSTANCES] [--allow-paid-service-plans] [--reserved-route-ports RESERVED_ROUTE_PORTS] [-l LOG_VOLUME]"`
+	relatedCommands interface{} `related_commands:"create-space, space-quotas, set-space-quota"`
 }
 
 func (cmd CreateSpaceQuotaCommand) Execute([]string) error {
@@ -49,6 +51,7 @@ func (cmd CreateSpaceQuotaCommand) Execute([]string) error {
 			TotalServiceInstances: convertIntegerLimitFlagToNullInt(cmd.TotalServiceInstances),
 			TotalRoutes:           convertIntegerLimitFlagToNullInt(cmd.TotalRoutes),
 			TotalReservedPorts:    convertIntegerLimitFlagToNullInt(cmd.TotalReservedPorts),
+			TotalLogVolume:        convertBytesFlagToNullInt(cmd.TotalLogVolume),
 		},
 	)
 

command/v7/create_space_quota_command_test.go

@@ -142,6 +142,7 @@ var _ = Describe("create-space-quota Command", func() {
 				cmd.TotalServiceInstances = flag.IntegerLimit{IsSet: true, Value: 9}
 				cmd.TotalRoutes = flag.IntegerLimit{IsSet: true, Value: 1}
 				cmd.TotalReservedPorts = flag.IntegerLimit{IsSet: true, Value: 7}
+				cmd.TotalLogVolume = flag.BytesWithUnlimited{IsSet: true, Value: 512}
 
 				fakeActor.CreateSpaceQuotaReturns(
 					v7action.Warnings{"warnings-1", "warnings-2"},
@@ -163,6 +164,7 @@ var _ = Describe("create-space-quota Command", func() {
 					TotalServiceInstances: &types.NullInt{IsSet: true, Value: 9},
 					TotalRoutes:           &types.NullInt{IsSet: true, Value: 1},
 					TotalReservedPorts:    &types.NullInt{IsSet: true, Value: 7},
+					TotalLogVolume:        &types.NullInt{IsSet: true, Value: 512},
 				}))
 			})
 

command/v7/push_command.go

@@ -100,10 +100,11 @@ type PushCommand struct {
 	StartCommand            flag.Command                        `long:"start-command" short:"c" description:"Startup command, set to null to reset to default start command"`
 	Strategy                flag.DeploymentStrategy             `long:"strategy" description:"Deployment strategy, either rolling or null."`
 	Task                    bool                                `long:"task" description:"Push an app that is used only to execute tasks. The app will be staged, but not started and will have no route assigned."`
+	LogRateLimit            string                              `long:"log-rate-limit" short:"l" description:"Log rate limit per second, in bytes (e.g. 128B, 4K, 1M). -1 represents unlimited."`
 	Vars                    []template.VarKV                    `long:"var" description:"Variable key value pair for variable substitution, (e.g., name=app1); can specify multiple times"`
 	PathsToVarsFiles        []flag.PathWithExistenceCheck       `long:"vars-file" description:"Path to a variable substitution file for manifest; can specify multiple times"`
 	dockerPassword          interface{}                         `environmentName:"CF_DOCKER_PASSWORD" environmentDescription:"Password used for private docker repository"`
-	usage                   interface{}                         `usage:"CF_NAME push APP_NAME [-b BUILDPACK_NAME]\n   [-c COMMAND] [-f MANIFEST_PATH | --no-manifest] [--no-start] [--no-wait] [-i NUM_INSTANCES]\n   [-k DISK] [-m MEMORY] [-p PATH] [-s STACK] [-t HEALTH_TIMEOUT] [--task TASK]\n   [-u (process | port | http)] [--no-route | --random-route]\n   [--var KEY=VALUE] [--vars-file VARS_FILE_PATH]...\n \n   CF_NAME push APP_NAME --docker-image [REGISTRY_HOST:PORT/]IMAGE[:TAG] [--docker-username USERNAME]\n   [-c COMMAND] [-f MANIFEST_PATH | --no-manifest] [--no-start] [--no-wait] [-i NUM_INSTANCES]\n   [-k DISK] [-m MEMORY] [-p PATH] [-s STACK] [-t HEALTH_TIMEOUT] [--task TASK]\n   [-u (process | port | http)] [--no-route | --random-route ]\n   [--var KEY=VALUE] [--vars-file VARS_FILE_PATH]..."`
+	usage                   interface{}                         `usage:"CF_NAME push APP_NAME [-b BUILDPACK_NAME]\n   [-c COMMAND] [-f MANIFEST_PATH | --no-manifest] [--no-start] [--no-wait] [-i NUM_INSTANCES]\n   [-k DISK] [-m MEMORY] [-p PATH] [-s STACK] [-t HEALTH_TIMEOUT] [--task TASK]\n   [-u (process | port | http)] [--no-route | --random-route] [-l LOG_RATE_LIMIT]\n   [--var KEY=VALUE] [--vars-file VARS_FILE_PATH]...\n \n   CF_NAME push APP_NAME --docker-image [REGISTRY_HOST:PORT/]IMAGE[:TAG] [--docker-username USERNAME]\n   [-c COMMAND] [-f MANIFEST_PATH | --no-manifest] [--no-start] [--no-wait] [-i NUM_INSTANCES]\n   [-k DISK] [-m MEMORY] [-p PATH] [-s STACK] [-t HEALTH_TIMEOUT] [--task TASK]\n   [-u (process | port | http)] [--no-route | --random-route ] [-l LOG_RATE_LIMIT]\n   [--var KEY=VALUE] [--vars-file VARS_FILE_PATH]..."`
 	envCFStagingTimeout     interface{}                         `environmentName:"CF_STAGING_TIMEOUT" environmentDescription:"Max wait time for staging, in minutes" environmentDefault:"15"`
 	envCFStartupTimeout     interface{}                         `environmentName:"CF_STARTUP_TIMEOUT" environmentDescription:"Max wait time for app instance startup, in minutes" environmentDefault:"5"`
 
@@ -358,6 +359,7 @@ func (cmd PushCommand) GetFlagOverrides() (v7pushaction.FlagOverrides, error) {
 		Vars:                cmd.Vars,
 		NoManifest:          cmd.NoManifest,
 		Task:                cmd.Task,
+		LogRateLimit:        cmd.LogRateLimit,
 	}, nil
 }
 

command/v7/push_command_test.go

@@ -319,7 +319,7 @@ var _ = Describe("push Command", func() {
 							})
 						})
 
-						When("marsahlling the manifest succeeds", func() {
+						When("marshalling the manifest succeeds", func() {
 							BeforeEach(func() {
 								fakeManifestParser.MarshalManifestReturns([]byte("our-manifest"), nil)
 							})
@@ -1078,6 +1078,7 @@ var _ = Describe("push Command", func() {
 			cmd.PathsToVarsFiles = []flag.PathWithExistenceCheck{"/vars1", "/vars2"}
 			cmd.Vars = []template.VarKV{{Name: "key", Value: "val"}}
 			cmd.Task = true
+			cmd.LogRateLimit = "512M"
 		})
 
 		JustBeforeEach(func() {
@@ -1106,6 +1107,7 @@ var _ = Describe("push Command", func() {
 			Expect(overrides.PathsToVarsFiles).To(Equal([]string{"/vars1", "/vars2"}))
 			Expect(overrides.Vars).To(Equal([]template.VarKV{{Name: "key", Value: "val"}}))
 			Expect(overrides.Task).To(BeTrue())
+			Expect(overrides.LogRateLimit).To(Equal("512M"))
 		})
 
 		When("a docker image is provided", func() {