fix log rate limit quota checking

Author: sethboyles

app/actions/deployment_create.rb

@@ -169,7 +169,7 @@ def record_audit_event(deployment, droplet, user_audit_info, message)
       private
 
       def validate_quota!(message, app)
-        return if message.web_instances.blank? && message.memory_in_mb.blank?
+        return if message.web_instances.blank? && message.memory_in_mb.blank? && message.log_rate_limit_in_bytes_per_second.blank?
 
         current_web_process = app.newest_web_process
         current_web_process.instances = message.web_instances if message.web_instances
@@ -179,7 +179,6 @@ def validate_quota!(message, app)
         # Quotas wont get checked unless the process is started
         current_web_process.state = ProcessModel::STARTED
         current_web_process.validate
-
         raise Sequel::ValidationFailed.new(current_web_process) unless current_web_process.valid?
 
         current_web_process.reload

app/models/runtime/constraints/max_log_rate_limit_policy.rb

@@ -50,7 +50,7 @@ class AppMaxLogRateLimitPolicy < BaseMaxLogRateLimitPolicy
 
   def additional_checks
     resource.started? &&
-      (resource.column_changed?(:state) || resource.column_changed?(:instances))
+      (resource.column_changed?(:state) || resource.column_changed?(:instances) || resource.column_changed?(:log_rate_limit))
   end
 
   def requested_log_rate_limit

docs/v3/source/includes/api_resources/_deployments.erb

@@ -20,6 +20,9 @@
   "options" : {
     "max_in_flight": 3,
     "web_instances": 5,
+    "memory_in_mb": 1024,
+    "disk_in_mb": 1024,
+    "log_rate_limit_in_bytes_per_second": -1,
     "canary": {
       "steps": [
         {

docs/v3/source/includes/resources/deployments/_create.md.erb

@@ -79,6 +79,9 @@ Name | Type | Description | Default
 **strategy** | _string_ | The strategy to use for the deployment | `rolling`
 **options.max_in_flight** | _integer_ | The maximum number of new instances to deploy simultaneously | 1
 **options.web_instances** | _integer_ | The number of web instances the deployment will scale to | The current web process's instance count
+**options.memory_in_mb** |  _integer_ | The amount of memory in megabytes to allocate per web process instance.  If `null`, the amount allocated will be taken from the previous web process. | `null`
+**options.disk_in_mb** | _integer_ | The amount of disk in megabytes to allocate per web process instance.  If `null`, the amount allocated will be taken from the previous web process. | `null`
+**options.log_rate_limit_in_bytes_per_second** | _integer_ | Log rate limit in bytes per second to allocate per web process instance.  If `null`, the amount allocated will be taken from the previous web process. | `null`
 **options.canary.steps** | _array of [canary step objects](#canary-steps-object)_ | An array of canary steps to use for the deployment
 **metadata.labels** | [_label object_](#labels) | Labels applied to the deployment
 **metadata.annotations**  | [_annotation object_](#annotations) | Annotations applied to the deployment

docs/v3/source/includes/resources/deployments/_object.md.erb

@@ -21,6 +21,9 @@ Name | Type | Description
 **strategy** | _string_ | Strategy used for the deployment; supported strategies are `rolling` and `canary` (experimental)
 **options.max_in_flight** | _integer_ | The maximum number of new instances to deploy simultaneously
 **options.web_instances** | _integer_ | The number of web instances the deployment will scale to
+**options.memory_in_mb** |  _integer_ | The amount of memory in megabytes to allocate per web process instance.  If `null`, the amount allocated will be taken from the previous web process.
+**options.disk_in_mb** | _integer_ | The amount of disk in megabytes to allocate per web process instance.  If `null`, the amount allocated will be taken from the previous web process.
+**options.log_rate_limit_in_bytes_per_second** | _integer_ | Log rate limit in bytes per second to allocate per web process instance.  If `null`, the amount allocated will be taken from the previous web process.
 **options.canary.steps** | _array of [canary step objects](#canary-steps-object)_ | Canary steps to use for the deployment. Only available for deployments with strategy 'canary'. (experimental)
 **droplet.guid** | _string_ | The droplet guid that the deployment is transitioning the app to
 **previous_droplet.guid** | _string_ | The app's [current droplet guid](#get-current-droplet-association-for-an-app) before the deployment was created

spec/unit/actions/deployment_create_spec.rb

@@ -988,12 +988,12 @@ module VCAP::CloudController
               end
 
               context 'when the final state of the resulting web_process does not violate a quota' do
-                let(:disk_in_mb) { 1023 }
+                let(:disk_in_mb) { 999 }
 
                 it 'does not throw an error' do
                   deployment = DeploymentCreate.create(app:, message:, user_audit_info:)
-                  expect(deployment.disk_in_mb).to eq(1023)
-                  expect(app.reload.newest_web_process.disk_quota).to eq(1023)
+                  expect(deployment.disk_in_mb).to eq(999)
+                  expect(app.reload.newest_web_process.disk_quota).to eq(999)
                 end
               end
             end
@@ -1019,7 +1019,7 @@ module VCAP::CloudController
             end
 
             context 'quota validations' do
-              let!(:web_process) { ProcessModel.make(app: app, instances: 3, memory: 999, state: process_state) }
+              let!(:web_process) { ProcessModel.make(app: app, instances: 3, log_rate_limit: 999, memory: 999, state: process_state) }
 
               before do
                 app.organization.quota_definition = QuotaDefinition.make(app.organization, log_rate_limit: 10_000)

spec/unit/models/runtime/constraints/max_log_rate_limit_policy_spec.rb

@@ -50,6 +50,17 @@
             expect(validator).to validate_with_error(process, :log_rate_limit, error_name)
           end
         end
+
+        context 'when the log_rate_limit has changed and would exceed the quota' do
+          before do
+            process.log_rate_limit = 500
+          end
+
+          it 'registers an error' do
+            expect(org_or_space).to receive(:has_remaining_log_rate_limit).with(400).and_return(false)
+            expect(validator).to validate_with_error(process, :log_rate_limit, error_name)
+          end
+        end
       end
 
       context 'when the app is being stopped' do