gitlab-triage 1.43.0 → 1.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d1d38e50b3032593baffe5e3122da139f542294529cadaaffa5e2861d0a428
-  data.tar.gz: 83ac90f1c5815c5a39a6cb5d3d84b34112a1a3a72f2dd9a9481291bc171648c3
+  metadata.gz: '066092d8567b3b76494b99f0c244c565d1c9b65938082e741fe955742c89e88e'
+  data.tar.gz: 3fc1d9bf0c94a47b6d6a39002014bb60fe52ac93624cb50f6a06cc2f73d11528
 SHA512:
-  metadata.gz: 8d0aef0429e6892959468c199b0bddbb18ecf02bf864ee038f59b01f35e779a200724e8841b3f603add6267a5a6b3c7746520d10bc48d77c2a6a025e5d3ddaa2
-  data.tar.gz: 70ea6376e7855ce5ac2207d0f0dc779d8d4e32eb800192c5d3ec8cbfa546425797087525c6a281bfd5513b4d8d4619cf6a81e7fd2e59b7c48d77972653ca5b37
+  metadata.gz: cd1f5e1088ec9cbe4e21ed6c968ce47489be3d83c95fffd07fd8e59a8eb92240ed44172f09f34390901dd43241a70320e859b5350b1afd20007550736d4bad75
+  data.tar.gz: ef7c028266e48926aba06c4fc908798eb7b9b60d3a16cfe7fe05a6134e5756374419961f52baf6c41e12a38f61b5a9c66f11c7e771b725d640619bc13db9bf04

data/.gitignore

@@ -3,7 +3,6 @@
 /.rspec
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /pkg/

data/.gitlab/merge_request_templates/Release.md

@@ -1,8 +1,11 @@
-<!-- Replace `<PREVIOUS_VERSION>` with the previous version number here, `<COMMIT_UPDATING_VERSION>` with the latest
+<!--1. Modify /Gemfile.lock, updating specs: gitlab-triage to the new release. See the project's git tags for the latest release. -->
+<!--2. Modify /lib/gitlab/triage/version.rb, updating the version to the new release. -->
+<!--3. Open a merge request with this template -->
+<!--4. 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
 
-https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage/-/compare/v<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
+https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage/-/compare/<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
 
 ## Checklist
 

data/.gitlab-ci.yml

@@ -7,26 +7,27 @@ stages:
 default:
   tags:
     - gitlab-org
- 
+
 .ruby-cache: &ruby-cache
   cache:
     key:
       files:
-        - Gemfile
-        - gitlab-triage.gemspec
+        - Gemfile.lock
     paths:
       - vendor/ruby
-      - Gemfile.lock
     policy: pull
 
 .use-ruby:
   image: ruby:3.2
   <<: *ruby-cache
+  variables:
+    BUNDLE_FROZEN: "true"
+    BUNDLE_PATH: "vendor"
   before_script:
     - ruby --version
     - gem install bundler --no-document
     - bundle --version
-    - bundle install --jobs $(nproc) --path=vendor --retry 3 --quiet
+    - bundle install --jobs $(nproc) --retry 3 --quiet
     - bundle check
 
 workflow:

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 10000`
-# on 2024-04-16 16:23:46 UTC using RuboCop version 1.57.2.
+# on 2024-06-13 12:56:53 UTC using RuboCop version 1.62.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -25,6 +25,17 @@ CodeReuse/ActiveRecord:
     - 'spec/support/shared_examples/label_command_shared_examples.rb'
     - 'spec/support/stub_api.rb'
 
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Categories, ExpectedOrder.
+# ExpectedOrder: module_inclusion, constants, public_class_methods, initializer, public_methods, protected_methods, private_methods
+Layout/ClassStructure:
+  Exclude:
+    - 'lib/gitlab/triage/filters/base_conditions_filter.rb'
+    - 'lib/gitlab/triage/filters/member_conditions_filter.rb'
+    - 'lib/gitlab/triage/graphql_queries/query_builder.rb'
+    - 'lib/gitlab/triage/limiters/base_limiter.rb'
+
 # Offense count: 1
 Lint/ToEnumArguments:
   Exclude:
@@ -43,6 +54,51 @@ Performance/MethodObjectAsBlock:
 RSpec/MultipleMemoizedHelpers:
   Max: 10
 
+# Offense count: 305
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/gitlab/triage/action/comment_on_summary_spec.rb'
+    - 'spec/gitlab/triage/action/comment_spec.rb'
+    - 'spec/gitlab/triage/action/delete_spec.rb'
+    - 'spec/gitlab/triage/action/issue_spec.rb'
+    - 'spec/gitlab/triage/action/summarize_spec.rb'
+    - 'spec/gitlab/triage/action_spec.rb'
+    - 'spec/gitlab/triage/engine_spec.rb'
+    - 'spec/gitlab/triage/entity_builders/issue_builder_spec.rb'
+    - 'spec/gitlab/triage/entity_builders/summary_builder_spec.rb'
+    - 'spec/gitlab/triage/expand_condition/expansion_spec.rb'
+    - 'spec/gitlab/triage/expand_condition/list_spec.rb'
+    - 'spec/gitlab/triage/expand_condition/sequence_spec.rb'
+    - 'spec/gitlab/triage/expand_condition_spec.rb'
+    - 'spec/gitlab/triage/filters/branch_date_filter_spec.rb'
+    - 'spec/gitlab/triage/filters/discussions_conditions_filter_spec.rb'
+    - 'spec/gitlab/triage/filters/issue_date_conditions_filter_spec.rb'
+    - 'spec/gitlab/triage/filters/merge_request_date_conditions_filter_spec.rb'
+    - 'spec/gitlab/triage/filters/no_additional_labels_conditions_filter_spec.rb'
+    - 'spec/gitlab/triage/filters/ruby_conditions_filter_spec.rb'
+    - 'spec/gitlab/triage/filters/votes_conditions_filter_spec.rb'
+    - 'spec/gitlab/triage/limiters/date_field_limiter_spec.rb'
+    - 'spec/gitlab/triage/network_adapters/httparty_adapter_spec.rb'
+    - 'spec/gitlab/triage/policies/base_policy_spec.rb'
+    - 'spec/gitlab/triage/policies/rule_policy_spec.rb'
+    - 'spec/gitlab/triage/policies/summary_policy_spec.rb'
+    - 'spec/gitlab/triage/resource/base_spec.rb'
+    - 'spec/gitlab/triage/resource/context_spec.rb'
+    - 'spec/gitlab/triage/resource/epic_spec.rb'
+    - 'spec/gitlab/triage/resource/instance_version_spec.rb'
+    - 'spec/gitlab/triage/resource/issue_spec.rb'
+    - 'spec/gitlab/triage/resource/label_event_spec.rb'
+    - 'spec/gitlab/triage/resource/label_spec.rb'
+    - 'spec/gitlab/triage/resource/linked_issue_spec.rb'
+    - 'spec/gitlab/triage/resource/merge_request_spec.rb'
+    - 'spec/gitlab/triage/resource/milestone_spec.rb'
+    - 'spec/gitlab/triage/resource/shared/issuable_spec.rb'
+    - 'spec/gitlab/triage/rest_api_network_spec.rb'
+    - 'spec/gitlab/triage/retryable_spec.rb'
+    - 'spec/gitlab/triage/url_builders/url_builder_spec.rb'
+
 # Offense count: 10
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
@@ -54,13 +110,6 @@ RSpec/NoExpectationExample:
     - 'spec/integration/redact_confidentials_spec.rb'
     - 'spec/integration/summary_policies_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/SpecFilePathSuffix:
-  Exclude:
-    - 'spec/integration/issue_action_policy.rb'
-
 # Offense count: 12
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:

data/.ruby-version

@@ -1 +1 @@
-3.2.3
+3.2.4

data/.tool-versions

@@ -1 +1 @@
-ruby 3.2.3
+ruby 3.2.4

data/CONTRIBUTING.md

@@ -1,9 +1,9 @@
 ## Developer Certificate of Origin + License
 
-By contributing to GitLab B.V., You accept and agree to the following terms and
-conditions for Your present and future Contributions submitted to GitLab B.V.
-Except for the license granted herein to GitLab B.V. and recipients of software
-distributed by GitLab B.V., You reserve all right, title, and interest in and to
+By contributing to GitLab Inc., You accept and agree to the following terms and
+conditions for Your present and future Contributions submitted to GitLab Inc.
+Except for the license granted herein to GitLab Inc. and recipients of software
+distributed by GitLab Inc., You reserve all right, title, and interest in and to
 Your Contributions. All Contributions are subject to the following DCO + License
 terms.
 

data/Gemfile.lock

@@ -0,0 +1,239 @@
+PATH
+  remote: .
+  specs:
+    gitlab-triage (1.50.0)
+      activesupport (>= 5.1)
+      globalid (~> 1.0, >= 1.0.1)
+      graphql (< 2.1.0)
+      graphql-client (~> 0.16)
+      httparty (~> 0.20.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    claide (1.1.0)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
+    coderay (1.1.3)
+    colored2 (3.1.2)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    danger (9.4.3)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (>= 0.9.0, < 3.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.13)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (>= 4.0)
+      terminal-table (>= 1, < 4)
+    danger-gitlab (8.0.0)
+      danger
+      gitlab (~> 4.2, >= 4.2.0)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    faraday (2.9.1)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-http-cache (2.5.1)
+      faraday (>= 0.8)
+    faraday-net_http (3.1.0)
+      net-http
+    ffi (1.17.0)
+    formatador (1.1.0)
+    git (1.19.1)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
+    gitlab (4.19.0)
+      httparty (~> 0.20)
+      terminal-table (>= 1.5.1)
+    gitlab-dangerfiles (2.11.0)
+      danger (>= 8.4.5)
+      danger-gitlab (>= 8.0.0)
+    gitlab-styles (12.0.1)
+      rubocop (~> 1.62.1)
+      rubocop-factory_bot (~> 2.25.1)
+      rubocop-graphql (~> 1.5.0)
+      rubocop-performance (~> 1.20.2)
+      rubocop-rails (~> 2.24.0)
+      rubocop-rspec (~> 2.27.1)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    graphql (2.0.31)
+      base64
+    graphql-client (0.22.0)
+      activesupport (>= 3.0)
+      graphql (>= 1.13.0)
+    guard (2.18.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    hashdiff (1.1.0)
+    httparty (0.20.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    json (2.7.2)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    language_server-protocol (3.17.0.3)
+    lefthook (1.6.16)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.10)
+    method_source (1.1.0)
+    mime-types (3.5.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2024.0305)
+    minitest (5.23.1)
+    multi_xml (0.6.0)
+    mutex_m (0.2.0)
+    nap (1.1.0)
+    nenv (0.3.0)
+    net-http (0.4.1)
+      uri
+    no_proxy_fix (0.1.2)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (9.1.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    open4 (1.3.4)
+    parallel (1.25.1)
+    parser (3.3.3.0)
+      ast (~> 2.4.1)
+      racc
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (5.0.5)
+    racc (1.8.0)
+    rack (3.1.3)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    rchardet (1.8.0)
+    regexp_parser (2.9.2)
+    rexml (3.3.0)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.62.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-graphql (1.5.2)
+      rubocop (>= 0.90, < 2)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails (2.24.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (2.27.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
+    shellany (0.0.1)
+    strscan (3.1.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.3.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    uri (0.13.0)
+    webmock (3.23.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    yard (0.9.36)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gitlab-dangerfiles (~> 2.11.0)
+  gitlab-styles (~> 12.0)
+  gitlab-triage!
+  guard-rspec (~> 4.7.3)
+  lefthook (~> 1.3)
+  rake (~> 13.2)
+  rspec (~> 3.8)
+  webmock (~> 3.4)
+  yard
+
+BUNDLED WITH
+   2.5.11

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2017 GitLab B.V.
+Copyright (c) 2011-2024 GitLab Inc.
 
 With regard to the GitLab Software:
 

data/README.md

@@ -2,6 +2,8 @@
 
 # GitLab Triage Project
 
+[[_TOC_]]
+
 This project allows to automate triaging of issues and merge requests for GitLab projects or groups.
 
 ## Note this Gem is not supported by the GitLab Support team
@@ -177,6 +179,7 @@ Available condition types:
 - [`labels` condition](#labels-condition)
 - [`forbidden_labels` condition](#forbidden-labels-condition)
 - [`no_additional_labels` condition](#no-additional-labels-condition)
+- [`author_username` condition](#author-username-condition)
 - [`author_member` condition](#author-member-condition)
 - [`assignee_member` condition](#assignee-member-condition)
 - [`draft` condition](#draft-condition)
@@ -489,6 +492,17 @@ conditions:
   no_additional_labels: true
 ```
 
+##### Author username condition
+
+Accepts the username to filter on.
+
+Example:
+
+```yml
+conditions:
+  author_username: gitlab-bot
+```
+
 ##### Author Member condition
 
 This condition determines whether the author of a resource is a member of the specified group or project.
@@ -1155,14 +1169,15 @@ resource_rules:
   issues:
     rules:
       - name: Issues requiring extra testing
-        labels:
-          - needs-testing
+        conditions:
+          labels:
+            - needs-testing
         actions:
           issue:
             title: |
-              Testing: {{ title }}
+              Testing: {{title}}
             description: |
-              The issue {{ full_reference }} needs testing.
+              The issue {{full_reference}} needs testing.
 
               Please take care of them before the end of #{7.days.from_now.strftime('%Y-%m-%d')}
 
@@ -1171,7 +1186,7 @@ resource_rules:
 
 ##### Delete action
 
-**This action is only applicable for branches.**
+**This action is only applicable for branches, issues and merge requests.**
 
 Delete the resource.
 
@@ -1205,6 +1220,55 @@ sub-policies' summary.
 Note that only the `summarize` keys in the sub-policies' `actions` is used. Any
 other keys (e.g. `mention`, `comment`, `labels` etc.) are ignored.
 
+#### Custom type summaries
+
+By default, summary rules fetch GitLab resources (issues, merge requests, etc.) and use them to generate the summary content. However, you can create summaries that pull data from external sources (like ClickHouse, Prometheus, or custom APIs) without fetching any GitLab resources.
+
+To create a custom summary, add `type: custom` to your rule definition:
+
+```yml
+resource_rules:
+  issues:
+    summaries:
+      - name: Weekly Report
+        rules:
+          - name: Bug Heatmap
+            conditions:
+              labels:
+                - bug
+            actions:
+              summarize:
+                title: "Bugs"
+                item: "- {{title}}"
+                summary: "{{items}}"
+          
+          - name: Quarantined Tests
+            type: custom  # Skip resource fetching
+            actions:
+              summarize:
+                title: "Quarantined Tests"
+                summary: |
+                  #{ fetch_quarantined_tests_from_clickhouse() }
+        actions:
+          summarize:
+            title: "Weekly Report"
+            summary: |
+              {{items}}
+```
+
+When `type: custom` is specified:
+- No GitLab resources are fetched
+- The `conditions` field is optional and ignored
+- The `item` field in `actions.summarize` is not needed
+- The summary is always included in the report (as long as it has a title)
+- You can use Ruby expressions in the `summary` field to fetch data from external sources
+
+This is useful for:
+- Including metrics from external monitoring systems
+- Aggregating data from multiple sources
+- Generating reports from custom databases
+- Adding static sections to your triage reports
+
 You can define such policy as follows:
 
 ```yml
@@ -1403,6 +1467,10 @@ Usage: gitlab-triage [options]
     -H, --host-url [string]          A valid host url
     -r, --require [string]           Require a file before performing
     -d, --debug                      Print debug information
+        --cache-dir [string]         Directory containing pre-fetched API responses.
+                                     Files must follow the naming convention: <source>_<id>_<resource>.json
+                                     (e.g. groups_9970_members.json).
+                                     Can also be set via the GITLAB_TRIAGE_CACHE_DIR environment variable.
     -h, --help                       Print help message
     -v, --version                    Print version
         --init                       Initialize the project with a policy file
@@ -1528,6 +1596,44 @@ resource_rules:
             #{'/label ~P3' unless has_priority_label?}
 ```
 
+### API Response Caching (`--cache-dir`)
+
+In large CI pipelines with many concurrent triage jobs, each job independently fetches the same paginated API responses (e.g., group members). This results in many redundant API calls.
+
+The `--cache-dir` option (or `CACHE_DIR` environment variable) allows you to pre-fetch responses once and share them across all jobs via CI artifacts.
+
+#### File naming convention
+
+Cache files must be named `<source_type>_<source_id>_<resource>.json`, for example:
+
+- `groups_9970_members.json` — members of group 9970 (numeric ID)
+- `projects_278964_members.json` — members of project 278964 (numeric ID)
+- `groups_gitlab-org_gitlab_members.json` — members of `gitlab-org/gitlab` (path slashes replaced with `_`)
+
+The gem checks for a matching cache file before making each `query_api_cached` call. If a file exists, its contents are returned directly. If not, the gem falls back to the normal API call transparently.
+
+#### Usage in CI
+
+Pre-fetch in a `pre-hygiene` stage and share as an artifact:
+
+```yaml
+# pre-hygiene job writes the cache
+prefetch-members:
+  stage: pre-hygiene
+  script:
+    - ruby bin/prefetch_members
+  artifacts:
+    paths:
+      - tmp/members_cache/
+    expire_in: 1 hour
+
+# triage jobs read from the cache
+triage-job:
+  stage: hygiene
+  script:
+    - gitlab-triage --cache-dir tmp/members_cache --token $TOKEN --source groups --source-id 9970 -f policy.yml
+```
+
 ### Contributing
 
 Please refer to the [Contributing Guide](CONTRIBUTING.md).

data/gitlab-triage.gemspec

@@ -40,18 +40,15 @@ Gem::Specification.new do |spec|
   # see: https://github.com/github/graphql-client/pull/314
   # We can remove this check once PR 314 is merged and released
   spec.add_dependency 'graphql', '< 2.1.0'
-  spec.add_dependency 'httparty', '~> 0.17'
+  # Matching version of triage-ops's httparty
+  spec.add_dependency 'httparty', '~> 0.20.0'
 
   spec.add_development_dependency 'gitlab-dangerfiles', '~> 2.11.0'
-  spec.add_development_dependency 'gitlab-styles', '~> 10.0'
+  spec.add_development_dependency 'gitlab-styles', '~> 12.0'
   spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
   spec.add_development_dependency 'lefthook', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 13.2'
   spec.add_development_dependency 'rspec', '~> 3.8'
-  # we do not commit the bundle lockfile, so this temporary workaround needs to be
-  # present until 2.21.3 or 2.22.x is released
-  # See https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/issues/63
-  spec.add_development_dependency 'rubocop-rails', '!= 2.21.2'
   spec.add_development_dependency 'webmock', '~> 3.4'
   spec.add_development_dependency 'yard'
 end

data/lefthook.yml

@@ -9,6 +9,4 @@ pre-push:
       glob: '*.{rb,rake}'
       run: bundle exec rubocop {files}
     rspec:
-      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
-      glob: '*.{rb,rake}'
-      run: bundle exec rspec {files}
+      run: bundle exec rspec

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

@@ -61,6 +61,16 @@ module Gitlab
         end
 
         def perform(resource, comment)
+          if network.options.debug
+            if policy.actions.fetch(:redact_confidential_resources, true) && resource[:confidential]
+              puts Gitlab::Triage::UI.debug "Comment action resource: (confidential)"
+            else
+              puts Gitlab::Triage::UI.debug "Comment action resource: #{resource.inspect}"
+            end
+
+            puts Gitlab::Triage::UI.debug "Comment action content: #{comment}"
+          end
+
           network.post_api(
             build_post_url(resource),
             post_body(comment))
@@ -79,7 +89,7 @@ module Gitlab
           # POST /(groups|projects)/:id/(epics|issues|merge_requests)/:iid/notes
           post_url = UrlBuilders::UrlBuilder.new(url_builder_opts).build
 
-          puts Gitlab::Triage::UI.debug "post_url: #{post_url}" if network.options.debug
+          puts Gitlab::Triage::UI.debug "Comment action post_url: #{post_url}" if network.options.debug
 
           post_url
         end

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

@@ -57,7 +57,7 @@ module Gitlab
           post_url = UrlBuilders::UrlBuilder.new(
             network_options: network.options,
             source_id: summary['project_id'],
-            resource_type: policy.type,
+            resource_type: summary['type'],
             resource_id: summary['iid'],
             sub_resource_type: sub_resource_type
           ).build

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

@@ -20,7 +20,7 @@ module Gitlab
         end
 
         def act
-          return unless policy.type&.to_sym == :branches
+          return unless [:branches, :issues, :merge_requests].include?(policy.type&.to_sym)
 
           policy.resources.each do |resource|
             perform(resource)
@@ -48,7 +48,12 @@ module Gitlab
         end
 
         def resource_id(resource)
-          resource[:name]
+          case policy.type&.to_sym
+          when :branches
+            resource[:name]
+          when :issues, :merge_requests
+            resource[:iid]
+          end
         end
       end
     end

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

@@ -6,6 +6,8 @@ module Gitlab
   module Triage
     module Action
       class Summarize < Base
+        SUMMARY_RESOURCE_TYPE = 'issues'
+
         class Dry < Summarize
           private
 
@@ -13,7 +15,8 @@ module Gitlab
             policy.summary = {
               web_url: '[the-created-issue-url]',
               project_id: 'some-id',
-              iid: 'some-iid'
+              iid: 'some-iid',
+              type: SUMMARY_RESOURCE_TYPE
             }.with_indifferent_access
 
             if group_summary_without_destination?
@@ -41,7 +44,8 @@ module Gitlab
             return
           end
 
-          policy.summary = network.post_api(post_issue_url, post_issue_body)
+          response = network.post_api(post_issue_url, post_issue_body)
+          policy.summary = response.merge('type' => SUMMARY_RESOURCE_TYPE)
         end
 
         def issue
@@ -62,7 +66,7 @@ module Gitlab
           post_url = UrlBuilders::UrlBuilder.new(
             network_options: network.options,
             source_id: destination,
-            resource_type: 'issues'
+            resource_type: SUMMARY_RESOURCE_TYPE
           ).build
 
           puts Gitlab::Triage::UI.debug "post_issue_url: #{post_url}" if network.options.debug

data/lib/gitlab/triage/engine.rb

@@ -168,7 +168,7 @@ module Gitlab
           raise(
             ArgumentError,
             "--resource-reference can only start with '#' or '!' when --source=projects is passed " \
-            "('#{options.resource_reference}' passed)!"
+              "('#{options.resource_reference}' passed)!"
           )
         end
       end
@@ -268,7 +268,7 @@ module Gitlab
         return if rule_definitions.blank?
 
         rule_definitions.each do |rule_definition|
-          resources_for_rule(resource_type, rule_definition) do |resources|
+          resources_for_rule(resource_type, rule_definition, in_summary: false) do |resources|
             policy = Policies::RulePolicy.new(
               resource_type, rule_definition, resources, network)
 
@@ -336,7 +336,7 @@ module Gitlab
       def summary_parts_for_rules(resource_type, rule_definitions)
         # { summary_rule => resources }
         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|
+          to_enum(:resources_for_rule, resource_type, rule_definition, in_summary: true).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
@@ -355,15 +355,27 @@ module Gitlab
       #
       # @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' } }+.
+      # @param in_summary [Boolean] Whether this rule is part of a summary definition.
       #
       # @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)
+      def resources_for_rule(resource_type, rule_definition, in_summary: false)
         puts Gitlab::Triage::UI.header("Gathering resources for rule: **#{rule_definition[:name]}**", char: '-')
 
+        # Skip resource fetching for custom type rules
+        if rule_definition[:type] == 'custom'
+          unless in_summary
+            raise ArgumentError, "type: custom can only be used in summary rules, not in top-level rules (rule: #{rule_definition[:name]})"
+          end
+
+          puts "\n* Skipping resource fetch for custom type rule"
+          yield(PoliciesResources::RuleResources.new([]), {})
+          return
+        end
+
         ExpandCondition.perform(rule_conditions(rule_definition)) do |expanded_conditions|
           # retrieving the resources for every rule is inefficient
           # however, previous rules may affect those upcoming
@@ -450,7 +462,7 @@ module Gitlab
 
         FILTER_MAP.each do |condition_key, filter_value|
           # Skips to the next key value pair if the condition is not applicable
-          next unless conditions[condition_key]
+          next if conditions[condition_key].nil?
 
           case filter_value
           when Hash
@@ -469,9 +481,12 @@ module Gitlab
 
             # If the :ruby condition exists then filter based off of conditions
             # else we base off of the `conditions[condition_key]`.
+
             result =
               if condition_key.to_s == 'no_additional_labels'
                 filter.new(resource, conditions[:labels]).calculate
+              elsif condition_key.to_s == 'protected'
+                filter.new(resource, conditions[:protected]).calculate
               elsif filter.instance_method(:initialize).arity == 2
                 filter.new(resource, conditions[condition_key]).calculate
               else
@@ -501,6 +516,7 @@ module Gitlab
 
       # rubocop:disable Metrics/AbcSize
       # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       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
@@ -510,6 +526,8 @@ module Gitlab
 
         condition_builders = []
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('iids', options.resource_reference[1..]) if options.resource_reference
+        author_username = conditions[:author_username]
+        condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('author_username', author_username) if author_username
 
         condition_builders << APIQueryBuilders::MultiQueryParamBuilder.new('labels', conditions[:labels], ',') if conditions[:labels]
 
@@ -560,6 +578,7 @@ module Gitlab
       end
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def milestone_condition_builder(resource_type, milestone_condition)
         milestone_value = Array(milestone_condition)[0].to_s # back-compatibility

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

@@ -33,11 +33,15 @@ module Gitlab
         end
 
         def valid?
-          title =~ /\S+/
+          title_present?
         end
 
         private
 
+        def title_present?
+          /\S+/.match?(title)
+        end
+
         def build_text(template)
           return '' unless template
 

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

@@ -20,6 +20,7 @@ module Gitlab
           @resources = resources
           @network = network
           @separator = separator
+          @is_custom = policy_spec[:type] == 'custom'
         end
 
         def title
@@ -35,15 +36,27 @@ module Gitlab
         end
 
         def valid?
-          title =~ /\S+/ && any_resources?
+          title_present? && content_available?
         end
 
-        def any_resources?
-          @resources.any?
+        # Check if this summary has content to include in a parent summary.
+        # Custom type summaries generate content from templates (external data),
+        # but only if the template produces non-empty output.
+        # Regular summaries need GitLab resources to generate content.
+        def content_available?
+          if @is_custom
+            /\S+/.match?(description)
+          else
+            @resources.any?
+          end
         end
 
         private
 
+        def title_present?
+          /\S+/.match?(title)
+        end
+
         def title_resource
           { type: @type }
         end

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

@@ -91,6 +91,7 @@ module Gitlab
 
           conditions.each do |condition, condition_params|
             condition_queries << QueryParamBuilders::DateParamBuilder.new(condition_params) if condition.to_s == 'date'
+            condition_queries << QueryParamBuilders::BaseParamBuilder.new('authorUsername', condition_params) if condition.to_s == 'author_username'
             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 << QueryParamBuilders::BaseParamBuilder.new('iids', '$iids', with_quotes: false) if condition.to_s == 'iids'
@@ -151,9 +152,9 @@ module Gitlab
           args =
             case condition.to_s
             when 'forbidden_labels'
-              ['labels', condition_params, { negated: true }]
+              ['labelName', condition_params, { negated: true }]
             when 'labels'
-              ['labels', condition_params, {}]
+              ['labelName', condition_params, {}]
             else
               return nil
             end

data/lib/gitlab/triage/option_parser.rb

@@ -65,6 +65,14 @@ module Gitlab
               options.debug = value
             end
 
+            opts.on('--cache-dir [string]', String,
+              'Directory containing pre-fetched API responses. ' \
+                'Files must follow the naming convention: <source>_<id>_<resource>.json ' \
+                '(e.g. groups_9970_members.json). ' \
+                'Can also be set via the GITLAB_TRIAGE_CACHE_DIR environment variable.') do |value|
+              options.cache_dir = value
+            end
+
             opts.on('-h', '--help', 'Print help message') do
               $stdout.puts opts
               exit # rubocop:disable Rails/Exit

data/lib/gitlab/triage/options.rb

@@ -14,7 +14,8 @@ module Gitlab
       :debug,
       :host_url,
       :require_files,
-      :api_version
+      :api_version,
+      :cache_dir
     ) do
       def initialize(*args)
         super

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

@@ -21,7 +21,7 @@ module Gitlab
         end
 
         def name
-          @name ||= (policy_spec[:name] || "#{type}-#{object_id}")
+          @name ||= policy_spec[:name] || "#{type}-#{object_id}"
         end
 
         def source

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

@@ -10,7 +10,7 @@ module Gitlab
         # Build a summary from several rules policies
         def build_summary
           action = actions[:summarize]
-          issues = resources.map do |inner_policy_spec, inner_resources|
+          child_summaries = resources.map do |inner_policy_spec, inner_resources|
             Policies::RulePolicy.new(
               type, inner_policy_spec, inner_resources, network)
               .build_summary
@@ -19,7 +19,7 @@ module Gitlab
           EntityBuilders::SummaryBuilder.new(
             type: type,
             action: action,
-            resources: issues.select(&:any_resources?),
+            resources: child_summaries.select(&:content_available?),
             network: network,
             separator: "\n\n")
         end

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

@@ -76,6 +76,11 @@ module Gitlab
           started?(today) && !expired?(today)
         end
 
+        def all_active_with_start_date
+          @all_active_with_start_date ||=
+            all_active.select(&:start_date).sort_by(&:start_date)
+        end
+
         private
 
         def current_index
@@ -83,11 +88,6 @@ module Gitlab
             .index { |milestone| milestone.id == id }
         end
 
-        def all_active_with_start_date
-          @all_active_with_start_date ||=
-            all_active.select(&:start_date).sort_by(&:start_date)
-        end
-
         def all_active
           @all_active ||=
             network

data/lib/gitlab/triage/rest_api_network.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require 'active_support/all'
+require 'json'
 require 'net/protocol'
+require 'uri'
 
 require_relative 'retryable'
 require_relative 'ui'
@@ -13,6 +15,7 @@ module Gitlab
       include Retryable
 
       MINIMUM_RATE_LIMIT = 25
+      CACHE_URL_PATTERN = %r{/api/v[^/]+/(groups|projects)/(.+?)/(members)(?:\z|\?)}
 
       attr_reader :options, :adapter
 
@@ -20,10 +23,11 @@ module Gitlab
         @adapter = adapter
         @options = adapter.options
         @cache = {}
+        @file_cache = {}
       end
 
       def query_api_cached(url)
-        @cache[url] || @cache[url] = query_api(url)
+        @cache[url] || @cache[url] = load_from_file_cache(url) || query_api(url)
       end
 
       def query_api(url)
@@ -66,7 +70,7 @@ module Gitlab
 
       def post_api(url, body)
         response = execute_with_retry(
-          exception_types: Net::ReadTimeout,
+          exception_types: [Net::ReadTimeout, Errors::Network::InternalServerError],
           backoff_exceptions: Errors::Network::TooManyRequests, debug: options.debug) do
           puts Gitlab::Triage::UI.debug "post_api: #{url}" if options.debug
 
@@ -88,7 +92,7 @@ module Gitlab
 
       def delete_api(url)
         response = execute_with_retry(
-          exception_types: Net::ReadTimeout,
+          exception_types: [Net::ReadTimeout, Errors::Network::InternalServerError],
           backoff_exceptions: Errors::Network::TooManyRequests, debug: options.debug) do
           puts Gitlab::Triage::UI.debug "delete_api: #{url}" if options.debug
 
@@ -101,6 +105,53 @@ module Gitlab
 
       private
 
+      def cache_dir
+        options.cache_dir || ENV.fetch('GITLAB_TRIAGE_CACHE_DIR', nil)
+      end
+
+      def load_from_file_cache(url)
+        return nil unless cache_dir_valid?
+
+        cache_key = cache_key_for(url)
+        return nil unless cache_key
+
+        @file_cache[cache_key] || read_cache_file(cache_key)
+      end
+
+      def cache_dir_valid?
+        cache_dir && File.directory?(cache_dir)
+      end
+
+      def cache_key_for(url)
+        match = url.match(CACHE_URL_PATTERN)
+        return nil unless match
+
+        source_type = match[1]
+        source_id   = URI.decode_www_form_component(match[2]).tr('/', '_')
+        resource    = match[3]
+
+        "#{source_type}_#{source_id}_#{resource}"
+      end
+
+      def read_cache_file(cache_key)
+        data = parse_cache_file(cache_key)
+        return nil unless data
+
+        @file_cache[cache_key] = data
+        puts Gitlab::Triage::UI.debug "cache_dir: loaded #{data.size} records" if options.debug
+        data
+      end
+
+      def parse_cache_file(cache_key)
+        file = File.join(cache_dir, "#{cache_key}.json")
+        parsed = JSON.parse(File.read(file))
+        return nil unless parsed.is_a?(Array) && parsed.all?(Hash)
+
+        parsed.map(&:with_indifferent_access)
+      rescue JSON::ParserError, Errno::ENOENT, Errno::EACCES
+        nil
+      end
+
       def token
         options.token
       end

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.43.0'
+    VERSION = '1.50.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.43.0
+  version: 1.50.0
 platform: ruby
 authors:
 - GitLab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2026-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: gitlab-dangerfiles
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -170,20 +170,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 2.21.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 2.21.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +223,7 @@ files:
 - CONTRIBUTING.md
 - Dangerfile
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.md
 - README.md
@@ -352,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: GitLab triage automation project.