gitlab-dangerfiles 3.8.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcee2fd2dd96522a7b1a5d1f906bc7fccfa28c9d6e9f61d6843c1fcd22dee884
-  data.tar.gz: c433e7fd8d3fd698c1eb71e5291f24a191ee2c4a86d376bae6f18b0735352f2a
+  metadata.gz: ad2ad158af390c0b6b52fdd86927b4dd0a6118b7b2eca3ad60aaa88ac40b840a
+  data.tar.gz: 2872e01e85bf7190e2a3fd4cab71868f2e4924234443797e7479a3ab03497120
 SHA512:
-  metadata.gz: c014e0cf3905380549a0f088c5685b7e1251643f5bbdd3e5362e4cf3c0ca0c0e4a1456599db66eabd3dad006547b70010716a2ab5b9aa2318e573ced7bd3680d
-  data.tar.gz: 0311fcec0f9cd30684470739798c5ab9c296d2c3cfb22d7e73a98f2c644b6db373edd752587a134199a366372b877bca4d3f198aed89f133483db45a2d5979e6
+  metadata.gz: 7dccc5481318999e83be3a9535983ebbf69d731d5394cf66543df0fd77bf7e274d1b012255c9582a503caae5248956aa2441af1b9ad6ffddf6c5bc2bc730013b
+  data.tar.gz: 5d217f45be9fb3c68032bbffd9a7eee4eb4cdb4056200c8dabdaf8255aa084a28ff3cd3ac74a5fa2588634607c4a5d23ffc6d58cc709e9343296112b6b3457b3

data/README.md

@@ -218,17 +218,32 @@ danger-review:
     - bundle add gitlab-dangerfiles --version 3.1.0
 ```
 
-## Rake tasks
+## Local Danger Rake task
 
-You can import this gem's Rake tasks by adding the following to your project's `Rakefile`:
+You can run a Danger Rake task locally in a project to detect Danger errors before pushing commits to a remote
+branch.
 
-```ruby
-require 'gitlab-dangerfiles'
+1. [Install `gitlab-dangerfiles`](#installation) in your project.
+1. Add the following to your project's `Rakefile`:
+
+   ```ruby
+   require 'gitlab-dangerfiles'
+
+   Gitlab::Dangerfiles.load_tasks
+   ```
+
+To run the Danger Rake task in a project that has `master` as the default branch, run:
 
-Gitlab::Dangerfiles.load_tasks
+```shell
+bundle exec rake danger_local
 ```
 
-That will add the `danger_local` Rake task that allows to run Danger locally.
+To run the Danger Rake task in a project that doesn't have `master` as the default branch, you must set the
+`DANGER_LOCAL_BASE` environment variable. For example, in a project with `main` as the default branch:
+
+```shell
+DANGER_LOCAL_BASE="origin/main" bundle exec rake danger_local
+```
 
 ## Documentation
 
@@ -264,6 +279,12 @@ end
 
 See an [example](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92580) for more details.
 
+## Contributing
+
+Bug reports and merge requests are welcome at https://gitlab.com/gitlab-org/gitlab-dangerfiles. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://gitlab.com/gitlab-org/gitlab-dangerfiles/blob/master/CODE_OF_CONDUCT.md).
+
+Make sure to include a changelog entry in your commit message and read the [changelog entries section](https://docs.gitlab.com/ee/development/changelog.html).
+
 ## Release
 
 [Automated gem release process](https://gitlab.com/gitlab-org/quality/pipeline-common#release-process) is used to release new version of `gitlab-dangerfiles` through [pipelines](https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/-/blob/4f33cf30cab84f7e27ca0cb9a7c0da3ecc675c11/.gitlab-ci.yml#L51), and this will:
@@ -272,24 +293,22 @@ See an [example](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92580) fo
 - Add a release in the `gitlab-dangerfiles` project: https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/-/releases
 - Populate the release log with the API contents. For example: https://gitlab.com/api/v4/projects/19861191/repository/changelog?version=3.4.4
 
+We follow this release process in a separate merge request from the one that introduced the changes. The release merge request should just contain a version bump.
+
 ### Before release
 
-Make sure to include a changelog entry in your commit message and read the [changelog entries section](https://docs.gitlab.com/ee/development/changelog.html).
+Changes merged since the last release should have had changelog entries (see [Contributing](#contributing)).
 
-If you forget to set the changelog entry in your commit messages, you can also edit the release notes after it's being released.
+If changelog entries are missing, you can also edit the release notes after it's being released.
 
 ### Steps to release
 
-Use a `Release` merge request template and create a merge requet to update the version number in `version.rb`, and get the merge request merged by a maintainer.
+Use a `Release` merge request template and create a merge request to update the version number in `version.rb`, and get the merge request merged by a maintainer.
 
 This will then be packaged into a gem and pushed to [rubygems.org](https://rubygems.org) by the CI/CD.
 
 For example: [Bump version to 3.4.3](https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/-/merge_requests/149).
 
-## Contributing
-
-Bug reports and merge requests are welcome at https://gitlab.com/gitlab-org/gitlab-dangerfiles. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://gitlab.com/gitlab-org/gitlab-dangerfiles/blob/master/CODE_OF_CONDUCT.md).
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

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

@@ -25,9 +25,9 @@ module Danger
       engineering_productivity: '~"Engineering Productivity" for CI, Danger',
       tooling: '~"maintenance::workflow" / ~"maintenance::pipelines" for CI, Danger',
       ci_template: '~"ci::templates"',
-      product_intelligence: '~"product intelligence"',
-      integrations_be: '~"group::integrations" (backend)',
-      integrations_fe: '~"group::integrations" (frontend)',
+      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"',
     }.freeze
@@ -35,6 +35,8 @@ module Danger
 
     GITLAB_ORG_GROUP_ID = "9970"
 
+    STABLE_BRANCH_REGEX = %r{\A(?<version>\d+-\d+)-stable-ee\z}
+
     # Allows to set specific rule's configuration by passing a block.
     #
     # @yield [c] Yield a Gitlab::Dangerfiles::Config object
@@ -369,6 +371,10 @@ module Danger
       mr_web_url.include?("/gitlab-org/security/")
     end
 
+    def stable_branch_mr?
+      !!mr_target_branch.match(STABLE_BRANCH_REGEX) && !security_mr?
+    end
+
     # @return [Boolean] whether a MR title includes "cherry-pick" or not.
     def cherry_pick_mr?
       Gitlab::Dangerfiles::TitleLinting.has_cherry_pick_flag?(mr_title)
@@ -449,11 +455,16 @@ module Danger
       all_changed_files.grep(regex)
     end
 
-    # @return [Array<String>] the group labels (i.e. +"group::*"+) set on the MR.
+    # @return [String] the group label (i.e. +"group::*"+) set on the MR.
     def group_label
       mr_labels.find { |label| label.start_with?("group::") }
     end
 
+    # @return [String] the stage label (i.e. +"devops::*"+) set on the MR.
+    def stage_label
+      mr_labels.find { |label| label.start_with?("devops::") }
+    end
+
     # Accessor for storing labels to add so that other rules can check if labels will be added after Danger
     # has evaluated all the rules.
     # For instance, a rule might require a specific label to be set, but another rule could add this label

data/lib/danger/plugins/roulette.rb

@@ -52,7 +52,7 @@ module Danger
     def spin(project = nil, categories = [:none], timezone_experiment: false)
       project = (project || config_project_name).downcase
       categories = categories.map { |category| category&.downcase || :none }
-      categories.reject! { |category| integrations_reject_category?(category, project) }
+      categories.reject! { |category| import_and_integrate_reject_category?(category, project) }
 
       spins = categories.sort_by(&:to_s).map do |category|
         including_timezone = INCLUDE_TIMEZONE_FOR_CATEGORY.fetch(category, timezone_experiment)
@@ -89,14 +89,14 @@ module Danger
             # Fetch an already picked backend maintainer, or pick one otherwise
             spin.maintainer = backend_spin&.maintainer || spin_for_category(project, :backend, timezone_experiment: including_timezone).maintainer
           end
-        when :product_intelligence
+        when :analytics_instrumentation
           spin.optional_role = :maintainer
 
           if spin.maintainer.nil?
             # Fetch an already picked maintainer, or pick one otherwise
             spin.maintainer = backend_spin&.maintainer || frontend_spin&.maintainer || spin_for_category(project, :backend, timezone_experiment: including_timezone).maintainer
           end
-        when :integrations_be, :integrations_fe
+        when :import_integrate_be, :import_integrate_fe
           spin.optional_role = :maintainer
         when :ux
           spin.optional_role = :maintainer
@@ -173,10 +173,10 @@ module Danger
 
     # @param [String] category name
     # @return [Boolean]
-    def integrations_reject_category?(category, project)
-      # Reject integrations categories if the MR author has reviewing abilities for the category.
-      team_mr_author&.integrations_be?(project, category, helper.mr_labels) ||
-        team_mr_author&.integrations_fe?(project, category, helper.mr_labels)
+    def import_and_integrate_reject_category?(category, project)
+      # Reject Import and Integrate categories if the MR author has reviewing abilities for the category.
+      team_mr_author&.import_integrate_be?(project, category, helper.mr_labels) ||
+        team_mr_author&.import_integrate_fe?(project, category, helper.mr_labels)
     end
 
     def random
@@ -267,12 +267,17 @@ module Danger
       rsp = Net::HTTP.get_response(URI.parse(url))
 
       if rsp.is_a?(Net::HTTPRedirection)
-        warnings << "Redirection detected. Stopping."
+        if (uri = URI.parse(rsp.header["location"]))
+          uri.query = nil
+        end
+
+        warnings << "Redirection detected: #{uri}."
         return nil
       end
 
       unless rsp.is_a?(Net::HTTPOK)
-        warnings << "HTTPError: Failed to read #{url}: #{rsp.code}."
+        message = rsp.message[0, 30]
+        warnings << "HTTPError: Failed to read #{url}: #{rsp.code} #{message}."
         return nil
       end
 

data/lib/danger/rules/changes_size/Dangerfile

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+return if helper.stable_branch_mr?
+
 thresholds = helper.config.code_size_thresholds
 lines_changed = git.lines_of_code
 

data/lib/danger/rules/metadata/Dangerfile

@@ -5,7 +5,3 @@ fail("Merge request description is too short. Please provide a proper merge requ
 warn("This merge request does not have any assignee yet. Setting an assignee clarifies who needs to take action on the merge request at any given time.") if helper.mr_assignees.empty?
 
 warn("This merge request does not refer to an existing milestone.", sticky: false) if helper.mr_milestone.nil?
-
-default_branch = ENV['CI_DEFAULT_BRANCH'] || 'main'
-has_pick_into_stable_label = helper.mr_labels.find { |label| label.start_with?('Pick into') }
-warn("Most of the time, merge requests should target `#{default_branch}`. Otherwise, please set the relevant `Pick into X.Y` label.") if helper.mr_target_branch != default_branch && !has_pick_into_stable_label && !helper.security_mr?

data/lib/danger/rules/simple_roulette/Dangerfile

@@ -92,11 +92,11 @@ categories << :database if helper.mr_labels.include?('database')
 # Ensure to spin for UX reviewer when ~UX is applied (e.g. to review changes to the UI) except when it's from wider community contribution where we want to assign from the corresponding group
 categories << :ux if helper.mr_labels.include?('UX') && !helper.mr_labels.include?('Community contribution')
 
-# Ensure to spin for Product Intelligence reviewer when ~"product intelligence::review pending" is applied
-categories << :product_intelligence if helper.mr_labels.include?("product intelligence::review pending")
+# Ensure to spin for Analytics Instrumentation reviewer when ~"analytics instrumentation::review pending" is applied
+categories << :analytics_instrumentation if helper.mr_labels.include?("analytics instrumentation::review pending")
 
-# Skip Product intelligence reviews for growth experiment MRs
-categories.delete(:product_intelligence) if helper.mr_labels.include?("growth experiment")
+# Skip Analytics Instrumentation reviews for growth experiment MRs
+categories.delete(:analytics_instrumentation) if helper.mr_labels.include?("growth experiment")
 
 # Remove disabled categories
 categories.subtract(helper.config.disabled_roulette_categories)

data/lib/gitlab/dangerfiles/category.rb

@@ -14,8 +14,8 @@ module Gitlab
           none: None,
           test: Test,
           tooling: Tooling,
-          integrations_be: IntegrationsBE,
-          integrations_fe: IntegrationsFE,
+          import_integrate_be: ImportIntegrateBE,
+          import_integrate_fe: ImportIntegrateFE,
           ux: UX,
         }.freeze
       end
@@ -71,21 +71,21 @@ module Gitlab
         end
       end
 
-      class IntegrationsBE < Category
+      class ImportIntegrateBE < Category
         private
 
         def has_particular_capability?(teammate)
           kind == :reviewer &&
-            teammate.role.match?(/Backend Engineer.+Manage:Integrations/)
+            teammate.role.match?(/Backend Engineer.+Manage:Import and Integrate/)
         end
       end
 
-      class IntegrationsFE < Category
+      class ImportIntegrateFE < Category
         private
 
         def has_particular_capability?(teammate)
           kind == :reviewer &&
-            teammate.role.match?(/Frontend Engineer.+Manage:Integrations/)
+            teammate.role.match?(/Frontend Engineer.+Manage:Import and Integrate/)
         end
       end
 

data/lib/gitlab/dangerfiles/teammate.rb

@@ -55,14 +55,14 @@ module Gitlab
         has_capability?(project, category, :maintainer, labels)
       end
 
-      def integrations_be?(project, category, labels)
-        return false unless category == :integrations_be
+      def import_integrate_be?(project, category, labels)
+        return false unless category == :import_integrate_be
 
         has_capability?(project, category, :reviewer, labels)
       end
 
-      def integrations_fe?(project, category, labels)
-        return false unless category == :integrations_fe
+      def import_integrate_fe?(project, category, labels)
+        return false unless category == :import_integrate_fe
 
         has_capability?(project, category, :reviewer, labels)
       end

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.8.0"
+    VERSION = "3.10.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.10.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake