Skip to content

feat: notify diego of route updates #4298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philippthun merged 4 commits into from
Apr 16, 2025
Merged

feat: notify diego of route updates #4298

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52f18bf
feat: notify diego of route updates
maxmoehl Apr 10, 2025
61493be
Verify call to notify_backend_of_route_update in route.update
hoffmaen Apr 11, 2025
2af6885
Address review comments
hoffmaen Apr 11, 2025
9d65248
Notify diego outside of transaction
hoffmaen Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/actions/route_update.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ def update(route:, message:)

route.save
MetadataUpdate.update(route, message)

route.apps.each do |process|
ProcessRouteHandler.new(process).notify_backend_of_route_update
end
end

route
Expand Down
39 changes: 37 additions & 2 deletions spec/unit/actions/route_update_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ module VCAP::CloudController
end

let(:message) { RouteUpdateMessage.new(body) }
let(:route) { Route.make }
Comment thread
philippthun marked this conversation as resolved.
let(:space) { Space.make }
let(:route) { Route.make(space:) }

subject { RouteUpdate.new }
describe '#update metadata' do
Comment thread
philippthun marked this conversation as resolved.
Expand Down Expand Up @@ -143,6 +144,13 @@ module VCAP::CloudController

it 'adds no options' do
expect(message).to be_valid

Comment thread
philippthun marked this conversation as resolved.
Outdated
fake_route_handler = instance_double(ProcessRouteHandler)
process = ProcessModelFactory.make(space: space, state: 'STARTED', diego: false)
RouteMappingModel.make(app: process.app, route: route, process_type: process.type)
allow(ProcessRouteHandler).to receive(:new).with(process).and_return(fake_route_handler)
expect(fake_route_handler).to receive(:notify_backend_of_route_update)

subject.update(route:, message:)
route.reload
expect(route.options).to eq({})
Expand All @@ -160,8 +168,14 @@ module VCAP::CloudController

it 'adds the route option' do
expect(message).to be_valid
subject.update(route:, message:)

fake_route_handler = instance_double(ProcessRouteHandler)
process = ProcessModelFactory.make(space: space, state: 'STARTED', diego: false)
RouteMappingModel.make(app: process.app, route: route, process_type: process.type)
allow(ProcessRouteHandler).to receive(:new).with(process).and_return(fake_route_handler)
expect(fake_route_handler).to receive(:notify_backend_of_route_update)

subject.update(route:, message:)
route.reload
expect(route[:options]).to eq('{"loadbalancing":"round-robin"}')
end
Expand All @@ -180,6 +194,13 @@ module VCAP::CloudController

it 'modifies nothing' do
expect(message).to be_valid

fake_route_handler = instance_double(ProcessRouteHandler)
process = ProcessModelFactory.make(space: space, state: 'STARTED', diego: false)
RouteMappingModel.make(app: process.app, route: route, process_type: process.type)
allow(ProcessRouteHandler).to receive(:new).with(process).and_return(fake_route_handler)
expect(fake_route_handler).to receive(:notify_backend_of_route_update)

subject.update(route:, message:)
route.reload
expect(route.options).to include({ 'loadbalancing' => 'round-robin' })
Expand All @@ -197,6 +218,13 @@ module VCAP::CloudController

it 'updates the option' do
expect(message).to be_valid

fake_route_handler = instance_double(ProcessRouteHandler)
process = ProcessModelFactory.make(space: space, state: 'STARTED', diego: false)
RouteMappingModel.make(app: process.app, route: route, process_type: process.type)
allow(ProcessRouteHandler).to receive(:new).with(process).and_return(fake_route_handler)
expect(fake_route_handler).to receive(:notify_backend_of_route_update)

subject.update(route:, message:)
route.reload

Expand All @@ -215,6 +243,13 @@ module VCAP::CloudController

it 'removes this option' do
expect(message).to be_valid

fake_route_handler = instance_double(ProcessRouteHandler)
process = ProcessModelFactory.make(space: space, state: 'STARTED', diego: false)
RouteMappingModel.make(app: process.app, route: route, process_type: process.type)
allow(ProcessRouteHandler).to receive(:new).with(process).and_return(fake_route_handler)
expect(fake_route_handler).to receive(:notify_backend_of_route_update)

subject.update(route:, message:)
route.reload
expect(route.options).to eq({})
Expand Down