gitlab-triage 1.9.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d17d4b0574943a4b6dc8419c28fe0d8d09577adebe135e6aafe6cdd06a2ebd12
-  data.tar.gz: 7e937ca82cec7feec0e7223d7a6e4a967cd0d0a65d54a26b807f32cad3bf8669
+  metadata.gz: 68fbfe16d2db2547d8b262ff52cb7065860d13822a92b38d6d505234aafa0855
+  data.tar.gz: 99dc42b1125665a331b8dd6afe576e1c0b8b0abbd0cf8239d5be44184e900c52
 SHA512:
-  metadata.gz: 7041a271066e0b933dfc3d3fa47b7150592746c3a0f25352b363cfc4f6de9c48556ede940394e72c5054e7076244e3e87cc4c2e068755a43e66bbf3d1934f5ed
-  data.tar.gz: bf26c4395bc081ac3930f001448f33d4342dcb2f3a0aac8f74cff84aabe2f665675be8adf5578a2ef3a39d573c5d6f7dbcfeafa7a88339b389ab839a5c7918aa
+  metadata.gz: 37e60f6230d1467d18246aa4dc52f439c08939f5a7e2278ed543090c08d5c08b39bffc2840543cbd0a702480d8fbeeb65dc7932fe90a98c2d26a88c8b19f3805
+  data.tar.gz: 8f82804d8431b08791f3e37974a0cc47aacec887af2969f3e612cba8ac8212e0ac6a25f4235424801b01f6eb0d5bc6db72535d0fed1f962658270164613034cd

data/.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
   - prepare
   - test
   - triage
-  - release
+  - deploy
 
 default:
   image: ruby:2.7
@@ -38,6 +38,7 @@ workflow:
   services:
     - docker:${DOCKER_VERSION}-dind
   variables:
+    DOCKER_VERSION: "19.03.0"
     DOCKER_DRIVER: overlay2
     DOCKER_HOST: tcp://docker:2375
     DOCKER_TLS_CERTDIR: ""
@@ -118,7 +119,7 @@ dry-run:gitlab-triage:
     - gitlab-triage --version
     - gitlab-triage --help
     - gitlab-triage --init
-    - gitlab-triage --dry-run --debug --token $API_TOKEN --source-id $CI_PROJECT_PATH
+    - gitlab-triage --dry-run --debug --token $GITLAB_API_TOKEN --source-id $CI_PROJECT_PATH
 
 # This job requires allows to override the `CI_PROJECT_PATH` variable when triggered.
 dry-run:custom:
@@ -127,26 +128,6 @@ dry-run:custom:
     - when: manual
       allow_failure: true
 
-###################
-## Release stage ##
-###################
-release:
-  stage: release
-  rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
-      changes: ["lib/gitlab/triage/version.rb"]
-    - if: '$CI_MERGE_REQUEST_TITLE =~ /RELEASE/'
-      when: manual
-  before_script: []
-  script:
-    - version=$(ruby -r ./lib/gitlab/triage/version -e 'puts Gitlab::Triage::VERSION' | tr -d "\n")
-    - tag="v${version}"
-    - message="Version ${version}."
-    # TODO: Add release notes from the Release MR?
-    - 'curl --request POST --header "PRIVATE-TOKEN: ${API_TOKEN}" -d "tag_name=${tag}" -d "ref=${CI_COMMIT_SHA}" -d "message=${message}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/tags"'
-    - gem build gitlab-triage.gemspec
-    - gem push "gitlab-triage-${version}.gem"
-  artifacts:
-    paths:
-      - gitlab-triage*.gem
-    expire_in: 30 days
+include:
+  - project: 'gitlab-org/quality/pipeline-common'
+    file: '/ci/gem-release.yml'

data/.gitlab/merge_request_templates/Release.md

@@ -7,7 +7,7 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-triage/commits/
 <!-- Keep the sections order but remove the empty sections -->
 
 ```markdown
-### New scenarios and scenario updates
+### New features and features updates
 
 - !aaa <Title of the aaa MR>.
 
@@ -19,7 +19,7 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-triage/commits/
 
 - !ccc <Title of the ccc MR>.
 
-### Other changes (CI, backstage)
+### Other changes (tooling, technical debt)
 
 - !ddd <Title of the ddd MR>.
 ```
@@ -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"
+/label ~"Engineering Productivity" ~"ep::triage" ~"tooling::workflow"

data/Guardfile

@@ -24,7 +24,7 @@
 #  * zeus: 'zeus rspec' (requires the server to be started separately)
 #  * 'just' rspec: 'rspec'
 
-guard :rspec, cmd: "bundle exec rspec" do
+guard :rspec, cmd: "bundle exec rspec -f doc" do
   require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
 

data/README.md

@@ -141,6 +141,7 @@ 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)
 - [`ruby` condition](#ruby-condition)
 
 ##### Date condition
@@ -467,6 +468,24 @@ 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
+```
+
 ##### Ruby condition
 
 This condition allows users to write a Ruby expression to be evaluated for
@@ -552,6 +571,10 @@ Adds a number of labels to the resource.
 
 Accepts an array of strings. Each element is the name of a label to add.
 
+If any of the labels doesn't exist, the automation will stop immediately so
+that if a label is renamed or deleted, you'll have to explicitly update or remove
+it in your policy file.
+
 Example:
 
 ```yml
@@ -567,6 +590,10 @@ Removes a number of labels from the resource.
 
 Accepts an array of strings. Each element is the name of a label to remove.
 
+If any of the labels doesn't exist, the automation will stop immediately so
+that if a label is renamed or deleted, you'll have to explicitly update or remove
+it in your policy file.
+
 Example:
 
 ```yml
@@ -1016,22 +1043,22 @@ Usage: gitlab-triage [options]
 Triaging against a specific project:
 
 ```
-gitlab-triage --dry-run --token $API_TOKEN --source-id gitlab-org/triage
+gitlab-triage --dry-run --token $GITLAB_API_TOKEN --source-id gitlab-org/triage
 ```
 
 Triaging against a whole group:
 
 ```
-gitlab-triage --dry-run --token $API_TOKEN --source-id gitlab-org --source groups
+gitlab-triage --dry-run --token $GITLAB_API_TOKEN --source-id gitlab-org --source groups
 ```
 
 Triaging against an entire instance:
 
 ```
-gitlab-triage --dry-run --token $API_TOKEN --all-projects
+gitlab-triage --dry-run --token $GITLAB_API_TOKEN --all-projects
 ```
 
-> **Note:** The `--all-projects` option will process all resources for all projects visible to the specified `$API_TOKEN`
+> **Note:** The `--all-projects` option will process all resources for all projects visible to the specified `$GITLAB_API_TOKEN`
 
 #### Running on GitLab CI pipeline
 
@@ -1042,7 +1069,7 @@ run:triage:triage:
   stage: triage
   script:
     - gem install gitlab-triage
-    - gitlab-triage --token $API_TOKEN --source-id $CI_PROJECT_PATH
+    - gitlab-triage --token $GITLAB_API_TOKEN --source-id $CI_PROJECT_PATH
   only:
     - schedules
 ```
@@ -1056,7 +1083,7 @@ Yes, you can override the host url using the following options:
 ##### CLI
 
 ```
-gitlab-triage --dry-run --token $API_TOKEN --source-id gitlab-org/triage --host-url https://gitlab.host.com
+gitlab-triage --dry-run --token $GITLAB_API_TOKEN --source-id gitlab-org/triage --host-url https://gitlab.host.com
 ```
 
 ##### Policy file
@@ -1093,7 +1120,7 @@ Gitlab::Triage::Resource::Context.include MyPlugin
 And then run it with:
 
 ```shell
-gitlab-triage -r ./my_plugin.rb --token $API_TOKEN --source-id gitlab-org/triage
+gitlab-triage -r ./my_plugin.rb --token $GITLAB_API_TOKEN --source-id gitlab-org/triage
 ```
 
 This allows you to use `has_severity_label?` in the Ruby condition:

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

@@ -41,8 +41,8 @@ module Gitlab
           CommandBuilders::CommentCommandBuilder.new(
             [
               CommandBuilders::TextContentBuilder.new(policy.actions[:comment], resource: resource, network: network).build_command,
-              CommandBuilders::LabelCommandBuilder.new(policy.actions[:labels]).build_command,
-              CommandBuilders::RemoveLabelCommandBuilder.new(policy.actions[:remove_labels]).build_command,
+              CommandBuilders::LabelCommandBuilder.new(policy.actions[:labels], resource: resource, network: network).build_command,
+              CommandBuilders::RemoveLabelCommandBuilder.new(policy.actions[:remove_labels], resource: resource, network: network).build_command,
               CommandBuilders::CcCommandBuilder.new(policy.actions[:mention]).build_command,
               CommandBuilders::MoveCommandBuilder.new(policy.actions[:move]).build_command,
               CommandBuilders::StatusCommandBuilder.new(policy.actions[:status]).build_command

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

@@ -0,0 +1,78 @@
+require_relative '../validators/params_validator'
+
+module Gitlab
+  module Triage
+    module APIQueryBuilders
+      class DateQueryParamBuilder
+        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)
+        end
+
+        def validate_condition(condition)
+          ParamsValidator.new(self.class.filter_parameters, condition).validate!
+        end
+
+        def param_name
+          prefix = attribute.sub(/_at\z/, '')
+          suffix =
+            case interval_condition
+            when :older_than
+              'before'
+            when :newer_than
+              'after'
+            end
+
+          "#{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
+end

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

@@ -2,13 +2,15 @@ module Gitlab
   module Triage
     module CommandBuilders
       class BaseCommandBuilder
-        def initialize(items)
+        def initialize(items, resource: nil, network: nil)
           @items = Array.wrap(items)
           @items.delete('')
+          @resource = resource&.with_indifferent_access
+          @network = network
         end
 
         def build_command
-          if @items.any?
+          if items.any?
             [slash_command_string, content_string].compact.join(separator)
           else
             ""
@@ -17,6 +19,8 @@ module Gitlab
 
         private
 
+        attr_reader :items, :resource, :network
+
         def separator
           ' '
         end
@@ -26,7 +30,7 @@ module Gitlab
         end
 
         def content_string
-          @items.map do |item|
+          items.map do |item|
             format_item(item)
           end.join(separator)
         end

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

@@ -4,8 +4,25 @@ module Gitlab
   module Triage
     module CommandBuilders
       class LabelCommandBuilder < BaseCommandBuilder
+        def build_command
+          ensure_labels_exist!
+
+          super
+        end
+
         private
 
+        def ensure_labels_exist!
+          items.each do |label|
+            label_opts = { project_id: resource[:project_id], name: label }
+
+            unless Resource::Label.new(label_opts, network: network).exist?
+              raise Resource::Label::LabelDoesntExistError,
+                    "Label `#{label}` doesn't exist!"
+            end
+          end
+        end
+
         def slash_command_string
           "/label"
         end

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

@@ -34,13 +34,9 @@ module Gitlab
         }.freeze
         PLACEHOLDER_REGEX = /{{([\w\.]+)}}/.freeze
 
-        attr_reader :resource, :network
-
         def initialize(
           items, resource: nil, network: nil, redact_confidentials: true)
-          super(items)
-          @resource = resource&.with_indifferent_access
-          @network = network
+          super(items, resource: resource, network: network)
           @redact_confidentials = redact_confidentials
         end
 

data/lib/gitlab/triage/engine.rb

@@ -2,10 +2,8 @@ require 'active_support/all'
 require 'active_support/inflector'
 
 require_relative 'expand_condition'
-require_relative 'filters/issuable_date_conditions_filter'
 require_relative 'filters/merge_request_date_conditions_filter'
 require_relative 'filters/votes_conditions_filter'
-require_relative 'filters/forbidden_labels_conditions_filter'
 require_relative 'filters/no_additional_labels_conditions_filter'
 require_relative 'filters/author_member_conditions_filter'
 require_relative 'filters/assignee_member_conditions_filter'
@@ -16,6 +14,7 @@ require_relative 'policies/rule_policy'
 require_relative 'policies/summary_policy'
 require_relative 'policies_resources/rule_resources'
 require_relative 'policies_resources/summary_resources'
+require_relative 'api_query_builders/date_query_param_builder'
 require_relative 'api_query_builders/single_query_param_builder'
 require_relative 'api_query_builders/multi_query_param_builder'
 require_relative 'url_builders/url_builder'
@@ -153,7 +152,7 @@ module Gitlab
       end
 
       def resources_for_rule(resource_type, rule)
-        puts Gitlab::Triage::UI.header("Processing rule: **#{rule[:name]}**", char: '-')
+        puts Gitlab::Triage::UI.header("Gathering resources for rule: **#{rule[:name]}**", char: '-')
 
         ExpandCondition.perform(rule_conditions(rule)) do |conditions|
           # retrieving the resources for every rule is inefficient
@@ -193,26 +192,15 @@ module Gitlab
         resources.select do |resource|
           results = []
 
+          # rubocop:disable Style/IfUnlessModifier
           if conditions[:date]
-            results << case resource[:type]
-                       when 'issues'
-                         Filters::IssuableDateConditionsFilter.new(resource, conditions[:date]).calculate
-                       when 'merge_requests'
-                         Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
-                       else
-                         raise "Unknown resource type: #{resource[:type]}"
-                       end
+            results << Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
           end
 
-          # rubocop:disable Style/IfUnlessModifier
           if conditions[:upvotes]
             results << Filters::VotesConditionsFilter.new(resource, conditions[:upvotes]).calculate
           end
 
-          if conditions[:forbidden_labels]
-            results << Filters::ForbiddenLabelsConditionsFilter.new(resource, conditions[:forbidden_labels]).calculate
-          end
-
           if conditions[:no_additional_labels]
             results << Filters::NoAdditionalLabelsConditionsFilter.new(resource, conditions.fetch(:labels) { [] }).calculate
           end
@@ -251,11 +239,24 @@ module Gitlab
 
         condition_builders = []
         condition_builders << APIQueryBuilders::MultiQueryParamBuilder.new('labels', conditions[:labels], ',') if conditions[:labels]
+
+        if conditions[:forbidden_labels]
+          condition_builders << APIQueryBuilders::MultiQueryParamBuilder.new('not[labels]', conditions[:forbidden_labels], ',')
+        end
+
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('state', conditions[:state]) if conditions[:state]
         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]
 
+        if conditions[:date] && APIQueryBuilders::DateQueryParamBuilder.applicable?(conditions[:date])
+          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

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

@@ -1,21 +1,67 @@
-require_relative 'issuable_date_conditions_filter'
+require_relative 'base_conditions_filter'
 
 module Gitlab
   module Triage
     module Filters
-      class MergeRequestDateConditionsFilter < IssuableDateConditionsFilter
-        ATTRIBUTES = %w[updated_at created_at merged_at].freeze
+      class MergeRequestDateConditionsFilter < BaseConditionsFilter
+        ATTRIBUTES = %w[merged_at].freeze
+        CONDITIONS = %w[older_than newer_than].freeze
+        INTERVAL_TYPES = %w[days weeks months years].freeze
+
+        def self.allowed_attributes
+          self::ATTRIBUTES
+        end
+
+        def self.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
+
+        def initialize_variables(condition)
+          @attribute = condition[:attribute].to_sym
+          @condition = condition[:condition].to_sym
+          @interval_type = condition[:interval_type].to_sym
+          @interval = condition[:interval]
+        end
 
         # Guard against merge requests with no merged_at values
         def resource_value
-          super if @resource[@attribute]
+          @resource[@attribute]&.to_date
+        end
+
+        def condition_value
+          @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
         end
 
         # Guard against merge requests with no merged_at values
         def calculate
           return false unless resource_value
 
-          super
+          case @condition
+          when :older_than
+            resource_value < condition_value
+          when :newer_than
+            resource_value > condition_value
+          end
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Gitlab
             type: type,
             policy_spec: policy_spec,
             action: action,
-            resources: resources.resources,
+            resources: resources,
             network: network)
         end
       end

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

@@ -10,7 +10,7 @@ module Gitlab
         # Build an issue from several rules policies
         def build_issue
           action = actions[:summarize]
-          issues = resources.build_issues do |inner_policy_spec, inner_resources|
+          issues = resources.map do |inner_policy_spec, inner_resources|
             Policies::RulePolicy.new(
               type, inner_policy_spec, inner_resources, network)
               .build_issue

data/lib/gitlab/triage/policies_resources/rule_resources.rb

@@ -1,21 +1,11 @@
 # frozen_string_literal: true
 
+require 'delegate'
+
 module Gitlab
   module Triage
     module PoliciesResources
-      class RuleResources
-        attr_reader :resources
-
-        def initialize(new_resources)
-          @resources = new_resources
-        end
-
-        def each
-          resources.each do |resource|
-            yield(resource)
-          end
-        end
-      end
+      RuleResources = Class.new(SimpleDelegator)
     end
   end
 end

data/lib/gitlab/triage/policies_resources/summary_resources.rb

@@ -1,21 +1,11 @@
 # frozen_string_literal: true
 
+require 'delegate'
+
 module Gitlab
   module Triage
     module PoliciesResources
-      class SummaryResources
-        attr_reader :rule_to_resources
-
-        def initialize(new_rule_to_resources)
-          @rule_to_resources = new_rule_to_resources
-        end
-
-        def build_issues
-          rule_to_resources.map do |inner_policy_spec, inner_resources|
-            yield(inner_policy_spec, inner_resources)
-          end
-        end
-      end
+      SummaryResources = Class.new(SimpleDelegator)
     end
   end
 end

data/lib/gitlab/triage/resource/base.rb

@@ -58,11 +58,15 @@ module Gitlab
           build_url(params: params)
         end
 
+        def resource_id
+          resource[:iid]
+        end
+
         def resource_url(params: {}, sub_resource_type: nil)
           build_url(
             params: params,
             options: {
-              resource_id: resource[:iid],
+              resource_id: resource_id,
               sub_resource_type: sub_resource_type
             }
           )

data/lib/gitlab/triage/resource/label.rb

@@ -8,6 +8,8 @@ module Gitlab
   module Triage
     module Resource
       class Label < Base
+        LabelDoesntExistError = Class.new(StandardError)
+
         FIELDS = %i[
           id
           project_id
@@ -35,6 +37,19 @@ module Gitlab
             Time.parse(value) if value
           end
         end
+
+        def exist?
+          label = network.query_api_cached(resource_url).first
+          return false unless label
+
+          label[:name] == name
+        end
+
+        private
+
+        def resource_id
+          name
+        end
       end
     end
   end

data/lib/gitlab/triage/url_builders/url_builder.rb

@@ -17,7 +17,7 @@ module Gitlab
 
         def build
           url = base_url
-          url << "/#{@resource_id}" if @resource_id
+          url << "/#{percent_encode(@resource_id.to_s)}" if @resource_id
           url << "/#{@sub_resource_type}" if @sub_resource_type
           url << params_string if @params
           url
@@ -31,16 +31,20 @@ module Gitlab
 
         def base_url
           url = host_with_api_url
-          url << "/#{@source}/#{CGI.escape(@source_id.to_s)}" unless @all
+          url << "/#{@source}/#{percent_encode(@source_id.to_s)}" unless @all
           url << "/#{@resource_type}" if @resource_type
           url
         end
 
         def params_string
           "?" << @params.map do |k, v|
-            "#{k}=#{v}"
+            "#{percent_encode(k.to_s)}=#{percent_encode(v.to_s)}"
           end.join("&")
         end
+
+        def percent_encode(str)
+          CGI.escape(str).gsub('+', '%20')
+        end
       end
     end
   end

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

@@ -1,6 +1,8 @@
 module Gitlab
   module Triage
     class ParamsValidator
+      InvalidParameter = Class.new(ArgumentError)
+
       def initialize(parameter_definitions, value)
         @parameter_definitions = parameter_definitions
         @value = value
@@ -16,7 +18,7 @@ module Gitlab
 
       def validate_required_parameters(value)
         @parameter_definitions.each do |param|
-          raise ArgumentError, "#{param[:name]} is a required parameter" unless value[param[:name]]
+          raise InvalidParameter, "#{param[:name]} is a required parameter" unless value[param[:name]]
         end
       end
 
@@ -24,7 +26,7 @@ module Gitlab
         @parameter_definitions.each do |param|
           if value.has_key?(param[:name])
             param_types = Array(param[:type]).flatten
-            raise ArgumentError, "#{param[:name]} must be of type #{param[:type]}" unless param_types.any? { |type| value[param[:name]].is_a?(type) }
+            raise InvalidParameter, "#{param[:name]} must be of type #{param[:type]}" unless param_types.any? { |type| value[param[:name]].is_a?(type) }
           end
         end
       end
@@ -32,7 +34,7 @@ module Gitlab
       def validate_parameter_content(value)
         @parameter_definitions.each do |param|
           if param[:values]
-            raise ArgumentError, "#{param[:name]} must be of one of #{param[:values].join(',')}" unless param[:values].include?(value[param[:name]])
+            raise InvalidParameter, "#{param[:name]} must be of 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.9.0'
+    VERSION = '1.13.0'
   end
 end

data/support/.gitlab-ci.example.yml

@@ -8,7 +8,7 @@ dry-run:triage:
   script:
     - gem install gitlab-triage
     - gitlab-triage --help
-    - gitlab-triage --dry-run --token $API_TOKEN --source projects --source-id $CI_PROJECT_PATH
+    - gitlab-triage --dry-run --token $GITLAB_API_TOKEN --source projects --source-id $CI_PROJECT_PATH
   when: manual
   except:
     - schedules
@@ -17,6 +17,6 @@ run:triage:
   stage: triage
   script:
     - gem install gitlab-triage
-    - gitlab-triage --token $API_TOKEN --source projects --source-id $CI_PROJECT_PATH
+    - gitlab-triage --token $GITLAB_API_TOKEN --source projects --source-id $CI_PROJECT_PATH
   only:
     - schedules

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.13.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,7 @@ files:
 - lib/gitlab/triage/action/comment.rb
 - lib/gitlab/triage/action/summarize.rb
 - lib/gitlab/triage/api_query_builders/base_query_param_builder.rb
+- lib/gitlab/triage/api_query_builders/date_query_param_builder.rb
 - lib/gitlab/triage/api_query_builders/multi_query_param_builder.rb
 - lib/gitlab/triage/api_query_builders/single_query_param_builder.rb
 - lib/gitlab/triage/command_builders/base_command_builder.rb
@@ -157,8 +158,6 @@ 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/forbidden_labels_conditions_filter.rb
-- lib/gitlab/triage/filters/issuable_date_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

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

@@ -1,32 +0,0 @@
-require_relative 'base_conditions_filter'
-
-module Gitlab
-  module Triage
-    module Filters
-      class ForbiddenLabelsConditionsFilter < BaseConditionsFilter
-        def validate_condition(condition)
-          raise ArgumentError, 'condition must be an array containing forbidden label values' unless condition.is_a?(Array)
-        end
-
-        def initialize_variables(forbidden_labels)
-          @attribute = :labels
-          @forbidden_labels = forbidden_labels
-        end
-
-        def resource_value
-          @resource[@attribute]
-        end
-
-        def calculate
-          label_intersection.empty?
-        end
-
-        private
-
-        def label_intersection
-          resource_value & @forbidden_labels
-        end
-      end
-    end
-  end
-end

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

@@ -1,65 +0,0 @@
-require_relative 'base_conditions_filter'
-
-module Gitlab
-  module Triage
-    module Filters
-      class IssuableDateConditionsFilter < BaseConditionsFilter
-        ATTRIBUTES = %w[updated_at created_at].freeze
-        CONDITIONS = %w[older_than newer_than].freeze
-        INTERVAL_TYPES = %w[days weeks months years].freeze
-
-        def self.allowed_attributes
-          self::ATTRIBUTES
-        end
-
-        def self.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
-
-        def initialize_variables(condition)
-          @attribute = condition[:attribute].to_sym
-          @condition = condition[:condition].to_sym
-          @interval_type = condition[:interval_type].to_sym
-          @interval = condition[:interval]
-        end
-
-        def resource_value
-          @resource[@attribute].to_date
-        end
-
-        def condition_value
-          @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
-        end
-
-        def calculate
-          case @condition
-          when :older_than
-            resource_value < condition_value
-          when :newer_than
-            resource_value > condition_value
-          end
-        end
-      end
-    end
-  end
-end