Skip to content
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.

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

Refactor service_instance_list_fetcher perm logic #3014

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/controllers/v3/service_instances_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def index
ServiceInstanceListFetcher.fetch(
message,
eager_loaded_associations: Presenters::V3::ServiceInstancePresenter.associated_resources,
readable_space_guids: permission_queryer.readable_space_guids,
readable_spaces_dataset: permission_queryer.readable_space_guids_query,
)
end

Expand Down
6 changes: 3 additions & 3 deletions app/fetchers/service_instance_list_fetcher.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
module VCAP::CloudController
class ServiceInstanceListFetcher < BaseListFetcher
class << self
def fetch(message, omniscient: false, readable_space_guids: [], eager_loaded_associations: [])
def fetch(message, omniscient: false, readable_spaces_dataset: nil, eager_loaded_associations: [])
dataset = ServiceInstance.dataset.eager(eager_loaded_associations).
join(:spaces, id: Sequel[:service_instances][:space_id]).
left_join(:service_instance_shares, service_instance_guid: Sequel[:service_instances][:guid])

unless omniscient
dataset = dataset.where do
(Sequel[:spaces][:guid] =~ readable_space_guids) |
(Sequel[:service_instance_shares][:target_space_guid] =~ readable_space_guids)
(Sequel[:spaces][:guid] =~ readable_spaces_dataset) |
(Sequel[:service_instance_shares][:target_space_guid] =~ readable_spaces_dataset)
end
end

Expand Down
22 changes: 11 additions & 11 deletions spec/unit/fetchers/service_instance_list_fetcher_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ module VCAP::CloudController
end

it 'fetches nothing for users who cannot see any spaces' do
expect(fetcher.fetch(message).all).to be_empty
expect(fetcher.fetch(message, readable_spaces_dataset: Space.where(id: -1).select(:guid)).all).to be_empty
end

it 'fetches the instances owned by readable spaces' do
dataset = fetcher.fetch(message, readable_space_guids: [space_1.guid, space_3.guid])
dataset = fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_1.id, space_3.id]).select(:guid))
expect(dataset.all).to contain_exactly(msi_1, msi_3, upsi, ssi)
end

it 'fetches the instances shared to readable spaces' do
dataset = fetcher.fetch(message, readable_space_guids: [space_2.guid])
dataset = fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_2.id]).select(:guid))
expect(dataset.all).to contain_exactly(msi_2, ssi)
end

Expand All @@ -53,7 +53,7 @@ module VCAP::CloudController

it 'returns instances with matching name' do
expect(fetcher.fetch(message, omniscient: true)).to contain_exactly(msi_1, ssi)
expect(fetcher.fetch(message, readable_space_guids: [space_1.guid])).to contain_exactly(msi_1)
expect(fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_1.id]).select(:guid))).to contain_exactly(msi_1)
end
end

Expand All @@ -62,7 +62,7 @@ module VCAP::CloudController

it 'returns instances with matching space guids' do
expect(fetcher.fetch(message, omniscient: true)).to contain_exactly(msi_1, upsi)
expect(fetcher.fetch(message, readable_space_guids: [space_1.guid, space_2.guid])).to contain_exactly(msi_1, upsi)
expect(fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_1.id, space_2.id]).select(:guid))).to contain_exactly(msi_1, upsi)
end
end

Expand All @@ -71,7 +71,7 @@ module VCAP::CloudController

it 'returns instances with matching org guids' do
expect(fetcher.fetch(message, omniscient: true).map(&:guid)).to contain_exactly(*[msi_1, upsi, msi_2, ssi].map(&:guid))
expect(fetcher.fetch(message, readable_space_guids: [space_1.guid, space_3.guid])).to contain_exactly(msi_1, ssi, upsi)
expect(fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_1.id, space_3.id]).select(:guid))).to contain_exactly(msi_1, ssi, upsi)
end
end

Expand All @@ -83,7 +83,7 @@ module VCAP::CloudController

it 'returns instances with matching labels' do
expect(fetcher.fetch(message, omniscient: true)).to contain_exactly(msi_2)
expect(fetcher.fetch(message, readable_space_guids: [space_1.guid, space_2.guid])).to contain_exactly(msi_2)
expect(fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_1.id, space_2.id]).select(:guid))).to contain_exactly(msi_2)
end
end

Expand All @@ -93,7 +93,7 @@ module VCAP::CloudController

it 'returns instances with matching type' do
expect(fetcher.fetch(message, omniscient: true)).to contain_exactly(msi_1, msi_2, msi_3, ssi)
expect(fetcher.fetch(message, readable_space_guids: [space_1.guid])).to contain_exactly(msi_1)
expect(fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_1.id]).select(:guid))).to contain_exactly(msi_1)
end
end

Expand All @@ -102,7 +102,7 @@ module VCAP::CloudController

it 'returns instances with matching type' do
expect(fetcher.fetch(message, omniscient: true)).to contain_exactly(upsi)
expect(fetcher.fetch(message, readable_space_guids: [space_1.guid])).to contain_exactly(upsi)
expect(fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_1.id]).select(:guid))).to contain_exactly(upsi)
end
end
end
Expand All @@ -113,7 +113,7 @@ module VCAP::CloudController

it 'returns instances with matching service plan names' do
expect(fetcher.fetch(message, omniscient: true)).to contain_exactly(msi_1, msi_2, msi_4)
expect(fetcher.fetch(message, readable_space_guids: [space_1.guid])).to contain_exactly(msi_1, msi_4)
expect(fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_1.id]).select(:guid))).to contain_exactly(msi_1, msi_4)
end
end

Expand All @@ -123,7 +123,7 @@ module VCAP::CloudController

it 'returns instances with matching service plan guids' do
expect(fetcher.fetch(message, omniscient: true)).to contain_exactly(msi_1, msi_2, msi_4)
expect(fetcher.fetch(message, readable_space_guids: [space_1.guid])).to contain_exactly(msi_1, msi_4)
expect(fetcher.fetch(message, readable_spaces_dataset: Space.where(id: [space_1.id]).select(:guid))).to contain_exactly(msi_1, msi_4)
end
end
end
Expand Down