aws-sdk-s3 1.152.2 → 1.152.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f58eb23517500bb537d985b462dbe4e7260a24fd31cbbe1211c60e058b325e9
-  data.tar.gz: c4511cbafb037323c68e2cd009897783f2574ce36a7521beea2cd98b14226917
+  metadata.gz: f2482fd08d0cf7ae9c7c6d788012eade6f874ea94884406a3c0dc578fda76144
+  data.tar.gz: f96e49214b5875df09f6240f95c92bb31a8043d4df965d6996bbb43b681904be
 SHA512:
-  metadata.gz: d2e085ebe17353842130b4a896d8ef99b1c847ddbd13c43c996d9469042c2f9c6c93b23cd205cf5312177de36f7d3a431c0ed902df9bf8fd3fd4ba9a06763d53
-  data.tar.gz: 53577dfee6c983413b911a1b45073f8e1e5b296bdd89f13395f9bfc1e1ddd2c8960271fef96301bf5384dc0cce2ee73e15d431b64c892c95dc0b72b9f4e0260c
+  metadata.gz: 499d5fe7d55cfe2317d258def749e9b2cfc04c1181d35989b0de4bcbc4c7ac977bf39efe572ba956408c82a7bea40dba528383f56b6c8e03fcf9d4b3287535e9
+  data.tar.gz: b969f42c202b5c8677adfee0eb94eac5d1747de817306dbd4b14736c01bf715ce181b7560b445ccc28a4752f9dc409956e257156cdbe5b27964ea6d91b246eba

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.152.3 (2024-06-13)
+------------------
+
+* Issue - Handle 200 errors for all S3 operations that do not have streaming responses.
+
 1.152.2 (2024-06-12)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.152.2
+1.152.3

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

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

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

@@ -15,22 +15,67 @@ module Aws
 
           def call(context)
             @handler.call(context).on(200) do |response|
-              if error = check_for_error(context)
-                context.http_response.status_code = 500
-                response.data = nil
-                response.error = error
+              return response if streaming_output?(context.operation.output)
+
+              error = check_for_error(context)
+              return response unless error
+
+              context.http_response.status_code = 500
+              response.data = nil
+              response.error = error
+            end
+          end
+
+          private
+
+          # Streaming outputs are not subject to 200 errors.
+          def streaming_output?(output)
+            if (payload = output[:payload_member])
+              # checking ref and shape
+              payload['streaming'] || payload.shape['streaming'] ||
+                payload.eventstream
+            else
+              false
+            end
+          end
+
+          # Checks if the output shape is a structure shape and has members that
+          # are in the body for the case of a payload and a normal structure. A
+          # non-structure shape will not have members in the body. In the case
+          # of a string or blob, the body contents would have been checked first
+          # before this method is called in incomplete_xml_body?.
+          def members_in_body?(output)
+            shape =
+              if output[:payload_member]
+                output[:payload_member].shape
+              else
+                output.shape
               end
+
+            if structure_shape?(shape)
+              shape.members.any? { |_, k| k.location.nil? }
+            else
+              false
             end
           end
 
+          def structure_shape?(shape)
+            shape.is_a?(Seahorse::Model::Shapes::StructureShape)
+          end
+
+          # Must have a member in the body and have the start of an XML Tag.
+          # Other incomplete xml bodies will result in an XML ParsingError.
+          def incomplete_xml_body?(xml, output)
+            members_in_body?(output) && !xml.match(/<\w/)
+          end
+
           def check_for_error(context)
             xml = context.http_response.body_contents
-            if xml.match(/<Error>/)
+            if xml.match(/\?>\s*<Error>/)
               error_code = xml.match(/<Code>(.+?)<\/Code>/)[1]
               error_message = xml.match(/<Message>(.+?)<\/Message>/)[1]
               S3::Errors.error_class(error_code).new(context, error_message)
-            elsif !xml.match(/<\w/) # Must have the start of an XML Tag
-              # Other incomplete xml bodies will result in XML ParsingError
+            elsif incomplete_xml_body?(xml, context.operation.output)
               Seahorse::Client::NetworkingError.new(
                 S3::Errors
                   .error_class('InternalError')
@@ -40,15 +85,7 @@ module Aws
           end
         end
 
-        handler(
-          Handler,
-          step: :sign,
-          operations: [
-            :complete_multipart_upload,
-            :copy_object,
-            :upload_part_copy,
-          ]
-        )
+        handler(Handler, step: :sign)
       end
     end
   end

data/lib/aws-sdk-s3.rb

@@ -73,6 +73,6 @@ require_relative 'aws-sdk-s3/event_streams'
 # @!group service
 module Aws::S3
 
-  GEM_VERSION = '1.152.2'
+  GEM_VERSION = '1.152.3'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.152.2
+  version: 1.152.3
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms