gitlab-dangerfiles 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf965c37aaf01dff0630442feecb4fbe6e8d96bb2c9f7f714c631487c9eb894e
-  data.tar.gz: 720fe1ddfd202e0b199dfbd63fdb360a8a7e58d355182b7055ff0fdebb74c886
+  metadata.gz: 1d8182a9895b7c4ce505c6c31271030222ef4e3eefaee2569edccfe1a3ce892a
+  data.tar.gz: 32f4cd7af125f0cf2a96f7bb000eb725f2c58a7a5576349fe3905dd93302c53d
 SHA512:
-  metadata.gz: 31a832aa516290296662a7949b01a13c7dd47e7c05ad6c6e78cb1f189f2190b99094e97a07875d65f4cb6b5504a8816d1a26aa39a618480899f2026c58c2c311
-  data.tar.gz: 4f18f92c83494aff49ceec1a05f2b380bd9be7aee17a50a4126ec25c011cfc468a672da200d4a93420d4c47bbec19d6678dc389e083a56945d94d52a58862107
+  metadata.gz: fdb2baf7afe55ad315269cf4231efa717099dbb931ca5a6f3d7b268d9551b337fa5265627b8e134d739383a4cf72f5bf68588a19010bd4327c04297baaf3a49f
+  data.tar.gz: bdfa7d3753215241101362459e869cf53b1b4f141e96c58f9a31aac02a1dcb4aadae2caf98115704e8814664f0b74c466781aafe8da02d8f0bd00793857ccfb8

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

@@ -25,6 +25,7 @@ module Danger
       product_intelligence: '~"product intelligence"',
       integrations_be: '~"group::integrations" (backend)',
       integrations_fe: '~"group::integrations" (frontend)',
+      "Authentication and Authorization": '~"group::authentication and authorization"',
     }.freeze
 
     # Allows to set specific rule's configuration by passing a block.
@@ -299,6 +300,15 @@ module Danger
       gitlab_helper.mr_json["target_branch"]
     end
 
+    # @return [Hash] +{}+ when not in the CI context, and the merge request approval state otherwise.
+    def mr_approval_state
+      return {} unless ci?
+
+      gitlab_helper.api.merge_request_approval_state(
+        mr_target_project_id, mr_iid
+      )
+    end
+
     # @return [Boolean] +true+ when not in the CI context, and whether the MR is set to be squashed otherwise.
     def squash_mr?
       return true unless ci?

data/lib/danger/plugins/roulette.rb

@@ -18,11 +18,20 @@ module Danger
     Spin = Struct.new(:category, :reviewer, :maintainer, :optional_role, :timezone_experiment)
     HTTPError = Class.new(StandardError)
 
+    Approval = Struct.new(:category, :spin) do
+      def self.from_approval_rule(rule, maintainer)
+        category = rule["section"].to_sym
+        spin = Spin.new(category, nil, maintainer, :reviewer)
+
+        new(category, spin)
+      end
+    end
+
     # Finds the +Gitlab::Dangerfiles::Teammate+ object whose username matches the MR author username.
     #
     # @return [Gitlab::Dangerfiles::Teammate]
     def team_mr_author
-      @team_mr_author ||= company_members.find { |person| person.username == helper.mr_author }
+      @team_mr_author ||= find_member(helper.mr_author)
     end
 
     # Assigns GitLab team members to be reviewer and maintainer
@@ -87,6 +96,18 @@ module Danger
       spins
     end
 
+    def required_approvals
+      approval_rules = helper.mr_approval_state["rules"]
+
+      return [] unless approval_rules
+
+      approval_rules.filter_map do |rule|
+        rule["rule_type"] == "code_owner" &&
+          rule["approvals_required"] > 0 &&
+          Approval.from_approval_rule(rule, spin_for_approver(rule))
+      end
+    end
+
     private
 
     # @param [Gitlab::Dangerfiles::Teammate] person
@@ -115,8 +136,8 @@ module Danger
         team_mr_author&.integrations_fe?(project, category, helper.mr_labels)
     end
 
-    def new_random(seed)
-      Random.new(Digest::MD5.hexdigest(seed).to_i(16))
+    def random
+      @random ||= Random.new(Digest::MD5.hexdigest(helper.mr_source_branch).to_i(16))
     end
 
     def spin_role_for_category(team, role, project, category)
@@ -131,7 +152,7 @@ module Danger
     # @param [Array<Gitlab::Dangerfiles::Teammate>] people
     #
     # @return [Gitlab::Dangerfiles::Teammate]
-    def spin_for_person(people, random:, timezone_experiment: false)
+    def spin_for_person(people, timezone_experiment: false)
       shuffled_people = people.shuffle(random: random)
 
       if timezone_experiment
@@ -141,6 +162,14 @@ module Danger
       end
     end
 
+    def spin_for_approver(rule)
+      approvers = rule["eligible_approvers"].map do |approver|
+        find_member(approver["username"])
+      end
+
+      spin_for_person(approvers)
+    end
+
     def spin_for_category(project, category, timezone_experiment: false)
       team = project_team(project)
       reviewers, traintainers, maintainers =
@@ -148,13 +177,11 @@ module Danger
           spin_role_for_category(team, role, project, category)
         end
 
-      random = new_random(helper.mr_source_branch)
-
       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, random: random, timezone_experiment: timezone_experiment)
-      maintainer = spin_for_person(weighted_maintainers, random: random, timezone_experiment: timezone_experiment)
+      reviewer = spin_for_person(weighted_reviewers, timezone_experiment: timezone_experiment)
+      maintainer = spin_for_person(weighted_maintainers, timezone_experiment: timezone_experiment)
 
       Spin.new(category, reviewer, maintainer, false, timezone_experiment)
     end
@@ -187,6 +214,10 @@ module Danger
         end
     end
 
+    def find_member(username)
+      company_members.find { |person| person.username == username }
+    end
+
     # Like +team+, but only returns teammates in the current project, based on
     # project_name.
     #

data/lib/gitlab/dangerfiles/teammate.rb

@@ -23,6 +23,10 @@ module Gitlab
         options
       end
 
+      def inspect
+        "#<#{self.class} @username=#{username.inspect}>"
+      end
+
       def ==(other)
         return false unless other.respond_to?(:username)
 

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.3.0"
+    VERSION = "3.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake