gitlab-triage 1.12.0 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1f1647bd8e731bd00b60df96b8bf83e359c2506cbfebd18adedf04a9dcbfcc
-  data.tar.gz: f303e3db93eb3c15d2609de4a80a3c65809f0a8294f37ca0f8809b3ea822fb87
+  metadata.gz: 274f8c4fdb85670a259e32f6c378512e93a52619184714baea85372f77e54c9b
+  data.tar.gz: 469563e881bb1678de111984c70cdd53c64abe241ab27b69ac206c262a10d078
 SHA512:
-  metadata.gz: 348246b297761a1601805c719fbf8b1db6054d70de9c5944c2759c1e802afa23a6b920c334c339bfb9b51417ae701d0c6b6b066a70f7dd6ed463e38c1ad0a8ec
-  data.tar.gz: 1fdcf07e0694c0834fbaa7cec358aaf3ec1c6366ba4d9270b1036fd1c3d466c5ba727c7a839df4da32e3ff420b32f6fc92a1fa819aad5915657eb7113b94c057
+  metadata.gz: 8d850e51292669d2763dfbf7f313fe49b24e99c1bce44a12322901a8dc9f164f1a09c96ff56c6b9fcd798fbc82f43aeed06ed6cf80ede7fb2ec517edbe49d631
+  data.tar.gz: ef78109d3c19698308979c36ef43d3f8e163c5d053f45e093f56dd8da05f6a1c34b5463339a6631944718c561b01ded46845b35924a3d1b1454ed0379faa3310

data/.gitlab/CODEOWNERS

@@ -1,2 +1,2 @@
 # The official maintainers
-* @rymai @godfat @markglenfletcher
+* @rymai @godfat-gitlab @markglenfletcher

data/.gitlab/merge_request_templates/Release.md

@@ -32,4 +32,4 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-triage/commits/
 - Checklist after merging:
   - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
 
-/label ~"Engineering Productivity" ~"ep::triage" ~"tooling::workflow"
+/label ~"Engineering Productivity" ~"ep::triage" ~tooling ~"tooling::workflow"

data/README.md

@@ -141,6 +141,8 @@ Available condition types:
 - [`assignee_member` condition](#assignee-member-condition)
 - [`source_branch` condition](#source-branch-condition)
 - [`target_branch` condition](#target-branch-condition)
+- [`weight` condition](#weight-condition)
+- [`discussions` condition](#discussions-condition)
 - [`ruby` condition](#ruby-condition)
 
 ##### Date condition
@@ -467,6 +469,44 @@ conditions:
   target_branch: 'master'
 ```
 
+##### Weight condition
+
+Accepts a string per the [API documentation](https://docs.gitlab.com/ee/api/issues.html#list-issues).
+This condition is only applicable for issues (not merge requests).
+
+| State           | Type    | Value     |
+| ---------       | ----    | ------    |
+| Any weight      | string  | `Any`  |
+| No weight       | string  | `None`  |
+| Specific weight | integer  | integer |
+
+Example:
+
+```yml
+conditions:
+  weight: Any
+```
+
+##### Discussions condition
+
+Accepts a hash of fields.
+
+| Field           | Type    | Values                              | Required  |
+| ---------       | ----    | ----                                | --------  |
+| `attribute`     | string  | `threads`, `notes`                  | yes       |
+| `condition`     | string  | `less_than`, `greater_than`         | yes       |
+| `threshold`     | integer | integer                             | yes       |
+
+Example:
+
+```yml
+conditions:
+  discussions:
+    attribute: threads
+    condition: greater_than
+    threshold: 15
+```
+
 ##### Ruby condition
 
 This condition allows users to write a Ruby expression to be evaluated for

data/gitlab-triage.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport', '~> 5.1'
+  spec.add_dependency 'globalid', '~> 0.4'
+  spec.add_dependency 'graphql-client', '~> 0.16'
   spec.add_dependency 'httparty', '~> 0.17'
 
   spec.add_development_dependency 'bundler'

data/lib/gitlab/triage/api_query_builders/base_query_param_builder.rb

@@ -2,16 +2,25 @@ module Gitlab
   module Triage
     module APIQueryBuilders
       class BaseQueryParamBuilder
-        attr_reader :param_name, :param_contents
+        attr_reader :param_name, :param_contents, :allowed_values
 
-        def initialize(param_name, param_contents)
+        def initialize(param_name, param_contents, allowed_values: nil)
           @param_name = param_name
           @param_contents = param_contents
+          @allowed_values = allowed_values
+
+          validate_allowed_values! if allowed_values
         end
 
         def build_param
           "&#{param_name}=#{param_content.strip}"
         end
+
+        private
+
+        def validate_allowed_values!
+          ParamsValidator.new([{ name: param_name, type: String, values: allowed_values }], { param_name => param_contents }).validate!
+        end
       end
     end
   end

data/lib/gitlab/triage/api_query_builders/multi_query_param_builder.rb

@@ -6,14 +6,22 @@ module Gitlab
       class MultiQueryParamBuilder < BaseQueryParamBuilder
         attr_reader :separator
 
-        def initialize(param_name, param_contents, separator)
+        def initialize(param_name, param_contents, separator, allowed_values: nil)
           @separator = separator
-          super(param_name, param_contents)
+          super(param_name, Array(param_contents), allowed_values: allowed_values)
         end
 
         def param_content
           param_contents.map(&:strip).join(separator)
         end
+
+        private
+
+        def validate_allowed_values!
+          param_contents.each do |param|
+            ParamsValidator.new([{ name: param_name, type: String, values: allowed_values }], { param_name => param }).validate!
+          end
+        end
       end
     end
   end

data/lib/gitlab/triage/engine.rb

@@ -7,6 +7,7 @@ require_relative 'filters/votes_conditions_filter'
 require_relative 'filters/no_additional_labels_conditions_filter'
 require_relative 'filters/author_member_conditions_filter'
 require_relative 'filters/assignee_member_conditions_filter'
+require_relative 'filters/discussions_conditions_filter'
 require_relative 'filters/ruby_conditions_filter'
 require_relative 'limiters/date_field_limiter'
 require_relative 'action'
@@ -19,7 +20,10 @@ require_relative 'api_query_builders/single_query_param_builder'
 require_relative 'api_query_builders/multi_query_param_builder'
 require_relative 'url_builders/url_builder'
 require_relative 'network'
+require_relative 'graphql_network'
 require_relative 'network_adapters/httparty_adapter'
+require_relative 'network_adapters/graphql_adapter'
+require_relative 'graphql_queries/query_builder'
 require_relative 'ui'
 
 module Gitlab
@@ -27,7 +31,14 @@ module Gitlab
     class Engine
       attr_reader :per_page, :policies, :options
 
-      def initialize(policies:, options:, network_adapter_class: Gitlab::Triage::NetworkAdapters::HttpartyAdapter)
+      DEFAULT_NETWORK_ADAPTER = Gitlab::Triage::NetworkAdapters::HttpartyAdapter
+      DEFAULT_GRAPHQL_ADAPTER = Gitlab::Triage::NetworkAdapters::GraphqlAdapter
+      ALLOWED_STATE_VALUES = {
+        issues: %w[opened closed],
+        merge_requests: %w[opened closed merged]
+      }.with_indifferent_access.freeze
+
+      def initialize(policies:, options:, network_adapter_class: DEFAULT_NETWORK_ADAPTER, graphql_network_adapter_class: DEFAULT_GRAPHQL_ADAPTER)
         options.host_url = policies.delete(:host_url) { options.host_url }
         options.api_version = policies.delete(:api_version) { 'v4' }
         options.dry_run = ENV['TEST'] == 'true' if options.dry_run.nil?
@@ -36,6 +47,7 @@ module Gitlab
         @policies = policies
         @options = options
         @network_adapter_class = network_adapter_class
+        @graphql_network_adapter_class = graphql_network_adapter_class
 
         assert_all!
         assert_project_id!
@@ -62,6 +74,10 @@ module Gitlab
         @network ||= Network.new(network_adapter)
       end
 
+      def graphql_network
+        @graphql_network ||= GraphqlNetwork.new(graphql_network_adapter)
+      end
+
       private
 
       def assert_project_id!
@@ -94,6 +110,10 @@ module Gitlab
         @network_adapter ||= @network_adapter_class.new(options)
       end
 
+      def graphql_network_adapter
+        @graphql_network_adapter ||= @graphql_network_adapter_class.new(options)
+      end
+
       def rule_conditions(rule)
         rule.fetch(:conditions) { {} }
       end
@@ -158,8 +178,13 @@ module Gitlab
           # retrieving the resources for every rule is inefficient
           # however, previous rules may affect those upcoming
           resources = network.query_api(build_get_url(resource_type, conditions))
+          iids = resources.pluck('iid').map(&:to_s)
+
+          graphql_query = build_graphql_query(resource_type, conditions)
+          graphql_resources = graphql_network.query(graphql_query, source: options.source_id, iids: iids) if graphql_query.present?
           # In some filters/actions we want to know which resource type it is
           attach_resource_type(resources, resource_type)
+          decorate_resources_with_graphql_data(resources, graphql_resources)
 
           puts "\n\n* Found #{resources.count} resources..."
           print "* Filtering resources..."
@@ -180,6 +205,13 @@ module Gitlab
         resources.each { |resource| resource[:type] ||= resource_type }
       end
 
+      def decorate_resources_with_graphql_data(resources, graphql_resources)
+        return if graphql_resources.nil?
+
+        graphql_resources_by_id = graphql_resources.to_h { |resource| [resource[:id], resource] }
+        resources.each { |resource| resource.merge!(graphql_resources_by_id[resource[:id]].to_h) }
+      end
+
       def process_action(policy)
         Action.process(
           policy: policy,
@@ -213,6 +245,10 @@ module Gitlab
             results << Filters::AssigneeMemberConditionsFilter.new(resource, conditions[:assignee_member], network).calculate
           end
 
+          if conditions[:discussions]
+            results << Filters::DiscussionsConditionsFilter.new(resource, conditions[:discussions]).calculate
+          end
+
           if conditions[:ruby]
             results << Filters::RubyConditionsFilter.new(resource, conditions, network).calculate
           end
@@ -244,7 +280,13 @@ module Gitlab
           condition_builders << APIQueryBuilders::MultiQueryParamBuilder.new('not[labels]', conditions[:forbidden_labels], ',')
         end
 
-        condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('state', conditions[:state]) if conditions[:state]
+        if conditions[:state]
+          condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new(
+            'state',
+            conditions[:state],
+            allowed_values: ALLOWED_STATE_VALUES[resource_type])
+        end
+
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('milestone', Array(conditions[:milestone])[0]) if conditions[:milestone]
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('source_branch', conditions[:source_branch]) if conditions[:source_branch]
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('target_branch', conditions[:target_branch]) if conditions[:target_branch]
@@ -253,6 +295,10 @@ module Gitlab
           condition_builders << APIQueryBuilders::DateQueryParamBuilder.new(conditions.delete(:date))
         end
 
+        if conditions[:weight] && resource_type.to_sym == :issues
+          condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('weight', conditions[:weight])
+        end
+
         condition_builders.each do |condition_builder|
           params[condition_builder.param_name] = condition_builder.param_content
         end
@@ -266,6 +312,11 @@ module Gitlab
           params: params
         ).build
       end
+
+      def build_graphql_query(resource_type, conditions)
+        Gitlab::Triage::GraphqlQueries::QueryBuilder
+          .new(options.source, resource_type, conditions)
+      end
     end
   end
 end

data/lib/gitlab/triage/filters/discussions_conditions_filter.rb

@@ -0,0 +1,58 @@
+require_relative 'base_conditions_filter'
+
+module Gitlab
+  module Triage
+    module Filters
+      class DiscussionsConditionsFilter < BaseConditionsFilter
+        ATTRIBUTES = %w[notes threads].freeze
+        CONDITIONS = %w[greater_than less_than].freeze
+
+        def self.filter_parameters
+          [
+            {
+              name: :attribute,
+              type: String,
+              values: ATTRIBUTES
+            },
+            {
+              name: :condition,
+              type: String,
+              values: CONDITIONS
+            },
+            {
+              name: :threshold,
+              type: Numeric
+            }
+          ]
+        end
+
+        def initialize_variables(condition)
+          @attribute = condition[:attribute].to_sym
+          @condition = condition[:condition].to_sym
+          @threshold = condition[:threshold]
+        end
+
+        def resource_value
+          if @attribute == :notes
+            @resource[:user_notes_count]
+          else
+            @resource[:user_discussions_count]
+          end
+        end
+
+        def condition_value
+          @threshold
+        end
+
+        def calculate
+          case @condition
+          when :greater_than
+            resource_value.to_i > condition_value
+          when :less_than
+            resource_value.to_i < condition_value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/graphql_network.rb

@@ -0,0 +1,54 @@
+require 'active_support/all'
+require 'net/protocol'
+require 'globalid'
+
+require_relative 'retryable'
+require_relative 'ui'
+require_relative 'errors'
+
+module Gitlab
+  module Triage
+    class GraphqlNetwork
+      attr_reader :options, :adapter
+
+      def initialize(adapter)
+        @adapter = adapter
+        @options = adapter.options
+      end
+
+      def query(graphql_query, variables = {})
+        return if graphql_query.blank?
+
+        response = {}
+        resources = []
+
+        parsed_graphql_query = adapter.parse(graphql_query.query)
+
+        begin
+          print '.'
+
+          response = adapter.query(
+            parsed_graphql_query,
+            resource_path: graphql_query.resource_path,
+            variables: variables.merge(after: response.delete(:end_cursor))
+          )
+
+          resources.concat(Array.wrap(response.delete(:results)))
+        end while response.delete(:more_pages)
+
+        resources
+          .map { |resource| resource.deep_transform_keys(&:underscore) }
+          .map(&:with_indifferent_access)
+          .map { |resource| resource.merge(id: extract_id_from_global_id(resource[:id])) }
+      end
+
+      private
+
+      def extract_id_from_global_id(global_id)
+        return if global_id.blank?
+
+        GlobalID.parse(global_id).model_id.to_i
+      end
+    end
+  end
+end

data/lib/gitlab/triage/graphql_queries/query_builder.rb

@@ -0,0 +1,47 @@
+require_relative 'user_notes_query'
+require_relative 'threads_query'
+
+module Gitlab
+  module Triage
+    module GraphqlQueries
+      class QueryBuilder
+        def initialize(source_type, resource_type, conditions)
+          @source_type = source_type.to_s.singularize
+          @resource_type = resource_type
+          @conditions = conditions
+        end
+
+        def resource_path
+          [source_type, resource_type]
+        end
+
+        def query
+          return if query_template.nil?
+
+          format(query_template, source_type: source_type, resource_type: resource_type.to_s.camelize(:lower), group_query: group_query)
+        end
+
+        delegate :present?, to: :query_template
+
+        private
+
+        attr_reader :source_type, :resource_type, :conditions
+
+        def query_template
+          case conditions.dig(:discussions, :attribute).to_s
+          when 'notes'
+            UserNotesQuery
+          when 'threads'
+            ThreadsQuery
+          end
+        end
+
+        def group_query
+          return if source_type != 'group'
+
+          ', includeSubgroups: true'
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/graphql_queries/threads_query.rb

@@ -0,0 +1,23 @@
+module Gitlab
+  module Triage
+    module GraphqlQueries
+      ThreadsQuery = <<-GRAPHQL.freeze # rubocop:disable Naming/ConstantName
+        query($source: ID!, $after: String, $iids: [String!]) {
+          %{source_type}(fullPath: $source) {
+            id
+            %{resource_type}(after: $after, iids: $iids%{group_query}) {
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
+              nodes {
+                id
+                userDiscussionsCount
+              }
+            }
+          }
+        }
+      GRAPHQL
+    end
+  end
+end

data/lib/gitlab/triage/graphql_queries/user_notes_query.rb

@@ -0,0 +1,23 @@
+module Gitlab
+  module Triage
+    module GraphqlQueries
+      UserNotesQuery = <<-GRAPHQL.freeze # rubocop:disable Naming/ConstantName
+        query($source: ID!, $after: String, $iids: [String!]) {
+          %{source_type}(fullPath: $source) {
+            id
+            %{resource_type}(after: $after, iids: $iids%{group_query}) {
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
+              nodes {
+                id
+                userNotesCount
+              }
+            }
+          }
+        }
+      GRAPHQL
+    end
+  end
+end

data/lib/gitlab/triage/network_adapters/graphql_adapter.rb

@@ -0,0 +1,69 @@
+require 'graphql/client'
+require 'graphql/client/http'
+
+require_relative 'base_adapter'
+require_relative '../ui'
+require_relative '../errors'
+
+module Gitlab
+  module Triage
+    module NetworkAdapters
+      class GraphqlAdapter < BaseAdapter
+        Client = GraphQL::Client
+
+        def query(graphql_query, resource_path: [], variables: {})
+          response = client.query(graphql_query, variables: variables, context: { token: options.token })
+
+          raise_on_error!(response)
+
+          parsed_response = parse_response(response, resource_path)
+
+          return { results: {} } if parsed_response.nil?
+          return { results: parsed_response.map(&:to_h) } if parsed_response.is_a?(Client::List)
+          return { results: parsed_response.to_h } unless parsed_response.nodes?
+
+          {
+            more_pages: parsed_response.page_info.has_next_page,
+            end_cursor: parsed_response.page_info.end_cursor,
+            results: parsed_response.nodes.map(&:to_h)
+          }
+        end
+
+        delegate :parse, to: :client
+
+        private
+
+        def parse_response(response, resource_path)
+          resource_path.reduce(response.data) { |data, resource| data&.send(resource) }
+        end
+
+        def raise_on_error!(response)
+          return if response.errors.blank?
+
+          puts Gitlab::Triage::UI.debug response.inspect if options.debug
+
+          raise "There was an error: #{response.errors.messages.to_json}"
+        end
+
+        def http_client
+          Client::HTTP.new("#{options.host_url}/api/graphql") do
+            def headers(context) # rubocop:disable Lint/NestedMethodDefinition
+              {
+                'Content-type' => 'application/json',
+                'PRIVATE-TOKEN' => context[:token]
+              }
+            end
+          end
+        end
+
+        def schema
+          @schema ||= Client.load_schema(http_client)
+        end
+
+        def client
+          @client ||= Client.new(schema: schema, execute: http_client).tap { |client| client.allow_dynamic_queries = true }
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/validators/params_validator.rb

@@ -34,7 +34,7 @@ module Gitlab
       def validate_parameter_content(value)
         @parameter_definitions.each do |param|
           if param[:values]
-            raise InvalidParameter, "#{param[:name]} must be of one of #{param[:values].join(',')}" unless param[:values].include?(value[param[:name]])
+            raise InvalidParameter, "#{param[:name]} must be one of #{param[:values].join(',')}" unless param[:values].include?(value[param[:name]])
           end
         end
       end

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.12.0'
+    VERSION = '1.14.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.14.3
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: globalid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: graphql-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -158,16 +186,22 @@ files:
 - lib/gitlab/triage/filters/assignee_member_conditions_filter.rb
 - lib/gitlab/triage/filters/author_member_conditions_filter.rb
 - lib/gitlab/triage/filters/base_conditions_filter.rb
+- lib/gitlab/triage/filters/discussions_conditions_filter.rb
 - lib/gitlab/triage/filters/member_conditions_filter.rb
 - lib/gitlab/triage/filters/merge_request_date_conditions_filter.rb
 - lib/gitlab/triage/filters/name_conditions_filter.rb
 - lib/gitlab/triage/filters/no_additional_labels_conditions_filter.rb
 - lib/gitlab/triage/filters/ruby_conditions_filter.rb
 - lib/gitlab/triage/filters/votes_conditions_filter.rb
+- lib/gitlab/triage/graphql_network.rb
+- lib/gitlab/triage/graphql_queries/query_builder.rb
+- lib/gitlab/triage/graphql_queries/threads_query.rb
+- lib/gitlab/triage/graphql_queries/user_notes_query.rb
 - lib/gitlab/triage/limiters/base_limiter.rb
 - lib/gitlab/triage/limiters/date_field_limiter.rb
 - lib/gitlab/triage/network.rb
 - lib/gitlab/triage/network_adapters/base_adapter.rb
+- lib/gitlab/triage/network_adapters/graphql_adapter.rb
 - lib/gitlab/triage/network_adapters/httparty_adapter.rb
 - lib/gitlab/triage/network_adapters/test_adapter.rb
 - lib/gitlab/triage/option_parser.rb
@@ -213,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: GitLab triage automation project.