Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 9 insertions, 8 deletions

diff --git a/lib/bulk_imports/common/extractors/graphql_extractor.rb b/lib/bulk_imports/common/extractors/graphql_extractor.rb
index af274ee1299..cde3d1cad5b 100644
--- a/lib/bulk_imports/common/extractors/graphql_extractor.rb
+++ b/lib/bulk_imports/common/extractors/graphql_extractor.rb
@@ -4,17 +4,22 @@ module BulkImports
   module Common
     module Extractors
       class GraphqlExtractor
-        def initialize(query)
-          @query = query[:query]
+        def initialize(options = {})
+          @query = options[:query]
         end
 
         def extract(context)
           client = graphql_client(context)
 
-          client.execute(
+          response = client.execute(
             client.parse(query.to_s),
-            query.variables(context.entity)
+            query.variables(context)
           ).original_hash.deep_dup
+
+          BulkImports::Pipeline::ExtractedData.new(
+            data: response.dig(*query.data_path),
+            page_info: response.dig(*query.page_info_path)
+          )
         end
 
         private
@@ -27,10 +32,6 @@ module BulkImports
             token: context.configuration.access_token
           )
         end
-
-        def parsed_query
-          @parsed_query ||= graphql_client.parse(query.to_s)
-        end
       end
     end
   end