Skip to content

Commit cc92514

Browse files
committed
Fix some tests
1 parent 185230a commit cc92514

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

lib/cloud_controller/diego/app_recipe_builder.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,15 @@ def health_check_timeout_in_seconds
151151

152152
def generate_routes(info)
153153
http_routes = (info['http_routes'] || []).map do |i|
154-
{
154+
http_route = {
155155
hostnames: [i['hostname']],
156156
port: i['port'],
157157
route_service_url: i['route_service_url'],
158158
isolation_segment: IsolationSegmentSelector.for_space(process.space),
159-
protocol: i['protocol'],
160-
options: i['options']
159+
protocol: i['protocol']
161160
}
161+
http_route[:options] = i['options'] if i['options']
162+
http_route
162163
end
163164

164165
{

lib/cloud_controller/diego/protocol/routing_info.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def http_info(process_eager)
4343
info['router_group_guid'] = r.domain.router_group_guid if r.domain.is_a?(SharedDomain) && !r.domain.router_group_guid.nil?
4444
info['port'] = get_port_to_use(route_mapping)
4545
info['protocol'] = route_mapping.protocol
46-
info['options'] = r.options
46+
info['options'] = r.options if r.options
4747
info
4848
end
4949
end

0 commit comments

Comments
 (0)