Skip to content
Snippets Groups Projects
Commit 0e711381 authored by Mayra Cabrera's avatar Mayra Cabrera
Browse files

Merge branch '62535-upgrade-graphql-gem-to-version-1-8-17' into 'master'

Upgrade GraphQL gem to 1.8.17

See merge request gitlab-org/gitlab-ce!32299
parents 29e3a08b aa7b1cfc
No related branches found
No related tags found
No related merge requests found
Showing
with 44 additions and 40 deletions
Loading
Loading
@@ -83,7 +83,7 @@ gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 
# GraphQL API
gem 'graphql', '= 1.8.4'
gem 'graphql', '= 1.8.17'
gem 'graphiql-rails', '~> 1.4.10'
gem 'apollo_upload_server', '~> 2.0.0.beta3'
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
Loading
Loading
Loading
Loading
@@ -377,7 +377,7 @@ GEM
graphiql-rails (1.4.10)
railties
sprockets-rails
graphql (1.8.4)
graphql (1.8.17)
graphql-docs (1.6.0)
commonmarker (~> 0.16)
escape_utils (~> 1.2)
Loading
Loading
@@ -1110,7 +1110,7 @@ DEPENDENCIES
grape-path-helpers (~> 1.1)
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (= 1.8.4)
graphql (= 1.8.17)
graphql-docs (~> 1.6.0)
grpc (~> 1.19.0)
haml_lint (~> 0.31.0)
Loading
Loading
Loading
Loading
@@ -18,8 +18,6 @@ module Mutations
required: true,
description: copy_field_description(Types::Notes::NoteType, :body)
 
private
def resolve(args)
noteable = authorized_find!(id: args[:noteable_id])
 
Loading
Loading
@@ -37,6 +35,8 @@ module Mutations
}
end
 
private
def create_note_params(noteable, args)
{
noteable: noteable,
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@ module Resolvers
end
 
def model_by_full_path(model, full_path)
BatchLoader.for(full_path).batch(key: model) do |full_paths, loader, args|
BatchLoader::GraphQL.for(full_path).batch(key: model) do |full_paths, loader, args|
# `with_route` avoids an N+1 calculating full_path
args[:key].where_full_path_in(full_paths).with_route.each do |model_instance|
loader.call(model_instance.full_path, model_instance)
Loading
Loading
Loading
Loading
@@ -41,13 +41,11 @@ module Resolvers
 
type Types::IssueType, null: true
 
alias_method :project, :object
def resolve(**args)
# The project could have been loaded in batch by `BatchLoader`.
# At this point we need the `id` of the project to query for issues, so
# make sure it's loaded and not `nil` before continuing.
project.sync if project.respond_to?(:sync)
project = object.respond_to?(:sync) ? object.sync : object
return Issue.none if project.nil?
 
# Will need to be be made group & namespace aware with
Loading
Loading
Loading
Loading
@@ -25,8 +25,10 @@ module Resolvers
 
# rubocop: disable CodeReuse/ActiveRecord
def batch_load(iid)
BatchLoader.for(iid.to_s).batch(key: project) do |iids, loader, args|
args[:key].merge_requests.where(iid: iids).each do |mr|
BatchLoader::GraphQL.for(iid.to_s).batch(key: project) do |iids, loader, args|
arg_key = args[:key].respond_to?(:sync) ? args[:key].sync : args[:key]
arg_key.merge_requests.where(iid: iids).each do |mr|
loader.call(mr.iid.to_s, mr)
end
end
Loading
Loading
Loading
Loading
@@ -9,13 +9,11 @@ module Resolvers
 
type Types::ProjectType, null: true
 
alias_method :namespace, :object
def resolve(include_subgroups:)
# The namespace could have been loaded in batch by `BatchLoader`.
# At this point we need the `id` or the `full_path` of the namespace
# to query for projects, so make sure it's loaded and not `nil` before continuing.
namespace.sync if namespace.respond_to?(:sync)
namespace = object.respond_to?(:sync) ? object.sync : object
return Project.none if namespace.nil?
 
if include_subgroups
Loading
Loading
Loading
Loading
@@ -54,14 +54,14 @@ module Gitlab
# The field is a built-in/scalar type, or a list of scalars
# authorize using the parent's object
parent_typed_object.object
elsif resolved_type.respond_to?(:object)
# The field is a type representing a single object, we'll authorize
# against the object directly
resolved_type.object
elsif @field.connection? || resolved_type.is_a?(Array)
# The field is a connection or a list of non-built-in types, we'll
# authorize each element when rendering
nil
elsif resolved_type.respond_to?(:object)
# The field is a type representing a single object, we'll authorize
# against the object directly
resolved_type.object
else
# Resolved type is a single object that might not be loaded yet by
# the batchloader, we'll authorize that
Loading
Loading
Loading
Loading
@@ -29,19 +29,25 @@ module Gitlab
 
def authorized_find!(*args)
object = find_object(*args)
object = object.sync if object.respond_to?(:sync)
authorize!(object)
 
object
end
 
def authorize!(object)
unless authorized?(object)
unless authorized_resource?(object)
raise Gitlab::Graphql::Errors::ResourceNotAvailable,
"The resource that you are attempting to access does not exist or you don't have permission to perform this action"
end
end
 
def authorized?(object)
# this was named `#authorized?`, however it conflicts with the native
# graphql gem version
# TODO consider adopting the gem's built in authorization system
# https://gitlab.com/gitlab-org/gitlab-ee/issues/13984
def authorized_resource?(object)
# Sanity check. We don't want to accidentally allow a developer to authorize
# without first adding permissions to authorize against
if self.class.required_permissions.empty?
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@ module Gitlab
end
 
def find
BatchLoader.for(blob_id).batch(key: repository) do |blob_ids, loader, batch_args|
BatchLoader::GraphQL.for(blob_id).batch(key: repository) do |blob_ids, loader, batch_args|
Gitlab::Git::Blob.batch_lfs_pointers(batch_args[:key], blob_ids).each do |loaded_blob|
loader.call(loaded_blob.id, loaded_blob.lfs_oid)
end
Loading
Loading
Loading
Loading
@@ -12,7 +12,7 @@ module Gitlab
 
# rubocop: disable CodeReuse/ActiveRecord
def find
BatchLoader.for({ model: model_class, id: model_id.to_i }).batch do |loader_info, loader|
BatchLoader::GraphQL.for({ model: model_class, id: model_id.to_i }).batch do |loader_info, loader|
per_model = loader_info.group_by { |info| info[:model] }
per_model.each do |model, info|
ids = info.map { |i| i[:id] }
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@ module Gitlab
end
 
def find
BatchLoader.for(project_id).batch do |project_ids, loader|
BatchLoader::GraphQL.for(project_id).batch do |project_ids, loader|
ProjectStatistics.for_project_ids(project_ids).each do |statistics|
loader.call(statistics.project_id, statistics)
end
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@ module Gitlab
end
 
def find
BatchLoader.for(namespace_id).batch do |namespace_ids, loader|
BatchLoader::GraphQL.for(namespace_id).batch do |namespace_ids, loader|
Namespace::RootStorageStatistics.for_namespace_ids(namespace_ids).each do |statistics|
loader.call(statistics.namespace_id, statistics)
end
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@ module Gitlab
end
 
def find_last
BatchLoader.for(sha).batch(key: project) do |shas, loader, args|
BatchLoader::GraphQL.for(sha).batch(key: project) do |shas, loader, args|
pipelines = args[:key].ci_pipelines.latest_for_shas(shas)
 
pipelines.each do |pipeline|
Loading
Loading
Loading
Loading
@@ -129,7 +129,7 @@ describe GitlabSchema do
 
result = described_class.object_from_id(user.to_global_id.to_s)
 
expect(result.__sync).to eq(user)
expect(result.sync).to eq(user)
end
 
it 'batchloads the queries' do
Loading
Loading
@@ -138,7 +138,7 @@ describe GitlabSchema do
 
expect do
[described_class.object_from_id(user1.to_global_id),
described_class.object_from_id(user2.to_global_id)].map(&:__sync)
described_class.object_from_id(user2.to_global_id)].map(&:sync)
end.not_to exceed_query_limit(1)
end
end
Loading
Loading
@@ -149,7 +149,7 @@ describe GitlabSchema do
 
result = described_class.object_from_id(note.to_global_id)
 
expect(result.__sync).to eq(note)
expect(result.sync).to eq(note)
end
 
it 'batchloads the queries' do
Loading
Loading
@@ -158,7 +158,7 @@ describe GitlabSchema do
 
expect do
[described_class.object_from_id(note1.to_global_id),
described_class.object_from_id(note2.to_global_id)].map(&:__sync)
described_class.object_from_id(note2.to_global_id)].map(&:sync)
end.not_to exceed_query_limit(1)
end
end
Loading
Loading
Loading
Loading
@@ -14,6 +14,6 @@ describe Mutations::ResolvesProject do
project = create(:project)
 
expect(Resolvers::ProjectResolver).to receive(:new).with(object: nil, context: context).and_call_original
expect(mutation.resolve_project(full_path: project.full_path)).to eq(project)
expect(mutation.resolve_project(full_path: project.full_path).sync).to eq(project)
end
end
Loading
Loading
@@ -12,7 +12,7 @@ describe Resolvers::GroupResolver do
it 'batch-resolves groups by full path' do
paths = [group1.full_path, group2.full_path]
 
result = batch(max_queries: 1) do
result = batch_sync(max_queries: 1) do
paths.map { |path| resolve_group(path) }
end
 
Loading
Loading
@@ -20,7 +20,7 @@ describe Resolvers::GroupResolver do
end
 
it 'resolves an unknown full_path to nil' do
result = batch { resolve_group('unknown/project') }
result = batch_sync { resolve_group('unknown/project') }
 
expect(result).to be_nil
end
Loading
Loading
Loading
Loading
@@ -110,7 +110,7 @@ describe Resolvers::IssuesResolver do
 
context "when passing a non existent, batch loaded project" do
let(:project) do
BatchLoader.for("non-existent-path").batch do |_fake_paths, loader, _|
BatchLoader::GraphQL.for("non-existent-path").batch do |_fake_paths, loader, _|
loader.call("non-existent-path", nil)
end
end
Loading
Loading
Loading
Loading
@@ -17,7 +17,7 @@ describe Resolvers::MergeRequestsResolver do
 
describe '#resolve' do
it 'batch-resolves by target project full path and individual IID' do
result = batch(max_queries: 2) do
result = batch_sync(max_queries: 2) do
resolve_mr(project, iid: iid_1) + resolve_mr(project, iid: iid_2)
end
 
Loading
Loading
@@ -25,7 +25,7 @@ describe Resolvers::MergeRequestsResolver do
end
 
it 'batch-resolves by target project full path and IIDS' do
result = batch(max_queries: 2) do
result = batch_sync(max_queries: 2) do
resolve_mr(project, iids: [iid_1, iid_2])
end
 
Loading
Loading
@@ -33,7 +33,7 @@ describe Resolvers::MergeRequestsResolver do
end
 
it 'can batch-resolve merge requests from different projects' do
result = batch(max_queries: 3) do
result = batch_sync(max_queries: 3) do
resolve_mr(project, iid: iid_1) +
resolve_mr(project, iid: iid_2) +
resolve_mr(other_project, iid: other_iid)
Loading
Loading
@@ -43,13 +43,13 @@ describe Resolvers::MergeRequestsResolver do
end
 
it 'resolves an unknown iid to be empty' do
result = batch { resolve_mr(project, iid: -1) }
result = batch_sync { resolve_mr(project, iid: -1) }
 
expect(result).to be_empty
expect(result.compact).to be_empty
end
 
it 'resolves empty iids to be empty' do
result = batch { resolve_mr(project, iids: []) }
result = batch_sync { resolve_mr(project, iids: []) }
 
expect(result).to be_empty
end
Loading
Loading
Loading
Loading
@@ -46,7 +46,7 @@ describe Resolvers::NamespaceProjectsResolver do
 
context "when passing a non existent, batch loaded namespace" do
let(:namespace) do
BatchLoader.for("non-existent-path").batch do |_fake_paths, loader, _|
BatchLoader::GraphQL.for("non-existent-path").batch do |_fake_paths, loader, _|
loader.call("non-existent-path", nil)
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment