Include route in error messages for manifest route updates (cloudfoundry#5026)

* fix: cloud_controller_ng#4971

* Apply review feedback

Author: b1tamara

app/actions/manifest_route_update.rb

@@ -18,21 +18,25 @@ def update(app_guid, message, user_audit_info)
           app_guid => app
         }
         routes_to_map = []
+        current_route = nil
 
         message.manifest_route_mappings.each do |manifest_route_mapping|
+          current_route = manifest_route_mapping[:route].to_s
           route = {
             model: find_or_create_valid_route(app, manifest_route_mapping[:route].to_hash, user_audit_info),
-            protocol: manifest_route_mapping[:protocol]
+            protocol: manifest_route_mapping[:protocol],
+            route_string: current_route
           }
 
-          raise InvalidRoute.new("No domains exist for route #{manifest_route_mapping[:route]}") if route[:model].blank?
+          raise InvalidRoute.new("No domains exist for route #{current_route}") if route[:model].blank?
 
           routes_to_map << route
         end
 
         # map route to app, but do this only if the full message contains valid routes
         routes_to_map.
           each do |route|
+            current_route = route[:route_string]
             route_mapping = RouteMappingModel.find(app: app, route: route[:model])
             if route_mapping.nil?
               UpdateRouteDestinations.add(
@@ -53,7 +57,11 @@ def update(app_guid, message, user_audit_info)
             end
           end
       rescue Sequel::ValidationFailed, RouteCreate::Error, RouteUpdate::Error => e
-        raise InvalidRoute.new(e.message)
+        route_info = current_route ? "For route '#{current_route}': " : ''
+        raise InvalidRoute.new("#{route_info}#{e.message}")
+      rescue UpdateRouteDestinations::Error => e
+        route_info = current_route ? "For route '#{current_route}': " : ''
+        raise UpdateRouteDestinations::Error.new("#{route_info}#{e.message}")
       end
 
       private

spec/unit/actions/manifest_route_update_spec.rb

@@ -312,7 +312,10 @@ module VCAP::CloudController
               it 'throws an error' do
                 expect do
                   ManifestRouteUpdate.update(app.guid, message, user_audit_info)
-                end.to raise_error(VCAP::CloudController::UpdateRouteDestinations::Error, 'Cannot use \'http2\' protocol for tcp routes; valid options are: [tcp].')
+                end.to raise_error(
+                  VCAP::CloudController::UpdateRouteDestinations::Error,
+                  %r{For route 'http://tcp.tomato.avocado-toast.com:1234': Cannot use 'http2' protocol for tcp routes; valid options are: \[tcp\]}
+                )
               end
             end
           end
@@ -492,7 +495,10 @@ module VCAP::CloudController
           it 'raises an error indicating hash_header is required' do
             expect do
               ManifestRouteUpdate.update(app.guid, message, user_audit_info)
-            end.to raise_error(ManifestRouteUpdate::InvalidRoute, /Hash header must be present when loadbalancing is set to hash./)
+            end.to raise_error(
+              ManifestRouteUpdate::InvalidRoute,
+              %r{For route 'http://potato.tomato.avocado-toast.com/some-path': Hash header must be present when loadbalancing is set to hash.}
+            )
           end
         end