Skip to content

Commit 3fc5eca

Browse files
authored
Fix managed_service_instances dataset for spaces (#4481)
* the dataset should only include managed services (where "is_gateway_service" is true) and no user-provided services * this behaviour is consistent with the organization managed_service_instances dataset
1 parent eb32fe5 commit 3fc5eca

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

app/models/runtime/space.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ class DBNameUniqueRaceError < Sequel::ValidationFailed; end
5050

5151
one_to_many :events, primary_key: :guid, key: :space_guid
5252
one_to_many :service_instances
53-
one_to_many :managed_service_instances
53+
one_to_many :managed_service_instances,
54+
dataset: -> { VCAP::CloudController::ServiceInstance.filter(is_gateway_service: true) }
5455
many_to_many :service_instances_shared_from_other_spaces,
5556
left_key: :target_space_guid,
5657
left_primary_key: :guid,

spec/unit/models/runtime/space_spec.rb

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,19 @@ module VCAP::CloudController
115115
end
116116
end
117117

118+
describe 'dataset managed_service_instances' do
119+
subject(:space) { Space.make }
120+
121+
it 'includes managed service instances and no user provided service instances' do
122+
managed_service_instance = ManagedServiceInstance.make(space:)
123+
user_provided_service_instance = UserProvidedServiceInstance.make(space:)
124+
125+
managed_instances = space.managed_service_instances
126+
expect(managed_instances).to include(managed_service_instance)
127+
expect(managed_instances).not_to include(user_provided_service_instance)
128+
end
129+
end
130+
118131
describe 'domains' do
119132
subject(:space) { Space.make(organization:) }
120133
let(:organization) { Organization.make }

0 commit comments

Comments
 (0)