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

Merge pull request #5137 from amancevice/fix-deprecated-s3-download-strategy

Browse Source 
Fix to deprecated S3DownloadStrategy
This commit is contained in:
Mike McQuaid 2018-10-20 12:41:55 +01:00 committed by GitHub
commit 556b339c4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/compat/download_strategy.rb
View File

@ -26,6 +26,13 @@ class S3DownloadStrategy < CurlDownloadStrategy
ENV["AWS_ACCESS_KEY_ID"] = ENV["HOMEBREW_AWS_ACCESS_KEY_ID"] ENV["AWS_ACCESS_KEY_ID"] = ENV["HOMEBREW_AWS_ACCESS_KEY_ID"]
ENV["AWS_SECRET_ACCESS_KEY"] = ENV["HOMEBREW_AWS_SECRET_ACCESS_KEY"] ENV["AWS_SECRET_ACCESS_KEY"] = ENV["HOMEBREW_AWS_SECRET_ACCESS_KEY"]
begin
require "aws-sdk-s3"
rescue LoadError
Homebrew.install_gem! "aws-sdk-s3", "~> 1.8"
require "aws-sdk-s3"
end
begin begin
signer = Aws::S3::Presigner.new signer = Aws::S3::Presigner.new
s3url = signer.presigned_url :get_object, bucket: bucket, key: key s3url = signer.presigned_url :get_object, bucket: bucket, key: key
@ -204,12 +211,6 @@ end
class DownloadStrategyDetector class DownloadStrategyDetector
class << self class << self
module Compat module Compat
def detect(url, using = nil)
strategy = super
require_aws_sdk if strategy == S3DownloadStrategy
strategy
end
def detect_from_url(url) def detect_from_url(url)
case url case url
when %r{^s3://} when %r{^s3://}