fog-aws 0.11.0 → 3.18.0

data/lib/fog/aws/requests/storage/upload_part_copy.rb

@@ -0,0 +1,119 @@
+module Fog
+  module AWS
+    class Storage
+      # From https://docs.aws.amazon.com/AmazonS3/latest/API/API_UploadPartCopy.html
+      ALLOWED_UPLOAD_PART_OPTIONS = %i(
+        x-amz-copy-source
+        x-amz-copy-source-if-match
+        x-amz-copy-source-if-modified-since
+        x-amz-copy-source-if-none-match
+        x-amz-copy-source-if-unmodified-since
+        x-amz-copy-source-range
+        x-amz-copy-source-server-side-encryption-customer-algorithm
+        x-amz-copy-source-server-side-encryption-customer-key
+        x-amz-copy-source-server-side-encryption-customer-key-MD5
+        x-amz-expected-bucket-owner
+        x-amz-request-payer
+        x-amz-server-side-encryption-customer-algorithm
+        x-amz-server-side-encryption-customer-key
+        x-amz-server-side-encryption-customer-key-MD5
+        x-amz-source-expected-bucket-owner
+      ).freeze
+
+      class Real
+        require 'fog/aws/parsers/storage/upload_part_copy_object'
+
+        # Upload a part for a multipart copy
+        #
+        # @param target_bucket_name [String] Name of bucket to create copy in
+        # @param target_object_name [String] Name for new copy of object
+        # @param upload_id [String] Id of upload to add part to
+        # @param part_number [String] Index of part in upload
+        # @param options [Hash]:
+        # @option options [String] x-amz-metadata-directive Specifies whether to copy metadata from source or replace with data in request.  Must be in ['COPY', 'REPLACE']
+        # @option options [String] x-amz-copy_source-if-match Copies object if its etag matches this value
+        # @option options [Time] x-amz-copy_source-if-modified_since Copies object it it has been modified since this time
+        # @option options [String] x-amz-copy_source-if-none-match Copies object if its etag does not match this value
+        # @option options [Time] x-amz-copy_source-if-unmodified-since Copies object it it has not been modified since this time
+        # @option options [Time] x-amz-copy-source-range Specifes the range of bytes to copy from the source object
+        #
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * ETag [String] - etag of new object
+        #     * LastModified [Time] - date object was last modified
+        #
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_UploadPartCopy.html
+        #
+        def upload_part_copy(target_bucket_name, target_object_name, upload_id, part_number, options = {})
+          headers = options
+          request({
+            :expects    => 200,
+            :idempotent => true,
+            :headers    => headers,
+            :bucket_name => target_bucket_name,
+            :object_name => target_object_name,
+            :method     => 'PUT',
+            :query      => {'uploadId' => upload_id, 'partNumber' => part_number},
+            :parser   => Fog::Parsers::AWS::Storage::UploadPartCopyObject.new,
+          })
+        end
+      end # Real
+
+      class Mock # :nodoc:all
+        require 'fog/aws/requests/storage/shared_mock_methods'
+        include Fog::AWS::Storage::SharedMockMethods
+
+        def upload_part_copy(target_bucket_name, target_object_name, upload_id, part_number, options = {})
+          validate_options!(options)
+
+          copy_source = options['x-amz-copy-source']
+          copy_range = options['x-amz-copy-source-range']
+
+          raise 'No x-amz-copy-source header provided' unless copy_source
+          raise 'No x-amz-copy-source-range header provided' unless copy_range
+
+          source_bucket_name, source_object_name = copy_source.split('/', 2)
+          verify_mock_bucket_exists(source_bucket_name)
+
+          source_bucket = self.data[:buckets][source_bucket_name]
+          source_object = source_bucket && source_bucket[:objects][source_object_name] && source_bucket[:objects][source_object_name].first
+          upload_info = get_upload_info(target_bucket_name, upload_id)
+
+          response = Excon::Response.new
+
+          if source_object
+            start_pos, end_pos = byte_range(copy_range, source_object[:body].length)
+            upload_info[:parts][part_number] = source_object[:body][start_pos..end_pos]
+
+            response.status = 200
+            response.body = {
+              # just use the part number as the ETag, for simplicity
+              'ETag'          => part_number.to_i,
+              'LastModified'  => Time.parse(source_object['Last-Modified'])
+            }
+            response
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+        end
+
+        def byte_range(range, size)
+          matches = range.match(/bytes=(\d*)-(\d*)/)
+
+          return nil unless matches
+
+          end_pos = [matches[2].to_i, size].min
+
+          [matches[1].to_i, end_pos]
+        end
+
+        def validate_options!(options)
+          options.keys.each do |key|
+            raise "Invalid UploadPart option: #{key}" unless ::Fog::AWS::Storage::ALLOWED_UPLOAD_PART_OPTIONS.include?(key.to_sym)
+          end
+        end
+      end # Mock
+    end # Storage
+  end # AWS
+end # Fog

data/lib/fog/aws/requests/sts/assume_role.rb

@@ -39,6 +39,31 @@ module Fog
           })
         end
       end
+
+      class Mock
+        def assume_role(role_session_name, role_arn, external_id=nil, policy=nil, duration=3600)
+          account_id = /[0-9]{12}/.match(role_arn)
+          request_id = Fog::AWS::Mock.request_id
+
+          Excon::Response.new.tap do |response|
+            response.status = 200
+
+            response.body = {
+              'Arn'             => "arn:aws:sts::#{account_id}:assumed-role/#{role_session_name}/#{role_session_name}",
+              'AssumedRoleId'   => "#{Fog::Mock.random_base64(21)}:#{role_session_name}",
+              'AccessKeyId'     => Fog::Mock.random_base64(20),
+              'SecretAccessKey' => Fog::Mock.random_base64(40),
+              'SessionToken'    => Fog::Mock.random_base64(580),
+              'Expiration'      => (Time.now + duration).utc.iso8601,
+              'RequestId'       => request_id,
+            }
+
+            response.headers = {
+              'x-amzn-RequestId' => request_id,
+            }
+          end
+        end
+      end
     end
   end
 end

data/lib/fog/aws/requests/sts/assume_role_with_web_identity.rb

@@ -6,12 +6,13 @@ module Fog
 
         def assume_role_with_web_identity(role_arn, web_identity_token, role_session_name, options={})
           request_unsigned(
-            'Action'          => 'AssumeRoleWithWebIdentity',
-            'RoleArn'         => role_arn,
-            'RoleSessionName' => role_session_name,
-            'DurationSeconds' => options[:duration] || 3600,
-            :idempotent       => true,
-            :parser           => Fog::Parsers::AWS::STS::AssumeRoleWithWebIdentity.new
+            'Action'            => 'AssumeRoleWithWebIdentity',
+            'RoleArn'           => role_arn,
+            'RoleSessionName'   => role_session_name,
+            'WebIdentityToken'  => web_identity_token,
+            'DurationSeconds'   => options[:duration] || 3600,
+            :idempotent         => true,
+            :parser             => Fog::Parsers::AWS::STS::AssumeRoleWithWebIdentity.new
           )
         end
       end

data/lib/fog/aws/requests/support/describe_trusted_advisor_check_result.rb

@@ -0,0 +1,31 @@
+module Fog
+  module AWS
+    class Support
+      class Real
+        # Describe Trusted Advisor Check Result
+        # http://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeTrustedAdvisorCheckResult.html
+        # ==== Parameters
+        # * checkId <~String>  - Id of the check obtained from #describe_trusted_advisor_checks
+        # * language <~String> - Language to return.  Supported values are 'en' and 'jp'
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        def describe_trusted_advisor_check_result(options={})
+          request(
+            'Action'   => 'DescribeTrustedAdvisorCheckResult',
+            'checkId'  => options[:id],
+            'language' => options[:language] || 'en'
+          )
+        end
+      end
+
+      class Mock
+        def describe_trusted_advisor_check_result(options={})
+          response = Excon::Response.new
+          response.body = {'result' => self.data[:trusted_advisor_check_results][options[:id]]}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/support/describe_trusted_advisor_checks.rb

@@ -0,0 +1,29 @@
+module Fog
+  module AWS
+    class Support
+      class Real
+        # Describe Trusted Advisor Checks
+        # http://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeTrustedAdvisorChecks.html
+        # ==== Parameters
+        # * language <~String> - Language to return.  Supported values are 'en' and 'jp'
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        def describe_trusted_advisor_checks(options={})
+          request(
+            'Action'   => 'DescribeTrustedAdvisorChecks',
+            'language' => options[:language] || 'en'
+          )
+        end
+      end
+
+      class Mock
+        def describe_trusted_advisor_checks(options={})
+          response = Excon::Response.new
+          response.body = {'checks' => self.data[:trusted_advisor_checks].values}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/service_mapper.rb

@@ -0,0 +1,129 @@
+module Fog
+  module AWS
+    # @api private
+    #
+    # This is a temporary lookup helper for extracting into external module.
+    #
+    # Cleaner provider/service registration will replace this code.
+    #
+    class ServiceMapper
+      def self.class_for(key)
+        case key
+          when :auto_scaling
+            Fog::AWS::AutoScaling
+          when :beanstalk
+            Fog::AWS::ElasticBeanstalk
+          when :cdn
+            Fog::AWS::CDN
+          when :cloud_formation
+            Fog::AWS::CloudFormation
+          when :cloud_watch
+            Fog::AWS::CloudWatch
+          when :compute
+            Fog::AWS::Compute
+          when :data_pipeline
+            Fog::AWS::DataPipeline
+          when :ddb, :dynamodb
+            Fog::AWS::DynamoDB
+          when :dns
+            Fog::AWS::DNS
+          when :elasticache
+            Fog::AWS::Elasticache
+          when :elb
+            Fog::AWS::ELB
+          when :emr
+            Fog::AWS::EMR
+          when :glacier
+            Fog::AWS::Glacier
+          when :iam
+            Fog::AWS::IAM
+          when :redshift
+            Fog::AWS::Redshift
+          when :sdb, :simpledb
+            Fog::AWS::SimpleDB
+          when :ses
+            Fog::AWS::SES
+          when :sqs
+            Fog::AWS::SQS
+          when :eu_storage, :storage
+            Fog::AWS::Storage
+          when :rds
+            Fog::AWS::RDS
+          when :sns
+            Fog::AWS::SNS
+          when :sts
+            Fog::AWS::STS
+          else
+            # @todo Replace most instances of ArgumentError with NotImplementedError
+            # @todo For a list of widely supported Exceptions, see:
+            # => http://www.zenspider.com/Languages/Ruby/QuickRef.html#35
+            raise ArgumentError, "Unsupported #{self} service: #{key}"
+        end
+      end
+
+      def self.[](service)
+        @@connections ||= Hash.new do |hash, key|
+          hash[key] = case key
+                        when :auto_scaling
+                          Fog::AWS::AutoScaling.new
+                        when :beanstalk
+                          Fog::AWS::ElasticBeanstalk.new
+                        when :cdn
+                          Fog::Logger.warning("AWS[:cdn] is not recommended, use CDN[:aws] for portability")
+                          Fog::CDN.new(:provider => 'AWS')
+                        when :cloud_formation
+                          Fog::AWS::CloudFormation.new
+                        when :cloud_watch
+                          Fog::AWS::CloudWatch.new
+                        when :compute
+                          Fog::Logger.warning("AWS[:compute] is not recommended, use Compute[:aws] for portability")
+                          Fog::Compute.new(:provider => 'AWS')
+                        when :data_pipeline
+                          Fog::AWS::DataPipeline.new
+                        when :ddb, :dynamodb
+                          Fog::AWS::DynamoDB.new
+                        when :dns
+                          Fog::Logger.warning("AWS[:dns] is not recommended, use DNS[:aws] for portability")
+                          Fog::DNS.new(:provider => 'AWS')
+                        when :elasticache
+                          Fog::AWS::Elasticache.new
+                        when :elb
+                          Fog::AWS::ELB.new
+                        when :emr
+                          Fog::AWS::EMR.new
+                        when :glacier
+                          Fog::AWS::Glacier.new
+                        when :iam
+                          Fog::AWS::IAM.new
+                        when :redshift
+                          Fog::AWS::Redshift.new
+                        when :rds
+                          Fog::AWS::RDS.new
+                        when :eu_storage
+                          Fog::Storage.new(:provider => 'AWS', :region => 'eu-west-1')
+                        when :sdb, :simpledb
+                          Fog::AWS::SimpleDB.new
+                        when :ses
+                          Fog::AWS::SES.new
+                        when :sqs
+                          Fog::AWS::SQS.new
+                        when :storage
+                          Fog::Logger.warning("AWS[:storage] is not recommended, use Storage[:aws] for portability")
+                          Fog::Storage.new(:provider => 'AWS')
+                        when :sns
+                          Fog::AWS::SNS.new
+                        when :sts
+                          Fog::AWS::STS.new
+                        else
+                          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+                      end
+        end
+        @@connections[service]
+      end
+
+      def self.services
+        Fog::AWS.services
+      end
+    end
+  end
+end

data/lib/fog/aws/sqs.rb

@@ -128,7 +128,7 @@ module Fog
               :host               => @host,
               :path               => path || @path,
               :port               => @port,
-              :version            => '2009-02-01'
+              :version            => '2012-11-05'
             }
           )
 

data/lib/fog/aws/storage.rb

@@ -1,11 +1,12 @@
 module Fog
-  module Storage
-    class AWS < Fog::Service
+  module AWS
+    class Storage < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
 
       DEFAULT_REGION = 'us-east-1'
+      ACCELERATION_HOST = 's3-accelerate.amazonaws.com'
 
       DEFAULT_SCHEME = 'https'
       DEFAULT_SCHEME_PORT = {
@@ -13,6 +14,9 @@ module Fog
         'https' => 443
       }
 
+      MIN_MULTIPART_CHUNK_SIZE = 5242880
+      MAX_SINGLE_PUT_SIZE = 5368709120
+
       VALID_QUERY_KEYS = %w[
         acl
         cors
@@ -42,7 +46,7 @@ module Fog
       ]
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style, :instrumentor, :instrumentor_name, :aws_signature_version
+      recognizes :endpoint, :region, :host, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style, :acceleration, :instrumentor, :instrumentor_name, :aws_signature_version, :enable_signature_v4_streaming, :virtual_host, :cname, :max_put_chunk_size, :max_copy_chunk_size, :aws_credentials_refresh_threshold_seconds, :disable_content_md5_validation
 
       secrets    :aws_secret_access_key, :hmac
 
@@ -62,6 +66,7 @@ module Fog
       request :delete_bucket_policy
       request :delete_bucket_website
       request :delete_object
+      request :delete_object_url
       request :delete_multiple_objects
       request :delete_bucket_tagging
       request :get_bucket
@@ -82,6 +87,7 @@ module Fog
       request :get_object_http_url
       request :get_object_https_url
       request :get_object_url
+      request :get_object_tagging
       request :get_request_payment
       request :get_service
       request :head_bucket
@@ -105,12 +111,26 @@ module Fog
       request :put_object
       request :put_object_acl
       request :put_object_url
+      request :put_object_tagging
       request :put_request_payment
       request :sync_clock
       request :upload_part
+      request :upload_part_copy
 
       module Utils
         attr_accessor :region
+        attr_accessor :disable_content_md5_validation
+
+        # Amazon S3 limits max chunk size that can be uploaded/copied in a single request to 5GB.
+        # Other S3-compatible storages (like, Ceph) do not have such limit.
+        # Ceph shows much better performance when file is copied as a whole, in a single request.
+        # fog-aws user can use these settings to configure chunk sizes.
+        # A non-positive value will tell fog-aws to use a single put/copy request regardless of file size.
+        #
+        # @return [Integer]
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/userguide/copy-object.html
+        attr_reader :max_put_chunk_size
+        attr_reader :max_copy_chunk_size
 
         def cdn
           @cdn ||= Fog::AWS::CDN.new(
@@ -129,7 +149,7 @@ module Fog
         end
 
         def url(params, expires)
-          Fog::Logger.deprecation("Fog::Storage::AWS => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::AWS::Storage => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
           https_url(params, expires)
         end
 
@@ -166,6 +186,12 @@ module Fog
           params_to_url(params)
         end
 
+        # @param value [int]
+        # @param description [str]
+        def validate_chunk_size(value, description)
+          raise "#{description} (#{value}) is less than minimum #{MIN_MULTIPART_CHUNK_SIZE}" unless value <= 0 || value >= MIN_MULTIPART_CHUNK_SIZE
+        end
+
         private
 
         def validate_signature_version!
@@ -174,6 +200,16 @@ module Fog
           end
         end
 
+        def init_max_put_chunk_size!(options = {})
+          @max_put_chunk_size = options.fetch(:max_put_chunk_size, MAX_SINGLE_PUT_SIZE)
+          validate_chunk_size(@max_put_chunk_size, 'max_put_chunk_size')
+        end
+
+        def init_max_copy_chunk_size!(options = {})
+          @max_copy_chunk_size = options.fetch(:max_copy_chunk_size, MAX_SINGLE_PUT_SIZE)
+          validate_chunk_size(@max_copy_chunk_size, 'max_copy_chunk_size')
+        end
+
         def v4_signed_params_for_url(params, expires)
           now = Fog::Time.now
 
@@ -190,6 +226,7 @@ module Fog
 
           params = request_params(params)
           params[:headers][:host] = params[:host]
+          params[:headers][:host] += ":#{params[:port]}" if params.fetch(:port, nil)
 
           signature_query_params = @signer.signature_parameters(params, now, "UNSIGNED-PAYLOAD")
           params[:query] = (params[:query] || {}).merge(signature_query_params)
@@ -219,10 +256,10 @@ module Fog
           case region.to_s
           when DEFAULT_REGION, ''
             's3.amazonaws.com'
-          when 'cn-north-1'
-            's3.cn-north-1.amazonaws.com.cn'
+          when %r{\Acn-.*}
+            "s3.#{region}.amazonaws.com.cn"
           else
-            "s3-#{region}.amazonaws.com"
+            "s3.#{region}.amazonaws.com"
           end
         end
 
@@ -278,16 +315,22 @@ module Fog
               path_style = params.fetch(:path_style, @path_style)
               if !path_style
                 if COMPLIANT_BUCKET_NAMES !~ bucket_name
-                  Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
+                  Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance.  For details see: https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html")
                   path_style = true
                 elsif scheme == 'https' && !path_style && bucket_name =~ /\./
-                  Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) contains a '.' so is not accessible over https as a virtual hosted bucket, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
+                  Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) contains a '.' so is not accessible over https as a virtual hosted bucket, which will negatively impact performance.  For details see: https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html")
                   path_style = true
                 end
               end
 
-              if path_style
+              # uses the bucket name as host if `virtual_host: true`, you can also
+              # manually specify the cname if required.
+              if params[:virtual_host]
+                host = params.fetch(:cname, bucket_name)
+              elsif path_style
                 path = bucket_to_path bucket_name, path
+              elsif host.start_with?("#{bucket_name}.")
+                # no-op
               else
                 host = [bucket_name, host].join('.')
               end
@@ -314,7 +357,8 @@ module Fog
         def params_to_url(params)
           query = params[:query] && params[:query].map do |key, value|
             if value
-              [key, escape(value.to_s)].join('=')
+              # URL parameters need / to be escaped
+              [key, Fog::AWS.escape(value.to_s)].join('=')
             else
               key
             end
@@ -439,6 +483,12 @@ module Fog
 
 
           @path_style = options[:path_style] || false
+
+          init_max_put_chunk_size!(options)
+          init_max_copy_chunk_size!(options)
+
+          @disable_content_md5_validation = options[:disable_content_md5_validation] || false
+
           @signature_version = options.fetch(:aws_signature_version, 4)
           validate_signature_version!
           setup_credentials(options)
@@ -453,6 +503,8 @@ module Fog
         end
 
         def setup_credentials(options)
+          @aws_credentials_refresh_threshold_seconds = options[:aws_credentials_refresh_threshold_seconds]
+
           @aws_access_key_id = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
           @aws_session_token     = options[:aws_session_token]
@@ -496,10 +548,17 @@ module Fog
           @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.storage'
           @connection_options     = options[:connection_options] || {}
           @persistent = options.fetch(:persistent, false)
+          @acceleration = options.fetch(:acceleration, false)
           @signature_version = options.fetch(:aws_signature_version, 4)
+          @enable_signature_v4_streaming = options.fetch(:enable_signature_v4_streaming, true)
           validate_signature_version!
           @path_style = options[:path_style]  || false
 
+          init_max_put_chunk_size!(options)
+          init_max_copy_chunk_size!(options)
+
+          @disable_content_md5_validation = options[:disable_content_md5_validation] || false
+
           @region = options[:region] || DEFAULT_REGION
 
           if @endpoint = options[:endpoint]
@@ -513,6 +572,7 @@ module Fog
             @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
           end
 
+          @host = ACCELERATION_HOST if @acceleration
           setup_credentials(options)
         end
 
@@ -524,6 +584,8 @@ module Fog
 
 
         def setup_credentials(options)
+          @aws_credentials_refresh_threshold_seconds = options[:aws_credentials_refresh_threshold_seconds]
+
           @aws_access_key_id     = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
           @aws_session_token     = options[:aws_session_token]
@@ -577,20 +639,24 @@ module Fog
           if @signature_version == 4
             params[:headers]['x-amz-date'] = date.to_iso8601_basic
             if params[:body].respond_to?(:read)
-              # See http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html
-              # We ignore the bit about setting the content-encoding to aws-chunked because
-              # this can cause s3 to serve files with a blank content encoding which causes problems with some CDNs
-              # AWS have confirmed that s3 can infer that the content-encoding is aws-chunked from the x-amz-content-sha256 header
-              #
-              params[:headers]['x-amz-content-sha256'] = 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD'
-              params[:headers]['x-amz-decoded-content-length'] = params[:headers].delete 'Content-Length'
+              if @enable_signature_v4_streaming
+                # See http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html
+                # We ignore the bit about setting the content-encoding to aws-chunked because
+                # this can cause s3 to serve files with a blank content encoding which causes problems with some CDNs
+                # AWS have confirmed that s3 can infer that the content-encoding is aws-chunked from the x-amz-content-sha256 header
+                #
+                params[:headers]['x-amz-content-sha256'] = 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD'
+                params[:headers]['x-amz-decoded-content-length'] = params[:headers].delete 'Content-Length'
+              else
+                params[:headers]['x-amz-content-sha256'] = 'UNSIGNED-PAYLOAD'
+              end
             else
               params[:headers]['x-amz-content-sha256'] ||= OpenSSL::Digest::SHA256.hexdigest(params[:body] || '')
             end
             signature_components = @signer.signature_components(params, date, params[:headers]['x-amz-content-sha256'])
             params[:headers]['Authorization'] = @signer.components_to_header(signature_components)
 
-            if params[:body].respond_to?(:read)
+            if params[:body].respond_to?(:read) && @enable_signature_v4_streaming
               body = params.delete :body
               params[:request_block] = S3Streamer.new(body, signature_components['X-Amz-Signature'], @signer, date)
             end
@@ -761,4 +827,17 @@ DATA
       end
     end
   end
+
+  # @deprecated
+  module Storage
+    # @deprecated
+    class AWS < Fog::AWS::Storage
+      # @deprecated
+      # @overrides Fog::Service.new (from the fog-core gem)
+      def self.new(*)
+        Fog::Logger.deprecation 'Fog::Storage::AWS is deprecated, please use Fog::AWS::Storage.'
+        super
+      end
+    end
+  end
 end