admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #14491 from MikeMcQuaid/api_non_fatal_errors

Browse Source 
api: warn rather than fail if we've got a cached version.
This commit is contained in:
Rylan Polster 2023-02-03 05:50:58 -05:00 committed by GitHub
commit 051895850c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Library/Homebrew/api.rb
View File

@ -20,14 +20,16 @@ module Homebrew
API_DOMAIN = "https://formulae.brew.sh/api" API_DOMAIN = "https://formulae.brew.sh/api"
HOMEBREW_CACHE_API = (HOMEBREW_CACHE/"api").freeze HOMEBREW_CACHE_API = (HOMEBREW_CACHE/"api").freeze
MAX_RETRIES = 3
# Set a longer timeout just for large(r) files.
JSON_API_MAX_TIME = 10
sig { params(endpoint: String).returns(Hash) } sig { params(endpoint: String).returns(Hash) }
def fetch(endpoint) def fetch(endpoint)
return cache[endpoint] if cache.present? && cache.key?(endpoint) return cache[endpoint] if cache.present? && cache.key?(endpoint)
api_url = "#{API_DOMAIN}/#{endpoint}" api_url = "#{API_DOMAIN}/#{endpoint}"
output = Utils::Curl.curl_output("--fail", api_url, max_time: 5) output = Utils::Curl.curl_output("--fail", api_url)
raise ArgumentError, "No file found at #{Tty.underline}#{api_url}#{Tty.reset}" unless output.success? raise ArgumentError, "No file found at #{Tty.underline}#{api_url}#{Tty.reset}" unless output.success?
cache[endpoint] = JSON.parse(output.stdout) cache[endpoint] = JSON.parse(output.stdout)
@ -38,18 +40,24 @@ module Homebrew
sig { params(endpoint: String, target: Pathname).returns(Hash) } sig { params(endpoint: String, target: Pathname).returns(Hash) }
def fetch_json_api_file(endpoint, target:) def fetch_json_api_file(endpoint, target:)
retry_count = 0 retry_count = 0
url = "#{API_DOMAIN}/#{endpoint}" url = "#{API_DOMAIN}/#{endpoint}"
begin
curl_args = %W[--compressed --silent #{url}] curl_args = %W[--compressed --silent #{url}]
curl_args.prepend("--time-cond", target) if target.exist? && !target.empty? curl_args.prepend("--time-cond", target) if target.exist? && !target.empty?
Utils::Curl.curl_download(*curl_args, to: target, max_time: 5)
begin
# Disable retries here, we handle them ourselves below.
Utils::Curl.curl_download(*curl_args, to: target, max_time: JSON_API_MAX_TIME, retries: 0)
JSON.parse(target.read) JSON.parse(target.read)
rescue ErrorDuringExecution
raise unless target.exist?
raise if target.empty?
opoo "#{target.basename}: update failed, falling back to cached version."
rescue JSON::ParserError rescue JSON::ParserError
target.unlink target.unlink
retry_count += 1 retry_count += 1
odie "Cannot download non-corrupt #{url}!" if retry_count > MAX_RETRIES odie "Cannot download non-corrupt #{url}!" if retry_count > Homebrew::EnvConfig.curl_retries.to_i
retry retry
end end
@ -63,7 +71,7 @@ module Homebrew
raw_url = "https://raw.githubusercontent.com/#{repo}/#{endpoint}" raw_url = "https://raw.githubusercontent.com/#{repo}/#{endpoint}"
puts "Fetching #{raw_url}..." puts "Fetching #{raw_url}..."
output = Utils::Curl.curl_output("--fail", raw_url, max_time: 5) output = Utils::Curl.curl_output("--fail", raw_url)
raise ArgumentError, "No file found at #{Tty.underline}#{raw_url}#{Tty.reset}" unless output.success? raise ArgumentError, "No file found at #{Tty.underline}#{raw_url}#{Tty.reset}" unless output.success?
cache[endpoint] = output.stdout cache[endpoint] = output.stdout

2
Library/Homebrew/test/api/cask_spec.rb
View File

@ -46,7 +46,7 @@ describe Homebrew::API::Cask do
it "fetches the source of a cask (defaulting to master when no `git_head` is passed)" do it "fetches the source of a cask (defaulting to master when no `git_head` is passed)" do
curl_output = OpenStruct.new(stdout: "foo", success?: true) curl_output = OpenStruct.new(stdout: "foo", success?: true)
expect(Utils::Curl).to receive(:curl_output) expect(Utils::Curl).to receive(:curl_output)
.with("--fail", "https://raw.githubusercontent.com/Homebrew/homebrew-cask/master/Casks/foo.rb", max_time: 5) .with("--fail", "https://raw.githubusercontent.com/Homebrew/homebrew-cask/master/Casks/foo.rb")
.and_return(curl_output) .and_return(curl_output)
described_class.fetch_source("foo", git_head: nil) described_class.fetch_source("foo", git_head: nil)
end end