dependabot-common 0.111.12 → 0.111.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33c682911304df1e676eedc367677e4bf8ff4dd705e21fa5992ac888a12a604d
-  data.tar.gz: '097404a8d896b7a53d973fec7f6ea35c0c7b91e7483e9f359baaaa7c471109e8'
+  metadata.gz: bb22cba06a25cb551864e82276dc1bcfdab28dc5968c05c011e71d1a0b4c4f87
+  data.tar.gz: 92d63dbe180b2c07721f06c2c5a57d2a0c714e804eb82d76984386436ce20b65
 SHA512:
-  metadata.gz: b0ff09d71f6059c6326fd23af7743939e2b73f6a0f6cb983ac21f28400aeb09224f08fb0bfd253c0fe87ba3f32037649016144baccead862a41e9fced9ef1339
-  data.tar.gz: 0ba3c3c1f7c48cab597989bf5afbde055a9f0fbf3339f33a073ce405d29497a73161123c1324643d0e9d86ee8b0d2cd33b93d2026efe5276fd1cd7f76486b49c
+  metadata.gz: f0206816370c42988080bf78ee3304ff80670ede9e4d9a97e0429d026f29122275030ef175f149a3647073793b9766ee4887fd88af61c22e71fcfbff5c1c5155
+  data.tar.gz: ff7c003f83152f508dabbbb21abef82b6625326da655847a0323f3b9bd62e7a31dc465db87e900d2ff7fac786cda03785d60c89e5da929a7526472cf2e130636

data/lib/dependabot/git_metadata_fetcher.rb

@@ -14,6 +14,8 @@ module Dependabot
 
     def upload_pack
       @upload_pack ||= fetch_upload_pack_for(url)
+    rescue Octokit::ClientError
+      raise Dependabot::GitDependenciesNotReachable, [url]
     end
 
     def tags
@@ -37,28 +39,20 @@ module Dependabot
     # rubocop:disable Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/PerceivedComplexity
     def fetch_upload_pack_for(uri)
-      response = Excon.get(
-        service_pack_uri(uri),
-        idempotent: true,
-        **excon_defaults
-      )
-
+      response = fetch_raw_upload_pack_for(uri)
       return response.body if response.status == 200
 
-      if response.status >= 500 && uri.match?(KNOWN_HOSTS)
-        unless uri.match?(/github\.com/i)
-          raise "Server error at #{uri}: #{response.body}"
-        end
+      unless uri.match?(KNOWN_HOSTS)
+        raise Dependabot::GitDependenciesNotReachable, [uri]
+      end
 
-        case response.status
-        when 500 then raise Octokit::InternalServerError
-        when 501 then raise Octokit::NotImplemented
-        when 502 then raise Octokit::BadGateway
-        when 503 then raise Octokit::ServiceUnavailable
-        else raise Octokit::ServerError
-        end
+      if response.status < 400
+        raise "Unexpected response: #{response.status} - #{response.body}"
       end
 
+      raise Octokit::Error.from_response(response) if uri.match?(/github\.com/i)
+      raise "Server error at #{uri}: #{response.body}" if response.status >= 500
+
       raise Dependabot::GitDependenciesNotReachable, [uri]
     rescue Excon::Error::Socket, Excon::Error::Timeout
       retry_count ||= 0
@@ -72,6 +66,14 @@ module Dependabot
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity
 
+    def fetch_raw_upload_pack_for(uri)
+      Excon.get(
+        service_pack_uri(uri),
+        idempotent: true,
+        **excon_defaults
+      )
+    end
+
     def tags_for_upload_pack(upload_pack)
       peeled_lines = []
 

data/lib/dependabot/pull_request_creator.rb

@@ -13,6 +13,7 @@ module Dependabot
 
     class RepoNotFound < StandardError; end
     class RepoArchived < StandardError; end
+    class RepoDisabled < StandardError; end
     class NoHistoryInCommon < StandardError; end
 
     attr_reader :source, :dependencies, :files, :base_commit,

data/lib/dependabot/pull_request_creator/github.rb

@@ -65,7 +65,8 @@ module Dependabot
 
       def branch_exists?(name)
         git_metadata_fetcher.ref_names.include?(name)
-      rescue Dependabot::GitDependenciesNotReachable
+      rescue Dependabot::GitDependenciesNotReachable => e
+        raise e.cause if e.cause&.message&.include?("is disabled")
         raise(RepoNotFound, source.url) unless repo_exists?
 
         retrying ||= false
@@ -311,24 +312,27 @@ module Dependabot
         ).signature
       end
 
-      def handle_error(error)
-        case error
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def handle_error(err)
+        case err
         when Octokit::Forbidden
-          raise error unless error.message.include?("Repository was archived")
+          raise RepoDisabled, err.message if err.message.include?("disabled")
+          raise RepoArchived, err.message if err.message.include?("archived")
 
-          raise RepoArchived, error.message
+          raise err
         when Octokit::NotFound
-          raise error if repo_exists?
+          raise err if repo_exists?
 
-          raise RepoNotFound, error.message
+          raise RepoNotFound, err.message
         when Octokit::UnprocessableEntity
-          raise error unless error.message.include?("no history in common")
+          raise err unless err.message.include?("no history in common")
 
-          raise NoHistoryInCommon, error.message
+          raise NoHistoryInCommon, err.message
         else
-          raise error
+          raise err
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
   end
 end

data/lib/dependabot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.111.12
+  version: 0.111.13
 platform: ruby
 authors:
 - Dependabot