aws-sdk-s3 1.184.0 → 1.188.0

data/lib/aws-sdk-s3/file_downloader.rb

@@ -43,7 +43,7 @@ module Aws
           when 'get_range'
             if @chunk_size
               resp = @client.head_object(@params)
-              multithreaded_get_by_ranges(resp.content_length)
+              multithreaded_get_by_ranges(resp.content_length, resp.etag)
             else
               msg = 'In :get_range mode, :chunk_size must be provided'
               raise ArgumentError, msg
@@ -71,7 +71,7 @@ module Aws
           if resp.content_length <= MIN_CHUNK_SIZE
             single_request
           else
-            multithreaded_get_by_ranges(resp.content_length)
+            multithreaded_get_by_ranges(resp.content_length, resp.etag)
           end
         else
           # partNumber is an option
@@ -79,18 +79,18 @@ module Aws
           if resp.content_length <= MIN_CHUNK_SIZE
             single_request
           else
-            compute_mode(resp.content_length, count)
+            compute_mode(resp.content_length, count, resp.etag)
           end
         end
       end
 
-      def compute_mode(file_size, count)
+      def compute_mode(file_size, count, etag)
         chunk_size = compute_chunk(file_size)
         part_size = (file_size.to_f / count.to_f).ceil
         if chunk_size < part_size
-          multithreaded_get_by_ranges(file_size)
+          multithreaded_get_by_ranges(file_size, etag)
         else
-          multithreaded_get_by_parts(count, file_size)
+          multithreaded_get_by_parts(count, file_size, etag)
         end
       end
 
@@ -122,7 +122,7 @@ module Aws
         chunks.each_slice(@thread_count).to_a
       end
 
-      def multithreaded_get_by_ranges(file_size)
+      def multithreaded_get_by_ranges(file_size, etag)
         offset = 0
         default_chunk_size = compute_chunk(file_size)
         chunks = []
@@ -134,7 +134,7 @@ module Aws
           chunks << Part.new(
             part_number: part_number,
             size: (progress-offset),
-            params: @params.merge(range: range)
+            params: @params.merge(range: range, if_match: etag)
           )
           part_number += 1
           offset = progress
@@ -142,9 +142,9 @@ module Aws
         download_in_threads(PartList.new(chunks), file_size)
       end
 
-      def multithreaded_get_by_parts(n_parts, total_size)
+      def multithreaded_get_by_parts(n_parts, total_size, etag)
         parts = (1..n_parts).map do |part|
-          Part.new(part_number: part, params: @params.merge(part_number: part))
+          Part.new(part_number: part, params: @params.merge(part_number: part, if_match: etag))
         end
         download_in_threads(PartList.new(parts), total_size)
       end

data/lib/aws-sdk-s3/object.rb

@@ -397,11 +397,17 @@ module Aws::S3
     end
 
     # If present, indicates that the requester was successfully charged for
-    # the request.
+    # the request. For more information, see [Using Requester Pays buckets
+    # for storage transfers and usage][1] in the *Amazon Simple Storage
+    # Service user guide*.
     #
     # <note markdown="1"> This functionality is not supported for directory buckets.
     #
     #  </note>
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/RequesterPaysBuckets.html
     # @return [String]
     def request_charged
       data[:request_charged]

data/lib/aws-sdk-s3/object_acl.rb

@@ -55,11 +55,17 @@ module Aws::S3
     end
 
     # If present, indicates that the requester was successfully charged for
-    # the request.
+    # the request. For more information, see [Using Requester Pays buckets
+    # for storage transfers and usage][1] in the *Amazon Simple Storage
+    # Service user guide*.
     #
     # <note markdown="1"> This functionality is not supported for directory buckets.
     #
     #  </note>
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/RequesterPaysBuckets.html
     # @return [String]
     def request_charged
       data[:request_charged]

data/lib/aws-sdk-s3/plugins/streaming_retry.rb

@@ -62,18 +62,16 @@ module Aws
         class Handler < Seahorse::Client::Handler
 
           def call(context)
-            target = context.params[:response_target] || context[:response_target]
-
             # retry is only supported when range is NOT set on the initial request
-            if supported_target?(target) && !context.params[:range]
-              add_event_listeners(context, target)
+            if supported_target?(context) && !context.params[:range]
+              add_event_listeners(context)
             end
             @handler.call(context)
           end
 
           private
 
-          def add_event_listeners(context, target)
+          def add_event_listeners(context)
             context.http_response.on_headers(200..299) do
               case context.http_response.body
               when Seahorse::Client::BlockIO then
@@ -123,8 +121,8 @@ module Aws
               context.http_response.body.is_a?(RetryableManagedFile)
           end
 
-          def supported_target?(target)
-            case target
+          def supported_target?(context)
+            case context[:response_target]
             when Proc, String, Pathname then true
             else false
             end