gitlab-dangerfiles 3.12.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edf969f524278d280762935cb8a04c78a22180296c3b7e88deb342ab8f83c840
-  data.tar.gz: 6b3b3c493beb17172786cefaa6e6ac1dd1ef243234b5e90e632b79830a7fae9c
+  metadata.gz: c54d1dcf5be1bc4fb1b1f187ba1b203ddef74f661120b9efe9834ee05e95fee8
+  data.tar.gz: ac3617187d9bf2d523324b4320619fb361e30690ac2644e00e6a3edbaf78090c
 SHA512:
-  metadata.gz: 56e849f993eec188646a8f06106855409146070234b158c8cd48abe0378008c9d1c957dafbb1af6dbee4f86744014d1a852bc426993337f8b9978b9e7cdcdd80
-  data.tar.gz: 19f31baf98812c924fc62d88cdc601f0f73a0c9e0c239647e25d6e79c6a1a4eaec831397658883b9cc9aff70e0fabee8e3f4df0908f119c0262788296097793e
+  metadata.gz: c1b739e770be63ced18c8abd0a6f1be161bf62a98b86673fe88b95db79b589c57a0431174e43f4acf77e884e4bb8dc40272f17a6cb60282925062d1741f1d573
+  data.tar.gz: e6be44372b6881090c3e9a9d0099405315661c73a84a59ba7848b31f10ed4f72e3e861784fdfff47c985b192d26169ee96378d0d96487494c5d59ddd0e044d18

data/.gitlab-ci.yml

@@ -57,7 +57,6 @@ test:rufo:
 
 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'
@@ -78,11 +77,6 @@ gemnasium-dependency_scanning:
     - if: '$CI_MERGE_REQUEST_IID'
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 
-license_scanning:
-  rules:
-    - if: '$CI_MERGE_REQUEST_IID'
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-
 secret_detection:
   rules:
     - if: '$CI_MERGE_REQUEST_IID'

data/.rubocop.yml

@@ -20,7 +20,7 @@ Layout/LineLength:
   Enabled: false
 
 RSpec/MultipleMemoizedHelpers:
-  Max: 30
+  Max: 35
 
 RSpec/FilePath:
   Enabled: false

data/.rubocop_todo.yml

@@ -126,11 +126,6 @@ Lint/IdentityComparison:
     - 'spec/gitlab/dangerfiles/weightage/maintainers_spec.rb'
     - 'spec/gitlab/dangerfiles/weightage/reviewers_spec.rb'
 
-# Offense count: 1
-Lint/NonLocalExitFromIterator:
-  Exclude:
-    - 'lib/danger/rules/subtype_label/Dangerfile'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Lint/RedundantCopDisableDirective:
@@ -310,7 +305,6 @@ Style/FrozenStringLiteralComment:
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
-    - 'lib/danger/rules/subtype_label/Dangerfile'
     - 'lib/danger/rules/type_label/Dangerfile'
 
 # Offense count: 2
@@ -384,7 +378,6 @@ Style/PercentLiteralDelimiters:
     - 'Guardfile'
     - 'gitlab-dangerfiles.gemspec'
     - 'lib/danger/plugins/internal/helper.rb'
-    - 'lib/danger/rules/subtype_label/Dangerfile'
     - 'lib/gitlab/dangerfiles/tasks/main.rake'
     - 'spec/danger/plugins/internal/helper_spec.rb'
 
@@ -471,7 +464,6 @@ Style/SelectByRegexp:
 # SupportedStyles: only_raise, only_fail, semantic
 Style/SignalException:
   Exclude:
-    - 'lib/danger/rules/subtype_label/Dangerfile'
     - 'lib/danger/rules/type_label/Dangerfile'
 
 # Offense count: 7

data/README.md

@@ -148,19 +148,9 @@ project. To use it in your project, perform the following steps:
    end
    ```
 
-#### `subtype_label`
-
-This rule warns when the merge request is missing a [subtype label](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification).
-
-If the `DANGER_ERROR_WHEN_SUBTYPE_LABEL_IS_MISSING` environment variable evaluates to `true`, Danger will error instead of warning when a subtype label is missing.
-
 #### `type_label`
 
-This rule warns when the merge request is missing a [type label](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification).
-
-If the `DANGER_ERROR_WHEN_TYPE_LABEL_IS_MISSING` environment variable evaluates to `true`, Danger will error instead of warning when a type label is missing.
-
-If the `changelog` plugin is available, it also tries to infer a type label from the `Changelog` trailer of the MR.
+If the `changelog` plugin is available, it tries to infer a type label from the `Changelog` trailer of the MR.
 
 #### `z_add_labels`
 

data/gitlab-dangerfiles.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rake", ">= 0"
   spec.add_dependency "danger-gitlab", ">= 8.0.0"
-  spec.add_dependency "danger", ">= 8.4.5"
+  spec.add_dependency "danger", ">= 9.3.0"
 
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-parameterized"

data/lib/danger/plugins/changelog.rb

@@ -24,9 +24,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,
-        If you want to create a changelog entry for GitLab FOSS, add the `Changelog` trailer to the commit message you want to add to the changelog.
-
-        If you want to create a changelog entry for GitLab EE, also [add the `EE: true` trailer](https://docs.gitlab.com/ee/development/changelog.html#gitlab-enterprise-changes) to your commit message.
+        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.
       MSG

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

@@ -478,6 +478,7 @@ module Danger
 
     def current_milestone
       @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 }
         .min_by(&:start_date)
     end

data/lib/danger/plugins/roulette.rb

@@ -49,14 +49,6 @@ module Danger
       categories
     end
 
-    def assign_pedroms_for_ux_wider_community_contribution(spins)
-      # We want at least a UX reviewer who can review any wider community
-      # contribution even without a team designer. We assign this to Pedro.
-      ux_spin = look_for_fallback_designer_for_ux_wider_community_contribution?(spins)
-
-      ux_spin && ux_spin.reviewer = teammate_pedroms
-    end
-
     # Finds the +Gitlab::Dangerfiles::Teammate+ object whose username matches the MR author username.
     #
     # @return [Gitlab::Dangerfiles::Teammate]
@@ -72,7 +64,7 @@ module Danger
     #
     # @return [Array<Spin>]
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    def spin(project = nil, categories = [:none])
+    def spin(project = nil, categories = [:none], ux_fallback_wider_community_reviewer: teammate_pedroms)
       project = (project || config_project_name).downcase
       categories = categories.map { |category| category&.downcase || :none }
       categories.reject! { |category| import_and_integrate_reject_category?(category, project) }
@@ -120,6 +112,13 @@ module Danger
           spin.optional_role = :maintainer
         when :ux
           spin.optional_role = :maintainer
+
+          # We want at least a UX reviewer who can review any wider community
+          # contribution even without a team designer. We assign this to Pedro.
+          spin.reviewer = ux_fallback_wider_community_reviewer if
+            labels.include?("Community contribution") &&
+            spin.reviewer.nil? &&
+            spin.maintainer.nil?
         end
       end
 
@@ -285,7 +284,6 @@ module Danger
     end
 
     def prepare_ux_category!(categories)
-      # Ensure to spin for UX reviewer when ~UX is applied (e.g. to review changes to the UI)
       if labels.include?("Community contribution")
         categories << :ux
       else
@@ -297,7 +295,9 @@ module Danger
           # there's no designer for this team.
           labels << "Community contribution"
 
-          ux_spin = spin(nil, [:ux]).first
+          # Don't use a fallback reviewer so when a group doesn't have
+          # available reviewers, it'll not give us any reviewers.
+          ux_spin = spin(nil, [:ux], ux_fallback_wider_community_reviewer: nil).first
 
           categories << :ux if ux_spin.reviewer || ux_spin.maintainer
         ensure
@@ -307,15 +307,6 @@ module Danger
       end
     end
 
-    def look_for_fallback_designer_for_ux_wider_community_contribution?(spins)
-      labels.include?("Community contribution") &&
-        spins.find do |spin|
-          spin.category == :ux &&
-            spin.reviewer.nil? &&
-            spin.maintainer.nil?
-        end
-    end
-
     # Fetches the given +url+ and parse its response as JSON.
     #
     # @param [String] url

data/lib/danger/rules/simple_roulette/Dangerfile

@@ -87,10 +87,6 @@ if changes.any?
   show_category_column = categories.size > 1 || categories.first != :none
   random_roulette_spins = roulette.spin(nil, categories)
 
-  if categories.include?(:ux)
-    roulette.assign_pedroms_for_ux_wider_community_contribution(random_roulette_spins)
-  end
-
   rows = random_roulette_spins.map do |spin|
     markdown_row_for_spins(spin.category, [spin], show_category_column: show_category_column)
   end

data/lib/danger/rules/type_label/Dangerfile

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-TYPE_LABEL_MISSING_MESSAGE = "Please add a [merge request type](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification) to this merge request."
-
 require_relative "../../../gitlab/dangerfiles/type_label_guesser"
 
 return if helper.has_scoped_label_with_scope?("type")
@@ -10,9 +8,3 @@ if respond_to?(:changelog)
   type_label_guesser = Gitlab::Dangerfiles::TypeLabelGuesser.new
   helper.labels_to_add.concat(type_label_guesser.labels_from_changelog_categories(changelog.categories))
 end
-
-if ENV['DANGER_ERROR_WHEN_TYPE_LABEL_IS_MISSING'] == 'true'
-  fail TYPE_LABEL_MISSING_MESSAGE
-else
-  warn TYPE_LABEL_MISSING_MESSAGE
-end

data/lib/gitlab/dangerfiles/category.rb

@@ -78,27 +78,19 @@ module Gitlab
           super &&
 
             if labels.any?("Community contribution")
-              can_review_wider_community_contribution?(teammate)
+              # We want the designer for the team to review the wider community
+              # contribution because they're more familiar with that area.
+              the_designer_for_the_team?(teammate)
             else
-              can_review_team_memeber_contribution?(teammate)
+              # We don't want the designer for the team to review merge
+              # requests for the same team which is designed by themselves.
+              # So they can only review if they're not the designer for the team.
+              !the_designer_for_the_team?(teammate)
             end
         end
 
         private
 
-        def can_review_wider_community_contribution?(teammate)
-          # We want the designer for the team to review the wider community
-          # contribution because they're more familiar with that area.
-          the_designer_for_the_team?(teammate)
-        end
-
-        def can_review_team_memeber_contribution?(teammate)
-          # We don't want the designer for the team to review merge
-          # requests for the same team which is designed by themselves.
-          # So they can only review if they're not the designer for the team.
-          !the_designer_for_the_team?(teammate)
-        end
-
         def the_designer_for_the_team?(teammate)
           # Pick corresponding group for community contribution
           # Specialty can be:

data/lib/gitlab/dangerfiles/type_label_guesser.rb

@@ -8,8 +8,8 @@ module Gitlab
         security: %w[type::bug bug::vulnerability],
         performance: %w[type::bug bug::performance],
         added: %w[type::feature feature::addition],
-        deprecated: %w[type::feature feature::removal],
-        removed: %w[type::feature feature::removal],
+        deprecated: %w[type::maintenance maintenance::removal],
+        removed: %w[type::maintenance maintenance::removal],
       }.freeze
 
       def labels_from_changelog_categories(categories)

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.12.0"
+    VERSION = "4.0.0"
   end
 end

data/lib/gitlab/dangerfiles.rb

@@ -8,7 +8,6 @@ module Gitlab
       metadata
       simple_roulette
       type_label
-      subtype_label
       z_add_labels
       z_retry_link
     ].freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 4.0.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.4.5
+        version: 9.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.4.5
+        version: 9.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,6 @@ files:
 - lib/danger/rules/commits_counter/Dangerfile
 - lib/danger/rules/metadata/Dangerfile
 - lib/danger/rules/simple_roulette/Dangerfile
-- lib/danger/rules/subtype_label/Dangerfile
 - lib/danger/rules/type_label/Dangerfile
 - lib/danger/rules/z_add_labels/Dangerfile
 - lib/danger/rules/z_retry_link/Dangerfile

data/lib/danger/rules/subtype_label/Dangerfile

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-SUBTYPE_LABEL_MISSING_MESSAGE = "Please add a [merge request subtype](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification) to this merge request."
-
-types = %w(bug feature maintenance)
-types.each do |type|
-  return if helper.has_scoped_label_with_scope?(type)
-end
-
-if ENV['DANGER_ERROR_WHEN_SUBTYPE_LABEL_IS_MISSING'] == 'true'
-  fail SUBTYPE_LABEL_MISSING_MESSAGE
-else
-  warn SUBTYPE_LABEL_MISSING_MESSAGE
-end