aws-sdk-s3 1.220.0 → 1.232.1

data/lib/aws-sdk-s3/encryptionV3/kms_cipher_provider.rb

@@ -54,7 +54,7 @@ module Aws
             cek_alg = envelope['x-amz-c']
             encryption_context =
               if !envelope['x-amz-t'].nil?
-                Json.load(envelope['x-amz-t'])
+                extract_encryption_context(envelope['x-amz-t'])
               else
                 ##= ../specification/s3-encryption/data-format/content-metadata.md#v3-only
                 ##% If the mapkey x-amz-t is not present, the default Material Description value MUST be set to an empty map (`{}`).
@@ -102,6 +102,18 @@ module Aws
 
         private
 
+        # Raise a decryption error for a malformed material description.
+        def extract_encryption_context(matdesc)
+          context = Json.load(matdesc) if matdesc.is_a?(String)
+          unless context.is_a?(Hash)
+            raise Errors::DecryptionError, 'Malformed material description'
+          end
+
+          context
+        rescue Aws::Json::ParseError, EncodingError
+          raise Errors::DecryptionError, 'Malformed material description'
+        end
+
         def validate_key_wrap(key_wrap_schema)
           case key_wrap_schema
           when :kms_context then '12'

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

@@ -710,10 +710,13 @@ module Aws::S3
                               if (outpost_type = Aws::Endpoints::Matchers.attr(bucket_arn, "resourceId[2]"))
                                 if (access_point_name = Aws::Endpoints::Matchers.attr(bucket_arn, "resourceId[3]"))
                                   if Aws::Endpoints::Matchers.string_equals?(outpost_type, "accesspoint")
-                                    if Aws::Endpoints::Matchers.set?(parameters.endpoint) && (url = Aws::Endpoints::Matchers.parse_url(parameters.endpoint))
-                                      return Aws::Endpoints::Endpoint.new(url: "https://#{access_point_name}-#{bucket_arn['accountId']}.#{outpost_id}.#{url['authority']}", headers: {}, properties: {"authSchemes" => [{"disableDoubleEncoding" => true, "name" => "sigv4a", "signingName" => "s3-outposts", "signingRegionSet" => ["*"]}, {"disableDoubleEncoding" => true, "name" => "sigv4", "signingName" => "s3-outposts", "signingRegion" => "#{bucket_arn['region']}"}]})
+                                    if Aws::Endpoints::Matchers.valid_host_label?(access_point_name, false)
+                                      if Aws::Endpoints::Matchers.set?(parameters.endpoint) && (url = Aws::Endpoints::Matchers.parse_url(parameters.endpoint))
+                                        return Aws::Endpoints::Endpoint.new(url: "https://#{access_point_name}-#{bucket_arn['accountId']}.#{outpost_id}.#{url['authority']}", headers: {}, properties: {"authSchemes" => [{"disableDoubleEncoding" => true, "name" => "sigv4a", "signingName" => "s3-outposts", "signingRegionSet" => ["*"]}, {"disableDoubleEncoding" => true, "name" => "sigv4", "signingName" => "s3-outposts", "signingRegion" => "#{bucket_arn['region']}"}]})
+                                      end
+                                      return Aws::Endpoints::Endpoint.new(url: "https://#{access_point_name}-#{bucket_arn['accountId']}.#{outpost_id}.s3-outposts.#{bucket_arn['region']}.#{bucket_partition['dnsSuffix']}", headers: {}, properties: {"authSchemes" => [{"disableDoubleEncoding" => true, "name" => "sigv4a", "signingName" => "s3-outposts", "signingRegionSet" => ["*"]}, {"disableDoubleEncoding" => true, "name" => "sigv4", "signingName" => "s3-outposts", "signingRegion" => "#{bucket_arn['region']}"}]})
                                     end
-                                    return Aws::Endpoints::Endpoint.new(url: "https://#{access_point_name}-#{bucket_arn['accountId']}.#{outpost_id}.s3-outposts.#{bucket_arn['region']}.#{bucket_partition['dnsSuffix']}", headers: {}, properties: {"authSchemes" => [{"disableDoubleEncoding" => true, "name" => "sigv4a", "signingName" => "s3-outposts", "signingRegionSet" => ["*"]}, {"disableDoubleEncoding" => true, "name" => "sigv4", "signingName" => "s3-outposts", "signingRegion" => "#{bucket_arn['region']}"}]})
+                                    raise ArgumentError, "Invalid ARN: The access point name may only contain a-z, A-Z, 0-9 and `-`. Found: `#{access_point_name}`"
                                   end
                                   raise ArgumentError, "Expected an outpost type `accesspoint`, found #{outpost_type}"
                                 end

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

@@ -303,6 +303,17 @@ module Aws::S3
       end
     end
 
+    class DeleteObjectAnnotation
+      def self.build(context)
+        Aws::S3::EndpointParameters.create(
+          context.config,
+          bucket: context.params[:bucket],
+          use_dual_stack: context[:use_dualstack_endpoint],
+          accelerate: context[:use_accelerate_endpoint],
+        )
+      end
+    end
+
     class DeleteObjectTagging
       def self.build(context)
         Aws::S3::EndpointParameters.create(
@@ -660,6 +671,18 @@ module Aws::S3
       end
     end
 
+    class GetObjectAnnotation
+      def self.build(context)
+        Aws::S3::EndpointParameters.create(
+          context.config,
+          bucket: context.params[:bucket],
+          use_dual_stack: context[:use_dualstack_endpoint],
+          accelerate: context[:use_accelerate_endpoint],
+          key: context.params[:key],
+        )
+      end
+    end
+
     class GetObjectAttributes
       def self.build(context)
         Aws::S3::EndpointParameters.create(
@@ -842,6 +865,17 @@ module Aws::S3
       end
     end
 
+    class ListObjectAnnotations
+      def self.build(context)
+        Aws::S3::EndpointParameters.create(
+          context.config,
+          bucket: context.params[:bucket],
+          use_dual_stack: context[:use_dualstack_endpoint],
+          accelerate: context[:use_accelerate_endpoint],
+        )
+      end
+    end
+
     class ListObjectVersions
       def self.build(context)
         Aws::S3::EndpointParameters.create(
@@ -1165,6 +1199,18 @@ module Aws::S3
       end
     end
 
+    class PutObjectAnnotation
+      def self.build(context)
+        Aws::S3::EndpointParameters.create(
+          context.config,
+          bucket: context.params[:bucket],
+          use_dual_stack: context[:use_dualstack_endpoint],
+          accelerate: context[:use_accelerate_endpoint],
+          key: context.params[:key],
+        )
+      end
+    end
+
     class PutObjectLegalHold
       def self.build(context)
         Aws::S3::EndpointParameters.create(
@@ -1255,6 +1301,18 @@ module Aws::S3
       end
     end
 
+    class UpdateBucketMetadataAnnotationTableConfiguration
+      def self.build(context)
+        Aws::S3::EndpointParameters.create(
+          context.config,
+          bucket: context.params[:bucket],
+          use_dual_stack: context[:use_dualstack_endpoint],
+          accelerate: context[:use_accelerate_endpoint],
+          use_s3_express_control_endpoint: true,
+        )
+      end
+    end
+
     class UpdateBucketMetadataInventoryTableConfiguration
       def self.build(context)
         Aws::S3::EndpointParameters.create(
@@ -1376,6 +1434,8 @@ module Aws::S3
         DeleteBucketWebsite.build(context)
       when :delete_object
         DeleteObject.build(context)
+      when :delete_object_annotation
+        DeleteObjectAnnotation.build(context)
       when :delete_object_tagging
         DeleteObjectTagging.build(context)
       when :delete_objects
@@ -1436,6 +1496,8 @@ module Aws::S3
         GetObject.build(context)
       when :get_object_acl
         GetObjectAcl.build(context)
+      when :get_object_annotation
+        GetObjectAnnotation.build(context)
       when :get_object_attributes
         GetObjectAttributes.build(context)
       when :get_object_legal_hold
@@ -1468,6 +1530,8 @@ module Aws::S3
         ListDirectoryBuckets.build(context)
       when :list_multipart_uploads
         ListMultipartUploads.build(context)
+      when :list_object_annotations
+        ListObjectAnnotations.build(context)
       when :list_object_versions
         ListObjectVersions.build(context)
       when :list_objects
@@ -1522,6 +1586,8 @@ module Aws::S3
         PutObject.build(context)
       when :put_object_acl
         PutObjectAcl.build(context)
+      when :put_object_annotation
+        PutObjectAnnotation.build(context)
       when :put_object_legal_hold
         PutObjectLegalHold.build(context)
       when :put_object_lock_configuration
@@ -1538,6 +1604,8 @@ module Aws::S3
         RestoreObject.build(context)
       when :select_object_content
         SelectObjectContent.build(context)
+      when :update_bucket_metadata_annotation_table_configuration
+        UpdateBucketMetadataAnnotationTableConfiguration.build(context)
       when :update_bucket_metadata_inventory_table_configuration
         UpdateBucketMetadataInventoryTableConfiguration.build(context)
       when :update_bucket_metadata_journal_table_configuration

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

@@ -28,19 +28,25 @@ module Aws::S3
   #
   # ## Error Classes
   # * {AccessDenied}
+  # * {AnnotationLimitExceeded}
+  # * {AnnotationNameTooLong}
   # * {BucketAlreadyExists}
   # * {BucketAlreadyOwnedByYou}
   # * {EncryptionTypeMismatch}
   # * {IdempotencyParameterMismatch}
+  # * {InvalidAnnotationName}
   # * {InvalidObjectState}
+  # * {InvalidPrefix}
   # * {InvalidRequest}
   # * {InvalidWriteOffset}
+  # * {NoSuchAnnotation}
   # * {NoSuchBucket}
   # * {NoSuchKey}
   # * {NoSuchUpload}
   # * {ObjectAlreadyInActiveTierError}
   # * {ObjectNotInActiveTierError}
   # * {TooManyParts}
+  # * {UnsupportedMediaType}
   #
   # Additionally, error classes are dynamically generated for service errors based on the error code
   # if they are not defined above.
@@ -58,6 +64,26 @@ module Aws::S3
       end
     end
 
+    class AnnotationLimitExceeded < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::S3::Types::AnnotationLimitExceeded] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
+    class AnnotationNameTooLong < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::S3::Types::AnnotationNameTooLong] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
     class BucketAlreadyExists < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context
@@ -98,6 +124,16 @@ module Aws::S3
       end
     end
 
+    class InvalidAnnotationName < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::S3::Types::InvalidAnnotationName] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
     class InvalidObjectState < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context
@@ -118,6 +154,16 @@ module Aws::S3
       end
     end
 
+    class InvalidPrefix < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::S3::Types::InvalidPrefix] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
     class InvalidRequest < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context
@@ -138,6 +184,16 @@ module Aws::S3
       end
     end
 
+    class NoSuchAnnotation < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::S3::Types::NoSuchAnnotation] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
     class NoSuchBucket < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context
@@ -198,6 +254,16 @@ module Aws::S3
       end
     end
 
+    class UnsupportedMediaType < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::S3::Types::UnsupportedMediaType] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
   end
 end
 

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

@@ -196,7 +196,9 @@ module Aws
       end
 
       def single_request(opts)
-        params = get_opts(opts[:params]).merge(response_target: opts[:destination])
+        resolve_temp_path(opts)
+        target = opts[:temp_path] || opts[:destination]
+        params = get_opts(opts[:params]).merge(response_target: target)
         params[:on_chunk_received] = single_part_progress(opts) if opts[:progress_callback]
         resp = @client.get_object(params)
         return resp unless opts[:on_checksum_validated]

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

@@ -154,7 +154,6 @@ module Aws
             Thread.current[:net_http_override_body_stream_chunk] = @http_chunk_size if @http_chunk_size
             update_progress(progress, p)
             resp = @client.upload_part(p)
-            p[:body].close
             completed_part = { etag: resp.etag, part_number: p[:part_number] }
             apply_part_checksum(resp, completed_part)
             completed.push(completed_part)
@@ -162,6 +161,7 @@ module Aws
             abort_upload = true
             errors << e
           ensure
+            p[:body].close
             Thread.current[:net_http_override_body_stream_chunk] = nil if @http_chunk_size
             completion_queue << :done
           end

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

@@ -600,6 +600,39 @@ module Aws::S3
       data[:object_lock_legal_hold_status]
     end
 
+    # The event hold status for this object. This header is only returned if
+    # the requester has the `s3:GetObjectRetention` permission.
+    #
+    # <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #  </note>
+    # @return [String]
+    def object_lock_event_hold
+      data[:object_lock_event_hold]
+    end
+
+    # The event hold duration in days for this object. Only returned when
+    # the event hold is enabled.
+    #
+    # <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #  </note>
+    # @return [Integer]
+    def object_lock_event_hold_duration_days
+      data[:object_lock_event_hold_duration_days]
+    end
+
+    # The event hold duration in years for this object. Only returned when
+    # the event hold is enabled.
+    #
+    # <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #  </note>
+    # @return [Integer]
+    def object_lock_event_hold_duration_years
+      data[:object_lock_event_hold_duration_years]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -824,8 +857,9 @@ module Aws::S3
     #     },
     #     metadata_directive: "COPY", # accepts COPY, REPLACE
     #     tagging_directive: "COPY", # accepts COPY, REPLACE
-    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:kms, aws:kms:dsse
-    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP
+    #     annotation_directive: "COPY", # accepts COPY, EXCLUDE
+    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:backup, aws:kms, aws:kms:dsse
+    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP, AWS_BACKUP_WARM, AWS_BACKUP_LOW_COST_WARM
     #     website_redirect_location: "WebsiteRedirectLocation",
     #     sse_customer_algorithm: "SSECustomerAlgorithm",
     #     sse_customer_key: "SSECustomerKey",
@@ -841,6 +875,9 @@ module Aws::S3
     #     object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
     #     object_lock_retain_until_date: Time.now,
     #     object_lock_legal_hold_status: "ON", # accepts ON, OFF
+    #     object_lock_event_hold: "ON", # accepts ON, OFF
+    #     object_lock_event_hold_duration_days: 1,
+    #     object_lock_event_hold_duration_years: 1,
     #     expected_bucket_owner: "AccountId",
     #     expected_source_bucket_owner: "AccountId",
     #   })
@@ -1174,6 +1211,42 @@ module Aws::S3
     #     value of `x-amz-tagging` is the empty value.
     #
     #    </note>
+    # @option options [String] :annotation_directive
+    #   Specifies whether you want to copy annotations from the source object
+    #   or exclude them. If this header isn't specified, `COPY` is the
+    #   default behavior.
+    #
+    #   Valid Values: `COPY | EXCLUDE`
+    #
+    #   You can specify this directive as either an HTTP header
+    #   (`x-amz-object-annotation-directive`) or as a query string parameter.
+    #   Use the query string form when generating presigned URLs that need to
+    #   control annotation copy behavior.
+    #
+    #   When set to `COPY`, you must have `s3:GetObjectAnnotation` permission
+    #   on the source object and `s3:PutObjectAnnotation` permission on the
+    #   destination. Each annotation copied is billed as a separate PUT
+    #   request. If annotations on the source are modified during the copy,
+    #   Amazon S3 returns a retryable error.
+    #
+    #   <note markdown="1"> For directory buckets, annotations are not supported. Use `EXCLUDE` to
+    #   copy objects to directory buckets without errors. If you specify
+    #   `COPY` for a directory bucket, the request returns HTTP 501 (Not
+    #   Implemented).
+    #
+    #    </note>
+    #
+    #   <note markdown="1"> When you copy objects using multipart upload (for example, when the
+    #   Amazon Web Services CLI or Amazon Web Services SDKs use Transfer
+    #   Manager for objects larger than approximately 8 MB), annotations are
+    #   not copied by default. To include annotations, specify `--copy-props
+    #   default` in the Amazon Web Services CLI or the equivalent SDK
+    #   configuration. With this opt-in, the SDK reads source annotations,
+    #   completes the multipart upload, and then writes each annotation to the
+    #   destination. Between the upload completion and the last annotation
+    #   write, the destination object exists without all its annotations.
+    #
+    #    </note>
     # @option options [String] :server_side_encryption
     #   The server-side encryption algorithm used when storing this object in
     #   Amazon S3. Unrecognized or unsupported values won’t write a
@@ -1546,6 +1619,27 @@ module Aws::S3
     #   <note markdown="1"> This functionality is not supported for directory buckets.
     #
     #    </note>
+    # @option options [String] :object_lock_event_hold
+    #   The event hold status to apply to the object copy. Set to `ON` to
+    #   enable or `OFF` to disable.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_days
+    #   The event hold duration in days to apply to the object copy. You
+    #   cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_years
+    #   The event hold duration in years to apply to the object copy. You
+    #   cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
     # @option options [String] :expected_bucket_owner
     #   The account ID of the expected destination bucket owner. If the
     #   account ID that you provide does not match the actual owner of the
@@ -1948,8 +2042,8 @@ module Aws::S3
     #     metadata: {
     #       "MetadataKey" => "MetadataValue",
     #     },
-    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:kms, aws:kms:dsse
-    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP
+    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:backup, aws:kms, aws:kms:dsse
+    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP, AWS_BACKUP_WARM, AWS_BACKUP_LOW_COST_WARM
     #     website_redirect_location: "WebsiteRedirectLocation",
     #     sse_customer_algorithm: "SSECustomerAlgorithm",
     #     sse_customer_key: "SSECustomerKey",
@@ -1962,6 +2056,9 @@ module Aws::S3
     #     object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
     #     object_lock_retain_until_date: Time.now,
     #     object_lock_legal_hold_status: "ON", # accepts ON, OFF
+    #     object_lock_event_hold: "ON", # accepts ON, OFF
+    #     object_lock_event_hold_duration_days: 1,
+    #     object_lock_event_hold_duration_years: 1,
     #     expected_bucket_owner: "AccountId",
     #     checksum_algorithm: "CRC32", # accepts CRC32, CRC32C, SHA1, SHA256, CRC64NVME, SHA512, MD5, XXHASH64, XXHASH3, XXHASH128
     #     checksum_type: "COMPOSITE", # accepts COMPOSITE, FULL_OBJECT
@@ -2483,6 +2580,27 @@ module Aws::S3
     #   <note markdown="1"> This functionality is not supported for directory buckets.
     #
     #    </note>
+    # @option options [String] :object_lock_event_hold
+    #   Specifies the event hold status to apply to the uploaded object. Set
+    #   to `ON` to enable or `OFF` to disable.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_days
+    #   Specifies the event hold duration in days to apply to the uploaded
+    #   object. You cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_years
+    #   Specifies the event hold duration in years to apply to the uploaded
+    #   object. You cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
     # @option options [String] :expected_bucket_owner
     #   The account ID of the expected bucket owner. If the account ID that
     #   you provide does not match the actual owner of the bucket, the request
@@ -2554,8 +2672,8 @@ module Aws::S3
     #     metadata: {
     #       "MetadataKey" => "MetadataValue",
     #     },
-    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:kms, aws:kms:dsse
-    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP
+    #     server_side_encryption: "AES256", # accepts AES256, aws:fsx, aws:backup, aws:kms, aws:kms:dsse
+    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP, AWS_BACKUP_WARM, AWS_BACKUP_LOW_COST_WARM
     #     website_redirect_location: "WebsiteRedirectLocation",
     #     sse_customer_algorithm: "SSECustomerAlgorithm",
     #     sse_customer_key: "SSECustomerKey",
@@ -2568,6 +2686,9 @@ module Aws::S3
     #     object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
     #     object_lock_retain_until_date: Time.now,
     #     object_lock_legal_hold_status: "ON", # accepts ON, OFF
+    #     object_lock_event_hold: "ON", # accepts ON, OFF
+    #     object_lock_event_hold_duration_days: 1,
+    #     object_lock_event_hold_duration_years: 1,
     #     expected_bucket_owner: "AccountId",
     #   })
     # @param [Hash] options ({})
@@ -3193,6 +3314,27 @@ module Aws::S3
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html
+    # @option options [String] :object_lock_event_hold
+    #   Specifies the event hold status to apply to this object. Set to `ON`
+    #   to enable or `OFF` to disable.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_days
+    #   Specifies the event hold duration in days to apply to this object. You
+    #   cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    # @option options [Integer] :object_lock_event_hold_duration_years
+    #   Specifies the event hold duration in years to apply to this object.
+    #   You cannot specify a duration in both days and years.
+    #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
     # @option options [String] :expected_bucket_owner
     #   The account ID of the expected bucket owner. If the account ID that
     #   you provide does not match the actual owner of the bucket, the request
@@ -3259,7 +3401,7 @@ module Aws::S3
     #           bucket_name: "BucketName", # required
     #           prefix: "LocationPrefix", # required
     #           encryption: {
-    #             encryption_type: "AES256", # required, accepts AES256, aws:fsx, aws:kms, aws:kms:dsse
+    #             encryption_type: "AES256", # required, accepts AES256, aws:fsx, aws:backup, aws:kms, aws:kms:dsse
     #             kms_key_id: "SSEKMSKeyId",
     #             kms_context: "KMSContext",
     #           },
@@ -3290,7 +3432,7 @@ module Aws::S3
     #               value: "MetadataValue",
     #             },
     #           ],
-    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP
+    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR, SNOW, EXPRESS_ONEZONE, FSX_OPENZFS, FSX_ONTAP, AWS_BACKUP_WARM, AWS_BACKUP_LOW_COST_WARM
     #         },
     #       },
     #     },

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

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-require 'thread'
-
 module Aws
   module S3
     # @api private
     class ObjectCopier
-
       # @param [S3::Object] object
       def initialize(object, options = {})
         @object = object
@@ -23,7 +20,7 @@ module Aws
 
       private
 
-      def copy_object(source, target, options)
+      def copy_object(source, target, options) # rubocop:disable Metrics/MethodLength
         target_bucket, target_key = copy_target(target)
         options[:bucket] = target_bucket
         options[:key] = target_key
@@ -38,7 +35,7 @@ module Aws
         end
       end
 
-      def copy_source(source)
+      def copy_source(source) # rubocop:disable Metrics/MethodLength
         case source
         when String then source
         when Hash
@@ -50,54 +47,46 @@ module Aws
         when S3::ObjectVersion
           "#{source.bucket_name}/#{escape(source.object_key)}?versionId=#{source.id}"
         else
-          msg = "expected source to be an Aws::S3::Object, Hash, or String"
-          raise ArgumentError, msg
+          raise ArgumentError, 'expected source to be an Aws::S3::Object, Hash, or String'
         end
       end
 
       def copy_target(target)
         case target
-        when String then target.match(/([^\/]+?)\/(.+)/)[1,2]
+        when String then target.match(%r{([^/]+?)/(.+)})[1, 2]
         when Hash then target.values_at(:bucket, :key)
         when S3::Object then [target.bucket_name, target.key]
         else
-          msg = "expected target to be an Aws::S3::Object, Hash, or String"
-          raise ArgumentError, msg
+          raise ArgumentError, 'expected target to be an Aws::S3::Object, Hash, or String'
         end
       end
 
       def merge_options(source_or_target, options)
-        if Hash === source_or_target
-          source_or_target.inject(options.dup) do |opts, (key, value)|
-            opts[key] = value unless [:bucket, :key, :version_id].include?(key)
-            opts
+        if source_or_target.is_a?(Hash)
+          source_or_target.each_with_object(options.dup) do |(key, value), opts|
+            opts[key] = value unless %i[bucket key version_id].include?(key)
           end
         else
           options.dup
         end
       end
 
-      def apply_source_client(source, options)
-
-        if source.respond_to?(:client)
-          options[:copy_source_client] ||= source.client
-        end
+      def apply_source_client(source, options) # rubocop:disable Metrics/AbcSize
+        options[:copy_source_client] ||= source.client if source.respond_to?(:client)
 
         if options[:copy_source_region]
           config = @object.client.config
-          config = config.each_pair.inject({}) { |h, (k,v)| h[k] = v; h }
+          config = config.each_pair.with_object({}) { |(k, v), h| h[k] = v unless v.nil? }
           config[:region] = options.delete(:copy_source_region)
           options[:copy_source_client] ||= S3::Client.new(config)
         end
 
         options[:copy_source_client] ||= @object.client
-
       end
 
       def escape(str)
         Seahorse::Util.uri_path_escape(str)
       end
-
     end
   end
 end