gitlab-triage 1.16.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843acca8deb39647c9cea0af3b5fbeb5bfd620c7cc00f007c1ad3c891db198f4
-  data.tar.gz: b0445de658103d20efa09b883f98360f1569ce7c0a9e03a8928431bb05b4e61f
+  metadata.gz: 84173833ef78959cc6fdb59fa9dbe7e69ad7061265d22a1941c57a36b2f8e42b
+  data.tar.gz: 1293b7b39aca995152acfbed956af54c35d4897eee90f9db586bb318c20bd18c
 SHA512:
-  metadata.gz: fa98bec626946cfb312e48b6b0a5d7a06b5b47eda6d8caca6a2775a4d55c5cb1d1ffe97334fbae673da58a1ad324c3440a68be7d8665590e2bb536f11afb05df
-  data.tar.gz: '098cd6f58e0f2799911fed6650e0d729e9efd85721722340a5bd6215400dca2a3bef92f3d34c1e70ec306d49c1d1be15a27cb6d5d3d4ae055f406c3afb71cd35'
+  metadata.gz: 73b18f51c5386dc91946fe55531057d04908b74f42b16830458c8af11efdbac16a13791191310eddb5732764e2ffa49a89500d5fbbd8ca10a63dbae9f89acef8
+  data.tar.gz: ab7cefaa8a5574fb8f0e9b1c73875441975976275e28eb0f2e57194f6b26cf69323f60c3094b9d10cad88120df4abdbe112516c8c5e6a3c9f1e5e1efaad46a6f

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
     - rubocop-default.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   Exclude:
     - 'vendor/**/*'
     - 'tmp/**/*'

data/README.md

@@ -38,6 +38,7 @@ The format of the file is [YAML](https://en.wikipedia.org/wiki/YAML).
 project.
 
 Select which resource to add the policy to:
+- `epics`
 - `issues`
 - `merge_requests`
 
@@ -47,9 +48,28 @@ For example:
 
 ```yml
 resource_rules:
+  epics:
+    rules:
+      - name: My epic policy
+        conditions:
+          date:
+            attribute: updated_at
+            condition: older_than
+            interval_type: days
+            interval: 5
+          state: opened
+          labels:
+            - None
+        actions:
+          labels:
+            - needs attention
+          mention:
+            - markglenfletcher
+          comment: |
+            {{author}} This epic is unlabelled after 5 days. It needs attention. Please take care of this before the end of #{2.days.from_now.strftime('%Y-%m-%d')}
   issues:
     rules:
-      - name: My policy
+      - name: My issue policy
         conditions:
           date:
             attribute: updated_at
@@ -86,7 +106,7 @@ resource_rules:
               /label ~"needs attention"
   merge_requests:
     rules:
-      - name: My policy
+      - name: My merge request policy
         conditions:
           state: opened
           labels:
@@ -797,8 +817,8 @@ Accepts a hash of fields.
 
 | Field         | Type   | Description                                     | Required | Placeholders | Ruby expression | Default        |
 | ----          | ----   | ----                                            | ----     | ----         | ----            | ----           |
-| `title`       | string | The title of the generated issue                | yes      | yes          | no              |                |
-| `destination` | integer or string | The project ID or path to create the generated issue in | no       | no           | no              | source project |
+| `title`       | string | The title of the generated issue                | yes      | yes          | yes             |                |
+| `destination` | integer or string | The project ID or path to create the generated issue in | no   | no              | no             | source project |
 | `item`        | string | Template representing each triaged resource     | no       | yes          | yes             |                |
 | `summary`     | string | The description of the generated issue          | no       | Only `{{title}}`, `{{items}}`, `{{type}}` | yes | |
 | `redact_confidential_resources` | boolean | Whether redact fields for confidential resources | no | no | no | true |
@@ -901,7 +921,7 @@ resource_rules:
           comment_type: thread
           comment_on_summary: |
             # {{title}}
-            
+
             author: {{author}}
           summarize:
             title: |

data/bin/gitlab-triage

@@ -3,6 +3,7 @@
 require 'yaml'
 require_relative '../lib/gitlab/triage/option_parser'
 require_relative '../lib/gitlab/triage/engine'
+require_relative '../lib/gitlab/triage/ui'
 
 options = Gitlab::Triage::OptionParser.parse(ARGV)
 options.policies_files << '.triage-policies.yml' if options.policies_files.empty?
@@ -10,7 +11,9 @@ options.policies_files << '.triage-policies.yml' if options.policies_files.empty
 options.policies_files.each do |policies_file|
   policies = HashWithIndifferentAccess.new(YAML.load_file(policies_file))
 
-  Gitlab::Triage::Engine
+  policy_engine = Gitlab::Triage::Engine
     .new(policies: policies, options: options)
-    .perform
+
+  puts Gitlab::Triage::UI.header("Executing policies from #{policies_file}.", char: '*')
+  policy_engine.perform
 end

data/lib/gitlab/triage/action/comment.rb

@@ -57,14 +57,17 @@ module Gitlab
         end
 
         def build_post_url(resource)
-          # POST /projects/:id/issues/:issue_iid/notes
-          post_url = UrlBuilders::UrlBuilder.new(
+          url_builder_opts = {
             network_options: network.options,
-            source_id: resource[:project_id],
+            source: policy.source,
+            source_id: resource[policy.source_id_sym],
             resource_type: policy.type,
-            resource_id: resource['iid'],
+            resource_id: resource_id(resource),
             sub_resource_type: sub_resource_type
-          ).build
+          }
+
+          # POST /(groups|projects)/:id/(epics|issues|merge_requests)/:iid/notes
+          post_url = UrlBuilders::UrlBuilder.new(url_builder_opts).build
 
           puts Gitlab::Triage::UI.debug "post_url: #{post_url}" if network.options.debug
 
@@ -81,6 +84,15 @@ module Gitlab
             raise ArgumentError, "Unknown comment type: #{type}"
           end
         end
+
+        def resource_id(resource)
+          case policy.type
+          when 'epics'
+            resource['id']
+          else
+            resource['iid']
+          end
+        end
       end
     end
   end

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

@@ -1,57 +1,32 @@
-require_relative '../validators/params_validator'
+require_relative '../param_builders/date_param_builder'
+require_relative 'base_query_param_builder'
 
 module Gitlab
   module Triage
     module APIQueryBuilders
-      class DateQueryParamBuilder
+      class DateQueryParamBuilder < BaseQueryParamBuilder
         ATTRIBUTES = %w[updated_at created_at].freeze
-        CONDITIONS = %w[older_than newer_than].freeze
-        INTERVAL_TYPES = %w[days weeks months years].freeze
-
-        def self.filter_parameters
-          [
-            {
-              name: :attribute,
-              type: String,
-              values: ATTRIBUTES
-            },
-            {
-              name: :condition,
-              type: String,
-              values: CONDITIONS
-            },
-            {
-              name: :interval_type,
-              type: String,
-              values: INTERVAL_TYPES
-            },
-            {
-              name: :interval,
-              type: Numeric
-            }
-          ]
-        end
 
         def self.applicable?(condition)
           ATTRIBUTES.include?(condition[:attribute].to_s)
         end
 
         def initialize(condition_hash)
-          @attribute = condition_hash[:attribute].to_s
-          @interval_condition = condition_hash[:condition].to_sym
-          @interval_type = condition_hash[:interval_type]
-          @interval = condition_hash[:interval]
-          validate_condition(condition_hash)
+          date_param_builder = ParamBuilders::DateParamBuilder.new(ATTRIBUTES, condition_hash)
+
+          super(build_param_name(condition_hash), date_param_builder.param_content)
         end
 
-        def validate_condition(condition)
-          ParamsValidator.new(self.class.filter_parameters, condition).validate!
+        def param_content
+          param_contents
         end
 
-        def param_name
-          prefix = attribute.sub(/_at\z/, '')
+        private
+
+        def build_param_name(condition_hash)
+          prefix = condition_hash[:attribute].to_s.sub(/_at\z/, '')
           suffix =
-            case interval_condition
+            case condition_hash[:condition].to_sym
             when :older_than
               'before'
             when :newer_than
@@ -60,18 +35,6 @@ module Gitlab
 
           "#{prefix}_#{suffix}"
         end
-
-        def param_content
-          interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
-        end
-
-        def build_param
-          "&#{param_name}=#{param_content.strip}"
-        end
-
-        private
-
-        attr_reader :condition_hash, :attribute, :interval_condition, :interval_type, :interval
       end
     end
   end

data/lib/gitlab/triage/command_builders/label_command_builder.rb

@@ -14,7 +14,11 @@ module Gitlab
 
         def ensure_labels_exist!
           items.each do |label|
-            label_opts = { project_id: resource[:project_id], name: label }
+            source_id_key = resource.key?(:group_id) ? :group_id : :project_id
+            label_opts = {
+              source_id_key => resource[source_id_key],
+              name: label
+            }
 
             unless Resource::Label.new(label_opts, network: network).exist?
               raise Resource::Label::LabelDoesntExistError,

data/lib/gitlab/triage/engine.rb

@@ -37,6 +37,7 @@ module Gitlab
         issues: %w[opened closed],
         merge_requests: %w[opened closed merged]
       }.with_indifferent_access.freeze
+      EpicsTriagingForProjectImpossibleError = Class.new(StandardError)
 
       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 }
@@ -62,6 +63,10 @@ module Gitlab
         puts
 
         resource_rules.each do |resource_type, resource|
+          if resource_type == 'epics' && options.source != :groups
+            raise(EpicsTriagingForProjectImpossibleError, "Epics can only be triaged at the group level. Please set the `--source groups` option.")
+          end
+
           puts Gitlab::Triage::UI.header("Processing rules for #{resource_type}", char: '-')
           puts
 
@@ -177,14 +182,23 @@ module Gitlab
         ExpandCondition.perform(rule_conditions(rule)) do |conditions|
           # 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)
+          resources = []
+
+          if rule[:api] == 'graphql'
+            graphql_query = build_graphql_query(resource_type, conditions, true)
+            resources = graphql_network.query(graphql_query, source: source_full_path)
+          else
+            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: source_full_path, iids: iids) if graphql_query.any?
+
+            decorate_resources_with_graphql_data(resources, graphql_resources)
+          end
 
-          graphql_query = build_graphql_query(resource_type, conditions)
-          graphql_resources = graphql_network.query(graphql_query, source: source_full_path, 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..."
@@ -199,10 +213,17 @@ module Gitlab
         end
       end
 
-      # We don't have to do this once the response will contain the type
-      # of the resource. For now let's just attach it.
       def attach_resource_type(resources, resource_type)
-        resources.each { |resource| resource[:type] ||= resource_type }
+        resources.each { |resource| resource[:type] = resource_type }
+        # TODO:                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        # We should not overwrite the attribute here, but we need to
+        # fix it first. We should instead use something like
+        # gitlab_triage_resource_type so it won't conflict with the
+        # existing fields.
+        # And we need to retain the backward compatibility that using
+        # {{type}} will give us this value, rather than from the REST API,
+        # which will give us ISSUE from:
+        # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59648
       end
 
       def decorate_resources_with_graphql_data(resources, graphql_resources)
@@ -313,9 +334,9 @@ module Gitlab
         ).build
       end
 
-      def build_graphql_query(resource_type, conditions)
+      def build_graphql_query(resource_type, conditions, graphql_only = false)
         Gitlab::Triage::GraphqlQueries::QueryBuilder
-          .new(options.source, resource_type, conditions)
+          .new(options.source, resource_type, conditions, graphql_only: graphql_only)
       end
 
       def source_full_path

data/lib/gitlab/triage/graphql_network.rb

@@ -44,11 +44,21 @@ module Gitlab
         resources
           .map { |resource| resource.deep_transform_keys(&:underscore) }
           .map(&:with_indifferent_access)
-          .map { |resource| resource.merge(id: extract_id_from_global_id(resource[:id])) }
+          .map { |resource| normalize(resource) }
       end
 
       private
 
+      def normalize(resource)
+        resource
+          .slice(:iid, :title, :state, :author, :merged_at, :user_notes_count, :user_discussions_count, :upvotes, :downvotes, :project_id, :web_url)
+          .merge(
+            id: extract_id_from_global_id(resource[:id]),
+            labels: [*resource.dig(:labels, :nodes)].pluck(:title),
+            assignees: [*resource.dig(:assignees, :nodes)]
+          )
+      end
+
       def extract_id_from_global_id(global_id)
         return if global_id.blank?
 

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

@@ -1,14 +1,16 @@
-require_relative 'user_notes_query'
-require_relative 'threads_query'
+require_relative 'query_param_builders/base_param_builder'
+require_relative 'query_param_builders/date_param_builder'
+require_relative 'query_param_builders/labels_param_builder'
 
 module Gitlab
   module Triage
     module GraphqlQueries
       class QueryBuilder
-        def initialize(source_type, resource_type, conditions)
+        def initialize(source_type, resource_type, conditions, graphql_only: false)
           @source_type = source_type.to_s.singularize
           @resource_type = resource_type
           @conditions = conditions
+          @graphql_only = graphql_only
         end
 
         def resource_path
@@ -16,30 +18,100 @@ module Gitlab
         end
 
         def query
-          return if query_template.nil?
+          return if resource_fields.empty?
 
-          format(query_template, source_type: source_type, resource_type: resource_type.to_s.camelize(:lower), group_query: group_query)
+          format(
+            BASE_QUERY,
+            source_type: source_type,
+            resource_type: resource_type.to_s.camelize(:lower),
+            resource_fields: resource_fields.join(' '),
+            resource_query: resource_query,
+            iids_declaration: graphql_only ? nil : ', $iids: [String!]',
+            iids_query: graphql_only ? nil : ', iids: $iids'
+          )
         end
 
-        delegate :present?, to: :query_template
+        delegate :any?, to: :resource_fields
 
         private
 
-        attr_reader :source_type, :resource_type, :conditions
+        attr_reader :source_type, :resource_type, :conditions, :graphql_only
 
-        def query_template
-          case conditions.dig(:discussions, :attribute).to_s
-          when 'notes'
-            UserNotesQuery
-          when 'threads'
-            ThreadsQuery
+        BASE_QUERY = <<~GRAPHQL.freeze
+          query($source: ID!, $after: String%{iids_declaration}) {
+            %{source_type}(fullPath: $source) {
+              id
+              %{resource_type}(after: $after%{iids_query}%{resource_query}) {
+                pageInfo {
+                  hasNextPage
+                  endCursor
+                }
+                nodes {
+                  id iid title updatedAt createdAt webUrl projectId %{resource_fields}
+                }
+              }
+            }
+          }
+        GRAPHQL
+
+        def resource_fields
+          fields = []
+
+          fields << 'userNotesCount' if conditions.dig(:discussions, :attribute).to_s == 'notes'
+          fields << 'userDiscussionsCount' if conditions.dig(:discussions, :attribute).to_s == 'threads'
+
+          if graphql_only
+            fields << 'labels { nodes { title } }'
+            fields << 'author { id name username }'
+            fields << 'assignees { nodes { id name username } }' if conditions.key?(:assignee_member)
+            fields << 'upvotes' if conditions.dig(:upvotes, :attribute).to_s == 'upvotes'
+            fields << 'downvotes' if conditions.dig(:upvotes, :attribute).to_s == 'downvotes'
+            fields << 'mergedAt' if resource_type == 'merge_requests'
+          end
+
+          fields
+        end
+
+        def resource_query
+          condition_queries = []
+
+          condition_queries << QueryParamBuilders::BaseParamBuilder.new('includeSubgroups', true, with_quotes: false) if source_type == 'group'
+
+          conditions.each do |condition, condition_params|
+            condition_queries << QueryParamBuilders::DateParamBuilder.new(condition_params) if condition.to_s == 'date'
+            condition_queries << QueryParamBuilders::BaseParamBuilder.new('milestoneTitle', condition_params) if condition.to_s == 'milestone'
+            condition_queries << QueryParamBuilders::BaseParamBuilder.new('state', condition_params, with_quotes: false) if condition.to_s == 'state'
+
+            condition_queries << merge_requests_resource_query(condition, condition_params) if resource_type == 'merge_requests'
+            condition_queries << issues_resource_query(condition, condition_params) if resource_type == 'issues'
           end
+
+          condition_queries
+            .compact
+            .map(&:build_param)
+            .join
         end
 
-        def group_query
-          return if source_type != 'group'
+        def merge_requests_resource_query(condition, condition_params)
+          case condition.to_s
+          when 'forbidden_labels'
+            QueryParamBuilders::LabelsParamBuilder.new('labels', condition_params, negated: true)
+          when 'labels'
+            QueryParamBuilders::LabelsParamBuilder.new('labels', condition_params)
+          when 'source_branch'
+            QueryParamBuilders::BaseParamBuilder.new('sourceBranch', condition_params)
+          when 'target_branch'
+            QueryParamBuilders::BaseParamBuilder.new('targetBranch', condition_params)
+          end
+        end
 
-          ', includeSubgroups: true'
+        def issues_resource_query(condition, condition_params)
+          case condition.to_s
+          when 'forbidden_labels'
+            QueryParamBuilders::LabelsParamBuilder.new('labelName', condition_params, negated: true)
+          when 'labels'
+            QueryParamBuilders::LabelsParamBuilder.new('labelName', condition_params)
+          end
         end
       end
     end

data/lib/gitlab/triage/graphql_queries/query_param_builders/base_param_builder.rb

@@ -0,0 +1,30 @@
+require_relative '../../utils'
+
+module Gitlab
+  module Triage
+    module GraphqlQueries
+      module QueryParamBuilders
+        class BaseParamBuilder
+          attr_reader :param_name, :param_contents, :with_quotes, :negated
+
+          def initialize(param_name, param_contents, with_quotes: true, negated: false)
+            @param_name = param_name
+            @param_contents = param_contents.to_s.strip
+            @with_quotes = with_quotes
+            @negated = negated
+          end
+
+          def build_param
+            contents = with_quotes ? Utils.graphql_quote(param_contents) : param_contents
+
+            if negated
+              ", not: { #{param_name}: #{contents} }"
+            else
+              ", #{param_name}: #{contents}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/graphql_queries/query_param_builders/date_param_builder.rb

@@ -0,0 +1,35 @@
+require_relative '../../param_builders/date_param_builder'
+require_relative 'base_param_builder'
+
+module Gitlab
+  module Triage
+    module GraphqlQueries
+      module QueryParamBuilders
+        class DateParamBuilder < BaseParamBuilder
+          ATTRIBUTES = %w[updated_at created_at merged_at].freeze
+
+          def initialize(condition_hash)
+            date_param_builder = ParamBuilders::DateParamBuilder.new(ATTRIBUTES, condition_hash)
+
+            super(build_param_name(condition_hash), date_param_builder.param_content)
+          end
+
+          private
+
+          def build_param_name(condition_hash)
+            prefix = condition_hash[:attribute].to_s.sub(/_at\z/, '')
+            suffix =
+              case condition_hash[:condition].to_sym
+              when :older_than
+                'Before'
+              when :newer_than
+                'After'
+              end
+
+            "#{prefix}#{suffix}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/graphql_queries/query_param_builders/labels_param_builder.rb

@@ -0,0 +1,18 @@
+require_relative '../../utils'
+require_relative 'base_param_builder'
+
+module Gitlab
+  module Triage
+    module GraphqlQueries
+      module QueryParamBuilders
+        class LabelsParamBuilder < BaseParamBuilder
+          def initialize(param_name, labels, negated: false)
+            label_param_content = labels.map { |label| Utils.graphql_quote(label) }.join(', ').then { |content| "[#{content}]" }
+
+            super(param_name, label_param_content, with_quotes: false, negated: negated)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/network.rb

@@ -49,7 +49,7 @@ module Gitlab
           when Hash
             resources << results
           else
-            raise Errors::Network::UnexpectedResponse, "Unexpected response: #{results.inspect}"
+            raise_unexpected_response(results)
           end
 
           rate_limit_debug(response) if options.debug
@@ -73,7 +73,14 @@ module Gitlab
         rate_limit_debug(response) if options.debug
         rate_limit_wait(response)
 
-        response.delete(:results).with_indifferent_access
+        results = response.delete(:results)
+
+        case results
+        when Hash
+          results.with_indifferent_access
+        else
+          raise_unexpected_response(results)
+        end
       rescue Net::ReadTimeout
         {}
       end
@@ -95,6 +102,10 @@ module Gitlab
         puts Gitlab::Triage::UI.debug "Rate limit almost exceeded, sleeping for #{response[:ratelimit_reset_at] - Time.now} seconds" if options.debug
         sleep(1) until Time.now >= response[:ratelimit_reset_at]
       end
+
+      def raise_unexpected_response(results)
+        raise Errors::Network::UnexpectedResponse, "Unexpected response: #{results.inspect}"
+      end
     end
   end
 end

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

@@ -1,9 +1,11 @@
-require 'httparty'
+require_relative '../version'
 
 module Gitlab
   module Triage
     module NetworkAdapters
       class BaseAdapter
+        USER_AGENT = "GitLab Triage #{Gitlab::Triage::VERSION}".freeze
+
         attr_reader :options
 
         def initialize(options)

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

@@ -1,4 +1,3 @@
-require 'httparty'
 require 'graphql/client'
 require 'graphql/client/http'
 
@@ -64,6 +63,7 @@ module Gitlab
                 uri,
                 body: body.to_json,
                 headers: {
+                  'User-Agent' => USER_AGENT,
                   'Content-type' => 'application/json',
                   'PRIVATE-TOKEN' => context[:token]
                 }

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

@@ -12,6 +12,7 @@ module Gitlab
           response = HTTParty.get(
             url,
             headers: {
+              'User-Agent' => USER_AGENT,
               'Content-type' => 'application/json',
               'PRIVATE-TOKEN' => token
             }
@@ -35,6 +36,7 @@ module Gitlab
             url,
             body: body.to_json,
             headers: {
+              'User-Agent' => "GitLab Triage #{Gitlab::Triage::VERSION}",
               'Content-type' => 'application/json',
               'PRIVATE-TOKEN' => token
             }

data/lib/gitlab/triage/param_builders/date_param_builder.rb

@@ -0,0 +1,58 @@
+require_relative '../validators/params_validator'
+
+module Gitlab
+  module Triage
+    module ParamBuilders
+      class DateParamBuilder
+        CONDITIONS = %w[older_than newer_than].freeze
+        INTERVAL_TYPES = %w[days weeks months years].freeze
+
+        def initialize(allowed_attributes, condition_hash)
+          @allowed_attributes = allowed_attributes
+          @attribute = condition_hash[:attribute].to_s
+          @interval_condition = condition_hash[:condition].to_sym
+          @interval_type = condition_hash[:interval_type]
+          @interval = condition_hash[:interval]
+
+          validate_condition(condition_hash)
+        end
+
+        def param_content
+          interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+        end
+
+        private
+
+        attr_reader :allowed_attributes, :attribute, :interval_condition, :interval_type, :interval
+
+        def validate_condition(condition)
+          ParamsValidator.new(filter_parameters, condition).validate!
+        end
+
+        def filter_parameters
+          [
+            {
+              name: :attribute,
+              type: String,
+              values: allowed_attributes
+            },
+            {
+              name: :condition,
+              type: String,
+              values: CONDITIONS
+            },
+            {
+              name: :interval_type,
+              type: String,
+              values: INTERVAL_TYPES
+            },
+            {
+              name: :interval,
+              type: Numeric
+            }
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/policies/base_policy.rb

@@ -24,6 +24,24 @@ module Gitlab
           @name ||= (policy_spec[:name] || "#{type}-#{object_id}")
         end
 
+        def source
+          case type
+          when 'epics'
+            'groups'
+          else
+            'projects'
+          end
+        end
+
+        def source_id_sym
+          case type
+          when 'epics'
+            :group_id
+          else
+            :project_id
+          end
+        end
+
         def actions
           @actions ||= policy_spec.fetch(:actions) { {} }
         end

data/lib/gitlab/triage/resource/shared/issuable.rb

@@ -32,6 +32,8 @@ module Gitlab
             @labels_with_details ||= label_events
               .select { |event| event.action == 'add' && event.label }
               .map(&:label)
+              .sort_by(&:added_at)
+              .reverse
               .uniq(&:name)
               .select { |label| resource[:labels].include?(label.name) }
           end

data/lib/gitlab/triage/utils.rb

@@ -0,0 +1,13 @@
+module Gitlab
+  module Triage
+    module Utils
+      module_function
+
+      def graphql_quote(string)
+        contents = string.to_s.gsub('"', '\\"')
+
+        %("#{contents}")
+      end
+    end
+  end
+end

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.16.0'
+    VERSION = '1.20.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.20.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -196,8 +196,9 @@ files:
 - 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/graphql_queries/query_param_builders/base_param_builder.rb
+- lib/gitlab/triage/graphql_queries/query_param_builders/date_param_builder.rb
+- lib/gitlab/triage/graphql_queries/query_param_builders/labels_param_builder.rb
 - lib/gitlab/triage/limiters/base_limiter.rb
 - lib/gitlab/triage/limiters/date_field_limiter.rb
 - lib/gitlab/triage/network.rb
@@ -207,6 +208,7 @@ files:
 - lib/gitlab/triage/network_adapters/test_adapter.rb
 - lib/gitlab/triage/option_parser.rb
 - lib/gitlab/triage/options.rb
+- lib/gitlab/triage/param_builders/date_param_builder.rb
 - lib/gitlab/triage/policies/base_policy.rb
 - lib/gitlab/triage/policies/rule_policy.rb
 - lib/gitlab/triage/policies/summary_policy.rb
@@ -225,6 +227,7 @@ files:
 - lib/gitlab/triage/retryable.rb
 - lib/gitlab/triage/ui.rb
 - lib/gitlab/triage/url_builders/url_builder.rb
+- lib/gitlab/triage/utils.rb
 - lib/gitlab/triage/validators/limiter_validator.rb
 - lib/gitlab/triage/validators/params_validator.rb
 - lib/gitlab/triage/version.rb
@@ -249,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: GitLab triage automation project.

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

@@ -1,23 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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