Change route update/create logic according to specs

Author: hoffmaen

app/actions/manifest_route_update.rb

@@ -92,7 +92,9 @@ def find_or_create_valid_route(app, manifest_route, user_audit_info)
               domain: existing_domain,
               manifest_triggered: true
             )
-          elsif route[:options] != manifest_route[:options]
+          elsif manifest_route[:options] && route[:options] != manifest_route[:options]
+            # remove nil values from options
+            manifest_route[:options] = manifest_route[:options].compact
             message = RouteUpdateMessage.new({
                                                'options' => manifest_route[:options]
                                              })

app/actions/route_update.rb

@@ -4,17 +4,14 @@ def update(route:, message:)
       Route.db.transaction do
         if message.requested?(:options)
           route.options = if message.options.nil?
-                            route.options
+                            nil
                           elsif route.options.nil?
                             message.options
                           else
                             route.options.merge(message.options)
                           end
         end
 
-        # remove nil values from options
-        route.options = route.options.compact if route.options
-
         route.save
         MetadataUpdate.update(route, message)
       end

app/messages/validators.rb

@@ -242,11 +242,17 @@ def validate(record)
 
   class OptionsValidator < ActiveModel::Validator
     def validate(record)
-      # Empty option hashes are allowed, so we skip further validation
-      record.options.blank? && return
+
+      if record.options.blank?
+        # Route Creation with explicit 'null' options is not allowed
+        if record.is_a?(VCAP::CloudController::RouteCreateMessage) && record.options.nil?
+          record.errors.add(:options, message: 'is not a valid object')
+        end
+        return
+      end
 
       unless record.options.is_a?(Hash)
-        record.errors.add(:options, message: "'options' is not a valid object")
+        record.errors.add(:options, message: 'is not a valid object')
         return
       end
 

spec/request/space_manifests_spec.rb

@@ -761,10 +761,7 @@
           post "/v3/spaces/#{space.guid}/actions/apply_manifest", yml_manifest, yml_headers(user_header)
 
           expect(last_response.status).to eq(202)
-          job_guid = VCAP::CloudController::PollableJobModel.last.guid
 
-          Delayed::Worker.new.work_off
-          expect(VCAP::CloudController::PollableJobModel.find(guid: job_guid)).to be_complete, VCAP::CloudController::PollableJobModel.find(guid: job_guid).cf_api_error
           app1_model.reload
           expect(app1_model.routes.first.options).to eq({ 'lb_algo' => 'round-robin' })
         end
@@ -786,10 +783,7 @@
           post "/v3/spaces/#{space.guid}/actions/apply_manifest", yml_manifest, yml_headers(user_header)
 
           expect(last_response.status).to eq(202)
-          job_guid = VCAP::CloudController::PollableJobModel.last.guid
 
-          Delayed::Worker.new.work_off
-          expect(VCAP::CloudController::PollableJobModel.find(guid: job_guid)).to be_complete, VCAP::CloudController::PollableJobModel.find(guid: job_guid).cf_api_error
           app1_model.reload
           expect(app1_model.routes.first.options).to eq({ 'lb_algo' => 'round-robin' })
         end