gitlab-triage 1.27.0 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6668ca8a79611f5e39d317807cb604d7fb32320120283c9996a9784515523bf5
-  data.tar.gz: d6211b78036d039e89a75da4f93bbfa07c44b73ffd16f331ae1bfb5cc901cc9d
+  metadata.gz: 6f594160679b71928b75f5bec0131c846d79b10cdc0cebb33388d1bc907b9769
+  data.tar.gz: 04a02e449720f03ab2820c3be0693c17486e366a7bcfe87a1c1f6e02ee6a02da
 SHA512:
-  metadata.gz: bf0a6406e2a2b6f6cc6b7436831b3b95be04bbf1174c70d3fc5d4a0e24d4e8ccddcd1837864bc8e336fb1c5a0dc947c8a37716d74b31f35e025c4a21bcdb2fda
-  data.tar.gz: 0aa64137299f30fe4f83db4b50475c2b9a15e9730eebbcf5b98d5ce17150a70379f5ae629a87b5d399ce4c74a1712063e222c224ef2e6da29d3016ca48faa35f
+  metadata.gz: 44cc6360a513c7ad126ee8dbc4e5151fafbb8b4994e5e0ea84a2fdb5a32ec997271bd66ee3b065cbbbfb3e92548a38d599c025a6f32f378339522f836001cadf
+  data.tar.gz: 1177f4e8471c3fbe6606e5e0eeaee384335b327774a94574e9942d1928b7dec03c50b8c90df082091b7873f6f871c70a8b162732fa3740a222c861c1751f3f7a

data/.gitlab/CODEOWNERS

@@ -1,2 +1,2 @@
 # The official maintainers
-* @rymai @godfat-gitlab @markglenfletcher
+* @gitlab-org/quality/engineering-productivity 

data/README.md

@@ -178,6 +178,7 @@ Available condition types:
 - [`draft` condition](#draft-condition)
 - [`source_branch` condition](#source-branch-condition)
 - [`target_branch` condition](#target-branch-condition)
+- [`health_status` condition](#health-status-condition)
 - [`weight` condition](#weight-condition)
 - [`discussions` condition](#discussions-condition)
 - [`protected` condition](#protected-condition)
@@ -188,12 +189,12 @@ Available condition types:
 
 Accepts a hash of fields.
 
-| Field           | Type    | Values                                                                   | Required  |
-| ---------       | ----    |--------------------------------------------------------------------------| --------  |
+| Field           | Type    | Values                                                                     | Required  |
+| ---------       | ----    |----------------------------------------------------------------------------| --------  |
 | `attribute`     | string  | `created_at`, `updated_at`, `merged_at`, `authored_date`, `committed_date` | yes       |
-| `condition`     | string  | `older_than`, `newer_than`                                               | yes       |
-| `interval_type` | string  | `days`, `weeks`, `months`, `years`                                       | yes       |
-| `interval`      | integer | integer                                                                  | yes       |
+| `condition`     | string  | `older_than`, `newer_than`                                                 | yes       |
+| `interval_type` | string  | `minutes`, `hours`, `days`, `weeks`, `months`, `years`                     | yes       |
+| `interval`      | integer | integer                                                                    | yes       |
 > **Note:**
 >   - `merged_at` only works on merge requests.
 >   - `closed_at` is not supported in the GitLab API, but can be used in a [`ruby` condition](#ruby-condition).
@@ -210,6 +211,21 @@ conditions:
     interval: 12
 ```
 
+> **Note:** If the GitLab server is giving 500 error with this option, it
+> can mean that it's taking too much time to query this, and it's timing out.
+> A workaround for this is that we can filter in Ruby. If you need this
+> workaround, specify this with `filter_in_ruby: true`
+>
+> ```yaml
+> conditions:
+> date:
+>   attribute: updated_at
+>   condition: older_than
+>   interval_type: months
+>   interval: 12
+>   filter_in_ruby: true
+> ```
+
 ##### Milestone condition
 
 Accepts the name of a milestone to filter upon. Also accepts the following timebox values:
@@ -553,6 +569,27 @@ conditions:
   target_branch: 'master'
 ```
 
+##### Health Status 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).
+
+| State                  | Type    | Value     |
+| ---------              | ----    | ------    |
+| Any health status      | string  | `Any`  |
+| No health status       | string  | `None`  |
+| Specific health status | string  | One of `on_track`, `needs_attention` or `at_risk` |
+
+Example:
+
+```yml
+conditions:
+  health_status: Any
+```
+
+> **Note:** This query is not supported using GraphQL yet.
+
 ##### Weight condition
 
 **This condition is only applicable for issues.**
@@ -592,9 +629,9 @@ conditions:
     threshold: 15
 ```
 
-##### Protected condition  
+##### Protected condition
 
-** This condition is only applicable for branches** 
+** This condition is only applicable for branches**
 
 Accept a boolean.
 If not specified, default to `false` to filter out protected branches.
@@ -695,6 +732,7 @@ Available action types:
 - [`mention` action](#mention-action)
 - [`move` action](#move-action)
 - [`comment` action](#comment-action)
+  - [`redact_confidential_resources` option](#redact-confidential-resources-option)
 - [`comment_type` action option](#comment-type-action-option)
 - [`summarize` action](#summarize-action)
 - [`comment_on_summary` action](#comment-on-summary-action)
@@ -832,6 +870,22 @@ actions:
     {{author}} Are you still interested in finishing this merge request?
 ```
 
+###### Redact confidential resources option
+
+Determines if the data of confidential resources is redacted.
+
+If the option is set to `true` or not set, data from confidential will appear as `(confidential)`. \
+When it is set to `false`, everything will be revealed and visible.
+
+Example:
+
+```yml
+actions:
+  redact_confidential_resources: false
+  comment: |
+    {{author}} Are you still interested in finishing this merge request?
+```
+
 ##### Comment type action option
 
 Determines the type of comment to be added to the resource.
@@ -1075,11 +1129,11 @@ resource_rules:
 
 **This action is only applicable for branches.**
 
-Delete the resource. 
+Delete the resource.
 
 Accept a boolean. Set to `true` to enable.
 
-Example : 
+Example :
 ```yaml
 resource_rules:
   branches:
@@ -1291,15 +1345,18 @@ Usage: gitlab-triage [options]
 
     -n, --dry-run                    Don't actually update anything, just print
     -f, --policies-file [string]     A valid policies YML file
+        --all-projects               Process all projects the token has access to
     -s, --source [type]              The source type between [ projects or groups ], default value: projects
     -i, --source-id [string]         Source ID or path
     -p, --project-id [string]        [Deprecated] A project ID or path, please use `--source-id`
+        --resource-reference [string]
+                                     Resource short-reference, e.g. #42, !33, or &99
     -t, --token [string]             A valid API token
     -H, --host-url [string]          A valid host url
     -r, --require [string]           Require a file before performing
     -d, --debug                      Print debug information
     -h, --help                       Print help message
-        --all-projects               Process all projects visible to `--token`
+    -v, --version                    Print version
         --init                       Initialize the project with a policy file
         --init-ci                    Initialize the project with a .gitlab-ci.yml file
 ```
@@ -1336,6 +1393,14 @@ 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
 ```
 
+Triaging against specific resource:
+
+```
+gitlab-triage --dry-run --token $API_TOKEN --source-id gitlab-org/triage --resource-reference '#42'
+gitlab-triage --dry-run --token $API_TOKEN --source-id gitlab-org/triage --resource-reference '!33'
+gitlab-triage --dry-run --token $API_TOKEN --source groups --source-id gitlab-org --resource-reference '&99'
+```
+
 #### Running on GitLab CI pipeline
 
 You can enforce policies using a scheduled pipeline:

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

@@ -45,7 +45,12 @@ module Gitlab
         def build_comment(resource)
           CommandBuilders::CommentCommandBuilder.new(
             [
-              CommandBuilders::TextContentBuilder.new(policy.actions[:comment], resource: resource, network: network).build_command,
+              CommandBuilders::TextContentBuilder.new(
+                policy.actions[:comment],
+                resource: resource,
+                network: network,
+                redact_confidentials: policy.actions.fetch(:redact_confidential_resources, true)
+              ).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,

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

@@ -8,7 +8,8 @@ module Gitlab
         ATTRIBUTES = %w[updated_at created_at].freeze
 
         def self.applicable?(condition)
-          ATTRIBUTES.include?(condition[:attribute].to_s)
+          ATTRIBUTES.include?(condition[:attribute].to_s) &&
+            condition[:filter_in_ruby] != true
         end
 
         def initialize(condition_hash)

data/lib/gitlab/triage/engine.rb

@@ -2,6 +2,7 @@ require 'active_support/all'
 require 'active_support/inflector'
 
 require_relative 'expand_condition'
+require_relative 'filters/issue_date_conditions_filter'
 require_relative 'filters/merge_request_date_conditions_filter'
 require_relative 'filters/branch_date_filter'
 require_relative 'filters/branch_protected_filter'
@@ -43,6 +44,7 @@ module Gitlab
       MILESTONE_TIMEBOX_VALUES = %w[none any upcoming started].freeze
       ITERATION_SELECTION_VALUES = %w[none any].freeze
       EpicsTriagingForProjectImpossibleError = Class.new(StandardError)
+      MultiPolicyInInjectionModeError = 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 }
@@ -55,21 +57,23 @@ module Gitlab
         @network_adapter_class = network_adapter_class
         @graphql_network_adapter_class = graphql_network_adapter_class
 
-        assert_all!
-        assert_project_id!
+        assert_options!
+
+        @options.source = @options.source.to_s
+
         require_ruby_files
       end
 
       def perform
         puts "Performing a dry run.\n\n" if options.dry_run
 
-        puts Gitlab::Triage::UI.header("Triaging the `#{options.source_id}` #{options.source.to_s.singularize}", char: '=')
+        puts Gitlab::Triage::UI.header("Triaging the `#{options.source_id}` #{options.source.singularize}", char: '=')
         puts
 
         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
+          next unless right_resource_type_for_resource_option?(resource_type)
+
+          assert_epic_rule!(resource_type)
 
           puts Gitlab::Triage::UI.header("Processing summaries & rules for #{resource_type}", char: '-')
           puts
@@ -93,22 +97,86 @@ module Gitlab
 
       private
 
-      def assert_project_id!
+      def assert_options!
+        assert_all!
+        assert_source!
+        assert_source_id!
+        assert_resource_reference!
+      end
+
+      # rubocop:disable Style/IfUnlessModifier
+      def assert_all!
+        return unless options.all
+
+        if options.source
+          raise ArgumentError, '--all-projects option cannot be used in conjunction with --source option!'
+        end
+
+        if options.source_id
+          raise ArgumentError, '--all-projects option cannot be used in conjunction with --source-id option!'
+        end
+
+        if options.resource_reference # rubocop:disable Style/GuardClause
+          raise ArgumentError, '--all-projects option cannot be used in conjunction with --resource-reference option!'
+        end
+      end
+      # rubocop:enable Style/IfUnlessModifier
+
+      def assert_source!
+        return if options.source
+        return if options.all
+
+        raise ArgumentError, 'A source is needed (pass it with the `--source` option)!'
+      end
+
+      def assert_source_id!
         return if options.source_id
         return if options.all
 
-        raise ArgumentError, 'A project_id is needed (pass it with the `--source-id` option)!'
+        raise ArgumentError, 'A project or group ID is needed (pass it with the `--source-id` option)!'
       end
 
-      def assert_all!
-        raise ArgumentError, '--all-projects option cannot be used in conjunction with --source and --source-id option!' if
-          options.all && (options.source || options.source_id)
+      def assert_resource_reference!
+        return unless options.resource_reference
+
+        if options.source == 'groups' && !options.resource_reference.start_with?('&')
+          raise ArgumentError, "--resource-reference can only start with '&' when --source=groups is passed ('#{options.resource_reference}' passed)!"
+        end
+
+        if options.source == 'projects' && !options.resource_reference.start_with?('#', '!') # rubocop:disable Style/GuardClause
+          raise(
+            ArgumentError,
+            "--resource-reference can only start with '#' or '!' when --source=projects is passed " \
+            "('#{options.resource_reference}' passed)!"
+          )
+        end
       end
 
       def require_ruby_files
         options.require_files.each(&method(:require))
       end
 
+      def right_resource_type_for_resource_option?(resource_type)
+        return true unless options.resource_reference
+
+        resource_reference = options.resource_reference
+
+        case resource_type
+        when 'issues'
+          resource_reference.start_with?('#')
+        when 'merge_requests'
+          resource_reference.start_with?('!')
+        when 'epics'
+          resource_reference.start_with?('&')
+        end
+      end
+
+      def assert_epic_rule!(resource_type)
+        return 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
+
       def resource_rules
         @resource_rules ||= policies.delete(:resource_rules) { {} }
       end
@@ -278,20 +346,8 @@ module Gitlab
         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_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, expanded_conditions))
-            iids = resources.pluck('iid').map(&:to_s)
-
-            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)
-          end
+          resources = options.resources ||
+            fetch_resources(resource_type, expanded_conditions, rule_definition)
 
           # In some filters/actions we want to know which resource type it is
           attach_resource_type(resources, resource_type)
@@ -309,6 +365,38 @@ module Gitlab
         end
       end
 
+      def fetch_resources(resource_type, expanded_conditions, rule_definition)
+        resources = []
+
+        if rule_definition[:api] == 'graphql'
+          graphql_query_options = { source: source_full_path }
+
+          if options.resource_reference
+            expanded_conditions[:iids] = options.resource_reference[1..]
+            graphql_query_options[:iids] = [expanded_conditions[:iids]]
+          end
+
+          graphql_query = build_graphql_query(resource_type, expanded_conditions, true)
+
+          resources = graphql_network.query(graphql_query, **graphql_query_options)
+        else
+          # FIXME: Epics listing endpoint doesn't support filtering by `iids`, so instead we
+          # get a single epic when `--resource-reference` is given for epics.
+          # Because of that, the query could return a single epic, so we make sure we get an array.
+          resources = Array(network.query_api(build_get_url(resource_type, expanded_conditions)))
+
+          iids = resources.pluck('iid').map(&:to_s)
+          expanded_conditions[:iids] = iids
+
+          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)
+        end
+
+        resources
+      end
+
       def attach_resource_type(resources, resource_type)
         resources.each { |resource| resource[:type] = resource_type }
       end
@@ -328,7 +416,7 @@ module Gitlab
         puts
       end
 
-      def filter_resources(resources, conditions) # rubocop:disable Metrics/CyclomaticComplexity
+      def filter_resources(resources, conditions) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
         resources.select do |resource|
           results = []
 
@@ -337,8 +425,17 @@ module Gitlab
             case resource[:type]
             when 'branches'
               results << Filters::BranchDateFilter.new(resource, conditions[:date]).calculate
+            when 'issues'
+              if conditions.dig(:date, :filter_in_ruby)
+                results << Filters::IssueDateConditionsFilter.new(resource, conditions[:date]).calculate
+              end
             when 'merge_requests'
-              results << Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
+              if conditions.dig(:date, :filter_in_ruby) ||
+                  # REST API does not support filtering with merged_at,
+                  # so we have to filter it in Ruby
+                  conditions.dig(:date, :attribute) == 'merged_at'
+                results << Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
+              end
             end
           end
 
@@ -384,6 +481,8 @@ module Gitlab
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity
       def build_get_url(resource_type, conditions)
         # Example issues query with state and labels
         # https://gitlab.com/api/v4/projects/test-triage%2Fissue-project/issues?state=open&labels=project%20label%20with%20spaces,group_label_no_spaces
@@ -392,6 +491,8 @@ module Gitlab
         }
 
         condition_builders = []
+        condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('iids', options.resource_reference[1..]) if options.resource_reference
+
         condition_builders << APIQueryBuilders::MultiQueryParamBuilder.new('labels', conditions[:labels], ',') if conditions[:labels]
 
         if conditions[:forbidden_labels]
@@ -424,15 +525,23 @@ module Gitlab
           params[condition_builder.param_name] = condition_builder.param_content
         end
 
-        UrlBuilders::UrlBuilder.new(
+        url_builder_options = {
           network_options: options,
           all: options.all,
           source: options.source,
           source_id: options.source_id,
           resource_type: resource_type,
           params: params
-        ).build
+        }
+
+        # FIXME: Epics listing endpoint doesn't support filtering by `iids`, so instead we
+        # get a single epic when `--resource-reference` is given for epics.
+        url_builder_options[:resource_id] = options.resource_reference[1..] if options.resource_reference && resource_type == 'epics'
+
+        UrlBuilders::UrlBuilder.new(url_builder_options).build
       end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def milestone_condition_builder(resource_type, milestone_condition)
         milestone_value = Array(milestone_condition)[0].to_s # back-compatibility
@@ -464,6 +573,7 @@ module Gitlab
         [].tap do |condition_builders|
           condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('weight', conditions[:weight]) if conditions[:weight]
           condition_builders << iteration_condition_builder(conditions[:iteration]) if conditions[:iteration]
+          condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('health_status', conditions[:health_status]) if conditions[:health_status]
         end
       end
 

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

@@ -6,7 +6,9 @@ module Gitlab
       class BranchDateFilter < BaseConditionsFilter
         ATTRIBUTES = %w[committed_date authored_date].freeze
         CONDITIONS = %w[older_than newer_than].freeze
-        INTERVAL_TYPES = %w[days weeks months years].freeze
+        TIME_BASED_INTERVALS = %w[minutes hours].freeze
+        DATE_BASED_INTERVALS = %w[days weeks months years].freeze
+        INTERVAL_TYPES = TIME_BASED_INTERVALS + DATE_BASED_INTERVALS
 
         def self.allowed_attributes
           self::ATTRIBUTES
@@ -48,7 +50,11 @@ module Gitlab
         end
 
         def condition_value
-          @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          if TIME_BASED_INTERVALS.include?(@interval_type.to_s)
+            @interval.public_send(@interval_type).ago.to_datetime # rubocop:disable GitlabSecurity/PublicSend
+          else
+            @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          end
         end
 
         def calculate

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

@@ -0,0 +1,78 @@
+require_relative 'base_conditions_filter'
+
+module Gitlab
+  module Triage
+    module Filters
+      class IssueDateConditionsFilter < BaseConditionsFilter
+        CONDITIONS = %w[older_than newer_than].freeze
+        TIME_BASED_INTERVALS = %w[minutes hours].freeze
+        DATE_BASED_INTERVALS = %w[days weeks months years].freeze
+        INTERVAL_TYPES = TIME_BASED_INTERVALS + DATE_BASED_INTERVALS
+
+        def self.generate_allowed_attributes
+          %w[updated_at created_at]
+        end
+
+        def self.allowed_attributes
+          @allowed_attributes ||= generate_allowed_attributes.freeze
+        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
+          @resource[@attribute]&.to_date
+        end
+
+        def condition_value
+          if TIME_BASED_INTERVALS.include?(@interval_type.to_s)
+            @interval.public_send(@interval_type).ago.to_datetime # rubocop:disable GitlabSecurity/PublicSend
+          else
+            @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          end
+        end
+
+        # Guard against merge requests with no merged_at values
+        def calculate
+          return false unless resource_value
+
+          case @condition
+          when :older_than
+            resource_value < condition_value
+          when :newer_than
+            resource_value > condition_value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,65 +3,9 @@ require_relative 'base_conditions_filter'
 module Gitlab
   module Triage
     module Filters
-      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
-          @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
-
-          case @condition
-          when :older_than
-            resource_value < condition_value
-          when :newer_than
-            resource_value > condition_value
-          end
+      class MergeRequestDateConditionsFilter < IssueDateConditionsFilter
+        def self.generate_allowed_attributes
+          super << 'merged_at'
         end
       end
     end

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

@@ -11,6 +11,10 @@ module Gitlab
           @resource_type = resource_type
           @conditions = conditions
           @graphql_only = graphql_only
+          @resource_declarations = [
+            '$source: ID!',
+            '$after: String'
+          ]
         end
 
         def resource_path
@@ -26,8 +30,7 @@ module Gitlab
             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'
+            resource_declarations: resource_declarations.join(', ')
           )
         end
 
@@ -35,13 +38,13 @@ module Gitlab
 
         private
 
-        attr_reader :source_type, :resource_type, :conditions, :graphql_only
+        attr_reader :source_type, :resource_type, :conditions, :graphql_only, :resource_declarations
 
         BASE_QUERY = <<~GRAPHQL.freeze
-          query($source: ID!, $after: String%{iids_declaration}) {
+          query(%{resource_declarations}) {
             %{source_type}(fullPath: $source) {
               id
-              %{resource_type}(after: $after%{iids_query}%{resource_query}) {
+              %{resource_type}(after: $after%{resource_query}) {
                 pageInfo {
                   hasNextPage
                   endCursor
@@ -86,6 +89,11 @@ 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'
 
+            if condition.to_s == 'iids'
+              @resource_declarations << '$iids: [String!]'
+              condition_queries << QueryParamBuilders::BaseParamBuilder.new('iids', '$iids', with_quotes: false)
+            end
+
             case resource_type
             when 'issues'
               condition_queries << issues_label_query(condition, condition_params)

data/lib/gitlab/triage/option_parser.rb

@@ -43,6 +43,10 @@ module Gitlab
               options.source_id = value
             end
 
+            opts.on('--resource-reference [string]', String, 'Resource short-reference, e.g. #42, !33, or &99') do |value|
+              options.resource_reference = value
+            end
+
             opts.on('-t', '--token [string]', String, 'A valid API token') do |value|
               options.token = value
             end

data/lib/gitlab/triage/options.rb

@@ -3,9 +3,11 @@ module Gitlab
     Options = Struct.new(
       :dry_run,
       :policies_files,
+      :resources,
       :all,
       :source,
       :source_id,
+      :resource_reference,
       :token,
       :debug,
       :host_url,

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

@@ -5,7 +5,9 @@ module Gitlab
     module ParamBuilders
       class DateParamBuilder
         CONDITIONS = %w[older_than newer_than].freeze
-        INTERVAL_TYPES = %w[days weeks months years].freeze
+        TIME_BASED_INTERVALS = %w[minutes hours].freeze
+        DATE_BASED_INTERVALS = %w[days weeks months years].freeze
+        INTERVAL_TYPES = TIME_BASED_INTERVALS + DATE_BASED_INTERVALS
 
         def initialize(allowed_attributes, condition_hash)
           @allowed_attributes = allowed_attributes
@@ -18,7 +20,11 @@ module Gitlab
         end
 
         def param_content
-          interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          if TIME_BASED_INTERVALS.include?(interval_type)
+            interval.public_send(interval_type).ago.to_datetime # rubocop:disable GitlabSecurity/PublicSend
+          else
+            interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+          end
         end
 
         private

data/lib/gitlab/triage/ui.rb

@@ -14,6 +14,10 @@ module Gitlab
       def self.warn(text)
         "[WARNING] #{text}"
       end
+
+      def self.error(text)
+        "[ERROR] #{text}"
+      end
     end
   end
 end

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.27.0'
+    VERSION = '1.29.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.29.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -201,6 +201,7 @@ files:
 - lib/gitlab/triage/filters/branch_date_filter.rb
 - lib/gitlab/triage/filters/branch_protected_filter.rb
 - lib/gitlab/triage/filters/discussions_conditions_filter.rb
+- lib/gitlab/triage/filters/issue_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