aws-sdk-s3 1.113.0 → 1.113.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd3cdd3ce413a190558c3c4fb19b0c360e6fdc8429315addf9a99f8a4200e84f
-  data.tar.gz: 8ea6b6b1a93212b99871945b5deeaa90813f4aef35d55ae2c351194be17f2909
+  metadata.gz: 5274b91e581e514386584d3ea2284363db3bcc1d1d6cbdd3ea992484a26ba3e3
+  data.tar.gz: 6659086890fbfcb9223311361dbb67f3a55738f2a01ce4845bb05210dd06f59a
 SHA512:
-  metadata.gz: 4c83d52e47d9990c34a6ffa1b0ab647e333353dc516a4105a01df1fa2d93fe5d8a7e45c48072e27d95cd4e7581adcc606fabe3afb5cfd9e41047da330910ad37
-  data.tar.gz: a399eff773756874118891127b2ac26592b1c780559b3900ef0f4982e6ef3286b759331507a79778725e5cb61f7f140d94d08e77bd4ba51b05eb3e23b1f7a621
+  metadata.gz: 2e25bc0dd1c8249a1c5982cb36f1e06b8b8dc8c3c04e277cd2b9eff8bb3ed2fc4cfd2617ecdd8ea206881e066a02a0bccfc525258a5dc9b2b15a42ad1568a31b
+  data.tar.gz: 9fb04f15c827cdcad16645bde85de0e2b9bdca01483acebc13d6ca8b163eeb21038882468a275b96e293f4c7be42ff481b9275c681d492925cc6e3469a05de02

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Unreleased Changes
 ------------------
 
+1.113.2 (2022-04-26)
+------------------
+
+* Issue - Fix an issue where `ExpiredToken` errors were retried as if the request was from another region.
+
+1.113.1 (2022-04-25)
+------------------
+
+* Issue - Rewind the underlying file on a streaming retry that is not a truncated body (#2692).
+
 1.113.0 (2022-02-24)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.113.0
+1.113.2

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

@@ -15332,7 +15332,7 @@ module Aws::S3
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-s3'
-      context[:gem_version] = '1.113.0'
+      context[:gem_version] = '1.113.2'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -138,7 +138,8 @@ module Aws
           def handle_region_errors(response)
             if wrong_sigv4_region?(response) &&
                !fips_region?(response) &&
-               !custom_endpoint?(response)
+               !custom_endpoint?(response) &&
+               !expired_credentials?(response)
               get_region_and_retry(response.context)
             else
               response
@@ -162,6 +163,10 @@ module Aws
             resp.context.http_request.endpoint.host.include?('fips')
           end
 
+          def expired_credentials?(resp)
+            resp.context.http_response.body_contents.match(/<Code>ExpiredToken<\/Code>/)
+          end
+
           def custom_endpoint?(resp)
             resolved_suffix = Aws::Partitions::EndpointProvider.dns_suffix_for(
               resp.context.config.region,

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

@@ -36,6 +36,17 @@ module Aws
         def rewind; end
       end
 
+      class NonRetryableStreamingError < StandardError
+
+        def initialize(error)
+          super('Unable to retry request - retry could result in processing duplicated chunks.')
+          set_backtrace(error.backtrace)
+          @original_error = error
+        end
+
+        attr_reader :original_error
+      end
+
       # This handler works with the ResponseTarget plugin to provide smart
       # retries of S3 streaming operations that support the range parameter
       # (currently only: get_object).  When a 200 OK with a TruncatedBodyError
@@ -84,8 +95,18 @@ module Aws
             end
 
             context.http_response.on_error do |error|
-              if retryable_body?(context) && truncated_body?(error)
-                context.http_request.headers[:range] = "bytes=#{context.http_response.body.size}-"
+              if retryable_body?(context)
+                if truncated_body?(error)
+                  context.http_request.headers[:range] = "bytes=#{context.http_response.body.size}-"
+                else
+                  case context.http_response.body
+                  when RetryableManagedFile
+                    # call rewind on the underlying file
+                    context.http_response.body.instance_variable_get(:@file).rewind
+                  else
+                    raise NonRetryableStreamingError, error
+                  end
+                end
               end
             end
           end

data/lib/aws-sdk-s3.rb

@@ -69,6 +69,6 @@ require_relative 'aws-sdk-s3/event_streams'
 # @!group service
 module Aws::S3
 
-  GEM_VERSION = '1.113.0'
+  GEM_VERSION = '1.113.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.113.0
+  version: 1.113.2
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms