gitlab-dangerfiles 4.6.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 501394f58303715430e058da5fbc46a6c539136b8a888ed22521ab56da6595c3
-  data.tar.gz: 520c933eb21695e1cdc9e74cea42ec1e636b08455377d2b9dc3ebafe405977ac
+  metadata.gz: '0535903212a08369cccb1b24b1753e1cfa5a637b0827a706a8b37fd3e0fb0dc2'
+  data.tar.gz: c69bcd32f34546130f7b74ccb946be09e876a2820c53d7546b58d21ceed62f0b
 SHA512:
-  metadata.gz: 5d68efa303d47210a6e1d126d9e7706f8872ae61a5a24dacce6b6a48242f8e9d0854f8067d35c64e6340602768e4ed65bd1fcfab71f7447798576172095497bc
-  data.tar.gz: 79b38327e2b8a133c58124952b2ff371cb551fde1d61aeb29b5f67d29ee212f93c1c423842121f0247304af52414efd5e690d3fa1c4e50083a9dfacdca7f4d33
+  metadata.gz: 84e215eee590bde5eb47905ffbf44a14763964695e3d80637d5f8483337f1f792dd7dfee1f5ae0baeb734c85967f47060005a0a6a052e3b1ebf4c53c55243756
+  data.tar.gz: 57657967dcbce6d66f68780c04d57b39601160d26e07f20f4b529a083cfdeb7c71f9f20286f6724ad2a15610fa2793850900959d6961c3b5ece4c8f7d4725b67

data/.gitignore

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

data/.gitlab-ci.yml

@@ -2,9 +2,6 @@ stages:
   - test
   - deploy
 
-variables:
-  DEFAULT_CI_IMAGE: "ruby:${RUBY_VERSION}"
-
 workflow:
   rules:
     # For merge requests, create a pipeline.
@@ -15,12 +12,8 @@ workflow:
     - if: '$CI_COMMIT_TAG'
 
 default:
-  image: "${DEFAULT_CI_IMAGE}"
   tags:
     - gitlab-org
-  before_script:
-    - gem install bundler
-    - bundle install -j $(nproc) --path vendor
   cache:
     key:
       files:
@@ -28,12 +21,14 @@ default:
         - gitlab-dangerfiles.gemspec
     paths:
       - vendor/ruby
-      - Gemfile.lock
-    policy: pull
 
 .default-test-job:
+  image: "ruby:${RUBY_VERSION}"
   stage: test
   needs: []
+  before_script:
+    - gem install bundler
+    - bundle install -j $(nproc) --path vendor
   parallel:
     matrix:
       - RUBY_VERSION: ['3.0', '3.1', '3.2']
@@ -49,24 +44,19 @@ test:rubocop:
     - bundle exec rubocop -P -E .
 
 include:
-  - template: Security/Dependency-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/danger-review.yml'
-  - component: "gitlab.com/gitlab-org/quality/pipeline-common/gem-release@7.6.1"
+  - component: gitlab.com/components/sast/sast@~latest
+  - component: gitlab.com/components/secret-detection/secret-detection@~latest
+  - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
     inputs:
       smoke_test_script: "ruby -r 'gitlab-dangerfiles' -e \"puts Gitlab::Dangerfiles::VERSION\""
+  - component: gitlab.com/gitlab-org/components/danger-review/danger-review@~latest
+    inputs:
+      dry_run: true
+  - template: Security/Dependency-Scanning.gitlab-ci.yml
 
 # run security jobs on MRs
 # see: https://gitlab.com/gitlab-org/gitlab/-/issues/218444#note_478761991
 
-brakeman-sast:
-  rules:
-    - if: '$CI_MERGE_REQUEST_IID'
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-
 gemnasium-dependency_scanning:
   rules:
     - if: '$CI_MERGE_REQUEST_IID'

data/.rubocop.yml

@@ -28,27 +28,14 @@ RSpec/FilePath:
 RSpec/SpecFilePathFormat:
   Enabled: false
 
+Style/ArrayIntersect:
+  Enabled: false # We're still supporting Ruby 3.1 and below
+
 Style/HashSyntax:
   EnforcedStyle: ruby19_no_mixed_keys
   # Introduced in Ruby 3.1. Disable for now.
   EnforcedShorthandSyntax: never
 
-# To respect rufo formatting
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-# To respect rufo formatting
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-
-# To respect rufo formatting
-Style/TrailingCommaInArguments:
-  Enabled: false
-
-# To respect rufo formatting
-Layout/MultilineOperationIndentation:
-  Enabled: false
-
 # Was problematic, and not included in the .rubocop_todo.yml
 GitlabSecurity/PublicSend:
   Enabled: false

data/Gemfile.lock

@@ -0,0 +1,231 @@
+PATH
+  remote: .
+  specs:
+    gitlab-dangerfiles (4.8.0)
+      danger (>= 9.3.0)
+      danger-gitlab (>= 8.0.0)
+      rake (~> 13.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.4.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
+    claide (1.1.0)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
+    climate_control (1.2.0)
+    coderay (1.1.3)
+    colored2 (3.1.2)
+    concurrent-ruby (1.2.0)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    crack (0.4.5)
+      rexml
+    danger (9.3.0)
+      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.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 5.0)
+      terminal-table (>= 1, < 4)
+    danger-gitlab (8.0.0)
+      danger
+      gitlab (~> 4.2, >= 4.2.0)
+    debug_inspector (1.1.0)
+    diff-lcs (1.5.0)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-http-cache (2.5.0)
+      faraday (>= 0.8)
+    faraday-net_http (3.0.2)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    git (1.13.2)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
+    gitlab (4.19.0)
+      httparty (~> 0.20)
+      terminal-table (>= 1.5.1)
+    gitlab-styles (10.0.0)
+      rubocop (~> 1.43.0)
+      rubocop-graphql (~> 0.18)
+      rubocop-performance (~> 1.15)
+      rubocop-rails (~> 2.17)
+      rubocop-rspec (~> 2.18)
+    guard (2.18.0)
+      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.0.1)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
+      multi_xml (>= 0.5.2)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    lefthook (1.5.2)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.17.0)
+    multi_xml (0.6.0)
+    nap (1.1.0)
+    nenv (0.3.0)
+    no_proxy_fix (0.1.2)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (5.6.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    open4 (1.3.4)
+    parallel (1.22.1)
+    parser (3.2.1.0)
+      ast (~> 2.4.1)
+    proc_to_ast (0.1.0)
+      coderay
+      parser
+      unparser
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (5.0.1)
+    rack (3.0.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rchardet (1.8.0)
+    regexp_parser (2.7.0)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-parameterized (1.0.0)
+      rspec-parameterized-core (< 2)
+      rspec-parameterized-table_syntax (< 2)
+    rspec-parameterized-core (1.0.0)
+      parser
+      proc_to_ast
+      rspec (>= 2.13, < 4)
+      unparser
+    rspec-parameterized-table_syntax (1.0.0)
+      binding_of_caller
+      rspec-parameterized-core (< 2)
+    rspec-support (3.12.0)
+    rubocop (1.43.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.19.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.24.0)
+      rubocop (~> 1.33)
+    rubocop-graphql (0.19.0)
+      rubocop (>= 0.87, < 2)
+    rubocop-performance (1.19.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.17.4)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rspec (2.24.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
+    shellany (0.0.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.1)
+    timecop (0.9.6)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.4.2)
+    unparser (0.6.7)
+      diff-lcs (~> 1.3)
+      parser (>= 3.2.0)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  climate_control
+  gitlab-dangerfiles!
+  gitlab-styles (~> 10.0)
+  guard-rspec (~> 4.7.3)
+  lefthook (~> 1.3)
+  rspec (~> 3.8)
+  rspec-parameterized
+  rubocop-rails (< 2.21.2)
+  timecop
+  webmock
+  yard
+
+BUNDLED WITH
+   2.5.4

data/lefthook.yml

@@ -12,8 +12,3 @@ pre-push:
     rubocop:
       run: bundle exec rubocop
       glob: '*.rb'
-
-    # Ruby formatting checks
-    rufo:
-      run: bundle exec rufo --check .
-      glob: '*.rb'

data/lib/danger/plugins/changelog.rb

@@ -23,7 +23,7 @@ module Danger
 
     OPTIONAL_CHANGELOG_MESSAGE = {
       local: "If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry), feel free to ignore this message.",
-      ci: <<~MSG,
+      ci: <<~MSG
         If this merge request needs a changelog entry, add the `Changelog` trailer to the commit message you want to add to the changelog.
 
         If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry), feel free to ignore this message.
@@ -33,11 +33,11 @@ module Danger
 
     REQUIRED_CHANGELOG_REASONS = {
       db_changes: "introduces a database migration",
-      feature_flag_removed: "removes a feature flag",
+      feature_flag_removed: "removes a feature flag"
     }.freeze
     REQUIRED_CHANGELOG_MESSAGE = {
       local: "This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry).",
-      ci: <<~MSG,
+      ci: <<~MSG
         To create a changelog entry, add the `Changelog` trailer to one of your Git commit messages.
 
         This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry).
@@ -123,6 +123,10 @@ module Danger
 
     def revert_in_current_milestone?
       return false unless helper.revert_mr?
+      # In dry-run mode, without the API token, we are able to fetch the current milestone nor the labels.
+      # We simply assume that we are reverting in the current milestone.
+      return true unless helper.ci?
+      return false unless helper.current_milestone
 
       current_regression_label = "regression:#{helper.current_milestone.title}"
 
@@ -249,7 +253,7 @@ module Danger
       required_reasons.each_with_object({}) do |required_reason, memo|
         memo[required_reason] =
           CHANGELOG_MISSING_URL_TEXT +
-            (helper.ci? ? format(REQUIRED_CHANGELOG_MESSAGE[:ci], reason: REQUIRED_CHANGELOG_REASONS.fetch(required_reason)) : REQUIRED_CHANGELOG_MESSAGE[:local])
+          format(REQUIRED_CHANGELOG_MESSAGE[helper.ci? ? :ci : :local], reason: REQUIRED_CHANGELOG_REASONS.fetch(required_reason))
       end
     end
 

data/lib/danger/plugins/internal/helper.rb

@@ -27,8 +27,9 @@ module Danger
       analytics_instrumentation: '~"analytics instrumentation"',
       import_integrate_be: '~"group::import and integrate" (backend)',
       import_integrate_fe: '~"group::import and integrate" (frontend)',
-      "Authentication and Authorization": '~"group::authentication and authorization"',
-      Compliance: '~"group::compliance"',
+      Authentication: '~"group::authentication"',
+      Authorization: '~"group::authorization"',
+      Compliance: '~"group::compliance"'
     }.freeze
     # rubocop:enable Style/HashSyntax
 
@@ -344,11 +345,18 @@ module Danger
       )
     end
 
-    # @return [Boolean] +false+ when not in the CI context, and returns +true+ if the MR title starts with Revert or revert
-    def revert_mr?
-      return false unless ci?
+    MR_REVERT_START_WITH = /[Rr]evert /
 
-      mr_title.start_with?(/[Rr]evert/)
+    # When API token is available matches MR title to start with "Revert " or "revert ".
+    # Otherwise, matches if the single commit's message starts with "Revert " or "revert ".
+    #
+    # @return [Boolean] whether an MR is a revert
+    def revert_mr?
+      if ci?
+        mr_title.start_with?(MR_REVERT_START_WITH)
+      else
+        git.commits.size == 1 && git.commits.first.message.start_with?(MR_REVERT_START_WITH)
+      end
     end
 
     # @return [Boolean] +true+ when not in the CI context, and whether the MR is set to be squashed otherwise.
@@ -475,7 +483,10 @@ module Danger
       @labels_to_add ||= []
     end
 
+    # @return [Hash] the current API milestone object or +nil+ if run in dry-run mode
     def current_milestone
+      return unless ci?
+
       @current_milestone ||= gitlab_helper.api.group_milestones(GITLAB_ORG_GROUP_ID, state: "active")
         .auto_paginate
         .select { |m| m.title.match?(/\A\d+\.\d+\z/) && !m.expired && m.start_date && m.due_date }