aws-sdk-s3 1.200.0 → 1.202.0

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

@@ -907,6 +907,8 @@ module Aws::S3
     CopyObjectRequest.add_member(:grant_read, Shapes::ShapeRef.new(shape: GrantRead, location: "header", location_name: "x-amz-grant-read"))
     CopyObjectRequest.add_member(:grant_read_acp, Shapes::ShapeRef.new(shape: GrantReadACP, location: "header", location_name: "x-amz-grant-read-acp"))
     CopyObjectRequest.add_member(:grant_write_acp, Shapes::ShapeRef.new(shape: GrantWriteACP, location: "header", location_name: "x-amz-grant-write-acp"))
+    CopyObjectRequest.add_member(:if_match, Shapes::ShapeRef.new(shape: IfMatch, location: "header", location_name: "If-Match"))
+    CopyObjectRequest.add_member(:if_none_match, Shapes::ShapeRef.new(shape: IfNoneMatch, location: "header", location_name: "If-None-Match"))
     CopyObjectRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key", metadata: {"contextParam" => {"name" => "Key"}}))
     CopyObjectRequest.add_member(:metadata, Shapes::ShapeRef.new(shape: Metadata, location: "headers", location_name: "x-amz-meta-"))
     CopyObjectRequest.add_member(:metadata_directive, Shapes::ShapeRef.new(shape: MetadataDirective, location: "header", location_name: "x-amz-metadata-directive"))

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

@@ -13,87 +13,87 @@ module Aws::S3
   # @!attribute bucket
   #   The S3 bucket used to send the request. This is an optional parameter that will be set automatically for operations that are scoped to an S3 bucket.
   #
-  #   @return [String]
+  #   @return [string]
   #
   # @!attribute region
   #   The AWS region used to dispatch the request.
   #
-  #   @return [String]
+  #   @return [string]
   #
   # @!attribute use_fips
   #   When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute use_dual_stack
   #   When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute endpoint
   #   Override the endpoint used to send this request
   #
-  #   @return [String]
+  #   @return [string]
   #
   # @!attribute force_path_style
   #   When true, force a path-style endpoint to be used where the bucket name is part of the path.
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute accelerate
   #   When true, use S3 Accelerate. NOTE: Not all regions support S3 accelerate.
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute use_global_endpoint
   #   Whether the global endpoint should be used, rather then the regional endpoint for us-east-1.
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute use_object_lambda_endpoint
   #   Internal parameter to use object lambda endpoint for an operation (eg: WriteGetObjectResponse)
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute key
   #   The S3 Key used to send the request. This is an optional parameter that will be set automatically for operations that are scoped to an S3 Key.
   #
-  #   @return [String]
+  #   @return [string]
   #
   # @!attribute prefix
   #   The S3 Prefix used to send the request. This is an optional parameter that will be set automatically for operations that are scoped to an S3 Prefix.
   #
-  #   @return [String]
+  #   @return [string]
   #
   # @!attribute copy_source
   #   The Copy Source used for Copy Object request. This is an optional parameter that will be set automatically for operations that are scoped to Copy Source.
   #
-  #   @return [String]
+  #   @return [string]
   #
   # @!attribute disable_access_points
   #   Internal parameter to disable Access Point Buckets
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute disable_multi_region_access_points
   #   Whether multi-region access points (MRAP) should be disabled.
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute use_arn_region
   #   When an Access Point ARN is provided and this flag is enabled, the SDK MUST use the ARN's region when constructing the endpoint instead of the client's configured region.
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute use_s3_express_control_endpoint
   #   Internal parameter to indicate whether S3Express operation should use control plane, (ex. CreateBucket)
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute disable_s3_express_session_auth
   #   Parameter to indicate whether S3Express session auth should be disabled
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   EndpointParameters = Struct.new(
     :bucket,

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

@@ -51,11 +51,10 @@ module Aws
 
       def complete_upload(upload_id, parts, file_size, options)
         @client.complete_multipart_upload(
-          **complete_opts(options).merge(
-            upload_id: upload_id,
-            multipart_upload: { parts: parts },
-            mpu_object_size: file_size
-          )
+          **complete_opts(options),
+          upload_id: upload_id,
+          multipart_upload: { parts: parts },
+          mpu_object_size: file_size
         )
       rescue StandardError => e
         abort_upload(upload_id, options, [e])
@@ -79,8 +78,8 @@ module Aws
       rescue MultipartUploadError => e
         raise e
       rescue StandardError => e
-        msg = "failed to abort multipart upload: #{e.message}. "\
-          "Multipart upload failed: #{errors.map(&:message).join('; ')}"
+        msg = "failed to abort multipart upload: #{e.message}. " \
+              "Multipart upload failed: #{errors.map(&:message).join('; ')}"
         raise MultipartUploadError.new(msg, errors + [e])
       end
 
@@ -113,8 +112,15 @@ module Aws
         keys.any? { |key| checksum_key?(key) }
       end
 
+      def checksum_not_required?(options)
+        @client.config.request_checksum_calculation == 'when_required' && !options[:checksum_algorithm]
+      end
+
       def create_opts(options)
-        opts = { checksum_algorithm: Aws::Plugins::ChecksumAlgorithm::DEFAULT_CHECKSUM }
+        opts = {}
+        unless checksum_not_required?(options)
+          opts[:checksum_algorithm] = Aws::Plugins::ChecksumAlgorithm::DEFAULT_CHECKSUM
+        end
         opts[:checksum_type] = 'FULL_OBJECT' if has_checksum_key?(options.keys)
         CREATE_OPTIONS.each_with_object(opts) { |k, h| h[k] = options[k] if options.key?(k) }
       end
@@ -148,9 +154,7 @@ module Aws
             resp = @client.upload_part(p)
             p[:body].close
             completed_part = { etag: resp.etag, part_number: p[:part_number] }
-            algorithm = resp.context.params[:checksum_algorithm].downcase
-            k = "checksum_#{algorithm}".to_sym
-            completed_part[k] = resp.send(k)
+            apply_part_checksum(resp, completed_part)
             completed.push(completed_part)
           rescue StandardError => e
             abort_upload = true
@@ -164,6 +168,13 @@ module Aws
         errors
       end
 
+      def apply_part_checksum(resp, part)
+        return unless (checksum = resp.context.params[:checksum_algorithm])
+
+        k = :"checksum_#{checksum.downcase}"
+        part[k] = resp.send(k)
+      end
+
       def compute_default_part_size(file_size)
         [(file_size.to_f / MAX_PARTS).ceil, MIN_PART_SIZE].max.to_i
       end

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

@@ -136,10 +136,10 @@ module Aws::S3
     end
 
     # The Base64 encoded, 32-bit `CRC32 checksum` of the object. This
-    # checksum is only be present if the checksum was uploaded with the
-    # object. When you use an API operation on an object that was uploaded
-    # using multipart uploads, this value may not be a direct checksum value
-    # of the full object. Instead, it's a calculation based on the checksum
+    # checksum is only present if the checksum was uploaded with the object.
+    # When you use an API operation on an object that was uploaded using
+    # multipart uploads, this value may not be a direct checksum value of
+    # the full object. Instead, it's a calculation based on the checksum
     # values of each individual part. For more information about how
     # checksums are calculated with multipart uploads, see [ Checking object
     # integrity][1] in the *Amazon S3 User Guide*.
@@ -181,8 +181,8 @@ module Aws::S3
       data[:checksum_crc64nvme]
     end
 
-    # The Base64 encoded, 160-bit `SHA1` digest of the object. This will
-    # only be present if the object was uploaded with the object. When you
+    # The Base64 encoded, 160-bit `SHA1` digest of the object. This checksum
+    # is only present if the checksum was uploaded with the object. When you
     # use the API operation on an object that was uploaded using multipart
     # uploads, this value may not be a direct checksum value of the full
     # object. Instead, it's a calculation based on the checksum values of
@@ -198,14 +198,14 @@ module Aws::S3
       data[:checksum_sha1]
     end
 
-    # The Base64 encoded, 256-bit `SHA256` digest of the object. This will
-    # only be present if the object was uploaded with the object. When you
-    # use an API operation on an object that was uploaded using multipart
-    # uploads, this value may not be a direct checksum value of the full
-    # object. Instead, it's a calculation based on the checksum values of
-    # each individual part. For more information about how checksums are
-    # calculated with multipart uploads, see [ Checking object integrity][1]
-    # in the *Amazon S3 User Guide*.
+    # The Base64 encoded, 256-bit `SHA256` digest of the object. This
+    # checksum is only present if the checksum was uploaded with the object.
+    # When you use an API operation on an object that was uploaded using
+    # multipart uploads, this value may not be a direct checksum value of
+    # the full object. Instead, it's a calculation based on the checksum
+    # values of each individual part. For more information about how
+    # checksums are calculated with multipart uploads, see [ Checking object
+    # integrity][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -757,6 +757,8 @@ module Aws::S3
     #     grant_read: "GrantRead",
     #     grant_read_acp: "GrantReadACP",
     #     grant_write_acp: "GrantWriteACP",
+    #     if_match: "IfMatch",
+    #     if_none_match: "IfNoneMatch",
     #     metadata: {
     #       "MetadataKey" => "MetadataValue",
     #     },
@@ -1013,6 +1015,35 @@ module Aws::S3
     #   * This functionality is not supported for Amazon S3 on Outposts.
     #
     #    </note>
+    # @option options [String] :if_match
+    #   Copies the object if the entity tag (ETag) of the destination object
+    #   matches the specified tag. If the ETag values do not match, the
+    #   operation returns a `412 Precondition Failed` error. If a concurrent
+    #   operation occurs during the upload S3 returns a `409
+    #   ConditionalRequestConflict` response. On a 409 failure you should
+    #   fetch the object's ETag and retry the upload.
+    #
+    #   Expects the ETag value as a string.
+    #
+    #   For more information about conditional requests, see [RFC 7232][1].
+    #
+    #
+    #
+    #   [1]: https://tools.ietf.org/html/rfc7232
+    # @option options [String] :if_none_match
+    #   Copies the object only if the object key name at the destination does
+    #   not already exist in the bucket specified. Otherwise, Amazon S3
+    #   returns a `412 Precondition Failed` error. If a concurrent operation
+    #   occurs during the upload S3 returns a `409 ConditionalRequestConflict`
+    #   response. On a 409 failure you should retry the upload.
+    #
+    #   Expects the '*' (asterisk) character.
+    #
+    #   For more information about conditional requests, see [RFC 7232][1].
+    #
+    #
+    #
+    #   [1]: https://tools.ietf.org/html/rfc7232
     # @option options [Hash<String,String>] :metadata
     #   A map of metadata to store with the object in S3.
     # @option options [String] :metadata_directive
@@ -1535,17 +1566,15 @@ module Aws::S3
     #   you provide does not match the actual owner of the bucket, the request
     #   fails with the HTTP status code `403 Forbidden` (access denied).
     # @option options [String] :if_match
-    #   The `If-Match` header field makes the request method conditional on
-    #   ETags. If the ETag value does not match, the operation returns a `412
-    #   Precondition Failed` error. If the ETag matches or if the object
-    #   doesn't exist, the operation will return a `204 Success (No Content)
-    #   response`.
-    #
-    #   For more information about conditional requests, see [RFC 7232][1].
+    #   Deletes the object if the ETag (entity tag) value provided during the
+    #   delete operation matches the ETag of the object in S3. If the ETag
+    #   values do not match, the operation returns a `412 Precondition Failed`
+    #   error.
     #
-    #   <note markdown="1"> This functionality is only supported for directory buckets.
+    #   Expects the ETag value as a string. `If-Match` does accept a string
+    #   value of an '*' (asterisk) character to denote a match of any ETag.
     #
-    #    </note>
+    #   For more information about conditional requests, see [RFC 7232][1].
     #
     #
     #

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

@@ -354,6 +354,8 @@ module Aws::S3
     #     grant_read: "GrantRead",
     #     grant_read_acp: "GrantReadACP",
     #     grant_write_acp: "GrantWriteACP",
+    #     if_match: "IfMatch",
+    #     if_none_match: "IfNoneMatch",
     #     metadata: {
     #       "MetadataKey" => "MetadataValue",
     #     },
@@ -610,6 +612,35 @@ module Aws::S3
     #   * This functionality is not supported for Amazon S3 on Outposts.
     #
     #    </note>
+    # @option options [String] :if_match
+    #   Copies the object if the entity tag (ETag) of the destination object
+    #   matches the specified tag. If the ETag values do not match, the
+    #   operation returns a `412 Precondition Failed` error. If a concurrent
+    #   operation occurs during the upload S3 returns a `409
+    #   ConditionalRequestConflict` response. On a 409 failure you should
+    #   fetch the object's ETag and retry the upload.
+    #
+    #   Expects the ETag value as a string.
+    #
+    #   For more information about conditional requests, see [RFC 7232][1].
+    #
+    #
+    #
+    #   [1]: https://tools.ietf.org/html/rfc7232
+    # @option options [String] :if_none_match
+    #   Copies the object only if the object key name at the destination does
+    #   not already exist in the bucket specified. Otherwise, Amazon S3
+    #   returns a `412 Precondition Failed` error. If a concurrent operation
+    #   occurs during the upload S3 returns a `409 ConditionalRequestConflict`
+    #   response. On a 409 failure you should retry the upload.
+    #
+    #   Expects the '*' (asterisk) character.
+    #
+    #   For more information about conditional requests, see [RFC 7232][1].
+    #
+    #
+    #
+    #   [1]: https://tools.ietf.org/html/rfc7232
     # @option options [Hash<String,String>] :metadata
     #   A map of metadata to store with the object in S3.
     # @option options [String] :metadata_directive
@@ -1132,17 +1163,15 @@ module Aws::S3
     #   you provide does not match the actual owner of the bucket, the request
     #   fails with the HTTP status code `403 Forbidden` (access denied).
     # @option options [String] :if_match
-    #   The `If-Match` header field makes the request method conditional on
-    #   ETags. If the ETag value does not match, the operation returns a `412
-    #   Precondition Failed` error. If the ETag matches or if the object
-    #   doesn't exist, the operation will return a `204 Success (No Content)
-    #   response`.
+    #   Deletes the object if the ETag (entity tag) value provided during the
+    #   delete operation matches the ETag of the object in S3. If the ETag
+    #   values do not match, the operation returns a `412 Precondition Failed`
+    #   error.
     #
-    #   For more information about conditional requests, see [RFC 7232][1].
+    #   Expects the ETag value as a string. `If-Match` does accept a string
+    #   value of an '*' (asterisk) character to denote a match of any ETag.
     #
-    #   <note markdown="1"> This functionality is only supported for directory buckets.
-    #
-    #    </note>
+    #   For more information about conditional requests, see [RFC 7232][1].
     #
     #
     #

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

@@ -312,17 +312,15 @@ module Aws::S3
     #   you provide does not match the actual owner of the bucket, the request
     #   fails with the HTTP status code `403 Forbidden` (access denied).
     # @option options [String] :if_match
-    #   The `If-Match` header field makes the request method conditional on
-    #   ETags. If the ETag value does not match, the operation returns a `412
-    #   Precondition Failed` error. If the ETag matches or if the object
-    #   doesn't exist, the operation will return a `204 Success (No Content)
-    #   response`.
-    #
-    #   For more information about conditional requests, see [RFC 7232][1].
+    #   Deletes the object if the ETag (entity tag) value provided during the
+    #   delete operation matches the ETag of the object in S3. If the ETag
+    #   values do not match, the operation returns a `412 Precondition Failed`
+    #   error.
     #
-    #   <note markdown="1"> This functionality is only supported for directory buckets.
+    #   Expects the ETag value as a string. `If-Match` does accept a string
+    #   value of an '*' (asterisk) character to denote a match of any ETag.
     #
-    #    </note>
+    #   For more information about conditional requests, see [RFC 7232][1].
     #
     #
     #

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

@@ -25,7 +25,7 @@ The endpoint provider used to resolve endpoints. Any object that responds to
 
       option(
         :disable_s3_express_session_auth,
-        doc_type: 'Boolean',
+        doc_type: 'boolean',
         docstring: <<~DOCS) do |cfg|
 Parameter to indicate whether S3Express session auth should be disabled
         DOCS