aws-sdk-s3 1.65.0 → 1.69.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module Aws

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require 'time'
 require 'openssl'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'set'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 require 'set'
 require 'tempfile'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -274,7 +276,7 @@ module Aws::S3
         key: @object_key,
         upload_id: @id
       )
-      resp = @client.complete_multipart_upload(options)
+      @client.complete_multipart_upload(options)
       Object.new(
         bucket_name: @bucket_name,
         key: @object_key,

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     class MultipartUploadError < StandardError

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -216,7 +218,8 @@ module Aws::S3
     end
 
     # Provides storage class information of the object. Amazon S3 returns
-    # this header for all objects except for Standard storage class objects.
+    # this header for all objects except for S3 Standard storage class
+    # objects.
     #
     # For more information, see [Storage Classes][1].
     #
@@ -744,7 +747,16 @@ module Aws::S3
     # @option options [String] :range
     #   Downloads the specified range bytes of an object. For more information
     #   about the HTTP Range header, see
-    #   [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35]().
+    #   [https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35][1].
+    #
+    #   <note markdown="1"> Amazon S3 doesn't support retrieving multiple ranges of data per
+    #   `GET` request.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
     # @option options [String] :response_cache_control
     #   Sets the `Cache-Control` header of the response.
     # @option options [String] :response_content_disposition
@@ -1051,8 +1063,8 @@ module Aws::S3
     #   The server-side encryption algorithm used when storing this object in
     #   Amazon S3 (for example, AES256, aws:kms).
     # @option options [String] :storage_class
-    #   If you don't specify, Standard is the default storage class. Amazon
-    #   S3 supports other storage classes.
+    #   If you don't specify, S3 Standard is the default storage class.
+    #   Amazon S3 supports other storage classes.
     # @option options [String] :website_redirect_location
     #   If the bucket is configured as a website, redirects requests for this
     #   object to another object in the same bucket or to an external URL.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 
 module Aws

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 require 'cgi'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -495,7 +497,16 @@ module Aws::S3
     # @option options [String] :range
     #   Downloads the specified range bytes of an object. For more information
     #   about the HTTP Range header, see
-    #   [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35]().
+    #   [https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35][1].
+    #
+    #   <note markdown="1"> Amazon S3 doesn't support retrieving multiple ranges of data per
+    #   `GET` request.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
     # @option options [String] :response_cache_control
     #   Sets the `Cache-Control` header of the response.
     # @option options [String] :response_content_disposition
@@ -802,8 +813,8 @@ module Aws::S3
     #   The server-side encryption algorithm used when storing this object in
     #   Amazon S3 (for example, AES256, aws:kms).
     # @option options [String] :storage_class
-    #   If you don't specify, Standard is the default storage class. Amazon
-    #   S3 supports other storage classes.
+    #   If you don't specify, S3 Standard is the default storage class.
+    #   Amazon S3 supports other storage classes.
     # @option options [String] :website_redirect_location
     #   If the bucket is configured as a website, redirects requests for this
     #   object to another object in the same bucket or to an external URL.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -299,7 +301,16 @@ module Aws::S3
     # @option options [String] :range
     #   Downloads the specified range bytes of an object. For more information
     #   about the HTTP Range header, see
-    #   [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35]().
+    #   [https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35][1].
+    #
+    #   <note markdown="1"> Amazon S3 doesn't support retrieving multiple ranges of data per
+    #   `GET` request.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
     # @option options [String] :response_cache_control
     #   Sets the `Cache-Control` header of the response.
     # @option options [String] :response_content_disposition
@@ -382,6 +393,11 @@ module Aws::S3
     #   Downloads the specified range bytes of an object. For more information
     #   about the HTTP Range header, see
     #   [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35]().
+    #
+    #   <note markdown="1"> Amazon S3 doesn't support retrieving multiple ranges of data per
+    #   `GET` request.
+    #
+    #    </note>
     # @option options [String] :sse_customer_algorithm
     #   Specifies the algorithm to use to when encrypting the object (for
     #   example, AES256).

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins
@@ -13,10 +15,7 @@ module Aws
         class Handler < Seahorse::Client::Handler
 
           def call(context)
-            if
-              context.http_request.body &&
-              context.http_request.body.size > 0
-            then
+            if context.http_request.body && context.http_request.body.size > 0
               context.http_request.headers['expect'] = '100-continue'
             end
             @handler.call(context)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins
@@ -27,7 +29,7 @@ module Aws
               error_code = xml.match(/<Code>(.+?)<\/Code>/)[1]
               error_message = xml.match(/<Message>(.+?)<\/Message>/)[1]
               S3::Errors.error_class(error_code).new(context, error_message)
-            elsif !xml.match(/<[\w_]/) # Must have the start of an XML Tag
+            elsif !xml.match(/<\w/) # Must have the start of an XML Tag
               # Other incomplete xml bodies will result in XML ParsingError
               Seahorse::Client::NetworkingError.new(
                 S3::Errors

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,22 +1,19 @@
+# frozen_string_literal: true
+
 require 'openssl'
 
 module Aws
   module S3
     module Plugins
+      # @api private
+      # This plugin is effectively deprecated in favor of modeled
+      # httpChecksumRequired traits.
       class Md5s < Seahorse::Client::Plugin
-
-        # Amazon S3 requires these operations to have an MD5 checksum
-        REQUIRED_OPERATIONS = [
-          :delete_objects,
-          :put_bucket_cors,
-          :put_bucket_lifecycle,
-          :put_bucket_lifecycle_configuration,
-          :put_bucket_policy,
-          :put_bucket_replication,
-          :put_bucket_tagging,
-          :put_object_legal_hold,
-          :put_object_lock_configuration,
-          :put_object_retention
+        # These operations allow Content MD5 but are not required by
+        # httpChecksumRequired. This list should not grow.
+        OPTIONAL_OPERATIONS = [
+          :put_object,
+          :upload_part
         ]
 
         # @api private
@@ -63,20 +60,22 @@ module Aws
           default: true,
           doc_type: 'Boolean',
           docstring: <<-DOCS)
-When `true` a MD5 checksum will be computed for every request that
-sends a body.  When `false`, MD5 checksums will only be computed
-for operations that require them.  Checksum errors returned by Amazon
-S3 are automatically retried up to `:retry_limit` times.
+When `true` a MD5 checksum will be computed and sent in the Content Md5
+header for :put_object and :upload_part. When `false`, MD5 checksums
+will not be computed for these operations. Checksums are still computed
+for operations requiring them. Checksum errors returned by Amazon S3 are
+automatically retried up to `:retry_limit` times.
           DOCS
 
         def add_handlers(handlers, config)
-          # priority set low to ensure md5 is computed AFTER the request is
-          # built but before it is signed
-          handlers.add(Handler, {
-            priority: 10,
-            step: :build,
-            operations: config.compute_checksums ? nil : REQUIRED_OPERATIONS,
-          })
+          if config.compute_checksums
+            # priority set low to ensure md5 is computed AFTER the request is
+            # built but before it is signed
+            handlers.add(
+              Handler,
+              priority: 10, step: :build, operations: OPTIONAL_OPERATIONS
+            )
+          end
         end
 
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sigv4'
 
 module Aws

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'openssl'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'cgi'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'openssl'
 require 'base64'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     class Presigner

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -72,7 +74,7 @@ module Aws::S3
     #   bucket.
     # @return [Bucket]
     def create_bucket(options = {})
-      resp = @client.create_bucket(options)
+      @client.create_bucket(options)
       Bucket.new(
         name: options[:bucket],
         client: @client

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -389,8 +391,14 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] bucket_account_id
-    #   The account ID that owns the destination bucket. If no account ID is
-    #   provided, the owner will not be validated prior to exporting data.
+    #   The account ID that owns the destination S3 bucket. If no account ID
+    #   is provided, the owner is not validated before exporting data.
+    #
+    #   <note markdown="1"> Although this value is optional, we strongly recommend that you set
+    #   it to help prevent problems if the destination bucket ownership
+    #   changes.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] bucket
@@ -2616,9 +2624,9 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] storage_class
-    #   The storage class to use when replicating objects, such as standard
-    #   or reduced redundancy. By default, Amazon S3 uses the storage class
-    #   of the source object to create the object replica.
+    #   The storage class to use when replicating objects, such as S3
+    #   Standard or reduced redundancy. By default, Amazon S3 uses the
+    #   storage class of the source object to create the object replica.
     #
     #   For valid values, see the `StorageClass` element of the [PUT Bucket
     #   replication][1] action in the *Amazon Simple Storage Service API
@@ -3916,7 +3924,8 @@ module Aws::S3
     # @!attribute [rw] location_constraint
     #   Specifies the Region where the bucket resides. For a list of all the
     #   Amazon S3 supported location constraints by Region, see [Regions and
-    #   Endpoints][1].
+    #   Endpoints][1]. Buckets in Region `us-east-1` have a
+    #   LocationConstraint of `null`.
     #
     #
     #
@@ -4028,7 +4037,7 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] bucket
-    #   Name of the bucket for which to get the notification configuration
+    #   Name of the bucket for which to get the notification configuration.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotificationConfigurationRequest AWS API Documentation
@@ -4229,11 +4238,13 @@ module Aws::S3
     #   @return [Types::RedirectAllRequestsTo]
     #
     # @!attribute [rw] index_document
-    #   The name of the index document for the website.
+    #   The name of the index document for the website (for example
+    #   `index.html`).
     #   @return [Types::IndexDocument]
     #
     # @!attribute [rw] error_document
-    #   The name of the error document for the website.
+    #   The object key name of the website error document to use for 4XX
+    #   class errors.
     #   @return [Types::ErrorDocument]
     #
     # @!attribute [rw] routing_rules
@@ -4570,7 +4581,7 @@ module Aws::S3
     #
     # @!attribute [rw] storage_class
     #   Provides storage class information of the object. Amazon S3 returns
-    #   this header for all objects except for Standard storage class
+    #   this header for all objects except for S3 Standard storage class
     #   objects.
     #   @return [String]
     #
@@ -4713,7 +4724,16 @@ module Aws::S3
     # @!attribute [rw] range
     #   Downloads the specified range bytes of an object. For more
     #   information about the HTTP Range header, see
-    #   [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35]().
+    #   [https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35][1].
+    #
+    #   <note markdown="1"> Amazon S3 doesn't support retrieving multiple ranges of data per
+    #   `GET` request.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
     #   @return [String]
     #
     # @!attribute [rw] response_cache_control
@@ -5027,7 +5047,7 @@ module Aws::S3
       include Aws::Structure
     end
 
-    # Container for Glacier job parameters.
+    # Container for S3 Glacier job parameters.
     #
     # @note When making an API call, you may pass GlacierJobParameters
     #   data as a hash:
@@ -5037,7 +5057,7 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] tier
-    #   Glacier retrieval tier at which the restore will be processed.
+    #   S3 Glacier retrieval tier at which the restore will be processed.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GlacierJobParameters AWS API Documentation
@@ -5098,6 +5118,34 @@ module Aws::S3
     #
     # @!attribute [rw] email_address
     #   Email address of the grantee.
+    #
+    #   <note markdown="1"> Using email addresses to specify a grantee is only supported in the
+    #   following AWS Regions:
+    #
+    #    * US East (N. Virginia)
+    #
+    #   * US West (N. California)
+    #
+    #   * US West (Oregon)
+    #
+    #   * Asia Pacific (Singapore)
+    #
+    #   * Asia Pacific (Sydney)
+    #
+    #   * Asia Pacific (Tokyo)
+    #
+    #   * Europe (Ireland)
+    #
+    #   * South America (São Paulo)
+    #
+    #    For a list of all the Amazon S3 supported Regions and endpoints, see
+    #   [Regions and Endpoints][1] in the AWS General Reference.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     #   @return [String]
     #
     # @!attribute [rw] id
@@ -5275,7 +5323,7 @@ module Aws::S3
     #
     # @!attribute [rw] storage_class
     #   Provides storage class information of the object. Amazon S3 returns
-    #   this header for all objects except for Standard storage class
+    #   this header for all objects except for S3 Standard storage class
     #   objects.
     #
     #   For more information, see [Storage Classes][1].
@@ -5445,6 +5493,11 @@ module Aws::S3
     #   Downloads the specified range bytes of an object. For more
     #   information about the HTTP Range header, see
     #   [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35]().
+    #
+    #   <note markdown="1"> Amazon S3 doesn't support retrieving multiple ranges of data per
+    #   `GET` request.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] version_id
@@ -5795,7 +5848,14 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] account_id
-    #   The ID of the account that owns the destination bucket.
+    #   The account ID that owns the destination S3 bucket. If no account ID
+    #   is provided, the owner is not validated before exporting data.
+    #
+    #   <note markdown="1"> Although this value is optional, we strongly recommend that you set
+    #   it to help prevent problems if the destination bucket ownership
+    #   changes.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] bucket
@@ -5877,7 +5937,8 @@ module Aws::S3
     #       }
     #
     # @!attribute [rw] record_delimiter
-    #   The value used to separate individual records in the output.
+    #   The value used to separate individual records in the output. If no
+    #   value is specified, Amazon S3 uses a newline character ('\\n').
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/JSONOutput AWS API Documentation
@@ -6777,10 +6838,11 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] max_keys
-    #   Sets the maximum number of keys returned in the response. The
-    #   response might contain fewer keys but will never contain more. If
-    #   additional keys satisfy the search criteria, but were not returned
-    #   because max-keys was exceeded, the response contains
+    #   Sets the maximum number of keys returned in the response. By default
+    #   the API returns up to 1,000 key names. The response might contain
+    #   fewer keys but will never contain more. If additional keys satisfy
+    #   the search criteria, but were not returned because max-keys was
+    #   exceeded, the response contains
     #   &lt;isTruncated&gt;true&lt;/isTruncated&gt;. To return the
     #   additional keys, see key-marker and version-id-marker.
     #   @return [Integer]
@@ -6931,8 +6993,9 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] max_keys
-    #   Sets the maximum number of keys returned in the response. The
-    #   response might contain fewer keys but will never contain more.
+    #   Sets the maximum number of keys returned in the response. By default
+    #   the API returns up to 1,000 key names. The response might contain
+    #   fewer keys but will never contain more.
     #   @return [Integer]
     #
     # @!attribute [rw] prefix
@@ -6998,8 +7061,9 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] max_keys
-    #   Sets the maximum number of keys returned in the response. The
-    #   response might contain fewer keys but will never contain more.
+    #   Sets the maximum number of keys returned in the response. By default
+    #   the API returns up to 1,000 key names. The response might contain
+    #   fewer keys but will never contain more.
     #   @return [Integer]
     #
     # @!attribute [rw] common_prefixes
@@ -7117,8 +7181,9 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] max_keys
-    #   Sets the maximum number of keys returned in the response. The
-    #   response might contain fewer keys but will never contain more.
+    #   Sets the maximum number of keys returned in the response. By default
+    #   the API returns up to 1,000 key names. The response might contain
+    #   fewer keys but will never contain more.
     #   @return [Integer]
     #
     # @!attribute [rw] prefix
@@ -8618,7 +8683,7 @@ module Aws::S3
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev//cors.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html
     #   @return [Types::CORSConfiguration]
     #
     # @!attribute [rw] content_md5
@@ -9990,8 +10055,8 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] storage_class
-    #   If you don't specify, Standard is the default storage class. Amazon
-    #   S3 supports other storage classes.
+    #   If you don't specify, S3 Standard is the default storage class.
+    #   Amazon S3 supports other storage classes.
     #   @return [String]
     #
     # @!attribute [rw] website_redirect_location
@@ -11245,8 +11310,8 @@ module Aws::S3
     #   @return [Integer]
     #
     # @!attribute [rw] glacier_job_parameters
-    #   Glacier related parameters pertaining to this job. Do not use with
-    #   restores that specify `OutputLocation`.
+    #   S3 Glacier related parameters pertaining to this job. Do not use
+    #   with restores that specify `OutputLocation`.
     #   @return [Types::GlacierJobParameters]
     #
     # @!attribute [rw] type
@@ -11254,7 +11319,7 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] tier
-    #   Glacier retrieval tier at which the restore will be processed.
+    #   S3 Glacier retrieval tier at which the restore will be processed.
     #   @return [String]
     #
     # @!attribute [rw] description
@@ -11324,12 +11389,14 @@ module Aws::S3
     end
 
     # Specifies lifecycle rules for an Amazon S3 bucket. For more
-    # information, see [PUT Bucket lifecycle][1] in the *Amazon Simple
-    # Storage Service API Reference*.
+    # information, see [Put Bucket Lifecycle Configuration][1] in the
+    # *Amazon Simple Storage Service API Reference*. For examples, see [Put
+    # Bucket Lifecycle Configuration Examples][2]
     #
     #
     #
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTlifecycle.html
+    # [2]: https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketLifecycleConfiguration.html#API_PutBucketLifecycleConfiguration_Examples
     #
     # @note When making an API call, you may pass Rule
     #   data as a hash:
@@ -11381,6 +11448,13 @@ module Aws::S3
     #
     # @!attribute [rw] transition
     #   Specifies when an object transitions to a specified storage class.
+    #   For more information about Amazon S3 lifecycle configuration rules,
+    #   see [Transitioning Objects Using Amazon S3 Lifecycle][1] in the
+    #   *Amazon Simple Storage Service Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/lifecycle-transition-general-considerations.html
     #   @return [Types::Transition]
     #
     # @!attribute [rw] noncurrent_version_transition
@@ -11872,8 +11946,30 @@ module Aws::S3
     #   @return [String]
     #
     # @!attribute [rw] kms_master_key_id
-    #   KMS master key ID to use for the default encryption. This parameter
-    #   is allowed if and only if `SSEAlgorithm` is set to `aws:kms`.
+    #   AWS Key Management Service (KMS) customer master key ID to use for
+    #   the default encryption. This parameter is allowed if and only if
+    #   `SSEAlgorithm` is set to `aws:kms`.
+    #
+    #   You can specify the key ID or the Amazon Resource Name (ARN) of the
+    #   CMK. However, if you are using encryption with cross-account
+    #   operations, you must use a fully qualified CMK ARN. For more
+    #   information, see [Using encryption for cross-account operations][1].
+    #
+    #   **For example:**
+    #
+    #   * Key ID: `1234abcd-12ab-34cd-56ef-1234567890ab`
+    #
+    #   * Key ARN:
+    #     `arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab`
+    #
+    #   Amazon S3 only supports symmetric CMKs and not asymmetric CMKs. For
+    #   more information, see [Using Symmetric and Asymmetric Keys][2] in
+    #   the *AWS Key Management Service Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-encryption.html#bucket-encryption-update-bucket-policy
+    #   [2]: https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ServerSideEncryptionByDefault AWS API Documentation
@@ -12287,7 +12383,14 @@ module Aws::S3
       include Aws::Structure
     end
 
-    # Specifies when an object transitions to a specified storage class.
+    # Specifies when an object transitions to a specified storage class. For
+    # more information about Amazon S3 lifecycle configuration rules, see
+    # [Transitioning Objects Using Amazon S3 Lifecycle][1] in the *Amazon
+    # Simple Storage Service Developer Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/lifecycle-transition-general-considerations.html
     #
     # @note When making an API call, you may pass Transition
     #   data as a hash: