dependabot-common 0.98.30 → 0.98.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39968e992344afb730de7e02eb312982ceabcded5671e79bd2590a1a2d2d9b0d
-  data.tar.gz: 6c81f19124a04a0d5300733cef52982d559a30908b424c06234a4c34a1dcf280
+  metadata.gz: acad640cd551e4c5ee343d17311bac5cdfc4ad10807aa90f980b26299e87e9e1
+  data.tar.gz: 70f12e0ac10bc80c53a319e5222cfc94a554e8b344d654414fbbf886bf259cec
 SHA512:
-  metadata.gz: 72af31b12994256992abef74b2a99202950b1483dbda91938ce0f52cb3e20ceacb3134dcfecdbd3963d71d5611f2bc18eafcddb092ab829203962208876589dc
-  data.tar.gz: 3c5a42ef089476b28cb0acbaf8c8c0168825fa08f458205521caae0a26b11ad517711e1c956ae23f7922076485d243a0149086fae46094b7d2cada12959911c5
+  metadata.gz: f7ac6b7e472065c2513514a5544681cad0392d7a54b64b6168d11cfdf9189cb52974d6bcc9c3197c4df25aaa39fdb891589f6ebe13e237ec9d19e75fc0806097
+  data.tar.gz: 33701004d42ae340edb275da8bdb6780a271f99f74ba34af35705fb9996f7e161c17e242a507457bf33c6c9972ff977c7753313b76c98f5fe5fa6ef9cf9c4f20

data/lib/dependabot/git_commit_checker.rb

@@ -3,6 +3,8 @@
 require "excon"
 require "gitlab"
 require "dependabot/clients/github_with_retries"
+require "dependabot/clients/gitlab_with_retries"
+require "dependabot/clients/bitbucket"
 require "dependabot/metadata_finders"
 require "dependabot/errors"
 require "dependabot/utils"
@@ -10,7 +12,6 @@ require "dependabot/source"
 require "dependabot/dependency"
 require "dependabot/git_metadata_fetcher"
 
-# rubocop:disable Metrics/ClassLength
 module Dependabot
   class GitCommitChecker
     VERSION_REGEX = /(?<version>[0-9]+\.[0-9]+(?:\.[a-zA-Z0-9\-]+)*)$/.freeze
@@ -166,6 +167,7 @@ module Dependabot
 
       allow_identical && status == "identical"
     rescue Octokit::NotFound, Gitlab::Error::NotFound,
+           Clients::Bitbucket::NotFound,
            Octokit::InternalServerError
       false
     end
@@ -178,13 +180,8 @@ module Dependabot
     end
 
     def gitlab_commit_comparison_status(ref1, ref2)
-      access_token = credentials.
-                     select { |cred| cred["type"] == "git_source" }.
-                     find { |cred| cred["host"] == "gitlab.com" }&.
-                     fetch("token")
-
-      client = Gitlab.client(endpoint: "https://gitlab.com/api/v4",
-                             private_token: access_token.to_s)
+      client = Clients::GitlabWithRetries.
+               for_gitlab_dot_com(credentials: credentials)
 
       comparison = client.compare(listing_source_repo, ref1, ref2)
 
@@ -199,10 +196,10 @@ module Dependabot
             "#{listing_source_repo}/commits/?"\
             "include=#{ref2}&exclude=#{ref1}"
 
-      response = Excon.get(url,
-                           headers: bitbucket_auth_header,
-                           idempotent: true,
-                           **SharedHelpers.excon_defaults)
+      client = Clients::Bitbucket.
+               for_bitbucket_dot_org(credentials: credentials)
+
+      response = client.get(url)
 
       # Conservatively assume that ref2 is ahead in the equality case, of
       # if we get an unexpected format (e.g., due to a 404)
@@ -211,24 +208,6 @@ module Dependabot
       end
     end
 
-    def bitbucket_auth_header
-      token = credentials.
-              select { |cred| cred["type"] == "git_source" }.
-              find { |cred| cred["host"] == "bitbucket.org" }&.
-              fetch("token")
-
-      if token.nil? then {}
-      elsif token.include?(":")
-        encoded_token = Base64.encode64(token).delete("\n")
-        { "Authorization" => "Basic #{encoded_token}" }
-      elsif Base64.decode64(token).ascii_only? &&
-            Base64.decode64(token).include?(":")
-        { "Authorization" => "Basic #{token.delete("\n")}" }
-      else
-        { "Authorization" => "Bearer #{token}" }
-      end
-    end
-
     def dependency_source_details
       sources =
         dependency.requirements.map { |r| r.fetch(:source) }.uniq.compact
@@ -361,4 +340,3 @@ module Dependabot
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/dependabot/version.rb

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

metadata

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