aws-sdk-s3 1.147.0 → 1.152.3

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/plugins/s3_signer.rb

@@ -4,6 +4,11 @@ require 'aws-sigv4'
 
 module Aws
   module S3
+    # @api private
+    def self.bucket_region_cache
+      @bucket_region_cache ||= BucketRegionCache.new
+    end
+
     module Plugins
       # This plugin used to have a V4 signer but it was removed in favor of
       # generic Sign plugin that uses endpoint auth scheme.
@@ -51,7 +56,7 @@ module Aws
           private
 
           def check_for_cached_region(context, bucket)
-            cached_region = S3::BUCKET_REGIONS[bucket]
+            cached_region = Aws::S3.bucket_region_cache[bucket]
             if cached_region &&
                cached_region != context.config.region &&
                !S3Signer.custom_endpoint?(context)
@@ -97,7 +102,7 @@ module Aws
           end
 
           def update_bucket_cache(context, actual_region)
-            S3::BUCKET_REGIONS[context.params[:bucket]] = actual_region
+            Aws::S3.bucket_region_cache[context.params[:bucket]] = actual_region
           end
 
           def fips_region?(resp)

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

@@ -200,6 +200,7 @@ module Aws
         req.handlers.remove(Aws::Plugins::Sign::Handler)
         req.handlers.remove(Seahorse::Client::Plugins::ContentLength::Handler)
         req.handlers.remove(Aws::Rest::ContentTypeHandler)
+        req.handlers.remove(Aws::Plugins::InvocationId::Handler)
 
         req.handle(step: :send) do |context|
           # if an endpoint was not provided, force secure or insecure

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

@@ -166,7 +166,7 @@ module Aws::S3
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html
     # @return [Bucket]
     def create_bucket(options = {})
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_bucket(options)
       end
       Bucket.new(
@@ -194,7 +194,7 @@ module Aws::S3
     def buckets(options = {})
       batches = Enumerator.new do |y|
         batch = []
-        resp = Aws::Plugins::UserAgent.feature('resource') do
+        resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
           @client.list_buckets(options)
         end
         resp.data.buckets.each do |b|

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.147.0'
+  GEM_VERSION = '1.152.3'
 
 end

data/sig/client.rbs

@@ -14,6 +14,8 @@ module Aws
       def self.new: (
                       ?credentials: untyped,
                       ?region: String,
+                      ?access_grants: bool,
+                      ?access_grants_credentials_provider: untyped,
                       ?access_key_id: String,
                       ?active_endpoint_cache: bool,
                       ?adaptive_retry_wait_to_fill: bool,

data/sig/customizations/bucket.rbs

@@ -0,0 +1,19 @@
+module Aws
+  module S3
+    class Bucket
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Bucket.html#clear!-instance_method
+      def clear!: () -> void
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Bucket.html#delete!-instance_method
+      def delete!: (?max_attempts: ::Integer, ?initial_wait: ::Float) -> void
+                 | (?Hash[Symbol, untyped]) -> void
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Bucket.html#url-instance_method
+      def url: (?virtual_host: boolish, ?secure: boolish) -> String
+             | (?Hash[Symbol, untyped]) -> String
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Bucket.html#presigned_post-instance_method
+      def presigned_post: (Hash[Symbol, untyped]) -> untyped
+    end
+  end
+end

data/sig/customizations/object.rbs

@@ -0,0 +1,38 @@
+module Aws
+  module S3
+    class Object
+      alias size content_length
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#copy_from-instance_method
+      def copy_from: (untyped source, ?Hash[Symbol, untyped] options) -> void
+                   | ...
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#copy_to-instance_method
+      def copy_to: (untyped target, ?Hash[Symbol, untyped] options) -> void
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#move_to-instance_method
+      def move_to: (untyped target, ?Hash[Symbol, untyped] options) -> void
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#presigned_post-instance_method
+      def presigned_post: (?Hash[Symbol, untyped]) -> untyped
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#presigned_url-instance_method
+      def presigned_url: (Symbol | String method, ?Hash[Symbol, untyped] params) -> String
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#presigned_request-instance_method
+      def presigned_request: (Symbol | String method, ?Hash[Symbol, untyped] params) -> [String, Hash[String, String]]
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#public_url-instance_method
+      def public_url: (?Hash[Symbol, untyped] options) -> String
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#upload_stream-instance_method
+      def upload_stream: (?Hash[Symbol, untyped] options) { (IO write_stream) -> void } -> bool
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#upload_file-instance_method
+      def upload_file: (untyped source, ?Hash[Symbol, untyped] options) ?{ (untyped response) -> void } -> bool
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#download_file-instance_method
+      def download_file: (String destination, ?Hash[Symbol, untyped] options) -> bool
+    end
+  end
+end

data/sig/customizations/object_summary.rbs

@@ -0,0 +1,35 @@
+module Aws
+  module S3
+    class ObjectSummary
+      alias content_length size
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/ObjectSummary.html#copy_from-instance_method
+      def copy_from: (untyped source, ?Hash[Symbol, untyped] options) -> void
+                   | ...
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/ObjectSummary.html#copy_to-instance_method
+      def copy_to: (untyped target, ?Hash[Symbol, untyped] options) -> void
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/ObjectSummary.html#move_to-instance_method
+      def move_to: (untyped target, ?Hash[Symbol, untyped] options) -> void
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/ObjectSummary.html#presigned_post-instance_method
+      def presigned_post: (Hash[Symbol, untyped]) -> untyped
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/ObjectSummary.html#presigned_url-instance_method
+      def presigned_url: (Symbol | String method, ?Hash[Symbol, untyped] params) -> String
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/ObjectSummary.html#public_url-instance_method
+      def public_url: (?Hash[Symbol, untyped] options) -> String
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/ObjectSummary.html#upload_file-instance_method
+      def upload_file: (untyped source, ?Hash[Symbol, untyped] options) ?{ (untyped response) -> void } -> bool
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/ObjectSummary.html#upload_stream-instance_method
+      def upload_stream: (?Hash[Symbol, untyped] options) { (IO write_stream) -> void } -> bool
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/ObjectSummary.html#download_file-instance_method
+      def download_file: (String destination, ?Hash[Symbol, untyped] options) -> bool
+    end
+  end
+end

data/sig/resource.rbs

@@ -14,6 +14,8 @@ module Aws
                         ?client: Client,
                         ?credentials: untyped,
                         ?region: String,
+                        ?access_grants: bool,
+                        ?access_grants_credentials_provider: untyped,
                         ?access_key_id: String,
                         ?active_endpoint_cache: bool,
                         ?adaptive_retry_wait_to_fill: bool,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.147.0
+  version: 1.152.3
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-16 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms
@@ -47,7 +47,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.192.0
+        version: 3.197.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.192.0
+        version: 3.197.0
 description: Official AWS Ruby gem for Amazon Simple Storage Service (Amazon S3).
   This gem is part of the AWS SDK for Ruby.
 email:
@@ -70,6 +70,8 @@ files:
 - LICENSE.txt
 - VERSION
 - lib/aws-sdk-s3.rb
+- lib/aws-sdk-s3/access_grants_credentials.rb
+- lib/aws-sdk-s3/access_grants_credentials_provider.rb
 - lib/aws-sdk-s3/bucket.rb
 - lib/aws-sdk-s3/bucket_acl.rb
 - lib/aws-sdk-s3/bucket_cors.rb
@@ -127,7 +129,6 @@ files:
 - lib/aws-sdk-s3/errors.rb
 - lib/aws-sdk-s3/event_streams.rb
 - lib/aws-sdk-s3/express_credentials.rb
-- lib/aws-sdk-s3/express_credentials_cache.rb
 - lib/aws-sdk-s3/express_credentials_provider.rb
 - lib/aws-sdk-s3/file_downloader.rb
 - lib/aws-sdk-s3/file_part.rb
@@ -145,6 +146,7 @@ files:
 - lib/aws-sdk-s3/object_summary.rb
 - lib/aws-sdk-s3/object_version.rb
 - lib/aws-sdk-s3/plugins/accelerate.rb
+- lib/aws-sdk-s3/plugins/access_grants.rb
 - lib/aws-sdk-s3/plugins/arn.rb
 - lib/aws-sdk-s3/plugins/bucket_dns.rb
 - lib/aws-sdk-s3/plugins/bucket_name_restrictions.rb
@@ -182,6 +184,9 @@ files:
 - sig/bucket_versioning.rbs
 - sig/bucket_website.rbs
 - sig/client.rbs
+- sig/customizations/bucket.rbs
+- sig/customizations/object.rbs
+- sig/customizations/object_summary.rbs
 - sig/errors.rbs
 - sig/multipart_upload.rbs
 - sig/multipart_upload_part.rbs

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

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Aws
-  module S3
-    # @api private
-    class ExpressCredentialsCache
-      def initialize
-        @credentials = {}
-        @mutex = Mutex.new
-      end
-
-      def [](bucket_name)
-        @mutex.synchronize { @credentials[bucket_name] }
-      end
-
-      def []=(bucket_name, credential_provider)
-        @mutex.synchronize do
-          @credentials[bucket_name] = credential_provider
-        end
-      end
-
-      def clear
-        @mutex.synchronize { @credentials = {} }
-      end
-    end
-
-    # @api private
-    EXPRESS_CREDENTIALS_CACHE = ExpressCredentialsCache.new
-  end
-end