aws-sdk-s3 1.90.0 → 1.94.0

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
 
@@ -286,7 +286,7 @@ module Aws::S3
     # @option options [String] :version_id
     #   VersionId used to reference a specific version of the object.
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned by
+    #   The account ID of the expected bucket owner. If the bucket is owned by
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     # @return [Types::PutObjectAclOutput]

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
 
@@ -375,7 +375,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html
     # @option options [String] :copy_source_if_match
     #   Copies the object if its entity tag (ETag) matches the specified tag.
     # @option options [Time,DateTime,Date,Integer,String] :copy_source_if_modified_since
@@ -500,11 +500,11 @@ module Aws::S3
     # @option options [String] :object_lock_legal_hold_status
     #   Specifies whether you want to apply a Legal Hold to the copied object.
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected destination bucket owner. If the
+    #   The account ID of the expected destination bucket owner. If the
     #   destination bucket is owned by a different account, the request will
     #   fail with an HTTP `403 (Access Denied)` error.
     # @option options [String] :expected_source_bucket_owner
-    #   The account id of the expected source bucket owner. If the source
+    #   The account ID of the expected source bucket owner. If the source
     #   bucket is owned by a different account, the request will fail with an
     #   HTTP `403 (Access Denied)` error.
     # @return [Types::CopyObjectOutput]
@@ -548,7 +548,7 @@ module Aws::S3
     #   Indicates whether S3 Object Lock should bypass Governance-mode
     #   restrictions to process this operation.
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned by
+    #   The account ID of the expected bucket owner. If the bucket is owned by
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     # @return [Types::DeleteObjectOutput]
@@ -652,7 +652,7 @@ module Aws::S3
     #   for the part specified. Useful for downloading just a part of an
     #   object.
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned by
+    #   The account ID of the expected bucket owner. If the bucket is owned by
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     # @return [Types::GetObjectOutput]
@@ -812,7 +812,7 @@ module Aws::S3
     #   Specifies whether you want to apply a Legal Hold to the uploaded
     #   object.
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned by
+    #   The account ID of the expected bucket owner. If the bucket is owned by
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     # @return [MultipartUpload]
@@ -1061,7 +1061,7 @@ module Aws::S3
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned by
+    #   The account ID of the expected bucket owner. If the bucket is owned by
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     # @return [Types::PutObjectOutput]
@@ -1178,7 +1178,7 @@ module Aws::S3
     #
     #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned by
+    #   The account ID of the expected bucket owner. If the bucket is owned by
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     # @return [Types::RestoreObjectOutput]
@@ -1335,7 +1335,7 @@ module Aws::S3
       #   Governance-type Object Lock in place. You must have sufficient
       #   permissions to perform this operation.
       # @option options [String] :expected_bucket_owner
-      #   The account id of the expected bucket owner. If the bucket is owned by
+      #   The account ID of the expected bucket owner. If the bucket is owned by
       #   a different account, the request will fail with an HTTP `403 (Access
       #   Denied)` error.
       # @return [void]

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
 
@@ -256,7 +256,7 @@ module Aws::S3
     #   Indicates whether S3 Object Lock should bypass Governance-mode
     #   restrictions to process this operation.
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned by
+    #   The account ID of the expected bucket owner. If the bucket is owned by
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     # @return [Types::DeleteObjectOutput]
@@ -358,7 +358,7 @@ module Aws::S3
     #   for the part specified. Useful for downloading just a part of an
     #   object.
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned by
+    #   The account ID of the expected bucket owner. If the bucket is owned by
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     # @return [Types::GetObjectOutput]
@@ -442,7 +442,7 @@ module Aws::S3
     #   for the part specified. Useful querying about the size of the part and
     #   the number of parts in this object.
     # @option options [String] :expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned by
+    #   The account ID of the expected bucket owner. If the bucket is owned by
     #   a different account, the request will fail with an HTTP `403 (Access
     #   Denied)` error.
     # @return [Types::HeadObjectOutput]
@@ -546,7 +546,7 @@ module Aws::S3
       #   Governance-type Object Lock in place. You must have sufficient
       #   permissions to perform this operation.
       # @option options [String] :expected_bucket_owner
-      #   The account id of the expected bucket owner. If the bucket is owned by
+      #   The account ID of the expected bucket owner. If the bucket is owned by
       #   a different account, the request will fail with an HTTP `403 (Access
       #   Denied)` error.
       # @return [void]

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../arn/access_point_arn'
+require_relative '../arn/object_lambda_arn'
 require_relative '../arn/outpost_access_point_arn'
 
 module Aws
@@ -22,9 +23,9 @@ be made. Set to `false` to use the client's region instead.
           resolve_s3_use_arn_region(cfg)
         end
 
-        # param validator is validate:50 (required to add account_id from arn)
+        # param validator is validate:50
         # endpoint is build:90 (populates the URI for the first time)
-        # endpoint pattern is build:10 (prefix account id to host)
+        # endpoint pattern is build:10
         def add_handlers(handlers, _config)
           handlers.add(ARNHandler, step: :validate, priority: 75)
           handlers.add(UrlHandler)
@@ -38,6 +39,7 @@ be made. Set to `false` to use the client's region instead.
                 context.http_request.endpoint,
                 context.metadata[:s3_arn][:arn],
                 context.metadata[:s3_arn][:resolved_region],
+                context.metadata[:s3_arn][:fips],
                 context.metadata[:s3_arn][:dualstack],
                 # if regional_endpoint is false, a custom endpoint was provided
                 # in this case, we want to prefix the endpoint using the ARN
@@ -62,9 +64,17 @@ be made. Set to `false` to use the client's region instead.
               if arn
                 validate_config!(context, arn)
 
+                fips = false
+                if resolved_region.include?('fips')
+                  fips = true
+                  resolved_region = resolved_region.gsub('fips-', '')
+                                                   .gsub('-fips', '')
+                end
+
                 context.metadata[:s3_arn] = {
                   arn: arn,
                   resolved_region: resolved_region,
+                  fips: fips,
                   dualstack: extract_dualstack_config!(context)
                 }
               end
@@ -114,18 +124,10 @@ be made. Set to `false` to use the client's region instead.
           def resolve_arn!(member_value, region, use_arn_region)
             if Aws::ARNParser.arn?(member_value)
               arn = Aws::ARNParser.parse(member_value)
-              if arn.resource.start_with?('accesspoint')
-                s3_arn = Aws::S3::AccessPointARN.new(arn.to_h)
-              elsif arn.resource.start_with?('outpost')
-                s3_arn = Aws::S3::OutpostAccessPointARN.new(arn.to_h)
-              else
-                raise ArgumentError,
-                      'Only Access Point and Outpost Access Point type ARNs '\
-                      'are currently supported.'
-              end
+              s3_arn = resolve_arn_type!(arn)
               s3_arn.validate_arn!
               validate_region_config!(s3_arn, region, use_arn_region)
-              region = s3_arn.region if use_arn_region
+              region = s3_arn.region if use_arn_region && !region.include?('fips')
               [region, s3_arn]
             else
               [region]
@@ -133,15 +135,30 @@ be made. Set to `false` to use the client's region instead.
           end
 
           # @api private
-          def resolve_url!(url, arn, region, dualstack = false, has_custom_endpoint = false)
+          def resolve_url!(url, arn, region, fips = false, dualstack = false, has_custom_endpoint = false)
             custom_endpoint = url.host if has_custom_endpoint
-            url.host = arn.host_url(region, dualstack, custom_endpoint)
+            url.host = arn.host_url(region, fips, dualstack, custom_endpoint)
             url.path = url_path(url.path, arn)
             url
           end
 
           private
 
+          def resolve_arn_type!(arn)
+            case arn.service
+            when 's3'
+              Aws::S3::AccessPointARN.new(arn.to_h)
+            when 's3-outposts'
+              Aws::S3::OutpostAccessPointARN.new(arn.to_h)
+            when 's3-object-lambda'
+              Aws::S3::ObjectLambdaARN.new(arn.to_h)
+            else
+              raise ArgumentError,
+                    'Only Access Point, Outposts, and Object Lambdas ARNs '\
+                    'are currently supported.'
+            end
+          end
+
           def resolve_s3_use_arn_region(cfg)
             value = ENV['AWS_S3_USE_ARN_REGION'] ||
                     Aws.shared_config.s3_use_arn_region(profile: cfg.profile) ||
@@ -157,8 +174,7 @@ be made. Set to `false` to use the client's region instead.
             value
           end
 
-          # Remove ARN from the path since it was substituted already
-          # This only works because accesspoints care about the URL
+          # Remove ARN from the path because we've already set the new host
           def url_path(path, arn)
             path = path.sub("/#{Seahorse::Util.uri_escape(arn.to_s)}", '')
                        .sub("/#{arn}", '')
@@ -167,33 +183,40 @@ be made. Set to `false` to use the client's region instead.
           end
 
           def validate_region_config!(arn, region, use_arn_region)
-            fips = arn.support_fips?
-
-            # s3-external-1 is specific just to s3 and not part of partitions
-            # aws-global is a partition region
-            unless arn.partition == 'aws' &&
-                   (region == 's3-external-1' || region == 'aws-global')
-              if !fips && arn.region.include?('fips')
-                raise ArgumentError,
-                      'FIPS region ARNs are not supported for this type of ARN.'
+            if ['s3-external-1', 'aws-global'].include?(region)
+              # These "regions" are not regional endpoints
+              unless use_arn_region
+                raise Aws::Errors::InvalidARNRegionError,
+                      'Configured client region is not a regional endpoint.'
               end
-
-              if !fips && !use_arn_region && region.include?('fips')
-                raise ArgumentError,
-                      'FIPS client regions are not supported for this type of '\
-                      'ARN without `:s3_use_arn_region`.'
+              # These "regions" are in the AWS partition
+              # Cannot use ARN region unless it's the same partition
+              unless arn.partition == 'aws'
+                raise Aws::Errors::InvalidARNPartitionError
               end
-
-              # if it's a fips region, attempt to normalize it
-              if fips || use_arn_region
+            else
+              if region.include?('fips')
+                # If ARN type doesn't support FIPS but the client region is FIPS
+                unless arn.support_fips?
+                  raise ArgumentError,
+                        'FIPS client regions are not supported for this type '\
+                        'of ARN.'
+                end
+
+                fips = true
+                # Normalize the region so we can compare partition and regions
                 region = region.gsub('fips-', '').gsub('-fips', '')
               end
+
+              # Raise if the ARN and client regions are in different partitions
               if use_arn_region &&
                  !Aws::Partitions.partition(arn.partition).region?(region)
                 raise Aws::Errors::InvalidARNPartitionError
               end
 
-              if !use_arn_region && region != arn.region
+              # Raise if regions mismatch
+              # Either when it's a fips client or not using the ARN region
+              if (!use_arn_region || fips) && region != arn.region
                 raise Aws::Errors::InvalidARNRegionError
               end
             end

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

@@ -10,8 +10,8 @@ module Aws
           default: 'legacy',
           doc_type: String,
           docstring: <<-DOCS) do |cfg|
-Passing in `regional` to enable regional endpoint for S3's `us-east-1`
-region. Defaults to `legacy` mode using global endpoint.
+Pass in `regional` to enable the `us-east-1` regional endpoint.
+Defaults to `legacy` mode which uses the global endpoint.
           DOCS
           resolve_iad_regional_endpoint(cfg)
         end
@@ -27,14 +27,14 @@ region. Defaults to `legacy` mode using global endpoint.
         class Handler < Seahorse::Client::Handler
 
           def call(context)
-            # keep legacy global endpoint pattern by default
-            if context.config.s3_us_east_1_regional_endpoint == 'legacy'
+            # WriteGetObjectResponse does not have a global endpoint
+            # ARNs are regionalized, so don't touch those either.
+            if context.operation.name != 'WriteGetObjectResponse' &&
+               context.config.s3_us_east_1_regional_endpoint == 'legacy' &&
+               !context.metadata[:s3_arn]
               host = context.http_request.endpoint.host
-              # 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
-              end
+              legacy_host = IADRegionalEndpoint.legacy_host(host)
+              context.http_request.endpoint.host = legacy_host
             end
             @handler.call(context)
           end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Aws
+  module S3
+    module Plugins
+      # WriteGetObjectResponse is called from Lambda after a data transform.
+      # If there is no custom endpoint, we change the endpoint from s3 to
+      # s3-object-lambda just for this operation.
+      class ObjectLambdaEndpoint < Seahorse::Client::Plugin
+        class Handler < Seahorse::Client::Handler
+          def call(context)
+            if context.config.regional_endpoint
+              host = context.http_request.endpoint.host
+              host = host.sub('s3.', 's3-object-lambda.')
+              context.http_request.endpoint.host = host
+            end
+            @handler.call(context)
+          end
+        end
+
+        handler(Handler, operations: [:write_get_object_response])
+      end
+    end
+  end
+end

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

@@ -79,6 +79,12 @@ module Aws
                 region: arn[:resolved_region],
                 credentials: context.config.credentials
               )
+            elsif context.operation.name == 'WriteGetObjectResponse'
+              S3Signer.build_v4_signer(
+                service: 's3-object-lambda',
+                region: context.config.sigv4_region,
+                credentials: context.config.credentials
+              )
             else
               context.config.sigv4_signer
             end

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
 
@@ -14,7 +14,7 @@ module Aws::S3
     # upload that Amazon S3 will wait before permanently removing all parts
     # of the upload. For more information, see [ Aborting Incomplete
     # Multipart Uploads Using a Bucket Lifecycle Policy][1] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # S3 User Guide*.
     #
     #
     #
@@ -74,7 +74,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -83,12 +83,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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
@@ -112,7 +112,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -131,7 +131,7 @@ module Aws::S3
 
     # Configures the transfer acceleration state for an Amazon S3 bucket.
     # For more information, see [Amazon S3 Transfer Acceleration][1] in the
-    # *Amazon Simple Storage Service Developer Guide*.
+    # *Amazon S3 User Guide*.
     #
     #
     #
@@ -492,7 +492,7 @@ module Aws::S3
 
     # Specifies the lifecycle configuration for objects in an Amazon S3
     # bucket. For more information, see [Object Lifecycle Management][1] in
-    # the *Amazon Simple Storage Service Developer Guide*.
+    # the *Amazon S3 User Guide*.
     #
     #
     #
@@ -608,8 +608,7 @@ module Aws::S3
 
     # 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
-    # Guide*.
+    # Resource Sharing][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -621,6 +620,7 @@ module Aws::S3
     #       {
     #         cors_rules: [ # required
     #           {
+    #             id: "ID",
     #             allowed_headers: ["AllowedHeader"],
     #             allowed_methods: ["AllowedMethod"], # required
     #             allowed_origins: ["AllowedOrigin"], # required
@@ -649,6 +649,7 @@ module Aws::S3
     #   data as a hash:
     #
     #       {
+    #         id: "ID",
     #         allowed_headers: ["AllowedHeader"],
     #         allowed_methods: ["AllowedMethod"], # required
     #         allowed_origins: ["AllowedOrigin"], # required
@@ -656,6 +657,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 +693,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,
@@ -918,7 +925,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -927,12 +934,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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
@@ -1049,7 +1056,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -1320,7 +1327,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -1329,12 +1336,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] cache_control
@@ -1403,7 +1410,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html
     #   @return [String]
     #
     # @!attribute [rw] copy_source_if_match
@@ -1595,13 +1602,13 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected destination bucket owner. If the
+    #   The account ID of the expected destination bucket owner. If the
     #   destination bucket is owned by a different account, the request will
     #   fail with an HTTP `403 (Access Denied)` error.
     #   @return [String]
     #
     # @!attribute [rw] expected_source_bucket_owner
-    #   The account id of the expected source bucket owner. If the source
+    #   The account ID of the expected source bucket owner. If the source
     #   bucket is owned by a different account, the request will fail with
     #   an HTTP `403 (Access Denied)` error.
     #   @return [String]
@@ -1837,7 +1844,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -1846,12 +1853,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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
@@ -1975,7 +1982,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -1984,12 +1991,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] cache_control
@@ -2157,7 +2164,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2201,6 +2208,14 @@ module Aws::S3
     # The container element for specifying the default Object Lock retention
     # settings for new objects placed in the specified bucket.
     #
+    # <note markdown="1"> * The `DefaultRetention` settings require both a mode and a period.
+    #
+    # * The `DefaultRetention` period can be either `Days` or `Years` but
+    #   you must select one. You cannot specify `Days` and `Years` at the
+    #   same time.
+    #
+    #  </note>
+    #
     # @note When making an API call, you may pass DefaultRetention
     #   data as a hash:
     #
@@ -2212,17 +2227,18 @@ module Aws::S3
     #
     # @!attribute [rw] mode
     #   The default Object Lock retention mode you want to apply to new
-    #   objects placed in the specified bucket.
+    #   objects placed in the specified bucket. Must be used with either
+    #   `Days` or `Years`.
     #   @return [String]
     #
     # @!attribute [rw] days
     #   The number of days that you want to specify for the default
-    #   retention period.
+    #   retention period. Must be used with `Mode`.
     #   @return [Integer]
     #
     # @!attribute [rw] years
     #   The number of years that you want to specify for the default
-    #   retention period.
+    #   retention period. Must be used with `Mode`.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DefaultRetention AWS API Documentation
@@ -2287,7 +2303,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2315,7 +2331,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2343,7 +2359,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2402,7 +2418,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2430,7 +2446,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2463,7 +2479,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2491,7 +2507,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2518,7 +2534,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2545,7 +2561,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2572,7 +2588,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2599,7 +2615,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2627,7 +2643,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2770,7 +2786,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -2779,12 +2795,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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
@@ -2820,7 +2836,7 @@ module Aws::S3
     #   @return [Boolean]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2872,7 +2888,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -2881,12 +2897,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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
@@ -2899,7 +2915,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -2970,7 +2986,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -2979,12 +2995,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] delete
@@ -3017,7 +3033,7 @@ module Aws::S3
     #   @return [Boolean]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -3049,7 +3065,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4190,7 +4206,7 @@ module Aws::S3
     #   to which the filtering rule applies. The maximum length is 1,024
     #   characters. Overlapping prefixes and suffixes are not supported. For
     #   more information, see [Configuring Event Notifications][1] in the
-    #   *Amazon Simple Storage Service Developer Guide*.
+    #   *Amazon S3 User Guide*.
     #
     #
     #
@@ -4236,7 +4252,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4280,7 +4296,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4325,7 +4341,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4366,7 +4382,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4406,7 +4422,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4489,7 +4505,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4529,7 +4545,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4568,7 +4584,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4614,7 +4630,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4660,7 +4676,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4705,7 +4721,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4734,7 +4750,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4775,7 +4791,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4814,7 +4830,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4854,7 +4870,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4894,7 +4910,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4934,7 +4950,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -4973,7 +4989,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5020,7 +5036,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5078,7 +5094,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5137,11 +5153,11 @@ module Aws::S3
     #   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*.
+    #   Points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html
     #   @return [String]
     #
     # @!attribute [rw] key
@@ -5165,7 +5181,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5216,11 +5232,11 @@ module Aws::S3
     #   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*.
+    #   Points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html
     #   @return [String]
     #
     # @!attribute [rw] key
@@ -5246,7 +5262,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5293,15 +5309,15 @@ module Aws::S3
     #   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*.
+    #   Points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5553,7 +5569,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -5562,12 +5578,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] if_match
@@ -5676,7 +5692,7 @@ module Aws::S3
     #   @return [Integer]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5742,11 +5758,11 @@ module Aws::S3
     #   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*.
+    #   Points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html
     #   @return [String]
     #
     # @!attribute [rw] key
@@ -5772,7 +5788,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5829,7 +5845,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -5838,12 +5854,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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
@@ -5856,7 +5872,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5935,7 +5951,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -5978,7 +5994,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -6137,7 +6153,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -6146,16 +6162,16 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -6195,7 +6211,7 @@ module Aws::S3
     #   If an archive copy is already restored, the header value indicates
     #   when Amazon S3 is scheduled to delete the object copy. For example:
     #
-    #   `x-amz-restore: ongoing-request="false", expiry-date="Fri, 23 Dec
+    #   `x-amz-restore: ongoing-request="false", expiry-date="Fri, 21 Dec
     #   2012 00:00:00 GMT"`
     #
     #   If the object restoration is in progress, the header returns the
@@ -6473,7 +6489,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -6482,12 +6498,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] if_match
@@ -6572,7 +6588,7 @@ module Aws::S3
     #   @return [Integer]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -7219,7 +7235,7 @@ module Aws::S3
     # @!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 Simple Storage Service Developer Guide*.
+    #   the *Amazon S3 User Guide*.
     #
     #
     #
@@ -7229,7 +7245,7 @@ module Aws::S3
     # @!attribute [rw] filter
     #   Specifies object key name filtering rules. For information about key
     #   name filtering, see [Configuring Event Notifications][1] in the
-    #   *Amazon Simple Storage Service Developer Guide*.
+    #   *Amazon S3 User Guide*.
     #
     #
     #
@@ -7395,7 +7411,7 @@ 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.
+    #   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
@@ -7409,7 +7425,8 @@ module Aws::S3
     # @!attribute [rw] filter
     #   The `Filter` is used to identify objects that a Lifecycle Rule
     #   applies to. A `Filter` must have exactly one of `Prefix`, `Tag`, or
-    #   `And` specified.
+    #   `And` specified. `Filter` is required if the `LifecycleRule` does
+    #   not containt a `Prefix` element.
     #   @return [Types::LifecycleRuleFilter]
     #
     # @!attribute [rw] status
@@ -7445,7 +7462,7 @@ module Aws::S3
     #   upload that Amazon S3 will wait before permanently removing all
     #   parts of the upload. For more information, see [ Aborting Incomplete
     #   Multipart Uploads Using a Bucket Lifecycle Policy][1] in the *Amazon
-    #   Simple Storage Service Developer Guide*.
+    #   S3 User Guide*.
     #
     #
     #
@@ -7615,7 +7632,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -7746,7 +7763,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -7818,7 +7835,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -7964,7 +7981,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -7973,12 +7990,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] delimiter
@@ -8039,7 +8056,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -8219,7 +8236,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -8349,7 +8366,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -8358,12 +8375,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] delimiter
@@ -8400,7 +8417,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -8440,7 +8457,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -8449,12 +8466,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] prefix
@@ -8575,7 +8592,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -8584,12 +8601,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] delimiter
@@ -8636,7 +8653,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -8790,7 +8807,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -8799,12 +8816,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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
@@ -8838,7 +8855,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -9224,8 +9241,7 @@ module Aws::S3
     #   Specifies the number of days an object is noncurrent before Amazon
     #   S3 can perform the associated action. For information about the
     #   noncurrent days calculations, see [How Amazon S3 Calculates How Long
-    #   an Object Has Been Noncurrent][1] in the *Amazon Simple Storage
-    #   Service Developer Guide*.
+    #   an Object Has Been Noncurrent][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -9385,7 +9401,7 @@ module Aws::S3
 
     # Specifies object key name filtering rules. For information about key
     # name filtering, see [Configuring Event Notifications][1] in the
-    # *Amazon Simple Storage Service Developer Guide*.
+    # *Amazon S3 User Guide*.
     #
     #
     #
@@ -9534,11 +9550,16 @@ module Aws::S3
     #
     # @!attribute [rw] object_lock_enabled
     #   Indicates whether this bucket has an Object Lock configuration
-    #   enabled.
+    #   enabled. Enable `ObjectLockEnabled` when you apply
+    #   `ObjectLockConfiguration` to a bucket.
     #   @return [String]
     #
     # @!attribute [rw] rule
-    #   The Object Lock rule in place for the specified object.
+    #   Specifies the Object Lock rule for the specified object. Enable the
+    #   this rule when you apply `ObjectLockConfiguration` to a bucket.
+    #   Bucket settings require both a mode and a period. The period can be
+    #   either `Days` or `Years` but you must select one. You cannot specify
+    #   `Days` and `Years` at the same time.
     #   @return [Types::ObjectLockRule]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ObjectLockConfiguration AWS API Documentation
@@ -9612,8 +9633,11 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] default_retention
-    #   The default retention period that you want to apply to new objects
-    #   placed in the specified bucket.
+    #   The default Object Lock retention mode and period that you want to
+    #   apply to new objects placed in the specified bucket. Bucket settings
+    #   require both a mode and a period. The period can be either `Days` or
+    #   `Years` but you must select one. You cannot specify `Days` and
+    #   `Years` at the same time.
     #   @return [Types::DefaultRetention]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ObjectLockRule AWS API Documentation
@@ -9952,7 +9976,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 User Guide*.
+    # *Amazon S3 User Guide*.
     #
     #
     #
@@ -10046,7 +10070,7 @@ module Aws::S3
     #   @return [Types::AccelerateConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10144,7 +10168,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10221,7 +10245,7 @@ module Aws::S3
     #   @return [Types::AnalyticsConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10245,6 +10269,7 @@ module Aws::S3
     #         cors_configuration: { # required
     #           cors_rules: [ # required
     #             {
+    #               id: "ID",
     #               allowed_headers: ["AllowedHeader"],
     #               allowed_methods: ["AllowedMethod"], # required
     #               allowed_origins: ["AllowedOrigin"], # required
@@ -10264,8 +10289,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 User
-    #   Guide*.
+    #   Resource Sharing][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -10287,7 +10311,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10328,8 +10352,7 @@ module Aws::S3
     #   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 Simple Storage Service Developer
-    #   Guide*.
+    #   Encryption][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -10349,7 +10372,7 @@ module Aws::S3
     #   @return [Types::ServerSideEncryptionConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10472,7 +10495,7 @@ module Aws::S3
     #   @return [Types::InventoryConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10554,7 +10577,7 @@ module Aws::S3
     #   @return [Types::BucketLifecycleConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10619,7 +10642,7 @@ module Aws::S3
     #   @return [Types::LifecycleConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10678,7 +10701,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10735,7 +10758,7 @@ module Aws::S3
     #   @return [Types::MetricsConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10823,7 +10846,7 @@ module Aws::S3
     #   @return [Types::NotificationConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10884,7 +10907,7 @@ module Aws::S3
     #   @return [Types::NotificationConfigurationDeprecated]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10929,7 +10952,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -10982,7 +11005,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -11101,7 +11124,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -11153,7 +11176,7 @@ module Aws::S3
     #   @return [Types::RequestPaymentConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -11209,7 +11232,7 @@ module Aws::S3
     #   @return [Types::Tagging]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -11268,7 +11291,7 @@ module Aws::S3
     #   @return [Types::VersioningConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -11344,7 +11367,7 @@ module Aws::S3
     #   @return [Types::WebsiteConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -11434,11 +11457,11 @@ module Aws::S3
     #   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*.
+    #   Points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html
     #   @return [String]
     #
     # @!attribute [rw] content_md5
@@ -11495,7 +11518,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -11504,12 +11527,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] request_payer
@@ -11529,7 +11552,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -11593,11 +11616,11 @@ module Aws::S3
     #   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*.
+    #   Points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html
     #   @return [String]
     #
     # @!attribute [rw] key
@@ -11633,7 +11656,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -11720,7 +11743,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -11884,7 +11907,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -11893,12 +11916,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] cache_control
@@ -12146,7 +12169,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -12231,11 +12254,11 @@ module Aws::S3
     #   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*.
+    #   Points][1] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html
     #   @return [String]
     #
     # @!attribute [rw] key
@@ -12277,7 +12300,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -12339,7 +12362,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -12348,12 +12371,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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
@@ -12376,7 +12399,7 @@ module Aws::S3
     #   @return [Types::Tagging]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -12439,7 +12462,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 S3 User Guide*.
     #
     #
     #
@@ -12447,7 +12470,7 @@ module Aws::S3
     #   @return [Types::PublicAccessBlockConfiguration]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -12505,7 +12528,7 @@ module Aws::S3
     # @!attribute [rw] filter
     #   Specifies object key name filtering rules. For information about key
     #   name filtering, see [Configuring Event Notifications][1] in the
-    #   *Amazon Simple Storage Service Developer Guide*.
+    #   *Amazon S3 User Guide*.
     #
     #
     #
@@ -12553,7 +12576,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] events
-    #   A collection of bucket events for which to send notifications
+    #   A collection of bucket events for which to send notifications.
     #   @return [Array<String>]
     #
     # @!attribute [rw] queue
@@ -12796,7 +12819,7 @@ module Aws::S3
     #   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 Simple Storage Service Developer Guide*.
+    #   the *Amazon S3 User Guide*.
     #
     #
     #
@@ -12897,8 +12920,8 @@ module Aws::S3
     #   will be replicated according to the rule with the highest priority.
     #   The higher the number, the higher the priority.
     #
-    #   For more information, see [Replication][1] in the *Amazon Simple
-    #   Storage Service Developer Guide*.
+    #   For more information, see [Replication][1] in the *Amazon S3 User
+    #   Guide*.
     #
     #
     #
@@ -12999,7 +13022,7 @@ module Aws::S3
     #   filters in an `And` tag.
     #
     # * If you specify a filter based on multiple tags, wrap the `Tag`
-    #   elements in an `And` tag
+    #   elements in an `And` tag.
     #
     # @note When making an API call, you may pass ReplicationRuleAndOperator
     #   data as a hash:
@@ -13319,7 +13342,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -13328,12 +13351,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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
@@ -13361,7 +13384,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -13515,8 +13538,7 @@ 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 User
-    # Guide*.
+    # conditional redirects][1] in the *Amazon S3 User Guide*.
     #
     #
     #
@@ -13565,7 +13587,7 @@ module Aws::S3
     # Specifies lifecycle rules for an Amazon S3 bucket. For more
     # information, see [Put Bucket Lifecycle Configuration][1] in the
     # *Amazon Simple Storage Service API Reference*. For examples, see [Put
-    # Bucket Lifecycle Configuration Examples][2]
+    # Bucket Lifecycle Configuration Examples][2].
     #
     #
     #
@@ -13632,7 +13654,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 User Guide*.
+    #   *Amazon S3 User Guide*.
     #
     #
     #
@@ -13664,7 +13686,7 @@ module Aws::S3
     #   upload that Amazon S3 will wait before permanently removing all
     #   parts of the upload. For more information, see [ Aborting Incomplete
     #   Multipart Uploads Using a Bucket Lifecycle Policy][1] in the *Amazon
-    #   Simple Storage Service Developer Guide*.
+    #   S3 User Guide*.
     #
     #
     #
@@ -14031,7 +14053,7 @@ module Aws::S3
     #   @return [Types::ScanRange]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -14236,7 +14258,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 User Guide*.
+    #   S3 User Guide*.
     #
     #
     #
@@ -14597,8 +14619,8 @@ 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 User Guide*.
+    #   more information, see [Supported Event Types][1] in the *Amazon S3
+    #   User Guide*.
     #
     #
     #
@@ -14608,7 +14630,7 @@ module Aws::S3
     # @!attribute [rw] filter
     #   Specifies object key name filtering rules. For information about key
     #   name filtering, see [Configuring Event Notifications][1] in the
-    #   *Amazon Simple Storage Service Developer Guide*.
+    #   *Amazon S3 User Guide*.
     #
     #
     #
@@ -14677,8 +14699,8 @@ 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 User Guide*.
+    # [Transitioning Objects Using Amazon S3 Lifecycle][1] in the *Amazon S3
+    # User Guide*.
     #
     #
     #
@@ -14812,7 +14834,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -14821,12 +14843,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] copy_source
@@ -14873,7 +14895,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html
     #   @return [String]
     #
     # @!attribute [rw] copy_source_if_match
@@ -14968,13 +14990,13 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected destination bucket owner. If the
+    #   The account ID of the expected destination bucket owner. If the
     #   destination bucket is owned by a different account, the request will
     #   fail with an HTTP `403 (Access Denied)` error.
     #   @return [String]
     #
     # @!attribute [rw] expected_source_bucket_owner
-    #   The account id of the expected source bucket owner. If the source
+    #   The account ID of the expected source bucket owner. If the source
     #   bucket is owned by a different account, the request will fail with
     #   an HTTP `403 (Access Denied)` error.
     #   @return [String]
@@ -15089,7 +15111,7 @@ module Aws::S3
     #   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*.
+    #   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
@@ -15098,12 +15120,12 @@ module Aws::S3
     #   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*.
+    #   Outposts][2] in the *Amazon S3 User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html
-    #   [2]: https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html
+    #   [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] content_length
@@ -15165,7 +15187,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] expected_bucket_owner
-    #   The account id of the expected bucket owner. If the bucket is owned
+    #   The account ID of the expected bucket owner. If the bucket is owned
     #   by a different account, the request will fail with an HTTP `403
     #   (Access Denied)` error.
     #   @return [String]
@@ -15289,6 +15311,317 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass WriteGetObjectResponseRequest
+    #   data as a hash:
+    #
+    #       {
+    #         request_route: "RequestRoute", # required
+    #         request_token: "RequestToken", # required
+    #         body: source_file,
+    #         status_code: 1,
+    #         error_code: "ErrorCode",
+    #         error_message: "ErrorMessage",
+    #         accept_ranges: "AcceptRanges",
+    #         cache_control: "CacheControl",
+    #         content_disposition: "ContentDisposition",
+    #         content_encoding: "ContentEncoding",
+    #         content_language: "ContentLanguage",
+    #         content_length: 1,
+    #         content_range: "ContentRange",
+    #         content_type: "ContentType",
+    #         delete_marker: false,
+    #         etag: "ETag",
+    #         expires: Time.now,
+    #         expiration: "Expiration",
+    #         last_modified: Time.now,
+    #         missing_meta: 1,
+    #         metadata: {
+    #           "MetadataKey" => "MetadataValue",
+    #         },
+    #         object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
+    #         object_lock_legal_hold_status: "ON", # accepts ON, OFF
+    #         object_lock_retain_until_date: Time.now,
+    #         parts_count: 1,
+    #         replication_status: "COMPLETE", # accepts COMPLETE, PENDING, FAILED, REPLICA
+    #         request_charged: "requester", # accepts requester
+    #         restore: "Restore",
+    #         server_side_encryption: "AES256", # accepts AES256, aws:kms
+    #         sse_customer_algorithm: "SSECustomerAlgorithm",
+    #         ssekms_key_id: "SSEKMSKeyId",
+    #         sse_customer_key_md5: "SSECustomerKeyMD5",
+    #         storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS
+    #         tag_count: 1,
+    #         version_id: "ObjectVersionId",
+    #         bucket_key_enabled: false,
+    #       }
+    #
+    # @!attribute [rw] request_route
+    #   Route prefix to the HTTP URL generated.
+    #   @return [String]
+    #
+    # @!attribute [rw] request_token
+    #   A single use encrypted token that maps `WriteGetObjectResponse` to
+    #   the end user `GetObject` request.
+    #   @return [String]
+    #
+    # @!attribute [rw] body
+    #   The object data.
+    #   @return [IO]
+    #
+    # @!attribute [rw] status_code
+    #   The integer status code for an HTTP response of a corresponding
+    #   `GetObject` request.
+    #
+    #   **Status Codes**
+    #
+    #   * *200 - OK*
+    #
+    #   * *206 - Partial Content*
+    #
+    #   * *304 - Not Modified*
+    #
+    #   * *400 - Bad Request*
+    #
+    #   * *401 - Unauthorized*
+    #
+    #   * *403 - Forbidden*
+    #
+    #   * *404 - Not Found*
+    #
+    #   * *405 - Method Not Allowed*
+    #
+    #   * *409 - Conflict*
+    #
+    #   * *411 - Length Required*
+    #
+    #   * *412 - Precondition Failed*
+    #
+    #   * *416 - Range Not Satisfiable*
+    #
+    #   * *500 - Internal Server Error*
+    #
+    #   * *503 - Service Unavailable*
+    #   @return [Integer]
+    #
+    # @!attribute [rw] error_code
+    #   A string that uniquely identifies an error condition. Returned in
+    #   the &lt;Code&gt; tag of the error XML response for a corresponding
+    #   `GetObject` call. Cannot be used with a successful `StatusCode`
+    #   header or when the transformed object is provided in the body. All
+    #   error codes from S3 are sentence-cased. Regex value is
+    #   "^\[A-Z\]\[a-zA-Z\]+$".
+    #   @return [String]
+    #
+    # @!attribute [rw] error_message
+    #   Contains a generic description of the error condition. Returned in
+    #   the &lt;Message&gt; tag of the error XML response for a
+    #   corresponding `GetObject` call. Cannot be used with a successful
+    #   `StatusCode` header or when the transformed object is provided in
+    #   body.
+    #   @return [String]
+    #
+    # @!attribute [rw] accept_ranges
+    #   Indicates that a range of bytes was specified.
+    #   @return [String]
+    #
+    # @!attribute [rw] cache_control
+    #   Specifies caching behavior along the request/reply chain.
+    #   @return [String]
+    #
+    # @!attribute [rw] content_disposition
+    #   Specifies presentational information for the object.
+    #   @return [String]
+    #
+    # @!attribute [rw] content_encoding
+    #   Specifies what content encodings have been applied to the object and
+    #   thus what decoding mechanisms must be applied to obtain the
+    #   media-type referenced by the Content-Type header field.
+    #   @return [String]
+    #
+    # @!attribute [rw] content_language
+    #   The language the content is in.
+    #   @return [String]
+    #
+    # @!attribute [rw] content_length
+    #   The size of the content body in bytes.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] content_range
+    #   The portion of the object returned in the response.
+    #   @return [String]
+    #
+    # @!attribute [rw] content_type
+    #   A standard MIME type describing the format of the object data.
+    #   @return [String]
+    #
+    # @!attribute [rw] delete_marker
+    #   Specifies whether an object stored in Amazon S3 is (`true`) or is
+    #   not (`false`) a delete marker.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] etag
+    #   An opaque identifier assigned by a web server to a specific version
+    #   of a resource found at a URL.
+    #   @return [String]
+    #
+    # @!attribute [rw] expires
+    #   The date and time at which the object is no longer cacheable.
+    #   @return [Time]
+    #
+    # @!attribute [rw] expiration
+    #   If object stored in Amazon S3 expiration is configured (see PUT
+    #   Bucket lifecycle) it includes expiry-date and rule-id key-value
+    #   pairs providing object expiration information. The value of the
+    #   rule-id is URL encoded.
+    #   @return [String]
+    #
+    # @!attribute [rw] last_modified
+    #   The date and time that the object was last modified.
+    #   @return [Time]
+    #
+    # @!attribute [rw] missing_meta
+    #   Set to the number of metadata entries not returned in `x-amz-meta`
+    #   headers. This can happen if you create metadata using an API like
+    #   SOAP that supports more flexible metadata than the REST API. For
+    #   example, using SOAP, you can create metadata whose values are not
+    #   legal HTTP headers.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] metadata
+    #   A map of metadata to store with the object in S3.
+    #   @return [Hash<String,String>]
+    #
+    # @!attribute [rw] object_lock_mode
+    #   Indicates whether an object stored in Amazon S3 has Object Lock
+    #   enabled. For more information about S3 Object Lock, see [Object
+    #   Lock][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-lock.html
+    #   @return [String]
+    #
+    # @!attribute [rw] object_lock_legal_hold_status
+    #   Indicates whether an object stored in Amazon S3 has an active legal
+    #   hold.
+    #   @return [String]
+    #
+    # @!attribute [rw] object_lock_retain_until_date
+    #   The date and time when Object Lock is configured to expire.
+    #   @return [Time]
+    #
+    # @!attribute [rw] parts_count
+    #   The count of parts this object has.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] replication_status
+    #   Indicates if request involves bucket that is either a source or
+    #   destination in a Replication rule. For more information about S3
+    #   Replication, see [Replication][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/replication.html
+    #   @return [String]
+    #
+    # @!attribute [rw] request_charged
+    #   If present, indicates that the requester was successfully charged
+    #   for the request.
+    #   @return [String]
+    #
+    # @!attribute [rw] restore
+    #   Provides information about object restoration operation and
+    #   expiration time of the restored object copy.
+    #   @return [String]
+    #
+    # @!attribute [rw] server_side_encryption
+    #   The server-side encryption algorithm used when storing requested
+    #   object in Amazon S3 (for example, AES256, aws:kms).
+    #   @return [String]
+    #
+    # @!attribute [rw] sse_customer_algorithm
+    #   Encryption algorithm used if server-side encryption with a
+    #   customer-provided encryption key was specified for object stored in
+    #   Amazon 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.
+    #   @return [String]
+    #
+    # @!attribute [rw] sse_customer_key_md5
+    #   128-bit MD5 digest of customer-provided encryption key used in
+    #   Amazon S3 to encrypt data stored in S3. For more information, see
+    #   [Protecting data using server-side encryption with customer-provided
+    #   encryption keys (SSE-C)][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/ServerSideEncryptionCustomerKeys.html
+    #   @return [String]
+    #
+    # @!attribute [rw] storage_class
+    #   The class of storage used to store object in Amazon S3.
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_count
+    #   The number of tags, if any, on the object.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] version_id
+    #   An ID used to reference a specific version of the object.
+    #   @return [String]
+    #
+    # @!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).
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/WriteGetObjectResponseRequest AWS API Documentation
+    #
+    class WriteGetObjectResponseRequest < Struct.new(
+      :request_route,
+      :request_token,
+      :body,
+      :status_code,
+      :error_code,
+      :error_message,
+      :accept_ranges,
+      :cache_control,
+      :content_disposition,
+      :content_encoding,
+      :content_language,
+      :content_length,
+      :content_range,
+      :content_type,
+      :delete_marker,
+      :etag,
+      :expires,
+      :expiration,
+      :last_modified,
+      :missing_meta,
+      :metadata,
+      :object_lock_mode,
+      :object_lock_legal_hold_status,
+      :object_lock_retain_until_date,
+      :parts_count,
+      :replication_status,
+      :request_charged,
+      :restore,
+      :server_side_encryption,
+      :sse_customer_algorithm,
+      :ssekms_key_id,
+      :sse_customer_key_md5,
+      :storage_class,
+      :tag_count,
+      :version_id,
+      :bucket_key_enabled)
+      SENSITIVE = [:ssekms_key_id]
+      include Aws::Structure
+    end
+
     # The container for selecting objects from a content event stream.
     #
     # EventStream is an Enumerator of Events.