aws-sdk-s3 1.130.0 → 1.151.0

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

@@ -56,6 +56,10 @@ module Aws::S3
 
     # If present, indicates that the requester was successfully charged for
     # the request.
+    #
+    # <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #  </note>
     # @return [String]
     def request_charged
       data[:request_charged]
@@ -261,12 +265,12 @@ module Aws::S3
     #   [1]: http://www.ietf.org/rfc/rfc1864.txt
     # @option options [String] :checksum_algorithm
     #   Indicates the algorithm used to create the checksum for the object
-    #   when using the SDK. This header will not provide any additional
-    #   functionality if not using the SDK. When sending this header, there
-    #   must be a corresponding `x-amz-checksum` or `x-amz-trailer` header
-    #   sent. Otherwise, Amazon S3 fails the request with the HTTP status code
-    #   `400 Bad Request`. For more information, see [Checking object
-    #   integrity][1] in the *Amazon S3 User Guide*.
+    #   when you use the SDK. This header will not provide any additional
+    #   functionality if you don't use the SDK. When you send this header,
+    #   there must be a corresponding `x-amz-checksum` or `x-amz-trailer`
+    #   header sent. Otherwise, Amazon S3 fails the request with the HTTP
+    #   status code `400 Bad Request`. For more information, see [Checking
+    #   object integrity][1] in the *Amazon S3 User Guide*.
     #
     #   If you provide an individual checksum, Amazon S3 ignores any provided
     #   `ChecksumAlgorithm` parameter.
@@ -278,15 +282,15 @@ module Aws::S3
     #   Allows grantee the read, write, read ACP, and write ACP permissions on
     #   the bucket.
     #
-    #   This action is not supported by Amazon S3 on Outposts.
+    #   This functionality is not supported for Amazon S3 on Outposts.
     # @option options [String] :grant_read
     #   Allows grantee to list the objects in the bucket.
     #
-    #   This action is not supported by Amazon S3 on Outposts.
+    #   This functionality is not supported for Amazon S3 on Outposts.
     # @option options [String] :grant_read_acp
     #   Allows grantee to read the bucket ACL.
     #
-    #   This action is not supported by Amazon S3 on Outposts.
+    #   This functionality is not supported for Amazon S3 on Outposts.
     # @option options [String] :grant_write
     #   Allows grantee to create new objects in the bucket.
     #
@@ -295,23 +299,33 @@ module Aws::S3
     # @option options [String] :grant_write_acp
     #   Allows grantee to write the ACL for the applicable bucket.
     #
-    #   This action is not supported by Amazon S3 on Outposts.
+    #   This functionality is not supported for Amazon S3 on Outposts.
     # @option options [String] :request_payer
     #   Confirms that the requester knows that they will be charged for the
     #   request. Bucket owners need not specify this parameter in their
-    #   requests. For information about downloading objects from Requester
+    #   requests. If either the source or destination S3 bucket has Requester
+    #   Pays enabled, the requester will pay for corresponding charges to copy
+    #   the object. For information about downloading objects from Requester
     #   Pays buckets, see [Downloading Objects in Requester Pays Buckets][1]
     #   in the *Amazon S3 User Guide*.
     #
+    #   <note markdown="1"> This functionality is not supported for directory buckets.
+    #
+    #    </note>
+    #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
     # @option options [String] :version_id
-    #   VersionId used to reference a specific version of the object.
+    #   Version ID used to reference a specific version of the object.
+    #
+    #   <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 bucket is owned by
-    #   a different account, the request fails with the HTTP status code `403
-    #   Forbidden` (access denied).
+    #   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
+    #   fails with the HTTP status code `403 Forbidden` (access denied).
     # @return [Types::PutObjectAclOutput]
     def put(options = {})
       options = options.merge(

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

@@ -138,9 +138,7 @@ module Aws
       end
 
       def source_metadata(options)
-        if options[:content_length]
-          return { content_length: options.delete(:content_length) }
-        end
+        return options.slice(:content_length) if options[:content_length]
 
         client = options[:copy_source_client] || @client
 
@@ -150,11 +148,15 @@ module Aws
           bucket, key = options[:copy_source].match(/([^\/]+?)\/(.+)/)[1,2]
         end
 
-        key = CGI.unescape(key)
-        opts = { bucket: bucket, key: key }
-        opts[:version_id] = version_id if version_id
-        opts[:part_number] = options[:part_number] if options[:part_number]
-        client.head_object(opts).to_h
+        head_opts = { bucket: bucket, key: CGI.unescape(key) }.tap { |opts|
+          opts[:version_id]  = version_id if version_id
+          opts[:part_number] = options[:part_number] if options[:part_number]
+        }
+
+        client.head_object(head_opts).to_h.tap { |head|
+          head.delete(:server_side_encryption)
+          head.delete(:ssekms_key_id)
+        }
       end
 
       def default_part_size(source_size)