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

bintray: stricter checking of upload results

Browse Source 
Parse the JSON output of the upload and publish steps to ensure that
a "success" message is always seen on upload, and that the number of
files published is the same as the number of files we wanted to publish
as based on the bottle JSON description.
This commit is contained in:
Jonathan Chang 2020-06-10 17:50:10 +10:00
parent 3a7213c255
commit b57297d253
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Library/Homebrew/bintray.rb
View File

@ -34,7 +34,6 @@ class Bintray
def open_api(url, *extra_curl_args, auth: true) def open_api(url, *extra_curl_args, auth: true)
args = extra_curl_args args = extra_curl_args
args += ["--user", "#{@bintray_user}:#{@bintray_key}"] if auth args += ["--user", "#{@bintray_user}:#{@bintray_key}"] if auth
args += ["--output", "/dev/null"] unless Homebrew.args.verbose?
curl(*args, url, curl(*args, url,
show_output: Homebrew.args.verbose?, show_output: Homebrew.args.verbose?,
secrets: @bintray_key) secrets: @bintray_key)
@ -44,12 +43,23 @@ class Bintray
url = "#{API_URL}/content/#{@bintray_org}/#{repo}/#{package}/#{version}/#{remote_file}" url = "#{API_URL}/content/#{@bintray_org}/#{repo}/#{package}/#{version}/#{remote_file}"
args = ["--upload-file", local_file] args = ["--upload-file", local_file]
args += ["--header", "X-Checksum-Sha2: #{sha256}"] unless sha256.blank? args += ["--header", "X-Checksum-Sha2: #{sha256}"] unless sha256.blank?
open_api url, *args result = open_api url, *args
json = JSON.parse(result.stdout)
raise "Bottle upload failed: #{json["message"]}" unless json["message"] == "success"
result
end end
def publish(repo:, package:, version:) def publish(repo:, package:, version:, file_count:)
url = "#{API_URL}/content/#{@bintray_org}/#{repo}/#{package}/#{version}/publish" url = "#{API_URL}/content/#{@bintray_org}/#{repo}/#{package}/#{version}/publish"
open_api url, "--request", "POST" result = open_api url, "--request", "POST"
json = JSON.parse(result.stdout)
if !file_count.blank? && json["files"] != file_count
raise "Bottle publish failed: expected #{file_count} bottles, but published #{json["files"]} instead."
end
odebug "Published #{json["files"]} bottles"
result
end end
def official_org?(org: @bintray_org) def official_org?(org: @bintray_org)
@ -67,7 +77,7 @@ class Bintray
def package_exists?(repo:, package:) def package_exists?(repo:, package:)
url = "#{API_URL}/packages/#{@bintray_org}/#{repo}/#{package}" url = "#{API_URL}/packages/#{@bintray_org}/#{repo}/#{package}"
begin begin
open_api url, "--fail", "--silent", auth: false open_api url, "--fail", "--silent", "--output", "/dev/null", auth: false
rescue ErrorDuringExecution => e rescue ErrorDuringExecution => e
stderr = e.output stderr = e.output
.select { |type,| type == :stderr } .select { |type,| type == :stderr }
@ -140,10 +150,11 @@ class Bintray
remote_file: filename, remote_file: filename,
sha256: sha256) sha256: sha256)
end end
if publish_package next unless publish_package
odebug "Publishing #{@bintray_org}/#{bintray_repo}/#{bintray_package}/#{version}"
publish repo: bintray_repo, package: bintray_package, version: version bottle_count = bottle_hash["bottle"]["tags"].length
end odebug "Publishing #{@bintray_org}/#{bintray_repo}/#{bintray_package}/#{version}"
publish repo: bintray_repo, package: bintray_package, version: version, file_count: bottle_count
end end
end end
end end