Skip to content

Commit

Permalink
Merge pull request #5400 from dependabot/brrygrdn/cache-timeouts-for-…
Browse files Browse the repository at this point in the history
…composer

[Composer] Cache client-side timeouts when a remote host is unreachable
  • Loading branch information
brrygrdn committed Jul 22, 2022
2 parents d79a32e + 8214638 commit d552b28
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
8 changes: 2 additions & 6 deletions composer/lib/dependabot/composer/metadata_finder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require "excon"
require "dependabot/metadata_finders"
require "dependabot/metadata_finders/base"
require "dependabot/shared_helpers"
require "dependabot/registry_client"
require "dependabot/composer/version"

module Dependabot
Expand Down Expand Up @@ -48,11 +48,7 @@ def look_up_source_from_packagist
def packagist_listing
return @packagist_listing unless @packagist_listing.nil?

response = Excon.get(
"https://packagist.org/p/#{dependency.name.downcase}.json",
idempotent: true,
**SharedHelpers.excon_defaults
)
response = Dependabot::RegistryClient.get(url: "https://packagist.org/p/#{dependency.name.downcase}.json")

return nil unless response.status == 200

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ def registry_version_details
def fetch_registry_versions_from_url(url)
cred = registry_credentials.find { |c| url.include?(c["registry"]) }

response = Excon.get(
url,
idempotent: true,
user: cred&.fetch("username", nil),
password: cred&.fetch("password", nil),
**SharedHelpers.excon_defaults
response = Dependabot::RegistryClient.get(
url: url,
options: {
user: cred&.fetch("username", nil),
password: cred&.fetch("password", nil)
}
)

parse_registry_response(response, url)
Expand Down

0 comments on commit d552b28

Please sign in to comment.