dependabot-common 0.165.0 → 0.168.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fded763414c9d5eec2fcdcbde94cc2f6feb6cc28218b4505ebd3a05250a02140
-  data.tar.gz: 405ae147644579eb70e84cb0dbf9a3bb9b27cfc5ed144597a08ad5286eb1925f
+  metadata.gz: 427cfd662176d25750a84eff74448ac6a4bb83bdbad91499ce097789208b0fc8
+  data.tar.gz: f0c8f21a2d13f6ade2159d38e3d3c2a663d89c5195941e1d98c7fc843975cd14
 SHA512:
-  metadata.gz: 01aea5b71061b178a252555fa59f828d9f86a89d41d7d58e2a7d58c15cfae40a752eaf6f0858bb3b6e8dc5c224fc8b83c935e1dc3e7d264fab069d24244f6b64
-  data.tar.gz: 918375276fbc3ef7e735df189f1dfd9821f0473651959a0aad38a7932214f0fc02e0348139ae321c4944ea2ba6f0b7d013cb9ef7a054eb8373c0ab6a8f84cb9b
+  metadata.gz: ad8438cd7fd6ca00b0618369b9d2ecee382f2945e4516f2e6a22e478dfbc6c64c7da0067c899e5efa058c5304bc948d3de31cb61cd09a0487ed9c0d41cbca64a
+  data.tar.gz: 36b35131e863bb8308dd215161320e2af7bcce80b7d488a254c37169eb03c298bcf9473f9273ed580ee45aa6d744a85a9c2bd378a4f62b3d9cf22d5fad17eaba

data/lib/dependabot/clients/azure.rb

@@ -18,6 +18,8 @@ module Dependabot
 
       class Forbidden < StandardError; end
 
+      class TagsCreationForbidden < StandardError; end
+
       RETRYABLE_ERRORS = [InternalServerError, BadGateway, ServiceNotAvailable].freeze
 
       MAX_PR_DESCRIPTION_LENGTH = 3999
@@ -264,7 +266,12 @@ module Dependabot
         end
 
         raise Unauthorized if response.status == 401
-        raise Forbidden if response.status == 403
+
+        if response.status == 403
+          raise TagsCreationForbidden if tags_creation_forbidden?(response)
+
+          raise Forbidden
+        end
         raise NotFound if response.status == 404
 
         response
@@ -310,6 +317,13 @@ module Dependabot
         pr_description.force_encoding(Encoding::UTF_8)
       end
 
+      def tags_creation_forbidden?(response)
+        return if response.body.empty?
+
+        message = JSON.parse(response.body).fetch("message", nil)
+        message&.include?("TF401289")
+      end
+
       attr_reader :auth_header
       attr_reader :credentials
       attr_reader :source

data/lib/dependabot/metadata_finders/base/changelog_finder.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "excon"
-require "pandoc-ruby"
 
 require "dependabot/clients/github_with_retries"
 require "dependabot/clients/gitlab_with_retries"
@@ -37,31 +36,10 @@ module Dependabot
         def changelog_text
           return unless full_changelog_text
 
-          pruned_text = ChangelogPruner.new(
+          ChangelogPruner.new(
             dependency: dependency,
             changelog_text: full_changelog_text
           ).pruned_text
-
-          return pruned_text unless changelog.name.end_with?(".rst")
-
-          begin
-            PandocRuby.convert(
-              pruned_text,
-              from: :rst,
-              to: :markdown,
-              wrap: :none,
-              timeout: 10
-            )
-          rescue Errno::ENOENT => e
-            raise unless e.message == "No such file or directory - pandoc"
-
-            # If pandoc isn't installed just return the rst
-            pruned_text
-          rescue RuntimeError => e
-            raise unless e.message.include?("Pandoc timed out")
-
-            pruned_text
-          end
         end
 
         def upgrade_guide_url

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -142,6 +142,20 @@ module Dependabot
       end
 
       def message_trailers
+        return unless signoff_trailers || custom_trailers
+
+        [signoff_trailers, custom_trailers].compact.join("\n")
+      end
+
+      def custom_trailers
+        trailers = commit_message_options[:trailers]
+        return if trailers.nil?
+        raise("Commit trailers must be a Hash object") unless trailers.is_a?(Hash)
+
+        trailers.compact.map { |k, v| "#{k}: #{v}" }.join("\n")
+      end
+
+      def signoff_trailers
         return unless on_behalf_of_message || signoff_message
 
         [on_behalf_of_message, signoff_message].compact.join("\n")

data/lib/dependabot/pull_request_creator.rb

@@ -23,7 +23,7 @@ module Dependabot
     #
     # If you wish to disable this behaviour when using Dependabot Core directly,
     # pass a nil value when initialising this class.
-    DEFAULT_GITHUB_REDIRECTION_SERVICE = "github-redirect.dependabot.com"
+    DEFAULT_GITHUB_REDIRECTION_SERVICE = "redirect.github.com"
 
     class RepoNotFound < StandardError; end
 

data/lib/dependabot/source.rb

@@ -45,6 +45,8 @@ module Dependabot
       (?:#{AZURE_SOURCE})
     /x.freeze
 
+    IGNORED_PROVIDER_HOSTS = %w(gitbox.apache.org svn.apache.org fuchsia.googlesource.com).freeze
+
     attr_accessor :provider, :repo, :directory, :branch, :commit,
                   :hostname, :api_endpoint
 
@@ -64,6 +66,7 @@ module Dependabot
     def self.github_enterprise_from_url(url_string)
       captures = url_string&.match(GITHUB_ENTERPRISE_SOURCE)&.named_captures
       return unless captures
+      return if IGNORED_PROVIDER_HOSTS.include?(captures.fetch("host"))
 
       base_url = "https://#{captures.fetch('host')}"
 
@@ -86,6 +89,8 @@ module Dependabot
         # currently doesn't work with development environments
         resp.headers["X-GitHub-Request-Id"] &&
         !resp.headers["X-GitHub-Request-Id"].empty?
+    rescue Excon::Error
+      false
     end
 
     def initialize(provider:, repo:, directory: nil, branch: nil, commit: nil,

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.165.0"
+  VERSION = "0.168.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.165.0
+  version: 0.168.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -182,20 +182,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
-- !ruby/object:Gem::Dependency
-  name: pandoc-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement