gitlab-dangerfiles 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee27fb91564bfb45f28aed3fca576c6731c91ae9f69719e2ebb0ce5807ff1ee
-  data.tar.gz: 3bcd268c5fc1a91141a447ff6bb1b0c63841fe4dab2c65fffc61c7c488048275
+  metadata.gz: edf969f524278d280762935cb8a04c78a22180296c3b7e88deb342ab8f83c840
+  data.tar.gz: 6b3b3c493beb17172786cefaa6e6ac1dd1ef243234b5e90e632b79830a7fae9c
 SHA512:
-  metadata.gz: d5cab2d3171779a9f28c00452e4e0435a6aa93852d80847b4da3b03f38fe294e7c855232b1402d6f3ac14f99b04518993b5fb6401da928ed9189f86a44948769
-  data.tar.gz: dc580aa4781087b6598c8d4f2befb2fec6b9d87ae4ce964227b35a4fbc537c62f2bad0e4d947a65154753157a896cb890472be33d99f0e15463d63beed17b6ee
+  metadata.gz: 56e849f993eec188646a8f06106855409146070234b158c8cd48abe0378008c9d1c957dafbb1af6dbee4f86744014d1a852bc426993337f8b9978b9e7cdcdd80
+  data.tar.gz: 19f31baf98812c924fc62d88cdc601f0f73a0c9e0c239647e25d6e79c6a1a4eaec831397658883b9cc9aff70e0fabee8e3f4df0908f119c0262788296097793e

data/lib/danger/plugins/roulette.rb

@@ -11,11 +11,7 @@ module Danger
     ROULETTE_DATA_URL = "https://gitlab-org.gitlab.io/gitlab-roulette/roulette.json"
     HOURS_WHEN_PERSON_CAN_BE_PICKED = (6..14).freeze
 
-    INCLUDE_TIMEZONE_FOR_CATEGORY = {
-      database: false,
-    }.freeze
-
-    Spin = Struct.new(:category, :reviewer, :maintainer, :optional_role, :timezone_experiment)
+    Spin = Struct.new(:category, :reviewer, :maintainer, :optional_role)
     HTTPError = Class.new(StandardError)
 
     Approval = Struct.new(:category, :spin) do
@@ -73,26 +69,22 @@ module Danger
     #
     # @param project [String] A project path.
     # @param categories [Array<Symbol>] An array of categories symbols.
-    # @param timezone_experiment [Boolean] Whether to select reviewers based in timezone or not.
     #
     # @return [Array<Spin>]
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    def spin(project = nil, categories = [:none], timezone_experiment: false)
+    def spin(project = nil, categories = [:none])
       project = (project || config_project_name).downcase
       categories = categories.map { |category| category&.downcase || :none }
       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)
-
-        spin_for_category(project, category, timezone_experiment: including_timezone)
+        spin_for_category(project, category)
       end
 
       backend_spin = spins.find { |spin| spin.category == :backend }
       frontend_spin = spins.find { |spin| spin.category == :frontend }
 
       spins.each do |spin|
-        including_timezone = INCLUDE_TIMEZONE_FOR_CATEGORY.fetch(spin.category, timezone_experiment)
         case spin.category
         when :qa
           # MR includes QA changes, but also other changes, and author isn't an SET
@@ -105,24 +97,24 @@ module Danger
 
           if spin.reviewer.nil?
             # Fetch an already picked backend reviewer, or pick one otherwise
-            spin.reviewer = backend_spin&.reviewer || spin_for_category(project, :backend, timezone_experiment: including_timezone).reviewer
+            spin.reviewer = backend_spin&.reviewer || spin_for_category(project, :backend).reviewer
           end
         when :tooling, :engineering_productivity # Deprecated as of 2.3.0 in favor of tooling
           if spin.maintainer.nil?
             # 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
+            spin.maintainer = backend_spin&.maintainer || spin_for_category(project, :backend).maintainer
           end
         when :ci_template
           if spin.maintainer.nil?
             # 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
+            spin.maintainer = backend_spin&.maintainer || spin_for_category(project, :backend).maintainer
           end
         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
+            spin.maintainer = backend_spin&.maintainer || frontend_spin&.maintainer || spin_for_category(project, :backend).maintainer
           end
         when :import_integrate_be, :import_integrate_fe
           spin.optional_role = :maintainer
@@ -136,7 +128,7 @@ module Danger
 
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-    def required_approvals
+    def codeowners_approvals
       approval_rules = helper.mr_approval_state["rules"]
 
       return [] unless approval_rules
@@ -156,13 +148,25 @@ module Danger
       @teammate_pedroms ||= find_member("pedroms")
     end
 
+    alias_method :required_approvals, :codeowners_approvals
+
     private
 
     def spin_for_approval_rule?(rule)
       rule["rule_type"] == "code_owner" &&
-        rule["approvals_required"] > 0 &&
+        should_include_codeowners_rule?(rule) &&
         # Exclude generic codeowners rule, which should be covered by others already
-        !generic_codeowners_rule?(rule)
+        !generic_codeowners_rule?(rule) &&
+        !excluded_required_codeowners_rule?(rule)
+    end
+
+    def should_include_codeowners_rule?(rule)
+      rule["approvals_required"] > 0 ||
+        helper.config.included_optional_codeowners_sections_for_roulette.include?(rule["section"])
+    end
+
+    def excluded_required_codeowners_rule?(rule)
+      helper.config.excluded_required_codeowners_sections_for_roulette.include?(rule["section"])
     end
 
     def generic_codeowners_rule?(rule)
@@ -191,12 +195,6 @@ module Danger
       !mr_author?(person) && person.available
     end
 
-    # @param [Gitlab::Dangerfiles::Teammate] person
-    # @return [Boolean]
-    def valid_person_with_timezone?(person)
-      valid_person?(person) && HOURS_WHEN_PERSON_CAN_BE_PICKED.cover?(person.local_hour)
-    end
-
     # @param [Gitlab::Dangerfiles::Teammate] person
     # @return [Boolean]
     def mr_author?(person)
@@ -227,14 +225,10 @@ module Danger
     # @param [Array<Gitlab::Dangerfiles::Teammate>] people
     #
     # @return [Gitlab::Dangerfiles::Teammate]
-    def spin_for_person(people, timezone_experiment: false)
+    def spin_for_person(people)
       shuffled_people = people.shuffle(random: random)
 
-      if timezone_experiment
-        shuffled_people.find(&method(:valid_person_with_timezone?))
-      else
-        shuffled_people.find(&method(:valid_person?))
-      end
+      shuffled_people.find(&method(:valid_person?))
     end
 
     # Spin a reviewer for a particular approval rule
@@ -274,7 +268,7 @@ module Danger
       fallback_approvers.sample(random: random)
     end
 
-    def spin_for_category(project, category, timezone_experiment: false)
+    def spin_for_category(project, category)
       team = project_team(project)
       reviewers, traintainers, maintainers =
         %i[reviewer traintainer maintainer].map do |role|
@@ -284,10 +278,10 @@ module Danger
       weighted_reviewers = Gitlab::Dangerfiles::Weightage::Reviewers.new(reviewers, traintainers).execute
       weighted_maintainers = Gitlab::Dangerfiles::Weightage::Maintainers.new(maintainers).execute
 
-      reviewer = spin_for_person(weighted_reviewers, timezone_experiment: timezone_experiment)
-      maintainer = spin_for_person(weighted_maintainers, timezone_experiment: timezone_experiment)
+      reviewer = spin_for_person(weighted_reviewers)
+      maintainer = spin_for_person(weighted_maintainers)
 
-      Spin.new(category, reviewer, maintainer, false, timezone_experiment)
+      Spin.new(category, reviewer, maintainer, false)
     end
 
     def prepare_ux_category!(categories)

data/lib/gitlab/dangerfiles/config.rb

@@ -33,6 +33,14 @@ module Gitlab
       #   @return [Array] indicating which categories would be disabled for the simple roulette. Default to `[]` (all categories are enabled)
       attr_accessor :disabled_roulette_categories
 
+      # @!attribute included_optional_codeowners_sections_for_roulette
+      #   @return [Array] indicating which optional codeowners sections should be included in roulette. Default to `[]`.
+      attr_accessor :included_optional_codeowners_sections_for_roulette
+
+      # @!attribute excluded_required_codeowners_sections_for_roulette
+      #   @return [Array] indicating which required codeowners sections should be excluded from roulette. Default to `[]`.
+      attr_accessor :excluded_required_codeowners_sections_for_roulette
+
       DEFAULT_CHANGES_SIZE_THRESHOLDS = { high: 2_000, medium: 500 }.freeze
       DEFAULT_COMMIT_MESSAGES_MAX_COMMITS_COUNT = 10
 
@@ -44,6 +52,8 @@ module Gitlab
         @code_size_thresholds = DEFAULT_CHANGES_SIZE_THRESHOLDS
         @max_commits_count = DEFAULT_COMMIT_MESSAGES_MAX_COMMITS_COUNT
         @disabled_roulette_categories = []
+        @included_optional_codeowners_sections_for_roulette = []
+        @excluded_required_codeowners_sections_for_roulette = []
       end
     end
   end

data/lib/gitlab/dangerfiles/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake