dependabot-common 0.98.31 → 0.98.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acad640cd551e4c5ee343d17311bac5cdfc4ad10807aa90f980b26299e87e9e1
-  data.tar.gz: 70f12e0ac10bc80c53a319e5222cfc94a554e8b344d654414fbbf886bf259cec
+  metadata.gz: 25c0e74464e5a5fc1f0dfe7c799af9939d1636c948d3341413762f9967d7221c
+  data.tar.gz: 7b6162eec439ecd50dc0d19cd22b1c5fcd0db850912b1abc79ac35d59e330e2e
 SHA512:
-  metadata.gz: f7ac6b7e472065c2513514a5544681cad0392d7a54b64b6168d11cfdf9189cb52974d6bcc9c3197c4df25aaa39fdb891589f6ebe13e237ec9d19e75fc0806097
-  data.tar.gz: 33701004d42ae340edb275da8bdb6780a271f99f74ba34af35705fb9996f7e161c17e242a507457bf33c6c9972ff977c7753313b76c98f5fe5fa6ef9cf9c4f20
+  metadata.gz: 433eb08f26762e5fee3447f759d556aea736fe4061bcd415a38e426d9ead8b92f931c898ab964a6f2761a712d463921c58475076d40992717ed35b9baa2aa963
+  data.tar.gz: 9a7c393a0b76f62495248073fe670838d4f7c4663790df128524667ce1e1fc02e9852bcd65471ff087e6ed30b9b697aec9d93e94f6035ee340060956c89207b5

data/lib/dependabot/clients/bitbucket.rb

@@ -80,8 +80,8 @@ module Dependabot
       def get(url)
         response = Excon.get(
           url,
-          user: credentials&.fetch("username"),
-          password: credentials&.fetch("password"),
+          user: credentials&.fetch("username", nil),
+          password: credentials&.fetch("password", nil),
           idempotent: true,
           **Dependabot::SharedHelpers.excon_defaults
         )

data/lib/dependabot/clients/github_with_retries.rb

@@ -30,6 +30,7 @@ module Dependabot
           credentials.
           select { |cred| cred["type"] == "git_source" }.
           select { |cred| cred["host"] == source.hostname }.
+          select { |cred| cred["password"] }.
           map { |cred| cred.fetch("password") }
 
         new(
@@ -43,6 +44,7 @@ module Dependabot
           credentials.
           select { |cred| cred["type"] == "git_source" }.
           select { |cred| cred["host"] == "github.com" }.
+          select { |cred| cred["password"] }.
           map { |cred| cred.fetch("password") }
 
         new(access_tokens: access_tokens)

data/lib/dependabot/clients/gitlab_with_retries.rb

@@ -5,9 +5,7 @@ require "gitlab"
 module Dependabot
   module Clients
     class GitlabWithRetries
-      RETRYABLE_ERRORS = [
-        Gitlab::Error::BadGateway
-      ].freeze
+      RETRYABLE_ERRORS = [Gitlab::Error::BadGateway].freeze
 
       #######################
       # Constructor methods #
@@ -17,6 +15,7 @@ module Dependabot
         access_token =
           credentials.
           select { |cred| cred["type"] == "git_source" }.
+          select { |cred| cred["password"] }.
           find { |cred| cred["host"] == source.hostname }&.
           fetch("password")
 
@@ -30,6 +29,7 @@ module Dependabot
         access_token =
           credentials.
           select { |cred| cred["type"] == "git_source" }.
+          select { |cred| cred["password"] }.
           find { |cred| cred["host"] == "gitlab.com" }&.
           fetch("password")
 

data/lib/dependabot/git_metadata_fetcher.rb

@@ -98,7 +98,7 @@ module Dependabot
       if bare_uri.match?(%r{[^/]+:[^/]+@})
         # URI already has authentication details
         "https://#{bare_uri}"
-      elsif cred
+      elsif cred&.fetch("username", nil) && cred&.fetch("password", nil)
         # URI doesn't have authentication details, but we have credentials
         auth_string = "#{cred.fetch('username')}:#{cred.fetch('password')}"
         "https://#{auth_string}@#{bare_uri}"

data/lib/dependabot/shared_helpers.rb

@@ -179,7 +179,8 @@ module Dependabot
 
       github_credentials = credentials.
                            select { |c| c["type"] == "git_source" }.
-                           select { |c| c["host"] == "github.com" }
+                           select { |c| c["host"] == "github.com" }.
+                           select { |c| c["password"] || c["username"] }
 
       # If multiple credentials are specified for github.com, pick the one that
       # *isn't* just an app token (since it must have been added deliberately)

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.98.31
+  version: 0.98.32
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-22 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr