Use space subqueries for fetchting service credential bindings

As a regular user the select query for service credential bindings is filtered by a list of space guids (spaces the user has access to). This can produce very long queries. Instead we can use subqueries to filter the spaces directly in the db. Same approach is used in service lists, see #2580.
cloudfoundry · Dec 14, 2022 · b3ee59a · b3ee59a
1 parent ec85582
commit b3ee59a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/app/controllers/v3/service_credential_bindings_controller.rb b/app/controllers/v3/service_credential_bindings_controller.rb
@@ -22,7 +22,7 @@ def index
     invalid_param!(message.errors.full_messages) unless message.valid?
 
     results = list_fetcher.fetch(
-      space_guids: space_guids,
+      readable_spaces_query: spaces_query,
       message: message,
       eager_loaded_associations: Presenters::V3::ServiceCredentialBindingPresenter.associated_resources,
     )
@@ -328,14 +328,14 @@ def fetch_credentials_value(name)
   end
 
   def service_credential_binding
-    @service_credential_binding ||= fetcher.fetch(hashed_params[:guid], space_guids: space_guids)
+    @service_credential_binding ||= fetcher.fetch(hashed_params[:guid], readable_spaces_query: spaces_query)
   end
 
-  def space_guids
+  def spaces_query
     if permission_queryer.can_read_globally?
-      :all
+      nil
     else
-      permission_queryer.readable_space_guids
+      permission_queryer.readable_space_guids_query
     end
   end
 

diff --git a/app/fetchers/service_credential_binding_fetcher.rb b/app/fetchers/service_credential_binding_fetcher.rb
@@ -3,8 +3,8 @@
 module VCAP
   module CloudController
     class ServiceCredentialBindingFetcher
-      def fetch(guid, space_guids:)
-        list_fetcher.fetch(space_guids: space_guids).first(guid: guid)
+      def fetch(guid, readable_spaces_query: nil)
+        list_fetcher.fetch(readable_spaces_query: readable_spaces_query).first(guid: guid)
       end
 
       private

diff --git a/app/fetchers/service_credential_binding_list_fetcher.rb b/app/fetchers/service_credential_binding_list_fetcher.rb
@@ -18,12 +18,12 @@ class << self
           service_offering_guid
         }.freeze
 
-        def fetch(space_guids:, message: nil, eager_loaded_associations: [])
-          dataset = case space_guids
-                    when :all
+        def fetch(readable_spaces_query: nil, message: nil, eager_loaded_associations: [])
+          dataset = case readable_spaces_query
+                    when nil
                       ServiceCredentialBinding::View.dataset
                     else
-                      ServiceCredentialBinding::View.where { Sequel[:space_guid] =~ space_guids }
+                      ServiceCredentialBinding::View.where { Sequel[:space_id] =~ readable_spaces_query.select(:id) }
                     end
 
           dataset = dataset.eager(eager_loaded_associations)

diff --git a/app/models/services/service_credential_binding_view.rb b/app/models/services/service_credential_binding_view.rb
@@ -10,7 +10,7 @@ module Types
         Sequel.as(:service_keys__id, :id),
         Sequel.as(:service_keys__guid, :guid),
         Sequel.as(Types::SERVICE_KEY, :type),
-        Sequel.as(:spaces__guid, :space_guid),
+        Sequel.as(:spaces__id, :space_id),
         Sequel.as(:service_keys__created_at, :created_at),
         Sequel.as(:service_keys__updated_at, :updated_at),
         Sequel.as(:service_keys__name, :name),
@@ -44,7 +44,7 @@ module Types
         Sequel.as(:service_bindings__id, :id),
         Sequel.as(:service_bindings__guid, :guid),
         Sequel.as(Types::SERVICE_BINDING, :type),
-        Sequel.as(:spaces__guid, :space_guid),
+        Sequel.as(:spaces__id, :space_id),
         Sequel.as(:service_bindings__created_at, :created_at),
         Sequel.as(:service_bindings__updated_at, :updated_at),
         Sequel.as(:service_bindings__name, :name),