gitlab-dangerfiles 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe54dfd04f6f991218f15df710dbc9e0669e07f4f83c07f6c62ce10048fad8fb
-  data.tar.gz: af0c4147142df3f3f524c9c955bfd62bd2a249e04f69c72873f63db987c09b40
+  metadata.gz: 4a13e98277af51b86d8b4afca50ca70527b3b0ecba77e5a8123ce3a4b25466ee
+  data.tar.gz: 36dcfa615dad06e9cf4648ce7654f872dc79a8b1ad6d32c90d4af70f6d655e9e
 SHA512:
-  metadata.gz: 9ce6c07674bfa305f3b95ff85d9b50e1e2bb453d14468693ffcac6a2a31375d615642ccc7387a41076335956a0079c7423e69be8ccfd9a02fde849ff6a48251b
-  data.tar.gz: 5f938ce58903b1e77ce025059375112b54b86b8f8aa88a061c5ab3f1346d0faf2302f1a89bf4e18a3ee0921c039ebfd9763791f186695fad31c6d087e5059e06
+  metadata.gz: c16d35634b11646fc95c89f7868aa91541adbcc407ad923b4625dc2d55ed27a007ead9ce9f5cc1fdd1e3aecd473f566498955ffaa209b6e6d1cba93388ebdc00
+  data.tar.gz: 7a20be61d0f2777804315d02343d666e917c996e94b61916330bf2f7ac602ec6e35158a6768f0b73e5f4f1d420af435bae397ce72681379ce7a1cc6274c3180f

data/lib/danger/plugins/changelog.rb

@@ -40,14 +40,17 @@ module Danger
         This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry).
       MSG
     }.freeze
-
-    def self.categories
-      @categories ||= YAML
-        .load_file("#{ENV["CI_PROJECT_DIR"]}/.gitlab/changelog_config.yml")
-        .fetch("categories")
-        .keys
-        .freeze rescue []
-    end
+    CHANGELOG_CONFIG_FILE = "#{ENV["CI_PROJECT_DIR"]}/.gitlab/changelog_config.yml"
+    DEFAULT_CHANGELOG_CATEGORIES = %w[
+      added
+      fixed
+      changed
+      deprecated
+      removed
+      security
+      performance
+      other
+    ].freeze
 
     class ChangelogCheckResult
       attr_reader :errors, :warnings, :markdowns, :messages
@@ -90,6 +93,24 @@ module Danger
       end
     end
 
+    class CommitWrapper
+      extend Forwardable
+
+      attr_reader :category, :trailer_key
+
+      def initialize(commit, trailer_key, category)
+        @commit = commit
+        @trailer_key = trailer_key
+        @category = category
+      end
+
+      delegate %i[message sha] => :@commit
+    end
+
+    def categories
+      valid_changelog_commits.map(&:category)
+    end
+
     # rubocop:disable Style/SignalException
     def check!
       if git.modified_files.include?("CHANGELOG.md")
@@ -126,17 +147,13 @@ module Danger
     end
 
     def check_changelog_trailer(commit)
-      trailer = commit.message.match(CHANGELOG_TRAILER_REGEX)
-      name = trailer[:name]
-      category = trailer[:category]
-
-      unless name == "Changelog"
-        return ChangelogCheckResult.error("The changelog trailer for commit #{commit.sha} must be `Changelog` (starting with a capital C), not `#{name}`")
+      unless commit.trailer_key == "Changelog"
+        return ChangelogCheckResult.error("The changelog trailer for commit #{commit.sha} must be `Changelog` (starting with a capital C), not `#{commit.trailer_key}`")
       end
 
-      return ChangelogCheckResult.empty if self.class.categories.include?(category)
+      return ChangelogCheckResult.empty if valid_categories.include?(commit.category)
 
-      ChangelogCheckResult.error("Commit #{commit.sha} uses an invalid changelog category: #{category}")
+      ChangelogCheckResult.error("Commit #{commit.sha} uses an invalid changelog category: #{commit.category}")
     end
 
     def check_changelog_path
@@ -180,16 +197,16 @@ module Danger
     end
 
     def changelog_commits
-      git.commits.select do |commit|
-        commit.message.match?(CHANGELOG_TRAILER_REGEX)
+      git.commits.each_with_object([]) do |commit, memo|
+        trailer = commit.message.match(CHANGELOG_TRAILER_REGEX)
+
+        memo << CommitWrapper.new(commit, trailer[:name], trailer[:category]) if trailer
       end
     end
 
     def valid_changelog_commits
       changelog_commits.select do |commit|
-        trailer = commit.message.match(CHANGELOG_TRAILER_REGEX)
-
-        self.class.categories.include?(trailer[:category])
+        valid_categories.include?(commit.message.match(CHANGELOG_TRAILER_REGEX)[:category])
       end
     end
 
@@ -219,6 +236,28 @@ module Danger
 
     private
 
+    def valid_categories
+      return @categories if defined?(@categories)
+
+      @categories = if File.exist?(CHANGELOG_CONFIG_FILE)
+          begin
+            YAML
+              .load_file(CHANGELOG_CONFIG_FILE)
+              .fetch("categories")
+              .keys
+              .freeze
+          rescue Psych::SyntaxError, Psych::DisallowedClass => ex
+            puts "#{CHANGELOG_CONFIG_FILE} doesn't seem to be a valid YAML file:\n#{ex.message}\nFallbacking to the default categories: #{DEFAULT_CHANGELOG_CATEGORIES}"
+            DEFAULT_CHANGELOG_CATEGORIES
+          rescue => ex
+            puts "Received an unexpected failure while trying to fetch categories at #{CHANGELOG_CONFIG_FILE}:\n#{ex.message}\nFallbacking to the default categories: #{DEFAULT_CHANGELOG_CATEGORIES}"
+            DEFAULT_CHANGELOG_CATEGORIES
+          end
+        else
+          DEFAULT_CHANGELOG_CATEGORIES
+        end
+    end
+
     def read_file(path)
       File.read(path)
     end

data/lib/danger/rules/type_label/Dangerfile

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
+require_relative "../../../gitlab/dangerfiles/type_label_guesser"
+
+if respond_to?(:changelog) && !helper.has_scoped_label_with_scope?("type")
+  type_label_guesser = Gitlab::Dangerfiles::TypeLabelGuesser.new
+  helper.labels_to_add.merge(type_label_guesser.labels_from_changelog_categories(changelog.categories))
+end
+
 unless helper.has_scoped_label_with_scope?("type")
   warn "Please add a [merge request type](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification) to this merge request."
 end

data/lib/danger/rules/z_add_labels/Dangerfile

@@ -1,4 +1,4 @@
-# This rule is the last one since we want to add all the labels to add at once,
+# This rule is the (almost) last one since we want to add all the labels to add at once,
 # so we let other rules adding to `helper.labels_to_add` before actually adding them via the API here.
 
 # Don't try to post anything locally.
@@ -13,9 +13,3 @@ rescue Gitlab::Error::Forbidden
 end
 
 post_labels(helper.labels_to_add) if helper.labels_to_add.any?
-
-anything_to_post = status_report.values.any?(&:any?)
-
-if anything_to_post
-  markdown("**If needed, you can retry the [`danger-review` job](#{ENV["CI_JOB_URL"]}) that generated this comment.**")
-end

data/lib/danger/rules/z_retry_link/Dangerfile

@@ -0,0 +1,10 @@
+# This rule is the last one since we only want to post the "retry" message if there are anything to be posted.
+
+# There's no job to retry locally.
+return unless helper.ci?
+
+anything_to_post = status_report.values.any?(&:any?)
+
+if anything_to_post
+  markdown("**If needed, you can retry the [🔁 `danger-review` job](#{ENV['CI_JOB_URL']}) that generated this comment.**")
+end

data/lib/gitlab/dangerfiles/commit_linter.rb

@@ -115,11 +115,15 @@ module Gitlab
       end
 
       def files_changed
-        commit.diff_parent.stats[:total][:files]
+        # In some cases, the commits cannot be found so it's better to just move one
+        # See https://gitlab.com/gitlab-org/gitlab/-/issues/227814.
+        commit.diff_parent.size rescue 0
       end
 
       def lines_changed
-        commit.diff_parent.stats[:total][:lines]
+        # In some cases, the commits cannot be found so it's better to just move one
+        # See https://gitlab.com/gitlab-org/gitlab/-/issues/227814.
+        commit.diff_parent.lines rescue 0
       end
 
       def many_changes?

data/lib/gitlab/dangerfiles/spec_helper.rb

@@ -63,6 +63,6 @@ RSpec.shared_context "with dangerfile" do
 
   before do
     allow(dangerfile).to receive(:git).and_return(fake_git)
-    allow(dangerfile.helper).to receive(:changes).and_return(changes)
+    allow(dangerfile.helper).to receive(:changes).and_return(changes) if dangerfile.respond_to?(:helper)
   end
 end

data/lib/gitlab/dangerfiles/type_label_guesser.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Dangerfiles
+    class TypeLabelGuesser
+      CHANGELOG_CATEGORY_TO_TYPE_LABEL = {
+        fixed: %w[type::bug],
+        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],
+      }.freeze
+
+      def labels_from_changelog_categories(categories)
+        categories = categories.map(&:to_sym) & CHANGELOG_CATEGORY_TO_TYPE_LABEL.keys
+        return [] unless categories.one?
+
+        CHANGELOG_CATEGORY_TO_TYPE_LABEL.fetch(categories.first.to_sym, [])
+      end
+    end
+  end
+end

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "2.9.1"
+    VERSION = "2.10.0"
   end
 end

data/lib/gitlab/dangerfiles.rb

@@ -17,6 +17,7 @@ module Gitlab
       simple_roulette
       type_label
       z_add_labels
+      z_retry_link
     ].freeze
 
     # Utility method to construct a [Gitlab::Dangerfiles::Engine] instance,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-gitlab
@@ -158,6 +158,7 @@ files:
 - lib/danger/rules/simple_roulette/Dangerfile
 - lib/danger/rules/type_label/Dangerfile
 - lib/danger/rules/z_add_labels/Dangerfile
+- lib/danger/rules/z_retry_link/Dangerfile
 - lib/gitlab-dangerfiles.rb
 - lib/gitlab/Dangerfile
 - lib/gitlab/dangerfiles.rb
@@ -170,6 +171,7 @@ files:
 - lib/gitlab/dangerfiles/spec_helper.rb
 - lib/gitlab/dangerfiles/teammate.rb
 - lib/gitlab/dangerfiles/title_linting.rb
+- lib/gitlab/dangerfiles/type_label_guesser.rb
 - lib/gitlab/dangerfiles/version.rb
 - lib/gitlab/dangerfiles/weightage.rb
 - lib/gitlab/dangerfiles/weightage/maintainers.rb