aws-sdk-s3 1.98.0 → 1.102.0

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

@@ -74,9 +74,17 @@ module Aws
                 credentials: context.config.credentials
               )
             elsif (arn = context.metadata[:s3_arn])
+              if arn[:arn].is_a?(MultiRegionAccessPointARN)
+                signing_region = '*'
+                signing_algorithm = :sigv4a
+              else
+                signing_region = arn[:resolved_region]
+                signing_algorithm = :sigv4
+              end
               S3Signer.build_v4_signer(
                 service: arn[:arn].service,
-                region: arn[:resolved_region],
+                signing_algorithm: signing_algorithm,
+                region: signing_region,
                 credentials: context.config.credentials
               )
             elsif context.operation.name == 'WriteGetObjectResponse'
@@ -216,6 +224,7 @@ module Aws
               service: options[:service],
               region: options[:region],
               credentials_provider: options[:credentials],
+              signing_algorithm: options.fetch(:signing_algorithm, :sigv4),
               uri_escape_path: false,
               unsigned_headers: ['content-length', 'x-amzn-trace-id']
             )

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

@@ -231,17 +231,23 @@ module Aws
           end
           http_req.endpoint.query = query.join('&') unless query.empty?
 
+          signing_algorithm = :sigv4
+
           # If it's an ARN, get the resolved region and service
           if (arn = context.metadata[:s3_arn])
             region = arn[:resolved_region]
             service = arn[:arn].service
+            region = arn[:arn].is_a?(MultiRegionAccessPointARN) ? '*': arn[:resolved_region]
+            signing_algorithm = arn[:arn].is_a?(MultiRegionAccessPointARN) ? :sigv4a : :sigv4
           end
 
           signer = Aws::Sigv4::Signer.new(
             service: service || 's3',
             region: region || context.config.region,
+            signing_algorithm: signing_algorithm,
             credentials_provider: context.config.credentials,
             unsigned_headers: unsigned_headers,
+            apply_checksum_header: false,
             uri_escape_path: false
           )
 

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

@@ -71,19 +71,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -450,8 +450,8 @@ module Aws::S3
     end
 
     # In terms of implementation, a Bucket is a resource. An Amazon S3
-    # bucket name is globally unique, and the namespace is shared by all AWS
-    # accounts.
+    # bucket name is globally unique, and the namespace is shared by all
+    # Amazon Web Services accounts.
     #
     # @!attribute [rw] name
     #   The name of the bucket.
@@ -480,10 +480,11 @@ module Aws::S3
     class BucketAlreadyExists < Aws::EmptyStructure; end
 
     # The bucket you tried to create already exists, and you own it. Amazon
-    # S3 returns this error in all AWS Regions except in the North Virginia
-    # Region. For legacy compatibility, if you re-create an existing bucket
-    # that you already own in the North Virginia Region, Amazon S3 returns
-    # 200 OK and resets the bucket access control lists (ACLs).
+    # S3 returns this error in all Amazon Web Services Regions except in the
+    # North Virginia Region. For legacy compatibility, if you re-create an
+    # existing bucket that you already own in the North Virginia Region,
+    # Amazon S3 returns 200 OK and resets the bucket access control lists
+    # (ACLs).
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/BucketAlreadyOwnedByYou AWS API Documentation
     #
@@ -843,7 +844,7 @@ module Aws::S3
       include Aws::Structure
     end
 
-    # Container for specifying the AWS Lambda notification configuration.
+    # Container for specifying the Lambda notification configuration.
     #
     # @note When making an API call, you may pass CloudFunctionConfiguration
     #   data as a hash:
@@ -914,25 +915,26 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] bucket
-    #   The name of the bucket that contains the newly created object.
+    #   The name of the bucket that contains the newly created object. Does
+    #   not return the access point ARN or access point alias if used.
     #
     #   When using this action with an access point, you must direct
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -962,10 +964,10 @@ module Aws::S3
     #
     # @!attribute [rw] server_side_encryption
     #   If you specified server-side encryption either with an Amazon
-    #   S3-managed encryption key or an AWS KMS customer master key (CMK) in
-    #   your initiate multipart upload request, the response includes this
-    #   header. It confirms the encryption algorithm that Amazon S3 used to
-    #   encrypt the object.
+    #   S3-managed encryption key or an Amazon Web Services KMS customer
+    #   master key (CMK) in your initiate multipart upload request, the
+    #   response includes this header. It confirms the encryption algorithm
+    #   that Amazon S3 used to encrypt the object.
     #   @return [String]
     #
     # @!attribute [rw] version_id
@@ -974,14 +976,14 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   If present, specifies the ID of the AWS Key Management Service (AWS
-    #   KMS) symmetric customer managed customer master key (CMK) that was
-    #   used for the object.
+    #   If present, specifies the ID of the Amazon Web Services Key
+    #   Management Service (Amazon Web Services KMS) symmetric customer
+    #   managed customer master key (CMK) that was used for the object.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
     #   Indicates whether the multipart upload uses an S3 Bucket Key for
-    #   server-side encryption with AWS KMS (SSE-KMS).
+    #   server-side encryption with Amazon Web Services KMS (SSE-KMS).
     #   @return [Boolean]
     #
     # @!attribute [rw] request_charged
@@ -1027,6 +1029,29 @@ module Aws::S3
     #
     # @!attribute [rw] bucket
     #   Name of the bucket to which the multipart upload was initiated.
+    #
+    #   When using this action with an access point, you must direct
+    #   requests to the access point hostname. The access point hostname
+    #   takes the form
+    #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
+    #
+    #   When using this action with Amazon S3 on Outposts, you must direct
+    #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
+    #   takes the form
+    #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html
+    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html
     #   @return [String]
     #
     # @!attribute [rw] key
@@ -1221,21 +1246,21 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   If present, specifies the ID of the AWS Key Management Service (AWS
-    #   KMS) symmetric customer managed customer master key (CMK) that was
-    #   used for the object.
+    #   If present, specifies the ID of the Amazon Web Services Key
+    #   Management Service (Amazon Web Services KMS) symmetric customer
+    #   managed customer master key (CMK) that was used for the object.
     #   @return [String]
     #
     # @!attribute [rw] ssekms_encryption_context
-    #   If present, specifies the AWS KMS Encryption Context to use for
-    #   object encryption. The value of this header is a base64-encoded
-    #   UTF-8 string holding JSON with the encryption context key-value
-    #   pairs.
+    #   If present, specifies the Amazon Web Services KMS Encryption Context
+    #   to use for object encryption. The value of this header is a
+    #   base64-encoded UTF-8 string holding JSON with the encryption context
+    #   key-value pairs.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
     #   Indicates whether the copied object uses an S3 Bucket Key for
-    #   server-side encryption with AWS KMS (SSE-KMS).
+    #   server-side encryption with Amazon Web Services KMS (SSE-KMS).
     #   @return [Boolean]
     #
     # @!attribute [rw] request_charged
@@ -1322,19 +1347,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -1387,7 +1412,8 @@ module Aws::S3
     #     The value must be URL encoded.
     #
     #     <note markdown="1"> Amazon S3 supports copy operations using access points only when
-    #     the source and destination buckets are in the same AWS Region.
+    #     the source and destination buckets are in the same Amazon Web
+    #     Services Region.
     #
     #      </note>
     #
@@ -1522,10 +1548,11 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   Specifies the AWS KMS key ID to use for object encryption. All GET
-    #   and PUT requests for an object protected by AWS KMS will fail if not
-    #   made via SSL or using SigV4. For information about configuring using
-    #   any of the officially supported AWS SDKs and AWS CLI, see
+    #   Specifies the Amazon Web Services KMS key ID to use for object
+    #   encryption. All GET and PUT requests for an object protected by
+    #   Amazon Web Services KMS will fail if not made via SSL or using
+    #   SigV4. For information about configuring using any of the officially
+    #   supported Amazon Web Services SDKs and Amazon Web Services CLI, see
     #   [Specifying the Signature Version in Request Authentication][1] in
     #   the *Amazon S3 User Guide*.
     #
@@ -1535,9 +1562,10 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_encryption_context
-    #   Specifies the AWS KMS Encryption Context to use for object
-    #   encryption. The value of this header is a base64-encoded UTF-8
-    #   string holding JSON with the encryption context key-value pairs.
+    #   Specifies the Amazon Web Services KMS Encryption Context to use for
+    #   object encryption. The value of this header is a base64-encoded
+    #   UTF-8 string holding JSON with the encryption context key-value
+    #   pairs.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
@@ -1662,9 +1690,7 @@ module Aws::S3
     #
     # @!attribute [rw] etag
     #   Returns the ETag of the new object. The ETag reflects only changes
-    #   to the contents of an object, not its metadata. The source and
-    #   destination ETag is identical for a successfully copied
-    #   non-multipart object.
+    #   to the contents of an object, not its metadata.
     #   @return [String]
     #
     # @!attribute [rw] last_modified
@@ -1836,24 +1862,25 @@ module Aws::S3
     #
     # @!attribute [rw] bucket
     #   The name of the bucket to which the multipart upload was initiated.
+    #   Does not return the access point ARN or access point alias if used.
     #
     #   When using this action with an access point, you must direct
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -1888,21 +1915,21 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   If present, specifies the ID of the AWS Key Management Service (AWS
-    #   KMS) symmetric customer managed customer master key (CMK) that was
-    #   used for the object.
+    #   If present, specifies the ID of the Amazon Web Services Key
+    #   Management Service (Amazon Web Services KMS) symmetric customer
+    #   managed customer master key (CMK) that was used for the object.
     #   @return [String]
     #
     # @!attribute [rw] ssekms_encryption_context
-    #   If present, specifies the AWS KMS Encryption Context to use for
-    #   object encryption. The value of this header is a base64-encoded
-    #   UTF-8 string holding JSON with the encryption context key-value
-    #   pairs.
+    #   If present, specifies the Amazon Web Services KMS Encryption Context
+    #   to use for object encryption. The value of this header is a
+    #   base64-encoded UTF-8 string holding JSON with the encryption context
+    #   key-value pairs.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
     #   Indicates whether the multipart upload uses an S3 Bucket Key for
-    #   server-side encryption with AWS KMS (SSE-KMS).
+    #   server-side encryption with Amazon Web Services KMS (SSE-KMS).
     #   @return [Boolean]
     #
     # @!attribute [rw] request_charged
@@ -1979,19 +2006,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -2103,12 +2130,14 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   Specifies the ID of the symmetric customer managed AWS KMS CMK to
-    #   use for object encryption. All GET and PUT requests for an object
-    #   protected by AWS KMS will fail if not made via SSL or using SigV4.
-    #   For information about configuring using any of the officially
-    #   supported AWS SDKs and AWS CLI, see [Specifying the Signature
-    #   Version in Request Authentication][1] in the *Amazon S3 User Guide*.
+    #   Specifies the ID of the symmetric customer managed Amazon Web
+    #   Services KMS CMK to use for object encryption. All GET and PUT
+    #   requests for an object protected by Amazon Web Services KMS will
+    #   fail if not made via SSL or using SigV4. For information about
+    #   configuring using any of the officially supported Amazon Web
+    #   Services SDKs and Amazon Web Services CLI, see [Specifying the
+    #   Signature Version in Request Authentication][1] in the *Amazon S3
+    #   User Guide*.
     #
     #
     #
@@ -2116,9 +2145,10 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_encryption_context
-    #   Specifies the AWS KMS Encryption Context to use for object
-    #   encryption. The value of this header is a base64-encoded UTF-8
-    #   string holding JSON with the encryption context key-value pairs.
+    #   Specifies the Amazon Web Services KMS Encryption Context to use for
+    #   object encryption. The value of this header is a base64-encoded
+    #   UTF-8 string holding JSON with the encryption context key-value
+    #   pairs.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
@@ -2782,19 +2812,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -2831,7 +2861,8 @@ module Aws::S3
     #
     # @!attribute [rw] bypass_governance_retention
     #   Indicates whether S3 Object Lock should bypass Governance-mode
-    #   restrictions to process this operation.
+    #   restrictions to process this operation. To use this header, you must
+    #   have the `s3:PutBucketPublicAccessBlock` permission.
     #   @return [Boolean]
     #
     # @!attribute [rw] expected_bucket_owner
@@ -2884,19 +2915,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -2982,19 +3013,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -3027,8 +3058,8 @@ module Aws::S3
     #
     # @!attribute [rw] bypass_governance_retention
     #   Specifies whether you want to delete this object even if it has a
-    #   Governance-type Object Lock in place. You must have sufficient
-    #   permissions to perform this operation.
+    #   Governance-type Object Lock in place. To use this header, you must
+    #   have the `s3:PutBucketPublicAccessBlock` permission.
     #   @return [Boolean]
     #
     # @!attribute [rw] expected_bucket_owner
@@ -3151,8 +3182,8 @@ module Aws::S3
     #
     # @!attribute [rw] account
     #   Destination bucket owner account ID. In a cross-account scenario, if
-    #   you direct Amazon S3 to change replica ownership to the AWS account
-    #   that owns the destination bucket by specifying the
+    #   you direct Amazon S3 to change replica ownership to the Amazon Web
+    #   Services account that owns the destination bucket by specifying the
     #   `AccessControlTranslation` property, this is the account ID of the
     #   destination bucket owner. For more information, see [Replication
     #   Additional Configuration: Changing the Replica Owner][1] in the
@@ -3179,10 +3210,10 @@ module Aws::S3
     # @!attribute [rw] access_control_translation
     #   Specify this only in a cross-account scenario (where source and
     #   destination bucket owners are not the same), and you want to change
-    #   replica ownership to the AWS account that owns the destination
-    #   bucket. If this is not specified in the replication configuration,
-    #   the replicas are owned by same AWS account that owns the source
-    #   object.
+    #   replica ownership to the Amazon Web Services account that owns the
+    #   destination bucket. If this is not specified in the replication
+    #   configuration, the replicas are owned by same Amazon Web Services
+    #   account that owns the source object.
     #   @return [Types::AccessControlTranslation]
     #
     # @!attribute [rw] encryption_configuration
@@ -3235,10 +3266,11 @@ module Aws::S3
     #
     # @!attribute [rw] kms_key_id
     #   If the encryption type is `aws:kms`, this optional value specifies
-    #   the ID of the symmetric customer managed AWS KMS CMK to use for
-    #   encryption of job results. Amazon S3 only supports symmetric CMKs.
-    #   For more information, see [Using symmetric and asymmetric keys][1]
-    #   in the *AWS Key Management Service Developer Guide*.
+    #   the ID of the symmetric customer managed Amazon Web Services KMS CMK
+    #   to use for encryption of job results. Amazon S3 only supports
+    #   symmetric CMKs. For more information, see [Using symmetric and
+    #   asymmetric keys][1] in the *Amazon Web Services Key Management
+    #   Service Developer Guide*.
     #
     #
     #
@@ -3271,12 +3303,13 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] replica_kms_key_id
-    #   Specifies the ID (Key ARN or Alias ARN) of the customer managed AWS
-    #   KMS key stored in AWS Key Management Service (KMS) for the
-    #   destination bucket. Amazon S3 uses this key to encrypt replica
-    #   objects. Amazon S3 only supports symmetric, customer managed KMS
-    #   keys. For more information, see [Using symmetric and asymmetric
-    #   keys][1] in the *AWS Key Management Service Developer Guide*.
+    #   Specifies the ID (Key ARN or Alias ARN) of the customer managed
+    #   Amazon Web Services KMS key stored in Amazon Web Services Key
+    #   Management Service (KMS) for the destination bucket. Amazon S3 uses
+    #   this key to encrypt replica objects. Amazon S3 only supports
+    #   symmetric, customer managed KMS keys. For more information, see
+    #   [Using symmetric and asymmetric keys][1] in the *Amazon Web Services
+    #   Key Management Service Developer Guide*.
     #
     #
     #
@@ -3330,9 +3363,9 @@ module Aws::S3
     #
     #   * * *Code:* AccountProblem
     #
-    #     * *Description:* There is a problem with your AWS account that
-    #       prevents the action from completing successfully. Contact AWS
-    #       Support for further assistance.
+    #     * *Description:* There is a problem with your Amazon Web Services
+    #       account that prevents the action from completing successfully.
+    #       Contact Amazon Web Services Support for further assistance.
     #
     #     * *HTTP Status Code:* 403 Forbidden
     #
@@ -3341,7 +3374,8 @@ module Aws::S3
     #   * * *Code:* AllAccessDisabled
     #
     #     * *Description:* All access to this Amazon S3 resource has been
-    #       disabled. Contact AWS Support for further assistance.
+    #       disabled. Contact Amazon Web Services Support for further
+    #       assistance.
     #
     #     * *HTTP Status Code:* 403 Forbidden
     #
@@ -3386,11 +3420,11 @@ module Aws::S3
     #   * * *Code:* BucketAlreadyOwnedByYou
     #
     #     * *Description:* The bucket you tried to create already exists,
-    #       and you own it. Amazon S3 returns this error in all AWS Regions
-    #       except in the North Virginia Region. For legacy compatibility,
-    #       if you re-create an existing bucket that you already own in the
-    #       North Virginia Region, Amazon S3 returns 200 OK and resets the
-    #       bucket access control lists (ACLs).
+    #       and you own it. Amazon S3 returns this error in all Amazon Web
+    #       Services Regions except in the North Virginia Region. For legacy
+    #       compatibility, if you re-create an existing bucket that you
+    #       already own in the North Virginia Region, Amazon S3 returns 200
+    #       OK and resets the bucket access control lists (ACLs).
     #
     #     * *Code:* 409 Conflict (in all Regions except the North Virginia
     #       Region)
@@ -3495,8 +3529,8 @@ module Aws::S3
     #
     #   * * *Code:* InvalidAccessKeyId
     #
-    #     * *Description:* The AWS access key ID you provided does not exist
-    #       in our records.
+    #     * *Description:* The Amazon Web Services access key ID you
+    #       provided does not exist in our records.
     #
     #     * *HTTP Status Code:* 403 Forbidden
     #
@@ -3593,7 +3627,8 @@ module Aws::S3
     #   * * *Code:* InvalidPayer
     #
     #     * *Description:* All access to this object has been disabled.
-    #       Please contact AWS Support for further assistance.
+    #       Please contact Amazon Web Services Support for further
+    #       assistance.
     #
     #     * *HTTP Status Code:* 403 Forbidden
     #
@@ -3618,7 +3653,7 @@ module Aws::S3
     #
     #   * * *Code:* InvalidRequest
     #
-    #     * *Description:* Please use AWS4-HMAC-SHA256.
+    #     * *Description:* Please use `AWS4-HMAC-SHA256`.
     #
     #     * *HTTP Status Code:* 400 Bad Request
     #
@@ -3681,7 +3716,8 @@ module Aws::S3
     #   * * *Code:* InvalidRequest
     #
     #     * *Description:* Amazon S3 Transfer Acceleration is not supported
-    #       on this bucket. Contact AWS Support for more information.
+    #       on this bucket. Contact Amazon Web Services Support for more
+    #       information.
     #
     #     * *HTTP Status Code:* 400 Bad Request
     #
@@ -3690,7 +3726,8 @@ module Aws::S3
     #   * * *Code:* InvalidRequest
     #
     #     * *Description:* Amazon S3 Transfer Acceleration cannot be enabled
-    #       on this bucket. Contact AWS Support for more information.
+    #       on this bucket. Contact Amazon Web Services Support for more
+    #       information.
     #
     #     * *HTTP Status Code:* 400 Bad Request
     #
@@ -3938,7 +3975,7 @@ module Aws::S3
     #
     #     * *Description:* Your account is not signed up for the Amazon S3
     #       service. You must sign up before you can use Amazon S3. You can
-    #       sign up at the following URL: https://aws.amazon.com/s3
+    #       sign up at the following URL: [Amazon S3][2]
     #
     #     * *HTTP Status Code:* 403 Forbidden
     #
@@ -4027,9 +4064,10 @@ module Aws::S3
     #   * * *Code:* SignatureDoesNotMatch
     #
     #     * *Description:* The request signature we calculated does not
-    #       match the signature you provided. Check your AWS secret access
-    #       key and signing method. For more information, see [REST
-    #       Authentication][2] and [SOAP Authentication][3] for details.
+    #       match the signature you provided. Check your Amazon Web Services
+    #       secret access key and signing method. For more information, see
+    #       [REST Authentication][3] and [SOAP Authentication][4] for
+    #       details.
     #
     #     * *HTTP Status Code:* 403 Forbidden
     #
@@ -4108,8 +4146,9 @@ module Aws::S3
     #
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#access-bucket-intro
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html
-    #   [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/SOAPAuthentication.html
+    #   [2]: http://aws.amazon.com/s3
+    #   [3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html
+    #   [4]: https://docs.aws.amazon.com/AmazonS3/latest/dev/SOAPAuthentication.html
     #   @return [String]
     #
     # @!attribute [rw] message
@@ -5147,10 +5186,10 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -5226,10 +5265,10 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -5303,10 +5342,10 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -5442,14 +5481,14 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   If present, specifies the ID of the AWS Key Management Service (AWS
-    #   KMS) symmetric customer managed customer master key (CMK) that was
-    #   used for the object.
+    #   If present, specifies the ID of the Amazon Web Services Key
+    #   Management Service (Amazon Web Services KMS) symmetric customer
+    #   managed customer master key (CMK) that was used for the object.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
     #   Indicates whether the object uses an S3 Bucket Key for server-side
-    #   encryption with AWS KMS (SSE-KMS).
+    #   encryption with Amazon Web Services KMS (SSE-KMS).
     #   @return [Boolean]
     #
     # @!attribute [rw] storage_class
@@ -5563,19 +5602,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -5752,10 +5791,10 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -5839,19 +5878,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -6080,7 +6119,7 @@ module Aws::S3
     #   Email address of the grantee.
     #
     #   <note markdown="1"> Using email addresses to specify a grantee is only supported in the
-    #   following AWS Regions:
+    #   following Amazon Web Services Regions:
     #
     #    * US East (N. Virginia)
     #
@@ -6099,7 +6138,8 @@ module Aws::S3
     #   * South America (São Paulo)
     #
     #    For a list of all the Amazon S3 supported Regions and endpoints, see
-    #   [Regions and Endpoints][1] in the AWS General Reference.
+    #   [Regions and Endpoints][1] in the Amazon Web Services General
+    #   Reference.
     #
     #    </note>
     #
@@ -6147,19 +6187,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -6290,10 +6330,10 @@ module Aws::S3
     #
     # @!attribute [rw] server_side_encryption
     #   If the object is stored using server-side encryption either with an
-    #   AWS KMS customer master key (CMK) or an Amazon S3-managed encryption
-    #   key, the response includes this header with the value of the
-    #   server-side encryption algorithm used when storing this object in
-    #   Amazon S3 (for example, AES256, aws:kms).
+    #   Amazon Web Services KMS customer master key (CMK) or an Amazon
+    #   S3-managed encryption key, the response includes this header with
+    #   the value of the server-side encryption algorithm used when storing
+    #   this object in Amazon S3 (for example, AES256, aws:kms).
     #   @return [String]
     #
     # @!attribute [rw] metadata
@@ -6314,14 +6354,14 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   If present, specifies the ID of the AWS Key Management Service (AWS
-    #   KMS) symmetric customer managed customer master key (CMK) that was
-    #   used for the object.
+    #   If present, specifies the ID of the Amazon Web Services Key
+    #   Management Service (Amazon Web Services KMS) symmetric customer
+    #   managed customer master key (CMK) that was used for the object.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
     #   Indicates whether the object uses an S3 Bucket Key for server-side
-    #   encryption with AWS KMS (SSE-KMS).
+    #   encryption with Amazon Web Services KMS (SSE-KMS).
     #   @return [Boolean]
     #
     # @!attribute [rw] storage_class
@@ -6483,19 +6523,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -6647,8 +6687,9 @@ module Aws::S3
     # Container element that identifies who initiated the multipart upload.
     #
     # @!attribute [rw] id
-    #   If the principal is an AWS account, it provides the Canonical User
-    #   ID. If the principal is an IAM User, it provides a user ARN value.
+    #   If the principal is an Amazon Web Services account, it provides the
+    #   Canonical User ID. If the principal is an IAM User, it provides a
+    #   user ARN value.
     #   @return [String]
     #
     # @!attribute [rw] display_name
@@ -7196,8 +7237,7 @@ module Aws::S3
       include Aws::Structure
     end
 
-    # A container for specifying the configuration for AWS Lambda
-    # notifications.
+    # A container for specifying the configuration for Lambda notifications.
     #
     # @note When making an API call, you may pass LambdaFunctionConfiguration
     #   data as a hash:
@@ -7225,14 +7265,14 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] lambda_function_arn
-    #   The Amazon Resource Name (ARN) of the AWS Lambda function that
-    #   Amazon S3 invokes when the specified event type occurs.
+    #   The Amazon Resource Name (ARN) of the Lambda function that Amazon S3
+    #   invokes when the specified event type occurs.
     #   @return [String]
     #
     # @!attribute [rw] events
-    #   The Amazon S3 bucket event for which to invoke the AWS Lambda
-    #   function. For more information, see [Supported Event Types][1] in
-    #   the *Amazon S3 User Guide*.
+    #   The Amazon S3 bucket event for which to invoke the Lambda function.
+    #   For more information, see [Supported Event Types][1] in the *Amazon
+    #   S3 User Guide*.
     #
     #
     #
@@ -7866,6 +7906,7 @@ module Aws::S3
 
     # @!attribute [rw] bucket
     #   The name of the bucket to which the multipart upload was initiated.
+    #   Does not return the access point ARN or access point alias if used.
     #   @return [String]
     #
     # @!attribute [rw] key_marker
@@ -7975,19 +8016,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -8360,19 +8401,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -8394,7 +8435,9 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] marker
-    #   Specifies the key to start with when listing objects in a bucket.
+    #   Marker is where you want Amazon S3 to start listing from. Amazon S3
+    #   starts listing after this specified key. Marker can be any key in
+    #   the bucket.
     #   @return [String]
     #
     # @!attribute [rw] max_keys
@@ -8451,19 +8494,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -8586,19 +8629,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -8698,6 +8741,7 @@ module Aws::S3
     #
     # @!attribute [rw] bucket
     #   The name of the bucket to which the multipart upload was initiated.
+    #   Does not return the access point ARN or access point alias if used.
     #   @return [String]
     #
     # @!attribute [rw] key
@@ -8739,9 +8783,10 @@ module Aws::S3
     #
     # @!attribute [rw] initiator
     #   Container element that identifies who initiated the multipart
-    #   upload. If the initiator is an AWS account, this element provides
-    #   the same information as the `Owner` element. If the initiator is an
-    #   IAM User, this element provides the user ARN and display name.
+    #   upload. If the initiator is an Amazon Web Services account, this
+    #   element provides the same information as the `Owner` element. If the
+    #   initiator is an IAM User, this element provides the user ARN and
+    #   display name.
     #   @return [Types::Initiator]
     #
     # @!attribute [rw] owner
@@ -8801,19 +8846,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -9328,8 +9373,8 @@ module Aws::S3
     #   @return [Array<Types::QueueConfiguration>]
     #
     # @!attribute [rw] lambda_function_configurations
-    #   Describes the AWS Lambda functions to invoke and the events for
-    #   which to invoke them.
+    #   Describes the Lambda functions to invoke and the events for which to
+    #   invoke them.
     #   @return [Array<Types::LambdaFunctionConfiguration>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NotificationConfiguration AWS API Documentation
@@ -9381,7 +9426,7 @@ module Aws::S3
     #   @return [Types::QueueConfigurationDeprecated]
     #
     # @!attribute [rw] cloud_function_configuration
-    #   Container for specifying the AWS Lambda notification configuration.
+    #   Container for specifying the Lambda notification configuration.
     #   @return [Types::CloudFunctionConfiguration]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NotificationConfigurationDeprecated AWS API Documentation
@@ -9447,14 +9492,14 @@ module Aws::S3
     #   described below:
     #
     #   * Objects created by the PUT Object, POST Object, or Copy operation,
-    #     or through the AWS Management Console, and are encrypted by SSE-S3
-    #     or plaintext, have ETags that are an MD5 digest of their object
-    #     data.
+    #     or through the Amazon Web Services Management Console, and are
+    #     encrypted by SSE-S3 or plaintext, have ETags that are an MD5
+    #     digest of their object data.
     #
     #   * Objects created by the PUT Object, POST Object, or Copy operation,
-    #     or through the AWS Management Console, and are encrypted by SSE-C
-    #     or SSE-KMS, have ETags that are not an MD5 digest of their object
-    #     data.
+    #     or through the Amazon Web Services Management Console, and are
+    #     encrypted by SSE-C or SSE-KMS, have ETags that are not an MD5
+    #     digest of their object data.
     #
     #   * If an object is created by either the Multipart Upload or Part
     #     Copy operation, the ETag is not an MD5 digest, regardless of the
@@ -10024,8 +10069,8 @@ module Aws::S3
     # @!attribute [rw] restrict_public_buckets
     #   Specifies whether Amazon S3 should restrict public bucket policies
     #   for this bucket. Setting this element to `TRUE` restricts access to
-    #   this bucket to only AWS service principals and authorized users
-    #   within this account if the bucket has a public policy.
+    #   this bucket to only Amazon Web Service principals and authorized
+    #   users within this account if the bucket has a public policy.
     #
     #   Enabling this setting doesn't affect previously stored bucket
     #   policies, except that public and cross-account access within any
@@ -10132,8 +10177,9 @@ module Aws::S3
     #   was not corrupted in transit. For more information, go to [RFC
     #   1864.][1]
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #
     #
     #
@@ -10299,8 +10345,9 @@ module Aws::S3
     #   was not corrupted in transit. For more information, go to [RFC
     #   1864.][1]
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #
     #
     #
@@ -10347,9 +10394,9 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   Specifies default encryption for a bucket using server-side
     #   encryption with Amazon S3-managed keys (SSE-S3) or customer master
-    #   keys stored in AWS KMS (SSE-KMS). For information about the Amazon
-    #   S3 default encryption feature, see [Amazon S3 Default Bucket
-    #   Encryption][1] in the *Amazon S3 User Guide*.
+    #   keys stored in Amazon Web Services KMS (SSE-KMS). For information
+    #   about the Amazon S3 default encryption feature, see [Amazon S3
+    #   Default Bucket Encryption][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -10360,8 +10407,9 @@ module Aws::S3
     #   The base64-encoded 128-bit MD5 digest of the server-side encryption
     #   configuration.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] server_side_encryption_configuration
@@ -10631,8 +10679,9 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] content_md5
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] lifecycle_configuration
@@ -10693,8 +10742,9 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   The MD5 hash of the `PutBucketLogging` request body.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
@@ -10895,8 +10945,9 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   The MD5 hash of the `PutPublicAccessBlock` request body.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] notification_configuration
@@ -10944,8 +10995,9 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   The MD5 hash of the `OwnershipControls` request body.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
@@ -10988,8 +11040,9 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   The MD5 hash of the request body.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] confirm_remove_self_bucket_access
@@ -11103,8 +11156,9 @@ module Aws::S3
     #   was not corrupted in transit. For more information, see [RFC
     #   1864][1].
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #
     #
     #
@@ -11160,8 +11214,9 @@ module Aws::S3
     #   was not corrupted in transit. For more information, see [RFC
     #   1864][1].
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #
     #
     #
@@ -11216,8 +11271,9 @@ module Aws::S3
     #   was not corrupted in transit. For more information, see [RFC
     #   1864][1].
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #
     #
     #
@@ -11269,8 +11325,9 @@ module Aws::S3
     #   body was not corrupted in transit. For more information, see [RFC
     #   1864][1].
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #
     #
     #
@@ -11351,8 +11408,9 @@ module Aws::S3
     #   was not corrupted in transit. For more information, see [RFC
     #   1864][1].
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #
     #
     #
@@ -11451,10 +11509,10 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -11467,8 +11525,9 @@ module Aws::S3
     #   was not corrupted in transit. For more information, go to [RFC
     #   1864.&gt;][1]
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #
     #
     #
@@ -11514,19 +11573,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -11612,10 +11671,10 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -11650,8 +11709,9 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   The MD5 hash for the request body.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
@@ -11737,8 +11797,9 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   The MD5 hash for the request body.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
@@ -11777,10 +11838,11 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] server_side_encryption
-    #   If you specified server-side encryption either with an AWS KMS
-    #   customer master key (CMK) or Amazon S3-managed encryption key in
-    #   your PUT request, the response includes this header. It confirms the
-    #   encryption algorithm that Amazon S3 used to encrypt the object.
+    #   If you specified server-side encryption either with an Amazon Web
+    #   Services KMS customer master key (CMK) or Amazon S3-managed
+    #   encryption key in your PUT request, the response includes this
+    #   header. It confirms the encryption algorithm that Amazon S3 used to
+    #   encrypt the object.
     #   @return [String]
     #
     # @!attribute [rw] version_id
@@ -11802,21 +11864,21 @@ module Aws::S3
     #
     # @!attribute [rw] ssekms_key_id
     #   If `x-amz-server-side-encryption` is present and has the value of
-    #   `aws:kms`, this header specifies the ID of the AWS Key Management
-    #   Service (AWS KMS) symmetric customer managed customer master key
-    #   (CMK) that was used for the object.
+    #   `aws:kms`, this header specifies the ID of the Amazon Web Services
+    #   Key Management Service (Amazon Web Services KMS) symmetric customer
+    #   managed customer master key (CMK) that was used for the object.
     #   @return [String]
     #
     # @!attribute [rw] ssekms_encryption_context
-    #   If present, specifies the AWS KMS Encryption Context to use for
-    #   object encryption. The value of this header is a base64-encoded
-    #   UTF-8 string holding JSON with the encryption context key-value
-    #   pairs.
+    #   If present, specifies the Amazon Web Services KMS Encryption Context
+    #   to use for object encryption. The value of this header is a
+    #   base64-encoded UTF-8 string holding JSON with the encryption context
+    #   key-value pairs.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
     #   Indicates whether the uploaded object uses an S3 Bucket Key for
-    #   server-side encryption with AWS KMS (SSE-KMS).
+    #   server-side encryption with Amazon Web Services KMS (SSE-KMS).
     #   @return [Boolean]
     #
     # @!attribute [rw] request_charged
@@ -11903,19 +11965,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -12104,20 +12166,22 @@ module Aws::S3
     #
     # @!attribute [rw] ssekms_key_id
     #   If `x-amz-server-side-encryption` is present and has the value of
-    #   `aws:kms`, this header specifies the ID of the AWS Key Management
-    #   Service (AWS KMS) symmetrical customer managed customer master key
-    #   (CMK) that was used for the object. If you specify
-    #   `x-amz-server-side-encryption:aws:kms`, but do not provide`
-    #   x-amz-server-side-encryption-aws-kms-key-id`, Amazon S3 uses the AWS
-    #   managed CMK in AWS to protect the data. If the KMS key does not
-    #   exist in the same account issuing the command, you must use the full
-    #   ARN and not just the ID.
+    #   `aws:kms`, this header specifies the ID of the Amazon Web Services
+    #   Key Management Service (Amazon Web Services KMS) symmetrical
+    #   customer managed customer master key (CMK) that was used for the
+    #   object. If you specify `x-amz-server-side-encryption:aws:kms`, but
+    #   do not provide` x-amz-server-side-encryption-aws-kms-key-id`, Amazon
+    #   S3 uses the Amazon Web Services managed CMK in Amazon Web Services
+    #   to protect the data. If the KMS key does not exist in the same
+    #   account issuing the command, you must use the full ARN and not just
+    #   the ID.
     #   @return [String]
     #
     # @!attribute [rw] ssekms_encryption_context
-    #   Specifies the AWS KMS Encryption Context to use for object
-    #   encryption. The value of this header is a base64-encoded UTF-8
-    #   string holding JSON with the encryption context key-value pairs.
+    #   Specifies the Amazon Web Services KMS Encryption Context to use for
+    #   object encryption. The value of this header is a base64-encoded
+    #   UTF-8 string holding JSON with the encryption context key-value
+    #   pairs.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
@@ -12248,10 +12312,10 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -12292,8 +12356,9 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   The MD5 hash for the request body.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
@@ -12356,19 +12421,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -12387,8 +12452,9 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   The MD5 hash for the request body.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] tagging
@@ -12450,8 +12516,9 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   The MD5 hash of the `PutPublicAccessBlock` request body.
     #
-    #   For requests made using the AWS Command Line Interface (CLI) or AWS
-    #   SDKs, this field is calculated automatically.
+    #   For requests made using the Amazon Web Services Command Line
+    #   Interface (CLI) or Amazon Web Services SDKs, this field is
+    #   calculated automatically.
     #   @return [String]
     #
     # @!attribute [rw] public_access_block_configuration
@@ -12813,10 +12880,10 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] role
-    #   The Amazon Resource Name (ARN) of the AWS Identity and Access
-    #   Management (IAM) role that Amazon S3 assumes when replicating
-    #   objects. For more information, see [How to Set Up Replication][1] in
-    #   the *Amazon S3 User Guide*.
+    #   The Amazon Resource Name (ARN) of the Identity and Access Management
+    #   (IAM) role that Amazon S3 assumes when replicating objects. For more
+    #   information, see [How to Set Up Replication][1] in the *Amazon S3
+    #   User Guide*.
     #
     #
     #
@@ -12956,7 +13023,7 @@ module Aws::S3
     #   or disable the replication of these objects. Currently, Amazon S3
     #   supports only the filter that you can specify for objects created
     #   with server-side encryption using a customer master key (CMK) stored
-    #   in AWS Key Management Service (SSE-KMS).
+    #   in Amazon Web Services Key Management Service (SSE-KMS).
     #   @return [Types::SourceSelectionCriteria]
     #
     # @!attribute [rw] existing_object_replication
@@ -13163,7 +13230,7 @@ module Aws::S3
     # @!attribute [rw] minutes
     #   Contains an integer specifying time in minutes.
     #
-    #   Valid values: 15 minutes.
+    #   Valid value: 15
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ReplicationTimeValue AWS API Documentation
@@ -13336,19 +13403,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -13834,9 +13901,9 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] key_id
-    #   Specifies the ID of the AWS Key Management Service (AWS KMS)
-    #   symmetric customer managed customer master key (CMK) to use for
-    #   encrypting inventory reports.
+    #   Specifies the ID of the Amazon Web Services Key Management Service
+    #   (Amazon Web Services KMS) symmetric customer managed customer master
+    #   key (CMK) to use for encrypting inventory reports.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SSEKMS AWS API Documentation
@@ -14163,9 +14230,10 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] kms_master_key_id
-    #   AWS Key Management Service (KMS) customer AWS KMS key ID to use for
-    #   the default encryption. This parameter is allowed if and only if
-    #   `SSEAlgorithm` is set to `aws:kms`.
+    #   Amazon Web Services Key Management Service (KMS) customer Amazon Web
+    #   Services KMS key ID to use for the default encryption. This
+    #   parameter is allowed if and only if `SSEAlgorithm` is set to
+    #   `aws:kms`.
     #
     #   You can specify the key ID or the Amazon Resource Name (ARN) of the
     #   KMS key. However, if you are using encryption with cross-account
@@ -14181,7 +14249,8 @@ module Aws::S3
     #
     #   Amazon S3 only supports symmetric KMS keys and not asymmetric KMS
     #   keys. For more information, see [Using symmetric and asymmetric
-    #   keys][2] in the *AWS Key Management Service Developer Guide*.
+    #   keys][2] in the *Amazon Web Services Key Management Service
+    #   Developer Guide*.
     #
     #
     #
@@ -14275,8 +14344,8 @@ module Aws::S3
     # source objects that you want to replicate. You can choose to enable or
     # disable the replication of these objects. Currently, Amazon S3
     # supports only the filter that you can specify for objects created with
-    # server-side encryption using a customer master key (CMK) stored in AWS
-    # Key Management Service (SSE-KMS).
+    # server-side encryption using a customer master key (CMK) stored in
+    # Amazon Web Services Key Management Service (SSE-KMS).
     #
     # @note When making an API call, you may pass SourceSelectionCriteria
     #   data as a hash:
@@ -14292,7 +14361,7 @@ module Aws::S3
     #
     # @!attribute [rw] sse_kms_encrypted_objects
     #   A container for filter information for the selection of Amazon S3
-    #   objects encrypted with AWS KMS. If you include
+    #   objects encrypted with Amazon Web Services KMS. If you include
     #   `SourceSelectionCriteria` in the replication configuration, this
     #   element is required.
     #   @return [Types::SseKmsEncryptedObjects]
@@ -14321,7 +14390,7 @@ module Aws::S3
     end
 
     # A container for filter information for the selection of S3 objects
-    # encrypted with AWS KMS.
+    # encrypted with Amazon Web Services KMS.
     #
     # @note When making an API call, you may pass SseKmsEncryptedObjects
     #   data as a hash:
@@ -14332,8 +14401,8 @@ module Aws::S3
     #
     # @!attribute [rw] status
     #   Specifies whether Amazon S3 replicates objects created with
-    #   server-side encryption using an AWS KMS key stored in AWS Key
-    #   Management Service.
+    #   server-side encryption using an Amazon Web Services KMS key stored
+    #   in Amazon Web Services Key Management Service.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SseKmsEncryptedObjects AWS API Documentation
@@ -14766,14 +14835,14 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   If present, specifies the ID of the AWS Key Management Service (AWS
-    #   KMS) symmetric customer managed customer master key (CMK) that was
-    #   used for the object.
+    #   If present, specifies the ID of the Amazon Web Services Key
+    #   Management Service (Amazon Web Services KMS) symmetric customer
+    #   managed customer master key (CMK) that was used for the object.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
     #   Indicates whether the multipart upload uses an S3 Bucket Key for
-    #   server-side encryption with AWS KMS (SSE-KMS).
+    #   server-side encryption with Amazon Web Services KMS (SSE-KMS).
     #   @return [Boolean]
     #
     # @!attribute [rw] request_charged
@@ -14828,19 +14897,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -14871,7 +14940,8 @@ module Aws::S3
     #     The value must be URL encoded.
     #
     #     <note markdown="1"> Amazon S3 supports copy operations using access points only when
-    #     the source and destination buckets are in the same AWS Region.
+    #     the source and destination buckets are in the same Amazon Web
+    #     Services Region.
     #
     #      </note>
     #
@@ -15047,14 +15117,14 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   If present, specifies the ID of the AWS Key Management Service (AWS
-    #   KMS) symmetric customer managed customer master key (CMK) was used
-    #   for the object.
+    #   If present, specifies the ID of the Amazon Web Services Key
+    #   Management Service (Amazon Web Services KMS) symmetric customer
+    #   managed customer master key (CMK) was used for the object.
     #   @return [String]
     #
     # @!attribute [rw] bucket_key_enabled
     #   Indicates whether the multipart upload uses an S3 Bucket Key for
-    #   server-side encryption with AWS KMS (SSE-KMS).
+    #   server-side encryption with Amazon Web Services KMS (SSE-KMS).
     #   @return [Boolean]
     #
     # @!attribute [rw] request_charged
@@ -15105,19 +15175,19 @@ module Aws::S3
     #   requests to the access point hostname. The access point hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.s3-accesspoint.*Region*.amazonaws.com.
-    #   When using this action with an access point through the AWS SDKs,
-    #   you provide the access point ARN in place of the bucket name. For
-    #   more information about access point ARNs, see [Using access
-    #   points][1] in the *Amazon S3 User Guide*.
+    #   When using this action with an access point through the Amazon Web
+    #   Services SDKs, you provide the access point ARN in place of the
+    #   bucket name. For more information about access point ARNs, see
+    #   [Using access points][1] in the *Amazon S3 User Guide*.
     #
     #   When using this action with Amazon S3 on Outposts, you must direct
     #   requests to the S3 on Outposts hostname. The S3 on Outposts hostname
     #   takes the form
     #   *AccessPointName*-*AccountId*.*outpostID*.s3-outposts.*Region*.amazonaws.com.
-    #   When using this action using S3 on Outposts through the AWS SDKs,
-    #   you provide the Outposts bucket ARN in place of the bucket name. For
-    #   more information about S3 on Outposts ARNs, see [Using S3 on
-    #   Outposts][2] in the *Amazon S3 User Guide*.
+    #   When using this action using S3 on Outposts through the Amazon Web
+    #   Services SDKs, you provide the Outposts bucket ARN in place of the
+    #   bucket name. For more information about S3 on Outposts ARNs, see
+    #   [Using S3 on Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -15543,9 +15613,10 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] ssekms_key_id
-    #   If present, specifies the ID of the AWS Key Management Service (AWS
-    #   KMS) symmetric customer managed customer master key (CMK) that was
-    #   used for stored in Amazon S3 object.
+    #   If present, specifies the ID of the Amazon Web Services Key
+    #   Management Service (Amazon Web Services KMS) symmetric customer
+    #   managed customer master key (CMK) that was used for stored in Amazon
+    #   S3 object.
     #   @return [String]
     #
     # @!attribute [rw] sse_customer_key_md5
@@ -15573,7 +15644,8 @@ module Aws::S3
     #
     # @!attribute [rw] bucket_key_enabled
     #   Indicates whether the object stored in Amazon S3 uses an S3 bucket
-    #   key for server-side encryption with AWS KMS (SSE-KMS).
+    #   key for server-side encryption with Amazon Web Services KMS
+    #   (SSE-KMS).
     #   @return [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/WriteGetObjectResponseRequest AWS API Documentation