gitlab-triage 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84173833ef78959cc6fdb59fa9dbe7e69ad7061265d22a1941c57a36b2f8e42b
-  data.tar.gz: 1293b7b39aca995152acfbed956af54c35d4897eee90f9db586bb318c20bd18c
+  metadata.gz: 3390c4026f87e49c54807a88f711eaa87bce2e9e0093ca8c394b51f67986ccb4
+  data.tar.gz: 68a20611ec1d24730ca854985f77a991f85baba6dda5496619413b5dfdbdbc73
 SHA512:
-  metadata.gz: 73b18f51c5386dc91946fe55531057d04908b74f42b16830458c8af11efdbac16a13791191310eddb5732764e2ffa49a89500d5fbbd8ca10a63dbae9f89acef8
-  data.tar.gz: ab7cefaa8a5574fb8f0e9b1c73875441975976275e28eb0f2e57194f6b26cf69323f60c3094b9d10cad88120df4abdbe112516c8c5e6a3c9f1e5e1efaad46a6f
+  metadata.gz: 9c435258d811e1c15c293924e609ebb75135a643f8020749f459206d11e37deb98ee4cc3e0fd365d74e0a6a547515af944f3e95b4b8f5887c82d49e5fc77b4c9
+  data.tar.gz: 21f85618ecdcf8d2f1e7b061f95682f1a29ce140553f1f5eb62f1baf121316bf6e84bd01d15fddf0b4bb4e789e70eb030f88cf36f5955d13c5b59033cee94f0d

data/.gitignore

@@ -9,6 +9,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/doc/
 
 # rspec failure tracking
 .rspec_status

data/.gitlab/changelog_config.yml

@@ -0,0 +1,13 @@
+---
+# Settings for generating changelogs using the GitLab API. See
+# https://docs.gitlab.com/ee/api/repositories.html#generate-changelog-data for
+# more information.
+categories:
+  added: Added
+  fixed: Fixed
+  changed: Changed
+  deprecated: Deprecated
+  removed: Removed
+  security: Security
+  performance: Performance
+  other: Other

data/.gitlab/merge_request_templates/Release.md

@@ -1,35 +1,13 @@
-<!-- Replace `v4.5.0` with the previous release here, and `e18d76b309e42888759c1effe96767f13e34ae55`
-with the latest commit from https://gitlab.com/gitlab-org/gitlab-triage/commits/master that will be included in the release. -->
-- Diff: https://gitlab.com/gitlab-org/gitlab-triage/compare/v4.5.0...e18d76b309e42888759c1effe96767f13e34ae55
+<!-- Replace `<PREVIOUS_VERSION>` with the previous version number here, `<COMMIT_UPDATING_VERSION>` with the latest
+commit from this merge request, and `<NEW_VERSION>` with the upcoming version number. -->
+## Diff
 
-- Release notes:
+https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage/compare/v<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
 
-<!-- Keep the sections order but remove the empty sections -->
+## Checklist
 
-```markdown
-### New features and features updates
+- [ ] Diff link is up-to-date.
+- [ ] Check the release notes: https://gitlab.com/api/v4/projects/3430480/repository/changelog?version=<NEW_VERSION>
+- [ ] Based on the diff and the release notes, `version.rb` is updated, according to [SemVer](https://semver.org).
 
-- !aaa <Title of the aaa MR>.
-
-### Fixes
-
-- !bbb <Title of the bbb MR>.
-
-### Doc changes
-
-- !ccc <Title of the ccc MR>.
-
-### Other changes (tooling, technical debt)
-
-- !ddd <Title of the ddd MR>.
-```
-
-- Checklist before merging:
-  - [ ] Diff link is up-to-date.
-  - [ ] Based on the diff, `lib/gitlab/triage/version.rb` is updated, according to [SemVer](https://semver.org).
-  - [ ] Release notes are accurate.
-
-- Checklist after merging:
-  - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
-
-/label ~"Engineering Productivity" ~"ep::triage" ~tooling ~"tooling::workflow"
+/label ~"type::tooling" ~"tooling::workflow" ~"ep::triage"

data/.gitlab-ci.yml

@@ -129,5 +129,11 @@ dry-run:custom:
       allow_failure: true
 
 include:
+  - template: Security/Dependency-Scanning.gitlab-ci.yml
+  - template: Security/License-Scanning.gitlab-ci.yml
+  - template: Security/SAST.gitlab-ci.yml
+  - template: Security/Secret-Detection.gitlab-ci.yml
   - project: 'gitlab-org/quality/pipeline-common'
-    file: '/ci/gem-release.yml'
+    file:
+      - '/ci/danger-review.yml'
+      - '/ci/gem-release.yml'

data/.ruby-version

@@ -0,0 +1 @@
+2.7.4

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.4

data/.yardopts

@@ -0,0 +1,4 @@
+--protected
+--private
+-
+LICENSE.md

data/Dangerfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'gitlab-dangerfiles'
+
+Gitlab::Dangerfiles.for_project(self, &:import_defaults)

data/Gemfile

@@ -3,6 +3,13 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in gitlab-rubocop.gemspec
 gemspec
 
+gem "yard"
+
 group :test do
   gem 'gitlab-styles', '~> 3.3.0'
 end
+
+group :development, :test, :danger do
+  gem 'gitlab-dangerfiles', '~> 2.6.1', require: false
+  gem 'guard-rspec', '~> 4.7.3', require: false
+end

data/README.md

@@ -1,4 +1,4 @@
-[![pipeline status](https://gitlab.com/gitlab-org/gitlab-triage/badges/master/pipeline.svg)](https://gitlab.com/gitlab-org/gitlab-triage/commits/master)
+[![pipeline status](https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage/badges/master/pipeline.svg)](https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage/-/commits/master)
 
 # GitLab Triage Project
 
@@ -12,12 +12,13 @@ The `gitlab-triage` gem aims to enable project managers and maintainers to
 automatically triage Issues and Merge Requests in GitLab projects or groups
 based on defined policies.
 
-See [Running locally](#running-locally) for how to specify a project or a
+See [Running with the installed gem](#running-with-the-installed-gem) for how to specify a project or a
 group.
 
 ### What is a triage policy?
 
 Triage policies are defined on a resource level basis, resources being:
+- Epics
 - Issues
 - Merge Requests
 
@@ -90,7 +91,7 @@ resource_rules:
           comment: |
             {{author}} This issue 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')}
           summarize:
-            destination: gitlab-org/gitlab-triage
+            destination: gitlab-org/ruby/gems/gitlab-triage
             title: |
               #{resource[:type].capitalize} require labels
             item: |
@@ -159,6 +160,7 @@ Available condition types:
 - [`no_additional_labels` condition](#no-additional-labels-condition)
 - [`author_member` condition](#author-member-condition)
 - [`assignee_member` condition](#assignee-member-condition)
+- [`draft` condition](#draft-condition)
 - [`source_branch` condition](#source-branch-condition)
 - [`target_branch` condition](#target-branch-condition)
 - [`weight` condition](#weight-condition)
@@ -191,7 +193,14 @@ conditions:
 
 ##### Milestone condition
 
-Accepts the name of a milestone to filter upon.
+Accepts the name of a milestone to filter upon. Also accepts the following timebox values:
+
+- `none`
+- `any`
+- `upcoming`
+- `started`
+
+See the [`milestone_id` API field documentation](https://docs.gitlab.com/ee/api/issues.html) for their meaning.
 
 Example:
 
@@ -204,11 +213,12 @@ conditions:
 
 Accepts a string.
 
-| State           | Type    | Value     |
-| ---------       | ----    | ------    |
-| Closed issues   | string  | `closed`  |
-| Open issues     | string  | `opened`  |
-| Merged merge requests     | string  | `merged`  |
+| State             | Type    | Value    |
+| ---------         | ----    | ------   |
+| Closed issues/MRs | string  | `closed` |
+| Open issues/MRs   | string  | `opened` |
+| Locked issues     | string  | `locked` |
+| Merged merge requests | string  | `merged` |
 
 Example:
 
@@ -411,7 +421,6 @@ conditions:
 
 Accepts a boolean. If `true` the resource cannot have more labels than those specified by the `labels` condition.
 
-
 Example:
 
 ```yml
@@ -467,8 +476,23 @@ conditions:
     source_id: 9970
 ```
 
+##### Draft condition
+
+**This condition is only applicable for merge requests.**
+
+Accepts a boolean. If `true`, only draft MRs are returned. If `false`, only non-draft MRs are returned.
+
+Example:
+
+```yml
+conditions:
+  draft: true
+```
+
 ##### Source branch condition
 
+**This condition is only applicable for merge requests.**
+
 Accepts the name of a source branch to filter upon.
 
 Example:
@@ -480,6 +504,8 @@ conditions:
 
 ##### Target branch condition
 
+**This condition is only applicable for merge requests.**
+
 Accepts the name of a target branch to filter upon.
 
 Example:
@@ -491,8 +517,9 @@ conditions:
 
 ##### Weight condition
 
+**This condition is only applicable for issues.**
+
 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     |
 | ---------       | ----    | ------    |
@@ -716,8 +743,8 @@ The following placeholders are supported:
 - `downvotes`: the resources's downvotes count
 - `title`: the resource's title
 - `web_url`: the web URL pointing to the resource
-- `type`: the type of the resources. For now, only `issues` and
-  `merge_requests` are supported.
+- `full_reference`: the full reference of the resource as `namespace/project#12`, `namespace/project!42`, `namespace/project&72`
+- `type`: the type of the resources. For now, only `issues`, `merge_requests`, and `epics` are supported.
 
 If the resource doesn't respond to the placeholder, or if the field is `nil`,
 the placeholder is not replaced.
@@ -827,8 +854,7 @@ The following placeholders are supported for `summary`:
 
 - `title`: The title of the generated issue
 - `items`: Concatenated markdown separated by a newline for each `item`
-- `type`: The resource type for the summary. For now `issues` or
-  `merge_requests`
+- `type`: The resource type for the summary. For now `issues`, `merge_requests`, or `epics`,
 
 > **Note:**
 > - Both `item` and `summary` fields act like a [comment action](#comment-action),
@@ -957,17 +983,6 @@ resource_rules:
   issues:
     summaries:
       - name: Newest and oldest issues summary
-        actions:
-          summarize:
-            title: "Newest and oldest {{type}} summary"
-            summary: |
-              Please triage the following {{type}}:
-
-              {{items}}
-
-              Please take care of them before the end of #{7.days.from_now.strftime('%Y-%m-%d')}
-
-              /label ~"needs attention"
         rules:
           - name: New issues
             conditions:
@@ -993,6 +1008,17 @@ resource_rules:
                   Please triage the following old {{type}}:
 
                   {{items}}
+        actions:
+          summarize:
+            title: "Newest and oldest {{type}} summary"
+            summary: |
+              Please triage the following {{type}}:
+
+              {{items}}
+
+              Please take care of them before the end of #{7.days.from_now.strftime('%Y-%m-%d')}
+
+              /label ~"needs attention"
 ```
 
 Which could generate an issue like:
@@ -1032,7 +1058,7 @@ Here's a list of currently available Ruby expression API:
 
 | Name                    | Return type     | Description |
 | ----                    | ----            | ----        |
-| resource                | Hash            | The hash containing the raw data of the resource |
+| resource                | Hash            | The hash containing the raw data of the resource. Note that `resource[:type]` is the type of the policy (`issues`, `merge_requests`, or `epics`), not the API `type` field. |
 | author                  | String          | The username of the resource author |
 | milestone               | Milestone       | The milestone attached to the resource |
 | labels                  | [Label]         | A list of labels, having only names |
@@ -1041,7 +1067,7 @@ Here's a list of currently available Ruby expression API:
 | label_events            | [LabelEvent]    | A list of label events on the resource |
 | instance_version        | InstanceVersion | The version for the GitLab instance we're triaging with |
 | project_path            | String          | The path with namespace to the issues or merge requests project |
-| full_resource_reference | String          | A full reference incuding project path to the issue or merge request |
+| full_resource_reference | String          | A full reference including project path to the issue or merge request |
 
 ##### Methods for `MergeRequest` (merge request context)
 
@@ -1130,7 +1156,7 @@ Usage: gitlab-triage [options]
         --init-ci                    Initialize the project with a .gitlab-ci.yml file
 ```
 
-#### Running locally
+#### Running with the installed gem
 
 Triaging against a specific project:
 
@@ -1152,6 +1178,16 @@ 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 `$GITLAB_API_TOKEN`
 
+#### Running from source
+
+Execute the `gitlab-triage` script from the `./bin` directory.
+
+For example- after cloning this project, from the root `gitlab-triage` directory:
+
+```
+bundle exec bin/gitlab-triage --dry-run --token $GITLAB_API_TOKEN --source-id gitlab-org/triage
+```
+
 #### Running on GitLab CI pipeline
 
 You can enforce policies using a scheduled pipeline:

data/gitlab-triage.gemspec

@@ -9,11 +9,20 @@ Gem::Specification.new do |spec|
   spec.email         = ['gitlab_rubygems@gitlab.com']
 
   spec.summary       = 'GitLab triage automation project.'
-  spec.homepage      = 'https://gitlab.com/gitlab-org/gitlab-triage'
+  spec.homepage      = 'https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage'
   spec.license       = 'MIT'
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(docs|test|spec|features)/})
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage"
+  spec.metadata["changelog_uri"] = "https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage/-/releases"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match?(%r{^(docs?|spec|tmp)/}) }
   end
   spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

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

@@ -29,6 +29,7 @@ module Gitlab
           downvotes: "{{downvotes}}",
           title: "{{title}}",
           web_url: "{{web_url}}",
+          full_reference: "{{references.full}}",
           type: "{{type}}",
           items: "{{items}}"
         }.freeze
@@ -120,7 +121,7 @@ module Gitlab
           return attributes unless redact_confidential_attributes?
 
           case path
-          when 'web_url', 'items', 'type'
+          when 'web_url', 'items', 'type', 'references.full'
             attributes # No need to redact them
           else
             [Resource::Base::CONFIDENTIAL_TEXT]

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
+      MILESTONE_TIMEBOX_VALUES = %w[none any upcoming started].freeze
       EpicsTriagingForProjectImpossibleError = Class.new(StandardError)
 
       def initialize(policies:, options:, network_adapter_class: DEFAULT_NETWORK_ADAPTER, graphql_network_adapter_class: DEFAULT_GRAPHQL_ADAPTER)
@@ -62,16 +63,16 @@ module Gitlab
         puts Gitlab::Triage::UI.header("Triaging the `#{options.source_id}` #{options.source.to_s.singularize}", char: '=')
         puts
 
-        resource_rules.each do |resource_type, resource|
+        resource_rules.each do |resource_type, policy_definition|
           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 Gitlab::Triage::UI.header("Processing summaries & rules for #{resource_type}", char: '-')
           puts
 
-          process_summaries(resource_type, resource[:summaries])
-          process_rules(resource_type, resource[:rules])
+          process_summaries(resource_type, policy_definition[:summaries])
+          process_rules(resource_type, policy_definition[:rules])
         end
       end
 
@@ -127,71 +128,165 @@ module Gitlab
         rule.fetch(:limits) { {} }
       end
 
-      def process_summaries(resource_type, summaries)
-        return if summaries.blank?
-
-        summaries.each do |summary|
-          process_summary(resource_type, summary)
+      # Process an array of +summary_definitions+.
+      #
+      # @example Example of an array of summary definitions (shown as YAML for readability).
+      #
+      #   - name: Newest and oldest issues summary
+      #     rules:
+      #       - name: New issues
+      #         conditions:
+      #           state: opened
+      #         limits:
+      #           most_recent: 2
+      #         actions:
+      #           summarize:
+      #             item: "- [ ] [{{title}}]({{web_url}}) {{labels}}"
+      #             summary: |
+      #               Please triage the following new {{type}}:
+      #               {{items}}
+      #     actions:
+      #       summarize:
+      #         title: "Newest and oldest {{type}} summary"
+      #         summary: |
+      #           Please triage the following {{type}}:
+      #           {{items}}
+      #           Please take care of them before the end of #{7.days.from_now.strftime('%Y-%m-%d')}
+      #           /label ~"needs attention"
+      #
+      # @param summary_definitions [Array<Hash>] An array usually given as YAML in a triage policy file.
+      #
+      # @return [nil]
+      def process_summaries(resource_type, summary_definitions)
+        return if summary_definitions.blank?
+
+        summary_definitions.each do |summary_definition|
+          process_summary(resource_type, summary_definition)
         end
       end
 
-      def process_rules(resource_type, rules)
-        return if rules.blank?
-
-        rules.each do |rule|
-          resources_for_rule(resource_type, rule) do |resources|
+      # Process an array of +rule_definitions+.
+      #
+      # @example Example of an array of rule definitions.
+      #
+      #   [{ name: "New issues", conditions: { state: opened }, limits: { most_recent: 2 }, actions: { labels: ["needs attention"] } }]
+      #
+      # @param rule_definitions [Array<Hash>] An array usually given as YAML in a triage policy file.
+      #
+      # @return [nil]
+      def process_rules(resource_type, rule_definitions)
+        return if rule_definitions.blank?
+
+        rule_definitions.each do |rule_definition|
+          resources_for_rule(resource_type, rule_definition) do |resources|
             policy = Policies::RulePolicy.new(
-              resource_type, rule, resources, network)
+              resource_type, rule_definition, resources, network)
 
             process_action(policy)
           end
         end
       end
 
-      def process_summary(resource_type, summary)
-        puts Gitlab::Triage::UI.header("Processing summary: **#{summary[:name]}**", char: '~')
+      # Process a +summary_definition+.
+      #
+      # @example Example of a summary definition hash (shown as YAML for readability).
+      #
+      #   name: Newest and oldest issues summary
+      #   rules:
+      #     - name: New issues
+      #       conditions:
+      #         state: opened
+      #       limits:
+      #         most_recent: 2
+      #       actions:
+      #         summarize:
+      #           item: "- [ ] [{{title}}]({{web_url}}) {{labels}}"
+      #           summary: |
+      #             Please triage the following new {{type}}:
+      #             {{items}}
+      #   actions:
+      #     summarize:
+      #       title: "Newest and oldest {{type}} summary"
+      #       summary: |
+      #         Please triage the following {{type}}:
+      #         {{items}}
+      #         Please take care of them before the end of #{7.days.from_now.strftime('%Y-%m-%d')}
+      #         /label ~"needs attention"
+      #
+      # @param resource_type [String] The resource type, e.g. +issues+ or +merge_requests+.
+      # @param summary_definition [Hash] A hash usually given as YAML in a triage policy file:
+      #
+      # @return [nil]
+      def process_summary(resource_type, summary_definition)
+        puts Gitlab::Triage::UI.header("Processing summary: **#{summary_definition[:name]}**", char: '~')
         puts
 
-        summary_parts_for_rules(resource_type, summary[:rules]) do |resources|
+        summary_parts_for_rules(resource_type, summary_definition[:rules]) do |summary_resources|
           policy = Policies::SummaryPolicy.new(
-            resource_type, summary, resources, network)
+            resource_type, summary_definition, summary_resources, network)
 
           process_action(policy)
         end
       end
 
-      def summary_parts_for_rules(resource_type, rules)
+      # Transform an array of +rule_definitions+ into a +PoliciesResources::SummaryResources.new(rule => rule_resources)+ object.
+      #
+      # @example Example of an array of rule definitions.
+      #
+      #   [{ name: "New issues", conditions: { state: opened }, limits: { most_recent: 2 }, actions: { labels: ["needs attention"] } }]
+      #
+      # @param resource_type [String] The resource type, e.g. +issues+ or +merge_requests+.
+      # @param rule_definitions [Array<Hash>] An array of rule definitions, e.g.
+      #                                       +[{ name: 'Foo', conditions: { milestone: 'v1' } }, { name: 'Foo', conditions: { state: 'opened' } }]+.
+      #
+      # @yieldparam summary_resources [PoliciesResources::SummaryResources] An object which contains a +{ rule_definition => resources }+ hash.
+      # @yieldreturn [nil]
+      #
+      # @return [nil]
+      def summary_parts_for_rules(resource_type, rule_definitions)
         # { summary_rule => resources }
-        parts = rules.inject({}) do |result, rule|
-          resources_and_conditions =
-            to_enum(:resources_for_rule, resource_type, rule)
-
-          resources_and_conditions
-            .inject(result) do |result, (resources, conditions)|
-              # { expanded_summary_rule => resources }
-              result.merge(rule.merge(conditions: conditions) => resources)
-            end
+        parts = rule_definitions.each_with_object({}) do |rule_definition, result|
+          to_enum(:resources_for_rule, resource_type, rule_definition).each do |rule_resources, expanded_conditions|
+            # We replace the non-expanded rule conditions with the expanded ones
+            result.merge!(rule_definition.merge(conditions: expanded_conditions) => rule_resources)
+          end
+
+          result
         end
 
         yield(PoliciesResources::SummaryResources.new(parts))
       end
 
-      def resources_for_rule(resource_type, rule)
-        puts Gitlab::Triage::UI.header("Gathering resources for rule: **#{rule[:name]}**", char: '-')
-
-        ExpandCondition.perform(rule_conditions(rule)) do |conditions|
+      # Transform a non-expanded +rule_definition+ into a +PoliciesResources::RuleResources.new(resources)+ object.
+      #
+      # @example Example of a rule definition hash.
+      #
+      #   { name: "New issues", conditions: { state: opened }, limits: { most_recent: 2 }, actions: { labels: ["needs attention"] } }
+      #
+      # @param resource_type [String] The resource type, e.g. +issues+ or +merge_requests+.
+      # @param rule_definition [Hash] A rule definition, e.g. +{ name: 'Foo', conditions: { milestone: 'v1' } }+.
+      #
+      # @yieldparam rule_resources [PoliciesResources::RuleResources] An object which contains an array of resources.
+      # @yieldparam expanded_conditions [Hash] A hash of expanded conditions.
+      # @yieldreturn [nil]
+      #
+      # @return [nil]
+      def resources_for_rule(resource_type, rule_definition)
+        puts Gitlab::Triage::UI.header("Gathering resources for rule: **#{rule_definition[:name]}**", char: '-')
+
+        ExpandCondition.perform(rule_conditions(rule_definition)) do |expanded_conditions|
           # retrieving the resources for every rule is inefficient
           # however, previous rules may affect those upcoming
           resources = []
 
-          if rule[:api] == 'graphql'
-            graphql_query = build_graphql_query(resource_type, conditions, true)
+          if rule_definition[:api] == 'graphql'
+            graphql_query = build_graphql_query(resource_type, expanded_conditions, true)
             resources = graphql_network.query(graphql_query, source: source_full_path)
           else
-            resources = network.query_api(build_get_url(resource_type, conditions))
+            resources = network.query_api(build_get_url(resource_type, expanded_conditions))
             iids = resources.pluck('iid').map(&:to_s)
 
-            graphql_query = build_graphql_query(resource_type, conditions)
+            graphql_query = build_graphql_query(resource_type, expanded_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)
@@ -202,28 +297,19 @@ module Gitlab
 
           puts "\n\n* Found #{resources.count} resources..."
           print "* Filtering resources..."
-          resources = filter_resources(resources, conditions)
+          resources = filter_resources(resources, expanded_conditions)
           puts "\n* Total after filtering: #{resources.count} resources"
           print "* Limiting resources..."
-          resources = limit_resources(resources, rule_limits(rule))
+          resources = limit_resources(resources, rule_limits(rule_definition))
           puts "\n* Total after limiting: #{resources.count} resources"
           puts
 
-          yield(PoliciesResources::RuleResources.new(resources), conditions)
+          yield(PoliciesResources::RuleResources.new(resources), expanded_conditions)
         end
       end
 
       def attach_resource_type(resources, 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)
@@ -308,19 +394,20 @@ module Gitlab
             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]
+        condition_builders << milestone_condition_builder(resource_type, conditions[:milestone]) if conditions[:milestone]
 
         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])
+        case resource_type&.to_sym
+        when :issues
+          condition_builders.concat(issues_resource_query(conditions))
+        when :merge_requests
+          condition_builders.concat(merge_requests_resource_query(conditions))
         end
 
-        condition_builders.each do |condition_builder|
+        condition_builders.compact.each do |condition_builder|
           params[condition_builder.param_name] = condition_builder.param_content
         end
 
@@ -334,6 +421,50 @@ module Gitlab
         ).build
       end
 
+      def milestone_condition_builder(resource_type, milestone_condition)
+        milestone_value = Array(milestone_condition)[0].to_s # back-compatibility
+        return if milestone_value.empty?
+
+        # Issues API should use the `milestone_id` param for timebox values, and `milestone` for milestone title
+        args =
+          if resource_type.to_sym == :issues && MILESTONE_TIMEBOX_VALUES.include?(milestone_value.downcase)
+            ['milestone_id', milestone_value.downcase]
+          else
+            ['milestone', milestone_value]
+          end
+
+        APIQueryBuilders::SingleQueryParamBuilder.new(*args)
+      end
+
+      def issues_resource_query(conditions)
+        [].tap do |condition_builders|
+          condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('weight', conditions[:weight]) if conditions[:weight]
+        end
+      end
+
+      def merge_requests_resource_query(conditions)
+        [].tap do |condition_builders|
+          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]
+          condition_builders << draft_condition_builder(conditions[:draft]) if conditions.key?(:draft)
+        end
+      end
+
+      def draft_condition_builder(draft_condittion)
+        # Issues API only accepts 'yes' and 'no' as strings: https://docs.gitlab.com/ee/api/merge_requests.html
+        wip =
+          case draft_condittion
+          when true
+            'yes'
+          when false
+            'no'
+          else
+            raise ArgumentError, 'The "draft" condition only accepts true or false.'
+          end
+
+        APIQueryBuilders::SingleQueryParamBuilder.new('wip', wip)
+      end
+
       def build_graphql_query(resource_type, conditions, graphql_only = false)
         Gitlab::Triage::GraphqlQueries::QueryBuilder
           .new(options.source, resource_type, conditions, graphql_only: graphql_only)

data/lib/gitlab/triage/entity_builders/issue_builder.rb

@@ -49,7 +49,8 @@ module Gitlab
         end
 
         def description_resource
-          title_resource.merge(title: title, items: items)
+          title_resource.merge(
+            title: title, items: items, resources: @resources)
         end
 
         def items

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

@@ -66,7 +66,7 @@ module Gitlab
             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'
+            fields.push('draft', 'mergedAt') if resource_type == 'merge_requests'
           end
 
           fields
@@ -82,8 +82,13 @@ module Gitlab
             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'
+            case resource_type
+            when 'issues'
+              condition_queries << issues_label_query(condition, condition_params)
+            when 'merge_requests'
+              condition_queries << merge_requests_label_query(condition, condition_params)
+              condition_queries << merge_requests_resource_query(condition, condition_params)
+            end
           end
 
           condition_queries
@@ -92,26 +97,48 @@ module Gitlab
             .join
         end
 
+        def issues_label_query(condition, condition_params)
+          args =
+            case condition.to_s
+            when 'forbidden_labels'
+              ['labelName', condition_params, { negated: true }]
+            when 'labels'
+              ['labelName', condition_params]
+            else
+              return nil
+            end
+
+          QueryParamBuilders::LabelsParamBuilder.new(*args)
+        end
+
         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
+          args =
+            case condition.to_s
+            when 'source_branch'
+              ['sourceBranches', condition_params]
+            when 'target_branch'
+              ['targetBranches', condition_params]
+            when 'draft'
+              ['draft', condition_params, { with_quotes: false }]
+            else
+              return nil
+            end
+
+          QueryParamBuilders::BaseParamBuilder.new(*args)
         end
 
-        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
+        def merge_requests_label_query(condition, condition_params)
+          args =
+            case condition.to_s
+            when 'forbidden_labels'
+              ['labels', condition_params, { negated: true }]
+            when 'labels'
+              ['labels', condition_params]
+            else
+              return nil
+            end
+
+          QueryParamBuilders::LabelsParamBuilder.new(*args)
         end
       end
     end

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

@@ -14,10 +14,6 @@ module Gitlab
             request_group(resource[:group_id])[:full_path]
         end
         alias_method :group_path, :project_path
-
-        def reference
-          '&'
-        end
       end
     end
   end

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

@@ -8,10 +8,6 @@ module Gitlab
     module Resource
       class Issue < Base
         include Shared::Issuable
-
-        def reference
-          '#'
-        end
       end
     end
   end

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

@@ -9,10 +9,6 @@ module Gitlab
       class MergeRequest < Base
         include Shared::Issuable
 
-        def reference
-          '!'
-        end
-
         def first_contribution?
           if resource.key?(:first_contribution)
             resource[:first_contribution]

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

@@ -57,12 +57,7 @@ module Gitlab
           end
 
           def full_resource_reference
-            @full_resource_reference ||=
-              "#{project_path}#{reference}#{resource[:iid]}"
-          end
-
-          def reference
-            raise NotImplementedError
+            @full_resource_reference ||= resource.dig(:references, :full)
           end
 
           def root_id(

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

@@ -13,6 +13,8 @@ module Gitlab
           @sub_resource_type = options.fetch(:sub_resource_type, nil)
           @resource_id = options.fetch(:resource_id, nil)
           @params = options.fetch(:params, [])
+
+          @params = @params.merge(scope: :all) if @all
         end
 
         def build

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.20.0'
+    VERSION = '1.21.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 $GITLAB_API_TOKEN --source projects --source-id $CI_PROJECT_PATH
+    - gitlab-triage --dry-run --token $GITLAB_API_TOKEN --host-url $CI_SERVER_URL --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 $GITLAB_API_TOKEN --source projects --source-id $CI_PROJECT_PATH
+    - gitlab-triage --token $GITLAB_API_TOKEN --host-url $CI_SERVER_URL --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.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -148,9 +148,14 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitlab/CODEOWNERS"
+- ".gitlab/changelog_config.yml"
 - ".gitlab/merge_request_templates/Release.md"
 - ".rubocop.yml"
+- ".ruby-version"
+- ".tool-versions"
+- ".yardopts"
 - CONTRIBUTING.md
+- Dangerfile
 - Gemfile
 - Guardfile
 - LICENSE.md
@@ -233,10 +238,14 @@ files:
 - lib/gitlab/triage/version.rb
 - support/.gitlab-ci.example.yml
 - support/.triage-policies.example.yml
-homepage: https://gitlab.com/gitlab-org/gitlab-triage
+homepage: https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage
+  source_code_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage
+  changelog_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage/-/releases
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -245,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="