fix remaining tests

Author: a18e

app/messages/manifest_routes_update_message.rb

@@ -1,4 +1,5 @@
 require 'messages/base_message'
+require 'messages/route_options_message'
 require 'cloud_controller/app_manifest/manifest_route'
 
 module VCAP::CloudController
@@ -36,6 +37,10 @@ def contains_invalid_route_options?(routes)
           next unless r[:options]
 
           return true unless r[:options].is_a?(Hash)
+
+          return false if r[:options].empty?
+
+          return r[:options].keys.all? { |key| RouteOptionsMessage::VALID_MANIFEST_ROUTE_OPTIONS.exclude?(key) }
         end
       end
 

app/messages/route_options_message.rb

@@ -3,6 +3,8 @@
 module VCAP::CloudController
   class RouteOptionsMessage < BaseMessage
 
+    VALID_MANIFEST_ROUTE_OPTIONS = %i[loadbalancing-algorithm].freeze
+    VALID_ROUTE_OPTIONS = %i[lb_algo].freeze
     VALID_LOADBALANCING_ALGORITHMS = %w[round-robin least-connections].freeze
 
     register_allowed_keys %i[lb_algo]

app/presenters/v3/app_manifest_presenters/route_properties_presenter.rb

@@ -12,7 +12,7 @@ def to_hash(route_mappings:, app:, **_)
 
               if route_mapping.route.options
                 route_hash[:options] = {}
-                route_hash[:options]['loadbalancing-algorithm'] = route_mapping.route.options['lb_algo'] if route_mapping.route.options['lb_algo']
+                route_hash[:options][:'loadbalancing-algorithm'] = route_mapping.route.options[:lb_algo] if route_mapping.route.options[:lb_algo]
               end
 
               route_hash

lib/cloud_controller/app_manifest/manifest_route.rb

@@ -6,7 +6,7 @@ class ManifestRoute
     SUPPORTED_TCP_SCHEMES = %w[tcp unspecified].freeze
     WILDCARD_HOST = '*'.freeze
 
-    def self.parse(route, options=nil)
+    def self.parse(route, options = nil)
       parsed_uri = Addressable::URI.heuristic_parse(route, scheme: 'unspecified')
 
       attrs = if parsed_uri.nil?
@@ -26,6 +26,11 @@ def self.parse(route, options=nil)
     end
 
     def valid?
+      if @attrs[:options] && !@attrs[:options].empty?
+        return false if @attrs[:options].keys.any? { |key| RouteOptionsMessage::VALID_ROUTE_OPTIONS.exclude?(key) }
+        return false if @attrs[:options][:lb_algo] && RouteOptionsMessage::VALID_LOADBALANCING_ALGORITHMS.exclude?(@attrs[:options][:lb_algo])
+      end
+
       return false if @attrs[:host].blank?
 
       return SUPPORTED_TCP_SCHEMES.include?(@attrs[:scheme]) if @attrs[:port]

spec/request/space_manifests_spec.rb

@@ -668,7 +668,7 @@
           post "/v3/spaces/#{space.guid}/actions/apply_manifest", yml_manifest, yml_headers(user_header)
 
           expect(last_response).to have_status_code(422)
-          expect(last_response).to have_error_message('Routes contains an invalid loadbalancing-algorithm option')
+          expect(last_response).to have_error_message('Routes contains invalid route options')
         end
       end
 

spec/unit/lib/cloud_controller/app_manifest/manifest_route_spec.rb

@@ -119,7 +119,7 @@ module VCAP::CloudController
 
         context 'when there is an invalid loadbalancing-algorithm' do
           let(:route) { 'http://example.com' }
-          let(:options) { { 'loadbalancing-algorithm' => 'invalid' } }
+          let(:options) { { :'loadbalancing-algorithm' => 'invalid' } }
 
           it 'is invalid' do
             manifest_route = ManifestRoute.parse(route, options)

spec/unit/messages/manifest_routes_update_message_spec.rb

@@ -225,6 +225,22 @@ module VCAP::CloudController
         end
       end
 
+      context 'when a route contains invalid route options' do
+        let(:body) do
+          { 'routes' =>
+              [
+                { 'route' => 'existing.example.com',
+                  'options' => {'invalid' => 'invalid'} }
+              ] }
+        end
+
+        it 'returns true' do
+          msg = ManifestRoutesUpdateMessage.new(body)
+
+          expect(msg.valid?).to be(false)
+        end
+      end
+
       context 'when a route contains a valid loadbalancing-algorithm' do
         let(:body) do
           { 'routes' =>