aws-sdk-s3 1.166.0 → 1.168.0

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

@@ -57,6 +57,7 @@ module Aws::S3
     BucketLoggingStatus = Shapes::StructureShape.new(name: 'BucketLoggingStatus')
     BucketLogsPermission = Shapes::StringShape.new(name: 'BucketLogsPermission')
     BucketName = Shapes::StringShape.new(name: 'BucketName')
+    BucketRegion = Shapes::StringShape.new(name: 'BucketRegion')
     BucketType = Shapes::StringShape.new(name: 'BucketType')
     BucketVersioningStatus = Shapes::StringShape.new(name: 'BucketVersioningStatus')
     Buckets = Shapes::ListShape.new(name: 'Buckets')
@@ -464,6 +465,7 @@ module Aws::S3
     PutBucketEncryptionRequest = Shapes::StructureShape.new(name: 'PutBucketEncryptionRequest')
     PutBucketIntelligentTieringConfigurationRequest = Shapes::StructureShape.new(name: 'PutBucketIntelligentTieringConfigurationRequest')
     PutBucketInventoryConfigurationRequest = Shapes::StructureShape.new(name: 'PutBucketInventoryConfigurationRequest')
+    PutBucketLifecycleConfigurationOutput = Shapes::StructureShape.new(name: 'PutBucketLifecycleConfigurationOutput')
     PutBucketLifecycleConfigurationRequest = Shapes::StructureShape.new(name: 'PutBucketLifecycleConfigurationRequest')
     PutBucketLifecycleRequest = Shapes::StructureShape.new(name: 'PutBucketLifecycleRequest')
     PutBucketLoggingRequest = Shapes::StructureShape.new(name: 'PutBucketLoggingRequest')
@@ -603,6 +605,7 @@ module Aws::S3
     TopicConfigurationDeprecated = Shapes::StructureShape.new(name: 'TopicConfigurationDeprecated')
     TopicConfigurationList = Shapes::ListShape.new(name: 'TopicConfigurationList', flattened: true)
     Transition = Shapes::StructureShape.new(name: 'Transition')
+    TransitionDefaultMinimumObjectSize = Shapes::StringShape.new(name: 'TransitionDefaultMinimumObjectSize')
     TransitionList = Shapes::ListShape.new(name: 'TransitionList', flattened: true)
     TransitionStorageClass = Shapes::StringShape.new(name: 'TransitionStorageClass')
     Type = Shapes::StringShape.new(name: 'Type')
@@ -678,6 +681,7 @@ module Aws::S3
 
     Bucket.add_member(:name, Shapes::ShapeRef.new(shape: BucketName, location_name: "Name"))
     Bucket.add_member(:creation_date, Shapes::ShapeRef.new(shape: CreationDate, location_name: "CreationDate"))
+    Bucket.add_member(:bucket_region, Shapes::ShapeRef.new(shape: BucketRegion, location_name: "BucketRegion"))
     Bucket.struct_class = Types::Bucket
 
     BucketAlreadyExists.struct_class = Types::BucketAlreadyExists
@@ -1191,6 +1195,7 @@ module Aws::S3
     GetBucketInventoryConfigurationRequest.struct_class = Types::GetBucketInventoryConfigurationRequest
 
     GetBucketLifecycleConfigurationOutput.add_member(:rules, Shapes::ShapeRef.new(shape: LifecycleRules, location_name: "Rule"))
+    GetBucketLifecycleConfigurationOutput.add_member(:transition_default_minimum_object_size, Shapes::ShapeRef.new(shape: TransitionDefaultMinimumObjectSize, location: "header", location_name: "x-amz-transition-default-minimum-object-size"))
     GetBucketLifecycleConfigurationOutput.struct_class = Types::GetBucketLifecycleConfigurationOutput
 
     GetBucketLifecycleConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
@@ -1720,10 +1725,13 @@ module Aws::S3
     ListBucketsOutput.add_member(:buckets, Shapes::ShapeRef.new(shape: Buckets, location_name: "Buckets"))
     ListBucketsOutput.add_member(:owner, Shapes::ShapeRef.new(shape: Owner, location_name: "Owner"))
     ListBucketsOutput.add_member(:continuation_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "ContinuationToken"))
+    ListBucketsOutput.add_member(:prefix, Shapes::ShapeRef.new(shape: Prefix, location_name: "Prefix"))
     ListBucketsOutput.struct_class = Types::ListBucketsOutput
 
     ListBucketsRequest.add_member(:max_buckets, Shapes::ShapeRef.new(shape: MaxBuckets, location: "querystring", location_name: "max-buckets"))
     ListBucketsRequest.add_member(:continuation_token, Shapes::ShapeRef.new(shape: Token, location: "querystring", location_name: "continuation-token"))
+    ListBucketsRequest.add_member(:prefix, Shapes::ShapeRef.new(shape: Prefix, location: "querystring", location_name: "prefix"))
+    ListBucketsRequest.add_member(:bucket_region, Shapes::ShapeRef.new(shape: BucketRegion, location: "querystring", location_name: "bucket-region"))
     ListBucketsRequest.struct_class = Types::ListBucketsRequest
 
     ListDirectoryBucketsOutput.add_member(:buckets, Shapes::ShapeRef.new(shape: Buckets, location_name: "Buckets"))
@@ -2130,10 +2138,14 @@ module Aws::S3
     PutBucketInventoryConfigurationRequest[:payload] = :inventory_configuration
     PutBucketInventoryConfigurationRequest[:payload_member] = PutBucketInventoryConfigurationRequest.member(:inventory_configuration)
 
+    PutBucketLifecycleConfigurationOutput.add_member(:transition_default_minimum_object_size, Shapes::ShapeRef.new(shape: TransitionDefaultMinimumObjectSize, location: "header", location_name: "x-amz-transition-default-minimum-object-size"))
+    PutBucketLifecycleConfigurationOutput.struct_class = Types::PutBucketLifecycleConfigurationOutput
+
     PutBucketLifecycleConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketLifecycleConfigurationRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketLifecycleConfigurationRequest.add_member(:lifecycle_configuration, Shapes::ShapeRef.new(shape: BucketLifecycleConfiguration, location_name: "LifecycleConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketLifecycleConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
+    PutBucketLifecycleConfigurationRequest.add_member(:transition_default_minimum_object_size, Shapes::ShapeRef.new(shape: TransitionDefaultMinimumObjectSize, location: "header", location_name: "x-amz-transition-default-minimum-object-size"))
     PutBucketLifecycleConfigurationRequest.struct_class = Types::PutBucketLifecycleConfigurationRequest
     PutBucketLifecycleConfigurationRequest[:payload] = :lifecycle_configuration
     PutBucketLifecycleConfigurationRequest[:payload_member] = PutBucketLifecycleConfigurationRequest.member(:lifecycle_configuration)
@@ -3529,7 +3541,7 @@ module Aws::S3
           "requestChecksumRequired" => true,
         }
         o.input = Shapes::ShapeRef.new(shape: PutBucketLifecycleConfigurationRequest)
-        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.output = Shapes::ShapeRef.new(shape: PutBucketLifecycleConfigurationOutput)
       end)
 
       api.add_operation(:put_bucket_logging, Seahorse::Model::Operation.new.tap do |o|

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

@@ -306,9 +306,9 @@ module Aws::S3
     # @option options [String] :checksum_crc32
     #   This header can be used as a data integrity check to verify that the
     #   data received is the same data that was originally sent. This header
-    #   specifies the base64-encoded, 32-bit CRC32 checksum of the object. For
-    #   more information, see [Checking object integrity][1] in the *Amazon S3
-    #   User Guide*.
+    #   specifies the base64-encoded, 32-bit CRC-32 checksum of the object.
+    #   For more information, see [Checking object integrity][1] in the
+    #   *Amazon S3 User Guide*.
     #
     #
     #
@@ -316,7 +316,7 @@ module Aws::S3
     # @option options [String] :checksum_crc32c
     #   This header can be used as a data integrity check to verify that the
     #   data received is the same data that was originally sent. This header
-    #   specifies the base64-encoded, 32-bit CRC32C checksum of the object.
+    #   specifies the base64-encoded, 32-bit CRC-32C checksum of the object.
     #   For more information, see [Checking object integrity][1] in the
     #   *Amazon S3 User Guide*.
     #

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

@@ -78,9 +78,9 @@ module Aws::S3
 
     # This header can be used as a data integrity check to verify that the
     # data received is the same data that was originally sent. This header
-    # specifies the base64-encoded, 32-bit CRC32 checksum of the object. For
-    # more information, see [Checking object integrity][1] in the *Amazon S3
-    # User Guide*.
+    # specifies the base64-encoded, 32-bit CRC-32 checksum of the object.
+    # For more information, see [Checking object integrity][1] in the
+    # *Amazon S3 User Guide*.
     #
     #
     #
@@ -90,7 +90,7 @@ module Aws::S3
       data[:checksum_crc32]
     end
 
-    # The base64-encoded, 32-bit CRC32C checksum of the object. This will
+    # The base64-encoded, 32-bit CRC-32C checksum of the object. This will
     # only be present if it 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.
@@ -558,9 +558,9 @@ module Aws::S3
     # @option options [String] :checksum_crc32
     #   This header can be used as a data integrity check to verify that the
     #   data received is the same data that was originally sent. This header
-    #   specifies the base64-encoded, 32-bit CRC32 checksum of the object. For
-    #   more information, see [Checking object integrity][1] in the *Amazon S3
-    #   User Guide*.
+    #   specifies the base64-encoded, 32-bit CRC-32 checksum of the object.
+    #   For more information, see [Checking object integrity][1] in the
+    #   *Amazon S3 User Guide*.
     #
     #
     #
@@ -568,7 +568,7 @@ module Aws::S3
     # @option options [String] :checksum_crc32c
     #   This header can be used as a data integrity check to verify that the
     #   data received is the same data that was originally sent. This header
-    #   specifies the base64-encoded, 32-bit CRC32C checksum of the object.
+    #   specifies the base64-encoded, 32-bit CRC-32C checksum of the object.
     #   For more information, see [Checking object integrity][1] in the
     #   *Amazon S3 User Guide*.
     #

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

@@ -132,7 +132,7 @@ module Aws::S3
       data[:content_length]
     end
 
-    # The base64-encoded, 32-bit CRC32 checksum of the object. This will
+    # The base64-encoded, 32-bit CRC-32 checksum of the object. This will
     # only be present if it 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.
@@ -149,7 +149,7 @@ module Aws::S3
       data[:checksum_crc32]
     end
 
-    # The base64-encoded, 32-bit CRC32C checksum of the object. This will
+    # The base64-encoded, 32-bit CRC-32C checksum of the object. This will
     # only be present if it 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.
@@ -1073,17 +1073,17 @@ module Aws::S3
     #   * To encrypt new object copies to a directory bucket with SSE-KMS, we
     #     recommend you specify SSE-KMS as the directory bucket's default
     #     encryption configuration with a KMS key (specifically, a [customer
-    #     managed key][4]). [Amazon Web Services managed key][5] (`aws/s3`)
-    #     isn't supported. Your SSE-KMS configuration can only support 1
-    #     [customer managed key][4] per directory bucket for the lifetime of
-    #     the bucket. After you specify a customer managed key for SSE-KMS,
-    #     you can't override the customer managed key for the bucket's
-    #     SSE-KMS configuration. Then, when you perform a `CopyObject`
-    #     operation and want to specify server-side encryption settings for
-    #     new object copies with SSE-KMS in the encryption-related request
-    #     headers, you must ensure the encryption key is the same customer
-    #     managed key that you specified for the directory bucket's default
-    #     encryption configuration.
+    #     managed key][4]). The [Amazon Web Services managed key][5]
+    #     (`aws/s3`) isn't supported. Your SSE-KMS configuration can only
+    #     support 1 [customer managed key][4] per directory bucket for the
+    #     lifetime of the bucket. After you specify a customer managed key for
+    #     SSE-KMS, you can't override the customer managed key for the
+    #     bucket's SSE-KMS configuration. Then, when you perform a
+    #     `CopyObject` operation and want to specify server-side encryption
+    #     settings for new object copies with SSE-KMS in the
+    #     encryption-related request headers, you must ensure the encryption
+    #     key is the same customer managed key that you specified for the
+    #     directory bucket's default encryption configuration.
     #
     #
     #
@@ -1191,14 +1191,19 @@ module Aws::S3
     #   Guide*.
     #
     #   **Directory buckets** - If you specify `x-amz-server-side-encryption`
-    #   with `aws:kms`, you must specify the `
-    #   x-amz-server-side-encryption-aws-kms-key-id` header with the ID (Key
-    #   ID or Key ARN) of the KMS symmetric encryption customer managed key to
-    #   use. Otherwise, you get an HTTP `400 Bad Request` error. Only use the
-    #   key ID or key ARN. The key alias format of the KMS key isn't
-    #   supported. Your SSE-KMS configuration can only support 1 [customer
-    #   managed key][2] per directory bucket for the lifetime of the bucket.
-    #   [Amazon Web Services managed key][3] (`aws/s3`) isn't supported.
+    #   with `aws:kms`, the ` x-amz-server-side-encryption-aws-kms-key-id`
+    #   header is implicitly assigned the ID of the KMS symmetric encryption
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. If you want to specify the `
+    #   x-amz-server-side-encryption-aws-kms-key-id` header explicitly, you
+    #   can only specify it with the ID (Key ID or Key ARN) of the KMS
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. Otherwise, you get an HTTP `400 Bad
+    #   Request` error. Only use the key ID or key ARN. The key alias format
+    #   of the KMS key isn't supported. Your SSE-KMS configuration can only
+    #   support 1 [customer managed key][2] per directory bucket for the
+    #   lifetime of the bucket. The [Amazon Web Services managed key][3]
+    #   (`aws/s3`) isn't supported.
     #
     #
     #
@@ -2176,14 +2181,19 @@ module Aws::S3
     #   Amazon Web Services managed key (`aws/s3`) to protect the data.
     #
     #   **Directory buckets** - If you specify `x-amz-server-side-encryption`
-    #   with `aws:kms`, you must specify the `
-    #   x-amz-server-side-encryption-aws-kms-key-id` header with the ID (Key
-    #   ID or Key ARN) of the KMS symmetric encryption customer managed key to
-    #   use. Otherwise, you get an HTTP `400 Bad Request` error. Only use the
-    #   key ID or key ARN. The key alias format of the KMS key isn't
-    #   supported. Your SSE-KMS configuration can only support 1 [customer
-    #   managed key][1] per directory bucket for the lifetime of the bucket.
-    #   [Amazon Web Services managed key][2] (`aws/s3`) isn't supported.
+    #   with `aws:kms`, the ` x-amz-server-side-encryption-aws-kms-key-id`
+    #   header is implicitly assigned the ID of the KMS symmetric encryption
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. If you want to specify the `
+    #   x-amz-server-side-encryption-aws-kms-key-id` header explicitly, you
+    #   can only specify it with the ID (Key ID or Key ARN) of the KMS
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. Otherwise, you get an HTTP `400 Bad
+    #   Request` error. Only use the key ID or key ARN. The key alias format
+    #   of the KMS key isn't supported. Your SSE-KMS configuration can only
+    #   support 1 [customer managed key][1] per directory bucket for the
+    #   lifetime of the bucket. The [Amazon Web Services managed key][2]
+    #   (`aws/s3`) isn't supported.
     #
     #
     #
@@ -2423,10 +2433,11 @@ module Aws::S3
     #   information about REST request authentication, see [REST
     #   Authentication][1].
     #
-    #   <note markdown="1"> The `Content-MD5` header is required for any request to upload an
-    #   object with a retention period configured using Amazon S3 Object Lock.
-    #   For more information about Amazon S3 Object Lock, see [Amazon S3
-    #   Object Lock Overview][2] in the *Amazon S3 User Guide*.
+    #   <note markdown="1"> The `Content-MD5` or `x-amz-sdk-checksum-algorithm` header is required
+    #   for any request to upload an object with a retention period configured
+    #   using Amazon S3 Object Lock. For more information, see [Uploading
+    #   objects to an Object Lock enabled bucket ][2] in the *Amazon S3 User
+    #   Guide*.
     #
     #    </note>
     #
@@ -2437,7 +2448,7 @@ module Aws::S3
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.html
+    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-lock-managing.html#object-lock-put-object
     # @option options [String] :content_type
     #   A standard MIME type describing the format of the contents. For more
     #   information, see
@@ -2457,13 +2468,13 @@ module Aws::S3
     #   For the `x-amz-checksum-algorithm ` header, replace ` algorithm ` with
     #   the supported algorithm from the following list:
     #
-    #   * CRC32
+    #   * `CRC32`
     #
-    #   * CRC32C
+    #   * `CRC32C`
     #
-    #   * SHA1
+    #   * `SHA1`
     #
-    #   * SHA256
+    #   * `SHA256`
     #
     #   For more information, see [Checking object integrity][1] in the
     #   *Amazon S3 User Guide*.
@@ -2474,20 +2485,27 @@ module Aws::S3
     #   provided `ChecksumAlgorithm` parameter and uses the checksum algorithm
     #   that matches the provided value in `x-amz-checksum-algorithm `.
     #
-    #   <note markdown="1"> For directory buckets, when you use Amazon Web Services SDKs, `CRC32`
-    #   is the default checksum algorithm that's used for performance.
+    #   <note markdown="1"> The `Content-MD5` or `x-amz-sdk-checksum-algorithm` header is required
+    #   for any request to upload an object with a retention period configured
+    #   using Amazon S3 Object Lock. For more information, see [Uploading
+    #   objects to an Object Lock enabled bucket ][2] in the *Amazon S3 User
+    #   Guide*.
     #
     #    </note>
     #
+    #   For directory buckets, when you use Amazon Web Services SDKs, `CRC32`
+    #   is the default checksum algorithm that's used for performance.
+    #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html
+    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-lock-managing.html#object-lock-put-object
     # @option options [String] :checksum_crc32
     #   This header can be used as a data integrity check to verify that the
     #   data received is the same data that was originally sent. This header
-    #   specifies the base64-encoded, 32-bit CRC32 checksum of the object. For
-    #   more information, see [Checking object integrity][1] in the *Amazon S3
-    #   User Guide*.
+    #   specifies the base64-encoded, 32-bit CRC-32 checksum of the object.
+    #   For more information, see [Checking object integrity][1] in the
+    #   *Amazon S3 User Guide*.
     #
     #
     #
@@ -2495,7 +2513,7 @@ module Aws::S3
     # @option options [String] :checksum_crc32c
     #   This header can be used as a data integrity check to verify that the
     #   data received is the same data that was originally sent. This header
-    #   specifies the base64-encoded, 32-bit CRC32C checksum of the object.
+    #   specifies the base64-encoded, 32-bit CRC-32C checksum of the object.
     #   For more information, see [Checking object integrity][1] in the
     #   *Amazon S3 User Guide*.
     #
@@ -2734,14 +2752,19 @@ module Aws::S3
     #   Amazon Web Services managed key (`aws/s3`) to protect the data.
     #
     #   **Directory buckets** - If you specify `x-amz-server-side-encryption`
-    #   with `aws:kms`, you must specify the `
-    #   x-amz-server-side-encryption-aws-kms-key-id` header with the ID (Key
-    #   ID or Key ARN) of the KMS symmetric encryption customer managed key to
-    #   use. Otherwise, you get an HTTP `400 Bad Request` error. Only use the
-    #   key ID or key ARN. The key alias format of the KMS key isn't
-    #   supported. Your SSE-KMS configuration can only support 1 [customer
-    #   managed key][1] per directory bucket for the lifetime of the bucket.
-    #   [Amazon Web Services managed key][2] (`aws/s3`) isn't supported.
+    #   with `aws:kms`, the ` x-amz-server-side-encryption-aws-kms-key-id`
+    #   header is implicitly assigned the ID of the KMS symmetric encryption
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. If you want to specify the `
+    #   x-amz-server-side-encryption-aws-kms-key-id` header explicitly, you
+    #   can only specify it with the ID (Key ID or Key ARN) of the KMS
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. Otherwise, you get an HTTP `400 Bad
+    #   Request` error. Only use the key ID or key ARN. The key alias format
+    #   of the KMS key isn't supported. Your SSE-KMS configuration can only
+    #   support 1 [customer managed key][1] per directory bucket for the
+    #   lifetime of the bucket. The [Amazon Web Services managed key][2]
+    #   (`aws/s3`) isn't supported.
     #
     #
     #
@@ -3376,13 +3399,13 @@ module Aws::S3
       #   For the `x-amz-checksum-algorithm ` header, replace ` algorithm ` with
       #   the supported algorithm from the following list:
       #
-      #   * CRC32
+      #   * `CRC32`
       #
-      #   * CRC32C
+      #   * `CRC32C`
       #
-      #   * SHA1
+      #   * `SHA1`
       #
-      #   * SHA256
+      #   * `SHA256`
       #
       #   For more information, see [Checking object integrity][1] in the
       #   *Amazon S3 User Guide*.

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

@@ -723,17 +723,17 @@ module Aws::S3
     #   * To encrypt new object copies to a directory bucket with SSE-KMS, we
     #     recommend you specify SSE-KMS as the directory bucket's default
     #     encryption configuration with a KMS key (specifically, a [customer
-    #     managed key][4]). [Amazon Web Services managed key][5] (`aws/s3`)
-    #     isn't supported. Your SSE-KMS configuration can only support 1
-    #     [customer managed key][4] per directory bucket for the lifetime of
-    #     the bucket. After you specify a customer managed key for SSE-KMS,
-    #     you can't override the customer managed key for the bucket's
-    #     SSE-KMS configuration. Then, when you perform a `CopyObject`
-    #     operation and want to specify server-side encryption settings for
-    #     new object copies with SSE-KMS in the encryption-related request
-    #     headers, you must ensure the encryption key is the same customer
-    #     managed key that you specified for the directory bucket's default
-    #     encryption configuration.
+    #     managed key][4]). The [Amazon Web Services managed key][5]
+    #     (`aws/s3`) isn't supported. Your SSE-KMS configuration can only
+    #     support 1 [customer managed key][4] per directory bucket for the
+    #     lifetime of the bucket. After you specify a customer managed key for
+    #     SSE-KMS, you can't override the customer managed key for the
+    #     bucket's SSE-KMS configuration. Then, when you perform a
+    #     `CopyObject` operation and want to specify server-side encryption
+    #     settings for new object copies with SSE-KMS in the
+    #     encryption-related request headers, you must ensure the encryption
+    #     key is the same customer managed key that you specified for the
+    #     directory bucket's default encryption configuration.
     #
     #
     #
@@ -841,14 +841,19 @@ module Aws::S3
     #   Guide*.
     #
     #   **Directory buckets** - If you specify `x-amz-server-side-encryption`
-    #   with `aws:kms`, you must specify the `
-    #   x-amz-server-side-encryption-aws-kms-key-id` header with the ID (Key
-    #   ID or Key ARN) of the KMS symmetric encryption customer managed key to
-    #   use. Otherwise, you get an HTTP `400 Bad Request` error. Only use the
-    #   key ID or key ARN. The key alias format of the KMS key isn't
-    #   supported. Your SSE-KMS configuration can only support 1 [customer
-    #   managed key][2] per directory bucket for the lifetime of the bucket.
-    #   [Amazon Web Services managed key][3] (`aws/s3`) isn't supported.
+    #   with `aws:kms`, the ` x-amz-server-side-encryption-aws-kms-key-id`
+    #   header is implicitly assigned the ID of the KMS symmetric encryption
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. If you want to specify the `
+    #   x-amz-server-side-encryption-aws-kms-key-id` header explicitly, you
+    #   can only specify it with the ID (Key ID or Key ARN) of the KMS
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. Otherwise, you get an HTTP `400 Bad
+    #   Request` error. Only use the key ID or key ARN. The key alias format
+    #   of the KMS key isn't supported. Your SSE-KMS configuration can only
+    #   support 1 [customer managed key][2] per directory bucket for the
+    #   lifetime of the bucket. The [Amazon Web Services managed key][3]
+    #   (`aws/s3`) isn't supported.
     #
     #
     #
@@ -1826,14 +1831,19 @@ module Aws::S3
     #   Amazon Web Services managed key (`aws/s3`) to protect the data.
     #
     #   **Directory buckets** - If you specify `x-amz-server-side-encryption`
-    #   with `aws:kms`, you must specify the `
-    #   x-amz-server-side-encryption-aws-kms-key-id` header with the ID (Key
-    #   ID or Key ARN) of the KMS symmetric encryption customer managed key to
-    #   use. Otherwise, you get an HTTP `400 Bad Request` error. Only use the
-    #   key ID or key ARN. The key alias format of the KMS key isn't
-    #   supported. Your SSE-KMS configuration can only support 1 [customer
-    #   managed key][1] per directory bucket for the lifetime of the bucket.
-    #   [Amazon Web Services managed key][2] (`aws/s3`) isn't supported.
+    #   with `aws:kms`, the ` x-amz-server-side-encryption-aws-kms-key-id`
+    #   header is implicitly assigned the ID of the KMS symmetric encryption
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. If you want to specify the `
+    #   x-amz-server-side-encryption-aws-kms-key-id` header explicitly, you
+    #   can only specify it with the ID (Key ID or Key ARN) of the KMS
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. Otherwise, you get an HTTP `400 Bad
+    #   Request` error. Only use the key ID or key ARN. The key alias format
+    #   of the KMS key isn't supported. Your SSE-KMS configuration can only
+    #   support 1 [customer managed key][1] per directory bucket for the
+    #   lifetime of the bucket. The [Amazon Web Services managed key][2]
+    #   (`aws/s3`) isn't supported.
     #
     #
     #
@@ -2073,10 +2083,11 @@ module Aws::S3
     #   information about REST request authentication, see [REST
     #   Authentication][1].
     #
-    #   <note markdown="1"> The `Content-MD5` header is required for any request to upload an
-    #   object with a retention period configured using Amazon S3 Object Lock.
-    #   For more information about Amazon S3 Object Lock, see [Amazon S3
-    #   Object Lock Overview][2] in the *Amazon S3 User Guide*.
+    #   <note markdown="1"> The `Content-MD5` or `x-amz-sdk-checksum-algorithm` header is required
+    #   for any request to upload an object with a retention period configured
+    #   using Amazon S3 Object Lock. For more information, see [Uploading
+    #   objects to an Object Lock enabled bucket ][2] in the *Amazon S3 User
+    #   Guide*.
     #
     #    </note>
     #
@@ -2087,7 +2098,7 @@ module Aws::S3
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.html
+    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-lock-managing.html#object-lock-put-object
     # @option options [String] :content_type
     #   A standard MIME type describing the format of the contents. For more
     #   information, see
@@ -2107,13 +2118,13 @@ module Aws::S3
     #   For the `x-amz-checksum-algorithm ` header, replace ` algorithm ` with
     #   the supported algorithm from the following list:
     #
-    #   * CRC32
+    #   * `CRC32`
     #
-    #   * CRC32C
+    #   * `CRC32C`
     #
-    #   * SHA1
+    #   * `SHA1`
     #
-    #   * SHA256
+    #   * `SHA256`
     #
     #   For more information, see [Checking object integrity][1] in the
     #   *Amazon S3 User Guide*.
@@ -2124,20 +2135,27 @@ module Aws::S3
     #   provided `ChecksumAlgorithm` parameter and uses the checksum algorithm
     #   that matches the provided value in `x-amz-checksum-algorithm `.
     #
-    #   <note markdown="1"> For directory buckets, when you use Amazon Web Services SDKs, `CRC32`
-    #   is the default checksum algorithm that's used for performance.
+    #   <note markdown="1"> The `Content-MD5` or `x-amz-sdk-checksum-algorithm` header is required
+    #   for any request to upload an object with a retention period configured
+    #   using Amazon S3 Object Lock. For more information, see [Uploading
+    #   objects to an Object Lock enabled bucket ][2] in the *Amazon S3 User
+    #   Guide*.
     #
     #    </note>
     #
+    #   For directory buckets, when you use Amazon Web Services SDKs, `CRC32`
+    #   is the default checksum algorithm that's used for performance.
+    #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html
+    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-lock-managing.html#object-lock-put-object
     # @option options [String] :checksum_crc32
     #   This header can be used as a data integrity check to verify that the
     #   data received is the same data that was originally sent. This header
-    #   specifies the base64-encoded, 32-bit CRC32 checksum of the object. For
-    #   more information, see [Checking object integrity][1] in the *Amazon S3
-    #   User Guide*.
+    #   specifies the base64-encoded, 32-bit CRC-32 checksum of the object.
+    #   For more information, see [Checking object integrity][1] in the
+    #   *Amazon S3 User Guide*.
     #
     #
     #
@@ -2145,7 +2163,7 @@ module Aws::S3
     # @option options [String] :checksum_crc32c
     #   This header can be used as a data integrity check to verify that the
     #   data received is the same data that was originally sent. This header
-    #   specifies the base64-encoded, 32-bit CRC32C checksum of the object.
+    #   specifies the base64-encoded, 32-bit CRC-32C checksum of the object.
     #   For more information, see [Checking object integrity][1] in the
     #   *Amazon S3 User Guide*.
     #
@@ -2384,14 +2402,19 @@ module Aws::S3
     #   Amazon Web Services managed key (`aws/s3`) to protect the data.
     #
     #   **Directory buckets** - If you specify `x-amz-server-side-encryption`
-    #   with `aws:kms`, you must specify the `
-    #   x-amz-server-side-encryption-aws-kms-key-id` header with the ID (Key
-    #   ID or Key ARN) of the KMS symmetric encryption customer managed key to
-    #   use. Otherwise, you get an HTTP `400 Bad Request` error. Only use the
-    #   key ID or key ARN. The key alias format of the KMS key isn't
-    #   supported. Your SSE-KMS configuration can only support 1 [customer
-    #   managed key][1] per directory bucket for the lifetime of the bucket.
-    #   [Amazon Web Services managed key][2] (`aws/s3`) isn't supported.
+    #   with `aws:kms`, the ` x-amz-server-side-encryption-aws-kms-key-id`
+    #   header is implicitly assigned the ID of the KMS symmetric encryption
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. If you want to specify the `
+    #   x-amz-server-side-encryption-aws-kms-key-id` header explicitly, you
+    #   can only specify it with the ID (Key ID or Key ARN) of the KMS
+    #   customer managed key that's configured for your directory bucket's
+    #   default encryption setting. Otherwise, you get an HTTP `400 Bad
+    #   Request` error. Only use the key ID or key ARN. The key alias format
+    #   of the KMS key isn't supported. Your SSE-KMS configuration can only
+    #   support 1 [customer managed key][1] per directory bucket for the
+    #   lifetime of the bucket. The [Amazon Web Services managed key][2]
+    #   (`aws/s3`) isn't supported.
     #
     #
     #
@@ -2836,13 +2859,13 @@ module Aws::S3
       #   For the `x-amz-checksum-algorithm ` header, replace ` algorithm ` with
       #   the supported algorithm from the following list:
       #
-      #   * CRC32
+      #   * `CRC32`
       #
-      #   * CRC32C
+      #   * `CRC32C`
       #
-      #   * SHA1
+      #   * `SHA1`
       #
-      #   * SHA256
+      #   * `SHA256`
       #
       #   For more information, see [Checking object integrity][1] in the
       #   *Amazon S3 User Guide*.

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

@@ -869,13 +869,13 @@ module Aws::S3
       #   For the `x-amz-checksum-algorithm ` header, replace ` algorithm ` with
       #   the supported algorithm from the following list:
       #
-      #   * CRC32
+      #   * `CRC32`
       #
-      #   * CRC32C
+      #   * `CRC32C`
       #
-      #   * SHA1
+      #   * `SHA1`
       #
-      #   * SHA256
+      #   * `SHA256`
       #
       #   For more information, see [Checking object integrity][1] in the
       #   *Amazon S3 User Guide*.