Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

12 files changed, 129 insertions, 23 deletions

diff --git a/app/graphql/resolvers/ci/project_pipeline_counts_resolver.rb b/app/graphql/resolvers/ci/project_pipeline_counts_resolver.rb
new file mode 100644
index 00000000000..728bc9627c5
--- /dev/null
+++ b/app/graphql/resolvers/ci/project_pipeline_counts_resolver.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Ci
+    class ProjectPipelineCountsResolver < BaseResolver
+      type Types::Ci::PipelineCountsType, null: true
+
+      argument :ref,
+              GraphQL::Types::String,
+              required: false,
+              description: "Filter pipelines by the ref they are run for."
+
+      argument :sha,
+              GraphQL::Types::String,
+              required: false,
+              description: "Filter pipelines by the SHA of the commit they are run for."
+
+      argument :source,
+              GraphQL::Types::String,
+              required: false,
+              description: "Filter pipelines by their source."
+
+      def resolve(**args)
+        ::Gitlab::PipelineScopeCounts.new(context[:current_user], object, args)
+      end
+    end
+  end
+end
diff --git a/app/graphql/resolvers/ci/runner_jobs_resolver.rb b/app/graphql/resolvers/ci/runner_jobs_resolver.rb
new file mode 100644
index 00000000000..2f6ca09d031
--- /dev/null
+++ b/app/graphql/resolvers/ci/runner_jobs_resolver.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Ci
+    class RunnerJobsResolver < BaseResolver
+      include Gitlab::Graphql::Authorize::AuthorizeResource
+      include LooksAhead
+
+      type ::Types::Ci::JobType.connection_type, null: true
+      authorize :read_builds
+      authorizes_object!
+
+      argument :statuses, [::Types::Ci::JobStatusEnum],
+               required: false,
+               description: 'Filter jobs by status.'
+
+      alias_method :runner, :object
+
+      def ready?(**args)
+        context[self.class] ||= { executions: 0 }
+        context[self.class][:executions] += 1
+
+        raise GraphQL::ExecutionError, "Jobs can be requested for only one runner at a time" if context[self.class][:executions] > 1
+
+        super
+      end
+
+      def resolve_with_lookahead(statuses: nil)
+        jobs = ::Ci::JobsFinder.new(current_user: current_user, runner: runner, params: { scope: statuses }).execute
+
+        apply_lookahead(jobs)
+      end
+
+      private
+
+      def preloads
+        {
+          previous_stage_jobs_and_needs: [:needs, :pipeline],
+          artifacts: [:job_artifacts],
+          pipeline: [:user]
+        }
+      end
+    end
+  end
+end
diff --git a/app/graphql/resolvers/ci/runners_resolver.rb b/app/graphql/resolvers/ci/runners_resolver.rb
index 9848b5a503f..e221dfea4d0 100644
--- a/app/graphql/resolvers/ci/runners_resolver.rb
+++ b/app/graphql/resolvers/ci/runners_resolver.rb
@@ -9,7 +9,12 @@ module Resolvers
 
       argument :active, ::GraphQL::Types::Boolean,
                required: false,
-               description: 'Filter runners by active (true) or paused (false) status.'
+               description: 'Filter runners by `active` (true) or `paused` (false) status.',
+               deprecated: { reason: :renamed, replacement: 'paused', milestone: '14.8' }
+
+      argument :paused, ::GraphQL::Types::Boolean,
+               required: false,
+               description: 'Filter runners by `paused` (true) or `active` (false) status.'
 
       argument :status, ::Types::Ci::RunnerStatusEnum,
                required: false,
@@ -41,8 +46,11 @@ module Resolvers
       protected
 
       def runners_finder_params(params)
+        # Give preference to paused argument over the deprecated 'active' argument
+        paused = params.fetch(:paused, params[:active] ? !params[:active] : nil)
+
         {
-          active: params[:active],
+          active: paused.nil? ? nil : !paused,
           status_status: params[:status]&.to_s,
           type_type: params[:type],
           tag_name: params[:tag_list],
diff --git a/app/graphql/resolvers/clusters/agent_tokens_resolver.rb b/app/graphql/resolvers/clusters/agent_tokens_resolver.rb
index 8208fa56485..722fbab3bb7 100644
--- a/app/graphql/resolvers/clusters/agent_tokens_resolver.rb
+++ b/app/graphql/resolvers/clusters/agent_tokens_resolver.rb
@@ -25,7 +25,7 @@ module Resolvers
       private
 
       def can_read_agent_tokens?
-        current_user.can?(:admin_cluster, project)
+        current_user.can?(:read_cluster, project)
       end
     end
   end
diff --git a/app/graphql/resolvers/kas/agent_configurations_resolver.rb b/app/graphql/resolvers/kas/agent_configurations_resolver.rb
index a1b1d3bfe4c..9db104287a6 100644
--- a/app/graphql/resolvers/kas/agent_configurations_resolver.rb
+++ b/app/graphql/resolvers/kas/agent_configurations_resolver.rb
@@ -21,7 +21,7 @@ module Resolvers
       private
 
       def can_read_agent_configuration?
-        current_user.can?(:admin_cluster, project)
+        current_user.can?(:read_cluster, project)
       end
 
       def kas_client
diff --git a/app/graphql/resolvers/kas/agent_connections_resolver.rb b/app/graphql/resolvers/kas/agent_connections_resolver.rb
index 8b7c4003598..cf1a47aac75 100644
--- a/app/graphql/resolvers/kas/agent_connections_resolver.rb
+++ b/app/graphql/resolvers/kas/agent_connections_resolver.rb
@@ -29,7 +29,7 @@ module Resolvers
 
       def get_connected_agents
         kas_client.get_connected_agents(project: project)
-      rescue GRPC::BadStatus => e
+      rescue GRPC::BadStatus, Gitlab::Kas::Client::ConfigurationError => e
         raise Gitlab::Graphql::Errors::ResourceNotAvailable, e.class.name
       end
 
diff --git a/app/graphql/resolvers/merge_requests_resolver.rb b/app/graphql/resolvers/merge_requests_resolver.rb
index 6dbcbe0e04d..72372ae6b42 100644
--- a/app/graphql/resolvers/merge_requests_resolver.rb
+++ b/app/graphql/resolvers/merge_requests_resolver.rb
@@ -55,6 +55,19 @@ module Resolvers
              required: false,
              description: 'Limit result to draft merge requests.'
 
+    argument :created_after, Types::TimeType,
+             required: false,
+             description: 'Merge requests created after this timestamp.'
+    argument :created_before, Types::TimeType,
+             required: false,
+             description: 'Merge requests created before this timestamp.'
+    argument :updated_after, Types::TimeType,
+             required: false,
+             description: 'Merge requests updated after this timestamp.'
+    argument :updated_before, Types::TimeType,
+             required: false,
+             description: 'Merge requests updated before this timestamp.'
+
     argument :labels, [GraphQL::Types::String],
              required: false,
              as: :label_name,
@@ -72,12 +85,6 @@ module Resolvers
              description: 'Sort merge requests by this criteria.',
              required: false,
              default_value: :created_desc
-    argument :created_after, Types::TimeType,
-             required: false,
-             description: 'Merge requests created after this timestamp.'
-    argument :created_before, Types::TimeType,
-             required: false,
-             description: 'Merge requests created before this timestamp.'
 
     negated do
       argument :labels, [GraphQL::Types::String],
diff --git a/app/graphql/resolvers/paginated_tree_resolver.rb b/app/graphql/resolvers/paginated_tree_resolver.rb
index 6c0545d26de..d29d87ca204 100644
--- a/app/graphql/resolvers/paginated_tree_resolver.rb
+++ b/app/graphql/resolvers/paginated_tree_resolver.rb
@@ -11,14 +11,14 @@ module Resolvers
               required: false,
               default_value: '', # root of the repository
               description: 'Path to get the tree for. Default value is the root of the repository.'
-    argument :ref, GraphQL::Types::String,
-              required: false,
-              default_value: :head,
-              description: 'Commit ref to get the tree for. Default value is HEAD.'
     argument :recursive, GraphQL::Types::Boolean,
               required: false,
               default_value: false,
               description: 'Used to get a recursive tree. Default is false.'
+    argument :ref, GraphQL::Types::String,
+              required: false,
+              default_value: :head,
+              description: 'Commit ref to get the tree for. Default value is HEAD.'
 
     alias_method :repository, :object
 
diff --git a/app/graphql/resolvers/project_jobs_resolver.rb b/app/graphql/resolvers/project_jobs_resolver.rb
index 8a2693ee46b..b09158d475d 100644
--- a/app/graphql/resolvers/project_jobs_resolver.rb
+++ b/app/graphql/resolvers/project_jobs_resolver.rb
@@ -18,7 +18,8 @@ module Resolvers
     def ready?(**args)
       context[self.class] ||= { executions: 0 }
       context[self.class][:executions] += 1
-      raise GraphQL::ExecutionError, "Jobs can only be requested for one project at a time" if context[self.class][:executions] > 1
+
+      raise GraphQL::ExecutionError, "Jobs can be requested for only one project at a time" if context[self.class][:executions] > 1
 
       super
     end
diff --git a/app/graphql/resolvers/recent_boards_resolver.rb b/app/graphql/resolvers/recent_boards_resolver.rb
new file mode 100644
index 00000000000..4de5b8f072b
--- /dev/null
+++ b/app/graphql/resolvers/recent_boards_resolver.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Resolvers
+  class RecentBoardsResolver < BaseResolver
+    type Types::BoardType, null: true
+
+    def resolve
+      parent = object.respond_to?(:sync) ? object.sync : object
+      return Board.none unless parent
+
+      recent_visits =
+        ::Boards::VisitsFinder.new(parent, current_user).latest(Board::RECENT_BOARDS_SIZE)
+
+      recent_visits&.map(&:board) || []
+    end
+  end
+end
diff --git a/app/graphql/resolvers/tree_resolver.rb b/app/graphql/resolvers/tree_resolver.rb
index 8d6ece0956e..f02eb226810 100644
--- a/app/graphql/resolvers/tree_resolver.rb
+++ b/app/graphql/resolvers/tree_resolver.rb
@@ -10,14 +10,14 @@ module Resolvers
               required: false,
               default_value: '',
               description: 'Path to get the tree for. Default value is the root of the repository.'
-    argument :ref, GraphQL::Types::String,
-              required: false,
-              default_value: :head,
-              description: 'Commit ref to get the tree for. Default value is HEAD.'
     argument :recursive, GraphQL::Types::Boolean,
               required: false,
               default_value: false,
               description: 'Used to get a recursive tree. Default is false.'
+    argument :ref, GraphQL::Types::String,
+              required: false,
+              default_value: :head,
+              description: 'Commit ref to get the tree for. Default value is HEAD.'
 
     alias_method :repository, :object
 
diff --git a/app/graphql/resolvers/users/groups_resolver.rb b/app/graphql/resolvers/users/groups_resolver.rb
index d8492a8fcf9..09c6b51cc3d 100644
--- a/app/graphql/resolvers/users/groups_resolver.rb
+++ b/app/graphql/resolvers/users/groups_resolver.rb
@@ -11,13 +11,13 @@ module Resolvers
       authorize :read_user_groups
       authorizes_object!
 
-      argument :search, GraphQL::Types::String,
-               required: false,
-               description: 'Search by group name or path.'
       argument :permission_scope,
                ::Types::PermissionTypes::GroupEnum,
                required: false,
                description: 'Filter by permissions the user has on groups.'
+      argument :search, GraphQL::Types::String,
+               required: false,
+               description: 'Search by group name or path.'
 
       before_connection_authorization do |nodes, current_user|
         Preloaders::GroupPolicyPreloader.new(nodes, current_user).execute