Fix to deprecated S3DownloadStrategy
Remove references to removed require_aws_sdk method See commit: 599ecc9b5ad7951b8ddc51490ebe93a976d43b29
This commit is contained in:
		
							parent
							
								
									4a0e97d85a
								
							
						
					
					
						commit
						2e7758b4e9
					
				@ -26,6 +26,13 @@ class S3DownloadStrategy < CurlDownloadStrategy
 | 
			
		||||
    ENV["AWS_ACCESS_KEY_ID"] = ENV["HOMEBREW_AWS_ACCESS_KEY_ID"]
 | 
			
		||||
    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
 | 
			
		||||
      signer = Aws::S3::Presigner.new
 | 
			
		||||
      s3url = signer.presigned_url :get_object, bucket: bucket, key: key
 | 
			
		||||
@ -204,12 +211,6 @@ end
 | 
			
		||||
class DownloadStrategyDetector
 | 
			
		||||
  class << self
 | 
			
		||||
    module Compat
 | 
			
		||||
      def detect(url, using = nil)
 | 
			
		||||
        strategy = super
 | 
			
		||||
        require_aws_sdk if strategy == S3DownloadStrategy
 | 
			
		||||
        strategy
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      def detect_from_url(url)
 | 
			
		||||
        case url
 | 
			
		||||
        when %r{^s3://}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user