aws-sdk-s3 1.88.0 → 1.91.0

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -634,6 +634,7 @@ module Aws::S3
     CORSConfiguration.add_member(:cors_rules, Shapes::ShapeRef.new(shape: CORSRules, required: true, location_name: "CORSRule"))
     CORSConfiguration.struct_class = Types::CORSConfiguration
 
+    CORSRule.add_member(:id, Shapes::ShapeRef.new(shape: ID, location_name: "ID"))
     CORSRule.add_member(:allowed_headers, Shapes::ShapeRef.new(shape: AllowedHeaders, location_name: "AllowedHeader"))
     CORSRule.add_member(:allowed_methods, Shapes::ShapeRef.new(shape: AllowedMethods, required: true, location_name: "AllowedMethod"))
     CORSRule.add_member(:allowed_origins, Shapes::ShapeRef.new(shape: AllowedOrigins, required: true, location_name: "AllowedOrigin"))
@@ -1288,6 +1289,7 @@ module Aws::S3
     GetObjectTaggingRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     GetObjectTaggingRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
     GetObjectTaggingRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
+    GetObjectTaggingRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
     GetObjectTaggingRequest.struct_class = Types::GetObjectTaggingRequest
 
     GetObjectTorrentOutput.add_member(:body, Shapes::ShapeRef.new(shape: Body, location_name: "Body", metadata: {"streaming"=>true}))
@@ -2105,6 +2107,7 @@ module Aws::S3
     PutObjectTaggingRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutObjectTaggingRequest.add_member(:tagging, Shapes::ShapeRef.new(shape: Tagging, required: true, location_name: "Tagging", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutObjectTaggingRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
+    PutObjectTaggingRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
     PutObjectTaggingRequest.struct_class = Types::PutObjectTaggingRequest
     PutObjectTaggingRequest[:payload] = :tagging
     PutObjectTaggingRequest[:payload_member] = PutObjectTaggingRequest.member(:tagging)

data/lib/aws-sdk-s3/customizations/bucket.rb

@@ -88,18 +88,23 @@ module Aws
       # You can pass `virtual_host: true` to use the bucket name as the
       # host name.
       #
-      #     bucket = s3.bucket('my.bucket.com')
+      #     bucket = s3.bucket('my-bucket.com')
       #     bucket.url(virtual_host: true)
-      #     #=> "http://my.bucket.com"
+      #     #=> "http://my-bucket.com"
       #
       # @option options [Boolean] :virtual_host (false) When `true`,
       #   the bucket name will be used as the host name. This is useful
       #   when you have a CNAME configured for this bucket.
       #
+      # @option options [Boolean] :secure (true) When `false`, http
+      #   will be used with virtual_host.  This is required when
+      #   the bucket name has a dot (.) in it.
+      #
       # @return [String] the URL for this bucket.
       def url(options = {})
         if options[:virtual_host]
-          "http://#{name}"
+          scheme = options.fetch(:secure, true) ? 'https' : 'http'
+          "#{scheme}://#{name}"
         elsif @arn
           Plugins::ARN.resolve_url!(
             client.config.endpoint.dup,

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

@@ -201,16 +201,22 @@ module Aws
       #     s3.bucket('bucket-name').object('obj-key').public_url
       #     #=> "https://bucket-name.s3.amazonaws.com/obj-key"
       #
-      # To use virtual hosted bucket url (disables https):
+      # To use virtual hosted bucket url.
+      # Uses https unless secure: false is set.  If the bucket
+      # name contains dots (.) then you will need to set secure: false.
       #
-      #     s3.bucket('my.bucket.com').object('key')
+      #     s3.bucket('my-bucket.com').object('key')
       #       .public_url(virtual_host: true)
-      #     #=> "http://my.bucket.com/key"
+      #     #=> "https://my-bucket.com/key"
       #
       # @option options [Boolean] :virtual_host (false) When `true`, the bucket
       #   name will be used as the host name. This is useful when you have
       #   a CNAME configured for the bucket.
       #
+      # @option options [Boolean] :secure (true) When `false`, http
+      #   will be used with virtual_host.  This is required when
+      #   the bucket name has a dot (.) in it.
+      #
       # @return [String]
       def public_url(options = {})
         url = URI.parse(bucket.url(options))

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -97,7 +97,7 @@ module Aws::S3
       data[:archive_status]
     end
 
-    # Last modified date of the object
+    # Creation date of the object.
     # @return [Time]
     def last_modified
       data[:last_modified]
@@ -722,8 +722,8 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with a COPY operation doesn’t affect
-    #   bucket-level settings for S3 Bucket Key.
+    #   Specifying this header with a COPY action doesn’t affect bucket-level
+    #   settings for S3 Bucket Key.
     # @option options [String] :copy_source_sse_customer_algorithm
     #   Specifies the algorithm to use when decrypting the source object (for
     #   example, AES256).
@@ -881,13 +881,13 @@ module Aws::S3
     # @option options [String] :version_id
     #   VersionId used to reference a specific version of the object.
     # @option options [String] :sse_customer_algorithm
-    #   Specifies the algorithm to use to when encrypting the object (for
+    #   Specifies the algorithm to use to when decrypting the object (for
     #   example, AES256).
     # @option options [String] :sse_customer_key
-    #   Specifies the customer-provided encryption key for Amazon S3 to use in
-    #   encrypting data. This value is used to store the object and then it is
-    #   discarded; Amazon S3 does not store the encryption key. The key must
-    #   be appropriate for use with the algorithm specified in the
+    #   Specifies the customer-provided encryption key for Amazon S3 used to
+    #   encrypt the data. This value is used to decrypt the object when
+    #   recovering it and must match the one used when storing the data. The
+    #   key must be appropriate for use with the algorithm specified in the
     #   `x-amz-server-side-encryption-customer-algorithm` header.
     # @option options [String] :sse_customer_key_md5
     #   Specifies the 128-bit MD5 digest of the encryption key according to
@@ -1034,7 +1034,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/http:/docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
     # @option options [String] :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
@@ -1045,7 +1045,7 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with an object operation doesn’t affect
+    #   Specifying this header with an object action doesn’t affect
     #   bucket-level settings for S3 Bucket Key.
     # @option options [String] :request_payer
     #   Confirms that the requester knows that they will be charged for the
@@ -1291,8 +1291,8 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with a PUT operation doesn’t affect
-    #   bucket-level settings for S3 Bucket Key.
+    #   Specifying this header with a PUT action doesn’t affect bucket-level
+    #   settings for S3 Bucket Key.
     # @option options [String] :request_payer
     #   Confirms that the requester knows that they will be charged for the
     #   request. Bucket owners need not specify this parameter in their

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -42,7 +42,7 @@ module Aws::S3
       @key
     end
 
-    # The date the Object was Last Modified
+    # Creation date of the object.
     # @return [Time]
     def last_modified
       data[:last_modified]
@@ -465,8 +465,8 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with a COPY operation doesn’t affect
-    #   bucket-level settings for S3 Bucket Key.
+    #   Specifying this header with a COPY action doesn’t affect bucket-level
+    #   settings for S3 Bucket Key.
     # @option options [String] :copy_source_sse_customer_algorithm
     #   Specifies the algorithm to use when decrypting the source object (for
     #   example, AES256).
@@ -624,13 +624,13 @@ module Aws::S3
     # @option options [String] :version_id
     #   VersionId used to reference a specific version of the object.
     # @option options [String] :sse_customer_algorithm
-    #   Specifies the algorithm to use to when encrypting the object (for
+    #   Specifies the algorithm to use to when decrypting the object (for
     #   example, AES256).
     # @option options [String] :sse_customer_key
-    #   Specifies the customer-provided encryption key for Amazon S3 to use in
-    #   encrypting data. This value is used to store the object and then it is
-    #   discarded; Amazon S3 does not store the encryption key. The key must
-    #   be appropriate for use with the algorithm specified in the
+    #   Specifies the customer-provided encryption key for Amazon S3 used to
+    #   encrypt the data. This value is used to decrypt the object when
+    #   recovering it and must match the one used when storing the data. The
+    #   key must be appropriate for use with the algorithm specified in the
     #   `x-amz-server-side-encryption-customer-algorithm` header.
     # @option options [String] :sse_customer_key_md5
     #   Specifies the 128-bit MD5 digest of the encryption key according to
@@ -777,7 +777,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/http:/docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
     # @option options [String] :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
@@ -788,7 +788,7 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with an object operation doesn’t affect
+    #   Specifying this header with an object action doesn’t affect
     #   bucket-level settings for S3 Bucket Key.
     # @option options [String] :request_payer
     #   Confirms that the requester knows that they will be charged for the
@@ -1034,8 +1034,8 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
     #   for object encryption with SSE-KMS.
     #
-    #   Specifying this header with a PUT operation doesn’t affect
-    #   bucket-level settings for S3 Bucket Key.
+    #   Specifying this header with a PUT action doesn’t affect bucket-level
+    #   settings for S3 Bucket Key.
     # @option options [String] :request_payer
     #   Confirms that the requester knows that they will be charged for the
     #   request. Bucket owners need not specify this parameter in their

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -330,13 +330,13 @@ module Aws::S3
     # @option options [Time,DateTime,Date,Integer,String] :response_expires
     #   Sets the `Expires` header of the response.
     # @option options [String] :sse_customer_algorithm
-    #   Specifies the algorithm to use to when encrypting the object (for
+    #   Specifies the algorithm to use to when decrypting the object (for
     #   example, AES256).
     # @option options [String] :sse_customer_key
-    #   Specifies the customer-provided encryption key for Amazon S3 to use in
-    #   encrypting data. This value is used to store the object and then it is
-    #   discarded; Amazon S3 does not store the encryption key. The key must
-    #   be appropriate for use with the algorithm specified in the
+    #   Specifies the customer-provided encryption key for Amazon S3 used to
+    #   encrypt the data. This value is used to decrypt the object when
+    #   recovering it and must match the one used when storing the data. The
+    #   key must be appropriate for use with the algorithm specified in the
     #   `x-amz-server-side-encryption-customer-algorithm` header.
     # @option options [String] :sse_customer_key_md5
     #   Specifies the 128-bit MD5 digest of the encryption key according to

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

@@ -15,7 +15,8 @@ module Aws
         class Handler < Seahorse::Client::Handler
 
           def call(context)
-            if context.http_request.body && context.http_request.body.size > 0
+            body = context.http_request.body
+            if body.respond_to?(:size) && body.size > 0
               context.http_request.headers['expect'] = '100-continue'
             end
             @handler.call(context)

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

@@ -17,7 +17,8 @@ region. Defaults to `legacy` mode using global endpoint.
         end
 
         def add_handlers(handlers, config)
-          if config.region == 'us-east-1'
+          # only modify non-custom endpoints
+          if config.regional_endpoint && config.region == 'us-east-1'
             handlers.add(Handler)
           end
         end
@@ -29,7 +30,7 @@ region. Defaults to `legacy` mode using global endpoint.
             # keep legacy global endpoint pattern by default
             if context.config.s3_us_east_1_regional_endpoint == 'legacy'
               host = context.http_request.endpoint.host
-              # if it's an ARN, don't touch the endpoint at all
+              # if it's an ARN then don't touch the endpoint at all
               unless context.metadata[:s3_arn]
                 legacy_host = IADRegionalEndpoint.legacy_host(host)
                 context.http_request.endpoint.host = legacy_host

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

@@ -23,7 +23,7 @@ module Aws
 
           def call(context)
             body = context.http_request.body
-            if body.size > 0
+            if body.respond_to?(:size) && body.size > 0
               context.http_request.headers['Content-Md5'] ||= md5(body)
             end
             @handler.call(context)

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

@@ -58,8 +58,7 @@ module Aws
       #   is returned instead of the default HTTPS URL.
       #
       # @option params [Boolean] :virtual_host (false) When `true`, the
-      #   bucket name will be used as the hostname. This will cause
-      #   the returned URL to be 'http' and not 'https'.
+      #   bucket name will be used as the hostname.
       #
       # @option params [Boolean] :use_accelerate_endpoint (false) When `true`,
       #   Presigner will attempt to use accelerated endpoint.

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -67,20 +67,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The bucket name to which the upload was taking place.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -621,6 +621,7 @@ module Aws::S3
     #       {
     #         cors_rules: [ # required
     #           {
+    #             id: "ID",
     #             allowed_headers: ["AllowedHeader"],
     #             allowed_methods: ["AllowedMethod"], # required
     #             allowed_origins: ["AllowedOrigin"], # required
@@ -649,6 +650,7 @@ module Aws::S3
     #   data as a hash:
     #
     #       {
+    #         id: "ID",
     #         allowed_headers: ["AllowedHeader"],
     #         allowed_methods: ["AllowedMethod"], # required
     #         allowed_origins: ["AllowedOrigin"], # required
@@ -656,6 +658,11 @@ module Aws::S3
     #         max_age_seconds: 1,
     #       }
     #
+    # @!attribute [rw] id
+    #   Unique identifier for the rule. The value cannot be longer than 255
+    #   characters.
+    #   @return [String]
+    #
     # @!attribute [rw] allowed_headers
     #   Headers that are specified in the `Access-Control-Request-Headers`
     #   header. These headers are allowed in a preflight OPTIONS request. In
@@ -687,6 +694,7 @@ module Aws::S3
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CORSRule AWS API Documentation
     #
     class CORSRule < Struct.new(
+      :id,
       :allowed_headers,
       :allowed_methods,
       :allowed_origins,
@@ -911,20 +919,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The name of the bucket that contains the newly created object.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -1153,6 +1161,14 @@ module Aws::S3
     #   `Condition` is specified and sibling `HttpErrorCodeReturnedEquals`
     #   is not specified. If both conditions are specified, both must be
     #   true for the redirect to be applied.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Condition AWS API Documentation
@@ -1305,20 +1321,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The name of the destination bucket.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -1533,7 +1549,7 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket
     #   Key for object encryption with SSE-KMS.
     #
-    #   Specifying this header with a COPY operation doesn’t affect
+    #   Specifying this header with a COPY action doesn’t affect
     #   bucket-level settings for S3 Bucket Key.
     #   @return [Boolean]
     #
@@ -1650,11 +1666,12 @@ 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 object.
+    #   destination ETag is identical for a successfully copied
+    #   non-multipart object.
     #   @return [String]
     #
     # @!attribute [rw] last_modified
-    #   Returns the date that the object was last modified.
+    #   Creation date of the object.
     #   @return [Time]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObjectResult AWS API Documentation
@@ -1821,20 +1838,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The name of the bucket to which the multipart upload was initiated.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -1959,20 +1976,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The name of the bucket to which to initiate the upload
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -2097,7 +2114,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/http:/docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
     #   @return [String]
     #
     # @!attribute [rw] ssekms_encryption_context
@@ -2112,7 +2129,7 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket
     #   Key for object encryption with SSE-KMS.
     #
-    #   Specifying this header with an object operation doesn’t affect
+    #   Specifying this header with an object action doesn’t affect
     #   bucket-level settings for S3 Bucket Key.
     #   @return [Boolean]
     #
@@ -2754,20 +2771,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The bucket name of the bucket containing the object.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -2856,20 +2873,20 @@ module Aws::S3
     #   The bucket name containing the objects from which to remove the
     #   tags.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -2881,7 +2898,8 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] key
-    #   Name of the object key.
+    #   The key that identifies the object in the bucket from which to
+    #   remove all tags.
     #   @return [String]
     #
     # @!attribute [rw] version_id
@@ -2916,8 +2934,8 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] errors
-    #   Container for a failed delete operation that describes the object
-    #   that Amazon S3 attempted to delete and the error it encountered.
+    #   Container for a failed delete action that describes the object that
+    #   Amazon S3 attempted to delete and the error it encountered.
     #   @return [Array<Types::Error>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectsOutput AWS API Documentation
@@ -2953,20 +2971,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The bucket name containing the objects to delete.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -3307,7 +3325,7 @@ module Aws::S3
     #   * * *Code:* AccountProblem
     #
     #     * *Description:* There is a problem with your AWS account that
-    #       prevents the operation from completing successfully. Contact AWS
+    #       prevents the action from completing successfully. Contact AWS
     #       Support for further assistance.
     #
     #     * *HTTP Status Code:* 403 Forbidden
@@ -3540,8 +3558,8 @@ module Aws::S3
     #
     #   * * *Code:* InvalidObjectState
     #
-    #     * *Description:* The operation is not valid for the current state
-    #       of the object.
+    #     * *Description:* The action is not valid for the current state of
+    #       the object.
     #
     #     * *HTTP Status Code:* 403 Forbidden
     #
@@ -3922,8 +3940,8 @@ module Aws::S3
     #
     #   * * *Code:* OperationAborted
     #
-    #     * *Description:* A conflicting conditional operation is currently
-    #       in progress against this resource. Try again.
+    #     * *Description:* A conflicting conditional action is currently in
+    #       progress against this resource. Try again.
     #
     #     * *HTTP Status Code:* 409 Conflict
     #
@@ -4120,6 +4138,14 @@ module Aws::S3
     #
     # @!attribute [rw] key
     #   The object key name to use when a 4XX class error occurs.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ErrorDocument AWS API Documentation
@@ -4131,9 +4157,12 @@ module Aws::S3
     end
 
     # Optional configuration to replicate existing source bucket objects.
-    # For more information, see [Replicating Existing Objects](
-    # https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-what-is-isnot-replicated.html#existing-object-replication)
-    # in the *Amazon S3 Developer Guide*.
+    # For more information, see [Replicating Existing Objects][1] in the
+    # *Amazon S3 Developer Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-what-is-isnot-replicated.html#existing-object-replication
     #
     # @note When making an API call, you may pass ExistingObjectReplication
     #   data as a hash:
@@ -5109,11 +5138,11 @@ module Aws::S3
     #   The bucket name that contains the object for which to get the ACL
     #   information.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -5188,11 +5217,11 @@ module Aws::S3
     #   The bucket name containing the object whose Legal Hold status you
     #   want to retrieve.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -5265,11 +5294,11 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The bucket whose Object Lock configuration you want to retrieve.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -5316,12 +5345,12 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] restore
-    #   Provides information about object restoration operation and
-    #   expiration time of the restored object copy.
+    #   Provides information about object restoration action and expiration
+    #   time of the restored object copy.
     #   @return [String]
     #
     # @!attribute [rw] last_modified
-    #   Last modified date of the object
+    #   Creation date of the object.
     #   @return [Time]
     #
     # @!attribute [rw] content_length
@@ -5525,20 +5554,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The bucket name containing the object.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -5617,14 +5646,14 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] sse_customer_algorithm
-    #   Specifies the algorithm to use to when encrypting the object (for
+    #   Specifies the algorithm to use to when decrypting the object (for
     #   example, AES256).
     #   @return [String]
     #
     # @!attribute [rw] sse_customer_key
-    #   Specifies the customer-provided encryption key for Amazon S3 to use
-    #   in encrypting data. This value is used to store the object and then
-    #   it is discarded; Amazon S3 does not store the encryption key. The
+    #   Specifies the customer-provided encryption key for Amazon S3 used to
+    #   encrypt the data. This value is used to decrypt the object when
+    #   recovering it and must match the one used when storing the data. The
     #   key must be appropriate for use with the algorithm specified in the
     #   `x-amz-server-side-encryption-customer-algorithm` header.
     #   @return [String]
@@ -5714,11 +5743,11 @@ module Aws::S3
     #   The bucket name containing the object whose retention settings you
     #   want to retrieve.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -5794,26 +5823,27 @@ module Aws::S3
     #         key: "ObjectKey", # required
     #         version_id: "ObjectVersionId",
     #         expected_bucket_owner: "AccountId",
+    #         request_payer: "requester", # accepts requester
     #       }
     #
     # @!attribute [rw] bucket
     #   The bucket name containing the object for which to get the tagging
     #   information.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -5839,13 +5869,26 @@ module Aws::S3
     #   (Access Denied)` error.
     #   @return [String]
     #
+    # @!attribute [rw] request_payer
+    #   Confirms that the requester knows that they will be charged for the
+    #   request. Bucket owners need not specify this parameter in their
+    #   requests. For information about downloading objects from requester
+    #   pays buckets, see [Downloading Objects in Requestor Pays Buckets][1]
+    #   in the *Amazon S3 Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTaggingRequest AWS API Documentation
     #
     class GetObjectTaggingRequest < Struct.new(
       :bucket,
       :key,
       :version_id,
-      :expected_bucket_owner)
+      :expected_bucket_owner,
+      :request_payer)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -6095,20 +6138,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The bucket name.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -6180,7 +6223,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] last_modified
-    #   Last modified date of the object
+    #   Creation date of the object.
     #   @return [Time]
     #
     # @!attribute [rw] content_length
@@ -6431,20 +6474,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The name of the bucket containing the object.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -6578,6 +6621,14 @@ module Aws::S3
     #   you make a request to samplebucket/images/ the data that is returned
     #   will be for the object with the key name images/index.html) The
     #   suffix must not be empty and must not include a slash character.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/IndexDocument AWS API Documentation
@@ -6790,6 +6841,14 @@ module Aws::S3
     # @!attribute [rw] prefix
     #   An object key name prefix that identifies the subset of objects to
     #   which the rule applies.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] tag
@@ -7345,6 +7404,14 @@ module Aws::S3
     # @!attribute [rw] prefix
     #   Prefix identifying one or more objects to which the rule applies.
     #   This is No longer used; use `Filter` instead.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] filter
@@ -7470,6 +7537,14 @@ module Aws::S3
     #
     # @!attribute [rw] prefix
     #   Prefix identifying one or more objects to which the rule applies.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] tag
@@ -7890,20 +7965,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The name of the bucket to which the multipart upload was initiated.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -8130,7 +8205,7 @@ module Aws::S3
     #
     # @!attribute [rw] max_keys
     #   Sets the maximum number of keys returned in the response. By default
-    #   the API returns up to 1,000 key names. The response might contain
+    #   the action returns up to 1,000 key names. The response might contain
     #   fewer keys but will never contain more. If additional keys satisfy
     #   the search criteria, but were not returned because max-keys was
     #   exceeded, the response contains
@@ -8218,8 +8293,8 @@ module Aws::S3
     #   @return [Integer]
     #
     # @!attribute [rw] common_prefixes
-    #   All of the keys rolled up in a common prefix count as a single
-    #   return when calculating the number of returns.
+    #   All of the keys (up to 1,000) rolled up in a common prefix count as
+    #   a single return when calculating the number of returns.
     #
     #   A response can contain CommonPrefixes only if you specify a
     #   delimiter.
@@ -8275,20 +8350,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The name of the bucket containing the objects.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -8318,7 +8393,7 @@ module Aws::S3
     #
     # @!attribute [rw] max_keys
     #   Sets the maximum number of keys returned in the response. By default
-    #   the API returns up to 1,000 key names. The response might contain
+    #   the action returns up to 1,000 key names. The response might contain
     #   fewer keys but will never contain more.
     #   @return [Integer]
     #
@@ -8366,20 +8441,20 @@ module Aws::S3
     # @!attribute [rw] name
     #   The bucket name.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -8404,13 +8479,13 @@ module Aws::S3
     #
     # @!attribute [rw] max_keys
     #   Sets the maximum number of keys returned in the response. By default
-    #   the API returns up to 1,000 key names. The response might contain
+    #   the action returns up to 1,000 key names. The response might contain
     #   fewer keys but will never contain more.
     #   @return [Integer]
     #
     # @!attribute [rw] common_prefixes
-    #   All of the keys rolled up into a common prefix count as a single
-    #   return when calculating the number of returns.
+    #   All of the keys (up to 1,000) rolled up into a common prefix count
+    #   as a single return when calculating the number of returns.
     #
     #   A response can contain `CommonPrefixes` only if you specify a
     #   delimiter.
@@ -8441,8 +8516,8 @@ module Aws::S3
     #
     # @!attribute [rw] key_count
     #   KeyCount is the number of keys returned with this request. KeyCount
-    #   will always be less than equals to MaxKeys field. Say you ask for 50
-    #   keys, your result will include less than equals 50 keys
+    #   will always be less than or equals to MaxKeys field. Say you ask for
+    #   50 keys, your result will include less than equals 50 keys
     #   @return [Integer]
     #
     # @!attribute [rw] continuation_token
@@ -8501,20 +8576,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   Bucket name to list.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -8536,7 +8611,7 @@ module Aws::S3
     #
     # @!attribute [rw] max_keys
     #   Sets the maximum number of keys returned in the response. By default
-    #   the API returns up to 1,000 key names. The response might contain
+    #   the action returns up to 1,000 key names. The response might contain
     #   fewer keys but will never contain more.
     #   @return [Integer]
     #
@@ -8716,20 +8791,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The name of the bucket to which the parts are being uploaded.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -9358,7 +9433,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] last_modified
-    #   The date the Object was Last Modified
+    #   Creation date of the object.
     #   @return [Time]
     #
     # @!attribute [rw] etag
@@ -9408,7 +9483,7 @@ module Aws::S3
       include Aws::Structure
     end
 
-    # This operation is not allowed against this storage tier.
+    # This action is not allowed against this storage tier.
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ObjectAlreadyInActiveTierError AWS API Documentation
     #
@@ -9425,7 +9500,15 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] key
-    #   Key name of the object to delete.
+    #   Key name of the object.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] version_id
@@ -9549,8 +9632,8 @@ module Aws::S3
       include Aws::Structure
     end
 
-    # The source object of the COPY operation is not in the active tier and
-    # is only stored in Amazon S3 Glacier.
+    # The source object of the COPY action is not in the active tier and is
+    # only stored in Amazon S3 Glacier.
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ObjectNotInActiveTierError AWS API Documentation
     #
@@ -9877,7 +9960,7 @@ module Aws::S3
     # Amazon S3 bucket. You can enable the configuration options in any
     # combination. For more information about when Amazon S3 considers a
     # bucket or object public, see [The Meaning of "Public"][1] in the
-    # *Amazon Simple Storage Service Developer Guide*.
+    # *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -10170,6 +10253,7 @@ module Aws::S3
     #         cors_configuration: { # required
     #           cors_rules: [ # required
     #             {
+    #               id: "ID",
     #               allowed_headers: ["AllowedHeader"],
     #               allowed_methods: ["AllowedMethod"], # required
     #               allowed_origins: ["AllowedOrigin"], # required
@@ -10189,7 +10273,7 @@ module Aws::S3
     # @!attribute [rw] cors_configuration
     #   Describes the cross-origin access configuration for objects in an
     #   Amazon S3 bucket. For more information, see [Enabling Cross-Origin
-    #   Resource Sharing][1] in the *Amazon Simple Storage Service Developer
+    #   Resource Sharing][1] in the *Amazon Simple Storage Service User
     #   Guide*.
     #
     #
@@ -11060,9 +11144,9 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] content_md5
-    #   &gt;The base64-encoded 128-bit MD5 digest of the data. You must use
-    #   this header as a message integrity check to verify that the request
-    #   body was not corrupted in transit. For more information, see [RFC
+    #   The base64-encoded 128-bit MD5 digest of the data. You must use this
+    #   header as a message integrity check to verify that the request 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
@@ -11352,11 +11436,11 @@ module Aws::S3
     #   The bucket name that contains the object to which you want to attach
     #   the ACL.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -11411,22 +11495,22 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] key
-    #   Key for which the PUT operation was initiated.
+    #   Key for which the PUT action was initiated.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -11511,11 +11595,11 @@ module Aws::S3
     #   The bucket name containing the object that you want to place a Legal
     #   Hold on.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -11800,22 +11884,22 @@ module Aws::S3
     #   @return [IO]
     #
     # @!attribute [rw] bucket
-    #   The bucket name to which the PUT operation was initiated.
+    #   The bucket name to which the PUT action was initiated.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -11933,7 +12017,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] key
-    #   Object key for which the PUT operation was initiated.
+    #   Object key for which the PUT action was initiated.
     #   @return [String]
     #
     # @!attribute [rw] metadata
@@ -12031,8 +12115,8 @@ module Aws::S3
     #   Setting this header to `true` causes Amazon S3 to use an S3 Bucket
     #   Key for object encryption with SSE-KMS.
     #
-    #   Specifying this header with a PUT operation doesn’t affect
-    #   bucket-level settings for S3 Bucket Key.
+    #   Specifying this header with a PUT action doesn’t affect bucket-level
+    #   settings for S3 Bucket Key.
     #   @return [Boolean]
     #
     # @!attribute [rw] request_payer
@@ -12149,11 +12233,11 @@ module Aws::S3
     #   The bucket name that contains the object you want to apply this
     #   Object Retention configuration to.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -12190,7 +12274,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] bypass_governance_retention
-    #   Indicates whether this operation should bypass Governance-mode
+    #   Indicates whether this action should bypass Governance-mode
     #   restrictions.
     #   @return [Boolean]
     #
@@ -12251,25 +12335,26 @@ module Aws::S3
     #           ],
     #         },
     #         expected_bucket_owner: "AccountId",
+    #         request_payer: "requester", # accepts requester
     #       }
     #
     # @!attribute [rw] bucket
     #   The bucket name containing the object.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -12305,6 +12390,18 @@ module Aws::S3
     #   (Access Denied)` error.
     #   @return [String]
     #
+    # @!attribute [rw] request_payer
+    #   Confirms that the requester knows that they will be charged for the
+    #   request. Bucket owners need not specify this parameter in their
+    #   requests. For information about downloading objects from requester
+    #   pays buckets, see [Downloading Objects in Requestor Pays Buckets][1]
+    #   in the *Amazon S3 Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTaggingRequest AWS API Documentation
     #
     class PutObjectTaggingRequest < Struct.new(
@@ -12313,7 +12410,8 @@ module Aws::S3
       :version_id,
       :content_md5,
       :tagging,
-      :expected_bucket_owner)
+      :expected_bucket_owner,
+      :request_payer)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -12535,6 +12633,14 @@ module Aws::S3
     #   `ReplaceKeyPrefixWith` to `/documents`. Not required if one of the
     #   siblings is present. Can be present only if `ReplaceKeyWith` is not
     #   provided.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] replace_key_with
@@ -12542,6 +12648,14 @@ module Aws::S3
     #   redirect request to `error.html`. Not required if one of the
     #   siblings is present. Can be present only if `ReplaceKeyPrefixWith`
     #   is not provided.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Redirect AWS API Documentation
@@ -12805,6 +12919,14 @@ module Aws::S3
     #   which the rule applies. The maximum prefix length is 1,024
     #   characters. To include all objects in a bucket, specify an empty
     #   string.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] filter
@@ -12946,6 +13068,14 @@ module Aws::S3
     # @!attribute [rw] prefix
     #   An object key name prefix that identifies the subset of objects to
     #   which the rule applies.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] tag
@@ -13191,20 +13321,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The bucket name containing the object to restore.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -13216,7 +13346,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] key
-    #   Object key for which the operation was initiated.
+    #   Object key for which the action was initiated.
     #   @return [String]
     #
     # @!attribute [rw] version_id
@@ -13394,8 +13524,8 @@ module Aws::S3
 
     # Specifies the redirect behavior and when a redirect is applied. For
     # more information about routing rules, see [Configuring advanced
-    # conditional redirects][1] in the *Amazon Simple Storage Service
-    # Developer Guide*.
+    # conditional redirects][1] in the *Amazon Simple Storage Service User
+    # Guide*.
     #
     #
     #
@@ -13492,6 +13622,14 @@ module Aws::S3
     # @!attribute [rw] prefix
     #   Object key prefix that identifies one or more objects to which this
     #   rule applies.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] status
@@ -13503,7 +13641,7 @@ module Aws::S3
     #   Specifies when an object transitions to a specified storage class.
     #   For more information about Amazon S3 lifecycle configuration rules,
     #   see [Transitioning Objects Using Amazon S3 Lifecycle][1] in the
-    #   *Amazon Simple Storage Service Developer Guide*.
+    #   *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -14107,7 +14245,7 @@ module Aws::S3
     #   Bucket Key. By default, S3 Bucket Key is not enabled.
     #
     #   For more information, see [Amazon S3 Bucket Keys][1] in the *Amazon
-    #   Simple Storage Service Developer Guide*.
+    #   Simple Storage Service User Guide*.
     #
     #
     #
@@ -14469,7 +14607,7 @@ module Aws::S3
     # @!attribute [rw] events
     #   The Amazon S3 bucket event about which to send notifications. For
     #   more information, see [Supported Event Types][1] in the *Amazon
-    #   Simple Storage Service Developer Guide*.
+    #   Simple Storage Service User Guide*.
     #
     #
     #
@@ -14549,7 +14687,7 @@ module Aws::S3
     # Specifies when an object transitions to a specified storage class. For
     # more information about Amazon S3 lifecycle configuration rules, see
     # [Transitioning Objects Using Amazon S3 Lifecycle][1] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # Simple Storage Service User Guide*.
     #
     #
     #
@@ -14676,20 +14814,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The bucket name.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
@@ -14953,20 +15091,20 @@ module Aws::S3
     # @!attribute [rw] bucket
     #   The name of the bucket to which the multipart upload was initiated.
     #
-    #   When using this API with an access point, you must direct requests
-    #   to the access point hostname. The access point hostname takes the
-    #   form
+    #   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 operation with an access point through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.
     #
-    #   When using this API with Amazon S3 on Outposts, you must direct
+    #   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 operation using S3 on Outposts through the AWS SDKs,
+    #   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 Simple Storage Service Developer Guide*.