gitlab-dangerfiles 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcee2fd2dd96522a7b1a5d1f906bc7fccfa28c9d6e9f61d6843c1fcd22dee884
-  data.tar.gz: c433e7fd8d3fd698c1eb71e5291f24a191ee2c4a86d376bae6f18b0735352f2a
+  metadata.gz: 5759d8762183090115e7cb10b4b2d7244735d3225b53966c8feaf28e9d9eee7e
+  data.tar.gz: f49d06c663430072bad4c4f05b8bd1f509ca2c1a095bd1e499e3870fbe061fc9
 SHA512:
-  metadata.gz: c014e0cf3905380549a0f088c5685b7e1251643f5bbdd3e5362e4cf3c0ca0c0e4a1456599db66eabd3dad006547b70010716a2ab5b9aa2318e573ced7bd3680d
-  data.tar.gz: 0311fcec0f9cd30684470739798c5ab9c296d2c3cfb22d7e73a98f2c644b6db373edd752587a134199a366372b877bca4d3f198aed89f133483db45a2d5979e6
+  metadata.gz: 3cd96f3ceb33c2a028f62b1f72a16196ee1afa3768f0463783262ce3a4bd1d98d85e9ab905a916c0ad27cf7bfaf2c16608c5d533e07c30b6463807122d711f09
+  data.tar.gz: 253aa1b4a8a31c2c323ff05fbad3e2f613b932c82a5f1d61505e92966c1bfe7c593d17bae094f6ebd59b5568433d93d83e443b16df7c75d1b257d1015834a405

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

@@ -26,8 +26,8 @@ module 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)',
+      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)
@@ -96,7 +96,7 @@ module Danger
             # 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/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,7 +71,7 @@ module Gitlab
         end
       end
 
-      class IntegrationsBE < Category
+      class ImportIntegrateBE < Category
         private
 
         def has_particular_capability?(teammate)
@@ -80,7 +80,7 @@ module Gitlab
         end
       end
 
-      class IntegrationsFE < Category
+      class ImportIntegrateFE < Category
         private
 
         def has_particular_capability?(teammate)

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.9.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.9.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake