aws-sdk-cloudfront 1.27.1 → 1.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62e8f351820ea1420cce15447e7bedec7734d26082fa29852d71768ae0cb9a71
-  data.tar.gz: cd702b060d586ed7ab002b65c382cb0b1ebec7c4caf5dab5fef3e2966bc7509f
+  metadata.gz: 2a0bcd9aef353c5dc4d9fb3e59d874e06d6a6f0109df0c9f55209aa10e5204de
+  data.tar.gz: 4775d1f1f2f78623138d3e1b780bc9c9e787586de6a2026789a8cc06afcadac0
 SHA512:
-  metadata.gz: 5b9bec567d2610cd105b74d5330a82ddc847525ffbd3db637556a5f3db058a9e6f08acdc21ee8f4d810c8480711f3e9b87e2f88cb63aaccee0b8d04fb09f7f74
-  data.tar.gz: 118650c65ed755a43ee23918044ae187b94a452c7d3109d37e222e7e4f5bc875ebcb75773275d690a81f0c76cec5ec3bb28286ebb66d74ffe1bc295b7cc3768e
+  metadata.gz: 4bce16e95dabb1aeac292e7334125007762da6db0cf2446428bc2e4bb199033aadec08f82251189c8d4c7f8f23ee3b937ecdf5675bc8c108843dff81cb4967ca
+  data.tar.gz: d6d4f139e11d720d2d4313dda7172ecdf771efe676a3577192c68ffcd9e89e4a406e0ac8d5a73224f89af858274fe768b6642d71e16e8bbcab87d105acb0e6a7

data/lib/aws-sdk-cloudfront.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -46,6 +48,6 @@ require_relative 'aws-sdk-cloudfront/customizations'
 # @service
 module Aws::CloudFront
 
-  GEM_VERSION = '1.27.1'
+  GEM_VERSION = '1.32.0'
 
 end

data/lib/aws-sdk-cloudfront/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -24,6 +26,7 @@ require 'aws-sdk-core/plugins/jsonvalue_converter.rb'
 require 'aws-sdk-core/plugins/client_metrics_plugin.rb'
 require 'aws-sdk-core/plugins/client_metrics_send_plugin.rb'
 require 'aws-sdk-core/plugins/transfer_encoding.rb'
+require 'aws-sdk-core/plugins/http_checksum.rb'
 require 'aws-sdk-core/plugins/signature_v4.rb'
 require 'aws-sdk-core/plugins/protocols/rest_xml.rb'
 
@@ -69,6 +72,7 @@ module Aws::CloudFront
     add_plugin(Aws::Plugins::ClientMetricsPlugin)
     add_plugin(Aws::Plugins::ClientMetricsSendPlugin)
     add_plugin(Aws::Plugins::TransferEncoding)
+    add_plugin(Aws::Plugins::HttpChecksum)
     add_plugin(Aws::Plugins::SignatureV4)
     add_plugin(Aws::Plugins::Protocols::RestXml)
 
@@ -161,7 +165,7 @@ module Aws::CloudFront
     #   @option options [String] :endpoint
     #     The client endpoint is normally constructed from the `:region`
     #     option. You should only configure an `:endpoint` when connecting
-    #     to test endpoints. This should be a valid HTTP(S) URI.
+    #     to test or custom endpoints. This should be a valid HTTP(S) URI.
     #
     #   @option options [Integer] :endpoint_cache_max_entries (1000)
     #     Used for the maximum size limit of the LRU cache storing endpoints data
@@ -176,7 +180,7 @@ module Aws::CloudFront
     #     requests fetching endpoints information. Defaults to 60 sec.
     #
     #   @option options [Boolean] :endpoint_discovery (false)
-    #     When set to `true`, endpoint discovery will be enabled for operations when available. Defaults to `false`.
+    #     When set to `true`, endpoint discovery will be enabled for operations when available.
     #
     #   @option options [Aws::Log::Formatter] :log_formatter (Aws::Log::Formatter.default)
     #     The log formatter.
@@ -424,6 +428,8 @@ module Aws::CloudFront
     #               origin_read_timeout: 1,
     #               origin_keepalive_timeout: 1,
     #             },
+    #             connection_attempts: 1,
+    #             connection_timeout: 1,
     #           },
     #         ],
     #       },
@@ -637,6 +643,8 @@ module Aws::CloudFront
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_ssl_protocols.items[0] #=> String, one of "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_read_timeout #=> Integer
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_keepalive_timeout #=> Integer
+    #   resp.distribution.distribution_config.origins.items[0].connection_attempts #=> Integer
+    #   resp.distribution.distribution_config.origins.items[0].connection_timeout #=> Integer
     #   resp.distribution.distribution_config.origin_groups.quantity #=> Integer
     #   resp.distribution.distribution_config.origin_groups.items #=> Array
     #   resp.distribution.distribution_config.origin_groups.items[0].id #=> String
@@ -811,6 +819,8 @@ module Aws::CloudFront
     #                 origin_read_timeout: 1,
     #                 origin_keepalive_timeout: 1,
     #               },
+    #               connection_attempts: 1,
+    #               connection_timeout: 1,
     #             },
     #           ],
     #         },
@@ -1033,6 +1043,8 @@ module Aws::CloudFront
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_ssl_protocols.items[0] #=> String, one of "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_read_timeout #=> Integer
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_keepalive_timeout #=> Integer
+    #   resp.distribution.distribution_config.origins.items[0].connection_attempts #=> Integer
+    #   resp.distribution.distribution_config.origins.items[0].connection_timeout #=> Integer
     #   resp.distribution.distribution_config.origin_groups.quantity #=> Integer
     #   resp.distribution.distribution_config.origin_groups.items #=> Array
     #   resp.distribution.distribution_config.origin_groups.items[0].id #=> String
@@ -1910,6 +1922,8 @@ module Aws::CloudFront
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_ssl_protocols.items[0] #=> String, one of "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_read_timeout #=> Integer
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_keepalive_timeout #=> Integer
+    #   resp.distribution.distribution_config.origins.items[0].connection_attempts #=> Integer
+    #   resp.distribution.distribution_config.origins.items[0].connection_timeout #=> Integer
     #   resp.distribution.distribution_config.origin_groups.quantity #=> Integer
     #   resp.distribution.distribution_config.origin_groups.items #=> Array
     #   resp.distribution.distribution_config.origin_groups.items[0].id #=> String
@@ -2078,6 +2092,8 @@ module Aws::CloudFront
     #   resp.distribution_config.origins.items[0].custom_origin_config.origin_ssl_protocols.items[0] #=> String, one of "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"
     #   resp.distribution_config.origins.items[0].custom_origin_config.origin_read_timeout #=> Integer
     #   resp.distribution_config.origins.items[0].custom_origin_config.origin_keepalive_timeout #=> Integer
+    #   resp.distribution_config.origins.items[0].connection_attempts #=> Integer
+    #   resp.distribution_config.origins.items[0].connection_timeout #=> Integer
     #   resp.distribution_config.origin_groups.quantity #=> Integer
     #   resp.distribution_config.origin_groups.items #=> Array
     #   resp.distribution_config.origin_groups.items[0].id #=> String
@@ -2692,6 +2708,8 @@ module Aws::CloudFront
     #   resp.distribution_list.items[0].origins.items[0].custom_origin_config.origin_ssl_protocols.items[0] #=> String, one of "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"
     #   resp.distribution_list.items[0].origins.items[0].custom_origin_config.origin_read_timeout #=> Integer
     #   resp.distribution_list.items[0].origins.items[0].custom_origin_config.origin_keepalive_timeout #=> Integer
+    #   resp.distribution_list.items[0].origins.items[0].connection_attempts #=> Integer
+    #   resp.distribution_list.items[0].origins.items[0].connection_timeout #=> Integer
     #   resp.distribution_list.items[0].origin_groups.quantity #=> Integer
     #   resp.distribution_list.items[0].origin_groups.items #=> Array
     #   resp.distribution_list.items[0].origin_groups.items[0].id #=> String
@@ -2874,6 +2892,8 @@ module Aws::CloudFront
     #   resp.distribution_list.items[0].origins.items[0].custom_origin_config.origin_ssl_protocols.items[0] #=> String, one of "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"
     #   resp.distribution_list.items[0].origins.items[0].custom_origin_config.origin_read_timeout #=> Integer
     #   resp.distribution_list.items[0].origins.items[0].custom_origin_config.origin_keepalive_timeout #=> Integer
+    #   resp.distribution_list.items[0].origins.items[0].connection_attempts #=> Integer
+    #   resp.distribution_list.items[0].origins.items[0].connection_timeout #=> Integer
     #   resp.distribution_list.items[0].origin_groups.quantity #=> Integer
     #   resp.distribution_list.items[0].origin_groups.items #=> Array
     #   resp.distribution_list.items[0].origin_groups.items[0].id #=> String
@@ -3521,6 +3541,8 @@ module Aws::CloudFront
     #               origin_read_timeout: 1,
     #               origin_keepalive_timeout: 1,
     #             },
+    #             connection_attempts: 1,
+    #             connection_timeout: 1,
     #           },
     #         ],
     #       },
@@ -3736,6 +3758,8 @@ module Aws::CloudFront
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_ssl_protocols.items[0] #=> String, one of "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_read_timeout #=> Integer
     #   resp.distribution.distribution_config.origins.items[0].custom_origin_config.origin_keepalive_timeout #=> Integer
+    #   resp.distribution.distribution_config.origins.items[0].connection_attempts #=> Integer
+    #   resp.distribution.distribution_config.origins.items[0].connection_timeout #=> Integer
     #   resp.distribution.distribution_config.origin_groups.quantity #=> Integer
     #   resp.distribution.distribution_config.origin_groups.items #=> Array
     #   resp.distribution.distribution_config.origin_groups.items[0].id #=> String
@@ -4158,7 +4182,7 @@ module Aws::CloudFront
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-cloudfront'
-      context[:gem_version] = '1.27.1'
+      context[:gem_version] = '1.32.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -1138,6 +1140,8 @@ module Aws::CloudFront
     Origin.add_member(:custom_headers, Shapes::ShapeRef.new(shape: CustomHeaders, location_name: "CustomHeaders"))
     Origin.add_member(:s3_origin_config, Shapes::ShapeRef.new(shape: S3OriginConfig, location_name: "S3OriginConfig"))
     Origin.add_member(:custom_origin_config, Shapes::ShapeRef.new(shape: CustomOriginConfig, location_name: "CustomOriginConfig"))
+    Origin.add_member(:connection_attempts, Shapes::ShapeRef.new(shape: integer, location_name: "ConnectionAttempts"))
+    Origin.add_member(:connection_timeout, Shapes::ShapeRef.new(shape: integer, location_name: "ConnectionTimeout"))
     Origin.struct_class = Types::Origin
 
     OriginCustomHeader.add_member(:header_name, Shapes::ShapeRef.new(shape: string, required: true, location_name: "HeaderName"))

data/lib/aws-sdk-cloudfront/cookie_signer.rb

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

data/lib/aws-sdk-cloudfront/customizations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # utility classes
 require 'aws-sdk-cloudfront/signer'
 require 'aws-sdk-cloudfront/url_signer'

data/lib/aws-sdk-cloudfront/errors.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-cloudfront/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:

data/lib/aws-sdk-cloudfront/signer.rb

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

data/lib/aws-sdk-cloudfront/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:
@@ -17,6 +19,7 @@ module Aws::CloudFront
     #
     class AccessDenied < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -62,6 +65,7 @@ module Aws::CloudFront
       :enabled,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -112,6 +116,7 @@ module Aws::CloudFront
     class AliasICPRecordal < Struct.new(
       :cname,
       :icp_recordal_status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -141,6 +146,7 @@ module Aws::CloudFront
     class Aliases < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -205,6 +211,7 @@ module Aws::CloudFront
       :quantity,
       :items,
       :cached_methods)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -217,6 +224,7 @@ module Aws::CloudFront
     #
     class BatchTooLarge < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -229,6 +237,7 @@ module Aws::CloudFront
     #
     class CNAMEAlreadyExists < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -236,19 +245,19 @@ module Aws::CloudFront
     #
     # You must create at least as many cache behaviors (including the
     # default cache behavior) as you have origins if you want CloudFront to
-    # distribute objects from all of the origins. Each cache behavior
-    # specifies the one origin from which you want CloudFront to get
-    # objects. If you have two origins and only the default cache behavior,
-    # the default cache behavior will cause CloudFront to get objects from
-    # one of the origins, but the other origin is never used.
-    #
-    # For the current limit on the number of cache behaviors that you can
-    # add to a distribution, see [Amazon CloudFront Limits][1] in the *AWS
-    # General Reference*.
+    # serve objects from all of the origins. Each cache behavior specifies
+    # the one origin from which you want CloudFront to get objects. If you
+    # have two origins and only the default cache behavior, the default
+    # cache behavior will cause CloudFront to get objects from one of the
+    # origins, but the other origin is never used.
+    #
+    # For the current quota (formerly known as limit) on the number of cache
+    # behaviors that you can add to a distribution, see [Quotas][1] in the
+    # *Amazon CloudFront Developer Guide*.
     #
-    # If you don't want to specify any cache behaviors, include only an
-    # empty `CacheBehaviors` element. Don't include an empty
-    # `CacheBehavior` element, or CloudFront returns a `MalformedXML` error.
+    # If you don’t want to specify any cache behaviors, include only an
+    # empty `CacheBehaviors` element. Don’t include an empty `CacheBehavior`
+    # element because this is invalid.
     #
     # To delete all cache behaviors in an existing distribution, update the
     # distribution configuration and include only an empty `CacheBehaviors`
@@ -258,12 +267,12 @@ module Aws::CloudFront
     # distribution configuration and specify all of the cache behaviors that
     # you want to include in the updated distribution.
     #
-    # For more information about cache behaviors, see [Cache Behaviors][2]
-    # in the *Amazon CloudFront Developer Guide*.
+    # For more information about cache behaviors, see [Cache Behavior
+    # Settings][2] in the *Amazon CloudFront Developer Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_cloudfront
+    # [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html
     # [2]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesCacheBehavior
     #
     # @note When making an API call, you may pass CacheBehavior
@@ -349,9 +358,7 @@ module Aws::CloudFront
     #
     # @!attribute [rw] target_origin_id
     #   The value of `ID` for the origin that you want CloudFront to route
-    #   requests to when a request matches the path pattern either for a
-    #   cache behavior or for the default cache behavior in your
-    #   distribution.
+    #   requests to when they match this cache behavior.
     #   @return [String]
     #
     # @!attribute [rw] forwarded_values
@@ -367,15 +374,15 @@ module Aws::CloudFront
     #   target origin that match the `PathPattern` for this cache behavior,
     #   specify `true` for `Enabled`, and specify the applicable values for
     #   `Quantity` and `Items`. For more information, see [Serving Private
-    #   Content through CloudFront][1] in the *Amazon CloudFront Developer
-    #   Guide*.
+    #   Content with Signed URLs and Signed Cookies][1] in the *Amazon
+    #   CloudFront Developer Guide*.
     #
-    #   If you don't want to require signed URLs in requests for objects
+    #   If you don’t want to require signed URLs in requests for objects
     #   that match `PathPattern`, specify `false` for `Enabled` and `0` for
     #   `Quantity`. Omit `Items`.
     #
     #   To add, change, or remove one or more trusted signers, change
-    #   `Enabled` to `true` (if it's currently `false`), change `Quantity`
+    #   `Enabled` to `true` (if it’s currently `false`), change `Quantity`
     #   as applicable, and specify all of the trusted signers that you want
     #   to include in the updated distribution.
     #
@@ -399,26 +406,25 @@ module Aws::CloudFront
     #   * `https-only`\: If a viewer sends an HTTP request, CloudFront
     #     returns an HTTP status code of 403 (Forbidden).
     #
-    #   For more information about requiring the HTTPS protocol, see [Using
-    #   an HTTPS Connection to Access Your Objects][1] in the *Amazon
+    #   For more information about requiring the HTTPS protocol, see
+    #   [Requiring HTTPS Between Viewers and CloudFront][1] in the *Amazon
     #   CloudFront Developer Guide*.
     #
     #   <note markdown="1"> The only way to guarantee that viewers retrieve an object that was
     #   fetched from the origin using HTTPS is never to use any other
     #   protocol to fetch the object. If you have recently changed from HTTP
-    #   to HTTPS, we recommend that you clear your objects' cache because
+    #   to HTTPS, we recommend that you clear your objects’ cache because
     #   cached objects are protocol agnostic. That means that an edge
     #   location will return an object from the cache regardless of whether
     #   the current request protocol matches the protocol used previously.
-    #   For more information, see [Managing How Long Content Stays in an
-    #   Edge Cache (Expiration)][2] in the *Amazon CloudFront Developer
-    #   Guide*.
+    #   For more information, see [Managing Cache Expiration][2] in the
+    #   *Amazon CloudFront Developer Guide*.
     #
     #    </note>
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/SecureConnections.html
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-https-viewers-to-cloudfront.html
     #   [2]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html
     #   @return [String]
     #
@@ -515,8 +521,7 @@ module Aws::CloudFront
     # @!attribute [rw] field_level_encryption_id
     #   The value of `ID` for the field-level encryption configuration that
     #   you want CloudFront to use for encrypting specific fields of data
-    #   for a cache behavior or for the default cache behavior in your
-    #   distribution.
+    #   for this cache behavior.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/cloudfront-2019-03-26/CacheBehavior AWS API Documentation
@@ -535,6 +540,7 @@ module Aws::CloudFront
       :compress,
       :lambda_function_associations,
       :field_level_encryption_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -615,6 +621,7 @@ module Aws::CloudFront
     class CacheBehaviors < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -656,6 +663,7 @@ module Aws::CloudFront
     class CachedMethods < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -668,6 +676,7 @@ module Aws::CloudFront
     #
     class CannotChangeImmutablePublicKeyFields < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -694,6 +703,7 @@ module Aws::CloudFront
       :id,
       :s3_canonical_user_id,
       :cloud_front_origin_access_identity_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -710,6 +720,7 @@ module Aws::CloudFront
     #
     class CloudFrontOriginAccessIdentityAlreadyExists < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -754,6 +765,7 @@ module Aws::CloudFront
     class CloudFrontOriginAccessIdentityConfig < Struct.new(
       :caller_reference,
       :comment)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -766,6 +778,7 @@ module Aws::CloudFront
     #
     class CloudFrontOriginAccessIdentityInUse < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -824,6 +837,7 @@ module Aws::CloudFront
       :is_truncated,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -851,6 +865,7 @@ module Aws::CloudFront
       :id,
       :s3_canonical_user_id,
       :comment)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -886,6 +901,7 @@ module Aws::CloudFront
       :format,
       :profile_id,
       :content_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -926,6 +942,7 @@ module Aws::CloudFront
     class ContentTypeProfileConfig < Struct.new(
       :forward_when_content_type_is_unknown,
       :content_type_profiles)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -958,6 +975,7 @@ module Aws::CloudFront
     class ContentTypeProfiles < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1002,6 +1020,7 @@ module Aws::CloudFront
     class CookieNames < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1061,6 +1080,7 @@ module Aws::CloudFront
     class CookiePreference < Struct.new(
       :forward,
       :whitelisted_names)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1093,6 +1113,7 @@ module Aws::CloudFront
     #
     class CreateCloudFrontOriginAccessIdentityRequest < Struct.new(
       :cloud_front_origin_access_identity_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1118,6 +1139,7 @@ module Aws::CloudFront
       :cloud_front_origin_access_identity,
       :location,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1164,6 +1186,8 @@ module Aws::CloudFront
     #                   origin_read_timeout: 1,
     #                   origin_keepalive_timeout: 1,
     #                 },
+    #                 connection_attempts: 1,
+    #                 connection_timeout: 1,
     #               },
     #             ],
     #           },
@@ -1347,6 +1371,7 @@ module Aws::CloudFront
     #
     class CreateDistributionRequest < Struct.new(
       :distribution_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1372,6 +1397,7 @@ module Aws::CloudFront
       :distribution,
       :location,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1419,6 +1445,8 @@ module Aws::CloudFront
     #                     origin_read_timeout: 1,
     #                     origin_keepalive_timeout: 1,
     #                   },
+    #                   connection_attempts: 1,
+    #                   connection_timeout: 1,
     #                 },
     #               ],
     #             },
@@ -1611,6 +1639,7 @@ module Aws::CloudFront
     #
     class CreateDistributionWithTagsRequest < Struct.new(
       :distribution_config_with_tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1636,6 +1665,7 @@ module Aws::CloudFront
       :distribution,
       :location,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1682,6 +1712,7 @@ module Aws::CloudFront
     #
     class CreateFieldLevelEncryptionConfigRequest < Struct.new(
       :field_level_encryption_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1706,6 +1737,7 @@ module Aws::CloudFront
       :field_level_encryption,
       :location,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1741,6 +1773,7 @@ module Aws::CloudFront
     #
     class CreateFieldLevelEncryptionProfileRequest < Struct.new(
       :field_level_encryption_profile_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1765,6 +1798,7 @@ module Aws::CloudFront
       :field_level_encryption_profile,
       :location,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1797,6 +1831,7 @@ module Aws::CloudFront
     class CreateInvalidationRequest < Struct.new(
       :distribution_id,
       :invalidation_batch)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1816,6 +1851,7 @@ module Aws::CloudFront
     class CreateInvalidationResult < Struct.new(
       :location,
       :invalidation)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1839,6 +1875,7 @@ module Aws::CloudFront
     #
     class CreatePublicKeyRequest < Struct.new(
       :public_key_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1863,6 +1900,7 @@ module Aws::CloudFront
       :public_key,
       :location,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1906,6 +1944,7 @@ module Aws::CloudFront
     #
     class CreateStreamingDistributionRequest < Struct.new(
       :streaming_distribution_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1931,6 +1970,7 @@ module Aws::CloudFront
       :streaming_distribution,
       :location,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1984,6 +2024,7 @@ module Aws::CloudFront
     #
     class CreateStreamingDistributionWithTagsRequest < Struct.new(
       :streaming_distribution_config_with_tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2009,6 +2050,7 @@ module Aws::CloudFront
       :streaming_distribution,
       :location,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2116,6 +2158,7 @@ module Aws::CloudFront
       :response_page_path,
       :response_code,
       :error_caching_min_ttl)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2167,6 +2210,7 @@ module Aws::CloudFront
     class CustomErrorResponses < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2201,11 +2245,17 @@ module Aws::CloudFront
     class CustomHeaders < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # A custom origin or an Amazon S3 bucket configured as a website
-    # endpoint.
+    # A custom origin. A custom origin is any origin that is *not* an Amazon
+    # S3 bucket, with one exception. An Amazon S3 bucket that is [configured
+    # with static website hosting][1] *is* a custom origin.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html
     #
     # @note When making an API call, you may pass CustomOriginConfig
     #   data as a hash:
@@ -2223,48 +2273,68 @@ module Aws::CloudFront
     #       }
     #
     # @!attribute [rw] http_port
-    #   The HTTP port the custom origin listens on.
+    #   The HTTP port that CloudFront uses to connect to the origin. Specify
+    #   the HTTP port that the origin listens on.
     #   @return [Integer]
     #
     # @!attribute [rw] https_port
-    #   The HTTPS port the custom origin listens on.
+    #   The HTTPS port that CloudFront uses to connect to the origin.
+    #   Specify the HTTPS port that the origin listens on.
     #   @return [Integer]
     #
     # @!attribute [rw] origin_protocol_policy
-    #   The origin protocol policy to apply to your origin.
+    #   Specifies the protocol (HTTP or HTTPS) that CloudFront uses to
+    #   connect to the origin. Valid values are:
+    #
+    #   * `http-only` – CloudFront always uses HTTP to connect to the
+    #     origin.
+    #
+    #   * `match-viewer` – CloudFront connects to the origin using the same
+    #     protocol that the viewer used to connect to CloudFront.
+    #
+    #   * `https-only` – CloudFront always uses HTTPS to connect to the
+    #     origin.
     #   @return [String]
     #
     # @!attribute [rw] origin_ssl_protocols
-    #   The SSL/TLS protocols that you want CloudFront to use when
-    #   communicating with your origin over HTTPS.
+    #   Specifies the minimum SSL/TLS protocol that CloudFront uses when
+    #   connecting to your origin over HTTPS. Valid values include `SSLv3`,
+    #   `TLSv1`, `TLSv1.1`, and `TLSv1.2`.
+    #
+    #   For more information, see [Minimum Origin SSL Protocol][1] in the
+    #   *Amazon CloudFront Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesOriginSSLProtocols
     #   @return [Types::OriginSslProtocols]
     #
     # @!attribute [rw] origin_read_timeout
-    #   You can create a custom origin read timeout. All timeout units are
-    #   in seconds. The default origin read timeout is 30 seconds, but you
-    #   can configure custom timeout lengths using the CloudFront API. The
-    #   minimum timeout length is 4 seconds; the maximum is 60 seconds.
+    #   Specifies how long, in seconds, CloudFront waits for a response from
+    #   the origin. This is also known as the *origin response timeout*. The
+    #   minimum timeout is 1 second, the maximum is 60 seconds, and the
+    #   default (if you don’t specify otherwise) is 30 seconds.
     #
-    #   If you need to increase the maximum time limit, contact the [AWS
-    #   Support Center][1].
+    #   For more information, see [Origin Response Timeout][1] in the
+    #   *Amazon CloudFront Developer Guide*.
     #
     #
     #
-    #   [1]: https://console.aws.amazon.com/support/home#/
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesOriginResponseTimeout
     #   @return [Integer]
     #
     # @!attribute [rw] origin_keepalive_timeout
-    #   You can create a custom keep-alive timeout. All timeout units are in
-    #   seconds. The default keep-alive timeout is 5 seconds, but you can
-    #   configure custom timeout lengths using the CloudFront API. The
-    #   minimum timeout length is 1 second; the maximum is 60 seconds.
+    #   Specifies how long, in seconds, CloudFront persists its connection
+    #   to the origin. The minimum timeout is 1 second, the maximum is 60
+    #   seconds, and the default (if you don’t specify otherwise) is 5
+    #   seconds.
     #
-    #   If you need to increase the maximum time limit, contact the [AWS
-    #   Support Center][1].
+    #   For more information, see [Origin Keep-alive Timeout][1] in the
+    #   *Amazon CloudFront Developer Guide*.
     #
     #
     #
-    #   [1]: https://console.aws.amazon.com/support/home#/
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesOriginKeepaliveTimeout
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/cloudfront-2019-03-26/CustomOriginConfig AWS API Documentation
@@ -2276,13 +2346,14 @@ module Aws::CloudFront
       :origin_ssl_protocols,
       :origin_read_timeout,
       :origin_keepalive_timeout)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # A complex type that describes the default cache behavior if you don't
-    # specify a `CacheBehavior` element or if files don't match any of the
-    # values of `PathPattern` in `CacheBehavior` elements. You must create
-    # exactly one default cache behavior.
+    # A complex type that describes the default cache behavior if you don’t
+    # specify a `CacheBehavior` element or if request URLs don’t match any
+    # of the values of `PathPattern` in `CacheBehavior` elements. You must
+    # create exactly one default cache behavior.
     #
     # @note When making an API call, you may pass DefaultCacheBehavior
     #   data as a hash:
@@ -2341,9 +2412,7 @@ module Aws::CloudFront
     #
     # @!attribute [rw] target_origin_id
     #   The value of `ID` for the origin that you want CloudFront to route
-    #   requests to when a request matches the path pattern either for a
-    #   cache behavior or for the default cache behavior in your
-    #   distribution.
+    #   requests to when they use the default cache behavior.
     #   @return [String]
     #
     # @!attribute [rw] forwarded_values
@@ -2359,15 +2428,15 @@ module Aws::CloudFront
     #   target origin that match the `PathPattern` for this cache behavior,
     #   specify `true` for `Enabled`, and specify the applicable values for
     #   `Quantity` and `Items`. For more information, see [Serving Private
-    #   Content through CloudFront][1] in the <i> Amazon CloudFront
-    #   Developer Guide</i>.
+    #   Content with Signed URLs and Signed Cookies][1] in the *Amazon
+    #   CloudFront Developer Guide*.
     #
-    #   If you don't want to require signed URLs in requests for objects
+    #   If you don’t want to require signed URLs in requests for objects
     #   that match `PathPattern`, specify `false` for `Enabled` and `0` for
     #   `Quantity`. Omit `Items`.
     #
     #   To add, change, or remove one or more trusted signers, change
-    #   `Enabled` to `true` (if it's currently `false`), change `Quantity`
+    #   `Enabled` to `true` (if it’s currently `false`), change `Quantity`
     #   as applicable, and specify all of the trusted signers that you want
     #   to include in the updated distribution.
     #
@@ -2391,26 +2460,25 @@ module Aws::CloudFront
     #   * `https-only`\: If a viewer sends an HTTP request, CloudFront
     #     returns an HTTP status code of 403 (Forbidden).
     #
-    #   For more information about requiring the HTTPS protocol, see [Using
-    #   an HTTPS Connection to Access Your Objects][1] in the *Amazon
+    #   For more information about requiring the HTTPS protocol, see
+    #   [Requiring HTTPS Between Viewers and CloudFront][1] in the *Amazon
     #   CloudFront Developer Guide*.
     #
     #   <note markdown="1"> The only way to guarantee that viewers retrieve an object that was
     #   fetched from the origin using HTTPS is never to use any other
     #   protocol to fetch the object. If you have recently changed from HTTP
-    #   to HTTPS, we recommend that you clear your objects' cache because
+    #   to HTTPS, we recommend that you clear your objects’ cache because
     #   cached objects are protocol agnostic. That means that an edge
     #   location will return an object from the cache regardless of whether
     #   the current request protocol matches the protocol used previously.
-    #   For more information, see [Managing How Long Content Stays in an
-    #   Edge Cache (Expiration)][2] in the *Amazon CloudFront Developer
-    #   Guide*.
+    #   For more information, see [Managing Cache Expiration][2] in the
+    #   *Amazon CloudFront Developer Guide*.
     #
     #    </note>
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/SecureConnections.html
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-https-viewers-to-cloudfront.html
     #   [2]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html
     #   @return [String]
     #
@@ -2507,8 +2575,7 @@ module Aws::CloudFront
     # @!attribute [rw] field_level_encryption_id
     #   The value of `ID` for the field-level encryption configuration that
     #   you want CloudFront to use for encrypting specific fields of data
-    #   for a cache behavior or for the default cache behavior in your
-    #   distribution.
+    #   for the default cache behavior.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/cloudfront-2019-03-26/DefaultCacheBehavior AWS API Documentation
@@ -2526,6 +2593,7 @@ module Aws::CloudFront
       :compress,
       :lambda_function_associations,
       :field_level_encryption_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2553,6 +2621,7 @@ module Aws::CloudFront
     class DeleteCloudFrontOriginAccessIdentityRequest < Struct.new(
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2622,6 +2691,7 @@ module Aws::CloudFront
     class DeleteDistributionRequest < Struct.new(
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2647,6 +2717,7 @@ module Aws::CloudFront
     class DeleteFieldLevelEncryptionConfigRequest < Struct.new(
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2672,6 +2743,7 @@ module Aws::CloudFront
     class DeleteFieldLevelEncryptionProfileRequest < Struct.new(
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2697,6 +2769,7 @@ module Aws::CloudFront
     class DeletePublicKeyRequest < Struct.new(
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2724,6 +2797,7 @@ module Aws::CloudFront
     class DeleteStreamingDistributionRequest < Struct.new(
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2804,6 +2878,7 @@ module Aws::CloudFront
       :active_trusted_signers,
       :distribution_config,
       :alias_icp_recordals)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2817,6 +2892,7 @@ module Aws::CloudFront
     #
     class DistributionAlreadyExists < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2862,6 +2938,8 @@ module Aws::CloudFront
     #                 origin_read_timeout: 1,
     #                 origin_keepalive_timeout: 1,
     #               },
+    #               connection_attempts: 1,
+    #               connection_timeout: 1,
     #             },
     #           ],
     #         },
@@ -3289,6 +3367,7 @@ module Aws::CloudFront
       :web_acl_id,
       :http_version,
       :is_ipv6_enabled)
+      SENSITIVE = [:comment]
       include Aws::Structure
     end
 
@@ -3336,6 +3415,8 @@ module Aws::CloudFront
     #                   origin_read_timeout: 1,
     #                   origin_keepalive_timeout: 1,
     #                 },
+    #                 connection_attempts: 1,
+    #                 connection_timeout: 1,
     #               },
     #             ],
     #           },
@@ -3532,6 +3613,7 @@ module Aws::CloudFront
     class DistributionConfigWithTags < Struct.new(
       :distribution_config,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3577,6 +3659,7 @@ module Aws::CloudFront
       :is_truncated,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3590,6 +3673,7 @@ module Aws::CloudFront
     #
     class DistributionNotDisabled < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3729,6 +3813,7 @@ module Aws::CloudFront
       :http_version,
       :is_ipv6_enabled,
       :alias_icp_recordals)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3767,6 +3852,7 @@ module Aws::CloudFront
     class EncryptionEntities < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3812,6 +3898,7 @@ module Aws::CloudFront
       :public_key_id,
       :provider_id,
       :field_patterns)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3839,6 +3926,7 @@ module Aws::CloudFront
       :id,
       :last_modified_time,
       :field_level_encryption_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3905,6 +3993,7 @@ module Aws::CloudFront
       :comment,
       :query_arg_profile_config,
       :content_type_profile_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3917,6 +4006,7 @@ module Aws::CloudFront
     #
     class FieldLevelEncryptionConfigAlreadyExists < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3929,6 +4019,7 @@ module Aws::CloudFront
     #
     class FieldLevelEncryptionConfigInUse < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3960,6 +4051,7 @@ module Aws::CloudFront
       :max_items,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3986,6 +4078,7 @@ module Aws::CloudFront
       :id,
       :last_modified_time,
       :field_level_encryption_profile_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3998,6 +4091,7 @@ module Aws::CloudFront
     #
     class FieldLevelEncryptionProfileAlreadyExists < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4050,6 +4144,7 @@ module Aws::CloudFront
       :caller_reference,
       :comment,
       :encryption_entities)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4062,6 +4157,7 @@ module Aws::CloudFront
     #
     class FieldLevelEncryptionProfileInUse < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4093,6 +4189,7 @@ module Aws::CloudFront
       :max_items,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4105,6 +4202,7 @@ module Aws::CloudFront
     #
     class FieldLevelEncryptionProfileSizeExceeded < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4141,6 +4239,7 @@ module Aws::CloudFront
       :name,
       :encryption_entities,
       :comment)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4175,6 +4274,7 @@ module Aws::CloudFront
       :comment,
       :query_arg_profile_config,
       :content_type_profile_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4202,6 +4302,7 @@ module Aws::CloudFront
     class FieldPatterns < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4302,6 +4403,7 @@ module Aws::CloudFront
       :cookies,
       :headers,
       :query_string_cache_keys)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4360,6 +4462,7 @@ module Aws::CloudFront
       :restriction_type,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4385,6 +4488,7 @@ module Aws::CloudFront
     #
     class GetCloudFrontOriginAccessIdentityConfigRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4404,6 +4508,7 @@ module Aws::CloudFront
     class GetCloudFrontOriginAccessIdentityConfigResult < Struct.new(
       :cloud_front_origin_access_identity_config,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4424,6 +4529,7 @@ module Aws::CloudFront
     #
     class GetCloudFrontOriginAccessIdentityRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4443,6 +4549,7 @@ module Aws::CloudFront
     class GetCloudFrontOriginAccessIdentityResult < Struct.new(
       :cloud_front_origin_access_identity,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4464,6 +4571,7 @@ module Aws::CloudFront
     #
     class GetDistributionConfigRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4483,6 +4591,7 @@ module Aws::CloudFront
     class GetDistributionConfigResult < Struct.new(
       :distribution_config,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4504,6 +4613,7 @@ module Aws::CloudFront
     #
     class GetDistributionRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4523,6 +4633,7 @@ module Aws::CloudFront
     class GetDistributionResult < Struct.new(
       :distribution,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4542,6 +4653,7 @@ module Aws::CloudFront
     #
     class GetFieldLevelEncryptionConfigRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4559,6 +4671,7 @@ module Aws::CloudFront
     class GetFieldLevelEncryptionConfigResult < Struct.new(
       :field_level_encryption_config,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4578,6 +4691,7 @@ module Aws::CloudFront
     #
     class GetFieldLevelEncryptionProfileConfigRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4595,6 +4709,7 @@ module Aws::CloudFront
     class GetFieldLevelEncryptionProfileConfigResult < Struct.new(
       :field_level_encryption_profile_config,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4613,6 +4728,7 @@ module Aws::CloudFront
     #
     class GetFieldLevelEncryptionProfileRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4630,6 +4746,7 @@ module Aws::CloudFront
     class GetFieldLevelEncryptionProfileResult < Struct.new(
       :field_level_encryption_profile,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4649,6 +4766,7 @@ module Aws::CloudFront
     #
     class GetFieldLevelEncryptionRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4666,6 +4784,7 @@ module Aws::CloudFront
     class GetFieldLevelEncryptionResult < Struct.new(
       :field_level_encryption,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4693,6 +4812,7 @@ module Aws::CloudFront
     class GetInvalidationRequest < Struct.new(
       :distribution_id,
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4711,6 +4831,7 @@ module Aws::CloudFront
     #
     class GetInvalidationResult < Struct.new(
       :invalidation)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4729,6 +4850,7 @@ module Aws::CloudFront
     #
     class GetPublicKeyConfigRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4746,6 +4868,7 @@ module Aws::CloudFront
     class GetPublicKeyConfigResult < Struct.new(
       :public_key_config,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4764,6 +4887,7 @@ module Aws::CloudFront
     #
     class GetPublicKeyRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4781,6 +4905,7 @@ module Aws::CloudFront
     class GetPublicKeyResult < Struct.new(
       :public_key,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4801,6 +4926,7 @@ module Aws::CloudFront
     #
     class GetStreamingDistributionConfigRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4820,6 +4946,7 @@ module Aws::CloudFront
     class GetStreamingDistributionConfigResult < Struct.new(
       :streaming_distribution_config,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4840,6 +4967,7 @@ module Aws::CloudFront
     #
     class GetStreamingDistributionRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4859,6 +4987,7 @@ module Aws::CloudFront
     class GetStreamingDistributionResult < Struct.new(
       :streaming_distribution,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4936,6 +5065,7 @@ module Aws::CloudFront
     class Headers < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4949,6 +5079,7 @@ module Aws::CloudFront
     #
     class IllegalFieldLevelEncryptionConfigAssociationWithCacheBehavior < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4961,6 +5092,7 @@ module Aws::CloudFront
     #
     class IllegalUpdate < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4973,10 +5105,11 @@ module Aws::CloudFront
     #
     class InconsistentQuantities < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # The argument is invalid.
+    # An argument is invalid.
     #
     # @!attribute [rw] message
     #   @return [String]
@@ -4985,6 +5118,7 @@ module Aws::CloudFront
     #
     class InvalidArgument < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4998,6 +5132,7 @@ module Aws::CloudFront
     #
     class InvalidDefaultRootObject < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5010,6 +5145,7 @@ module Aws::CloudFront
     #
     class InvalidErrorCode < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5025,6 +5161,7 @@ module Aws::CloudFront
     #
     class InvalidForwardCookies < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5037,6 +5174,7 @@ module Aws::CloudFront
     #
     class InvalidGeoRestrictionParameter < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5049,6 +5187,7 @@ module Aws::CloudFront
     #
     class InvalidHeadersForS3Origin < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5061,6 +5200,7 @@ module Aws::CloudFront
     #
     class InvalidIfMatchVersion < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5073,6 +5213,7 @@ module Aws::CloudFront
     #
     class InvalidLambdaFunctionAssociation < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5085,6 +5226,7 @@ module Aws::CloudFront
     #
     class InvalidLocationCode < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5097,6 +5239,7 @@ module Aws::CloudFront
     #
     class InvalidMinimumProtocolVersion < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5110,6 +5253,7 @@ module Aws::CloudFront
     #
     class InvalidOrigin < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5122,6 +5266,7 @@ module Aws::CloudFront
     #
     class InvalidOriginAccessIdentity < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5134,6 +5279,7 @@ module Aws::CloudFront
     #
     class InvalidOriginKeepaliveTimeout < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5146,6 +5292,7 @@ module Aws::CloudFront
     #
     class InvalidOriginReadTimeout < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5160,6 +5307,7 @@ module Aws::CloudFront
     #
     class InvalidProtocolSettings < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5172,6 +5320,7 @@ module Aws::CloudFront
     #
     class InvalidQueryStringParameters < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5185,6 +5334,7 @@ module Aws::CloudFront
     #
     class InvalidRelativePath < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5199,6 +5349,7 @@ module Aws::CloudFront
     #
     class InvalidRequiredProtocol < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5211,6 +5362,7 @@ module Aws::CloudFront
     #
     class InvalidResponseCode < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5223,6 +5375,7 @@ module Aws::CloudFront
     #
     class InvalidTTLOrder < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5235,6 +5388,7 @@ module Aws::CloudFront
     #
     class InvalidTagging < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5247,6 +5401,7 @@ module Aws::CloudFront
     #
     class InvalidViewerCertificate < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5263,6 +5418,7 @@ module Aws::CloudFront
     #
     class InvalidWebACLId < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5293,6 +5449,7 @@ module Aws::CloudFront
       :status,
       :create_time,
       :invalidation_batch)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5346,6 +5503,7 @@ module Aws::CloudFront
     class InvalidationBatch < Struct.new(
       :paths,
       :caller_reference)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5398,6 +5556,7 @@ module Aws::CloudFront
       :is_truncated,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5421,6 +5580,7 @@ module Aws::CloudFront
       :id,
       :create_time,
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5459,6 +5619,7 @@ module Aws::CloudFront
     class KeyPairIds < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5520,6 +5681,7 @@ module Aws::CloudFront
       :lambda_function_arn,
       :event_type,
       :include_body)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5565,6 +5727,7 @@ module Aws::CloudFront
     class LambdaFunctionAssociations < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5597,6 +5760,7 @@ module Aws::CloudFront
     class ListCloudFrontOriginAccessIdentitiesRequest < Struct.new(
       :marker,
       :max_items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5610,6 +5774,7 @@ module Aws::CloudFront
     #
     class ListCloudFrontOriginAccessIdentitiesResult < Struct.new(
       :cloud_front_origin_access_identity_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5653,6 +5818,7 @@ module Aws::CloudFront
       :marker,
       :max_items,
       :web_acl_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5667,6 +5833,7 @@ module Aws::CloudFront
     #
     class ListDistributionsByWebACLIdResult < Struct.new(
       :distribution_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5698,6 +5865,7 @@ module Aws::CloudFront
     class ListDistributionsRequest < Struct.new(
       :marker,
       :max_items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5711,6 +5879,7 @@ module Aws::CloudFront
     #
     class ListDistributionsResult < Struct.new(
       :distribution_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5741,6 +5910,7 @@ module Aws::CloudFront
     class ListFieldLevelEncryptionConfigsRequest < Struct.new(
       :marker,
       :max_items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5753,6 +5923,7 @@ module Aws::CloudFront
     #
     class ListFieldLevelEncryptionConfigsResult < Struct.new(
       :field_level_encryption_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5782,6 +5953,7 @@ module Aws::CloudFront
     class ListFieldLevelEncryptionProfilesRequest < Struct.new(
       :marker,
       :max_items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5794,6 +5966,7 @@ module Aws::CloudFront
     #
     class ListFieldLevelEncryptionProfilesResult < Struct.new(
       :field_level_encryption_profile_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5834,6 +6007,7 @@ module Aws::CloudFront
       :distribution_id,
       :marker,
       :max_items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5847,6 +6021,7 @@ module Aws::CloudFront
     #
     class ListInvalidationsResult < Struct.new(
       :invalidation_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5876,6 +6051,7 @@ module Aws::CloudFront
     class ListPublicKeysRequest < Struct.new(
       :marker,
       :max_items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5888,6 +6064,7 @@ module Aws::CloudFront
     #
     class ListPublicKeysResult < Struct.new(
       :public_key_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5914,6 +6091,7 @@ module Aws::CloudFront
     class ListStreamingDistributionsRequest < Struct.new(
       :marker,
       :max_items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5927,6 +6105,7 @@ module Aws::CloudFront
     #
     class ListStreamingDistributionsResult < Struct.new(
       :streaming_distribution_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5947,6 +6126,7 @@ module Aws::CloudFront
     #
     class ListTagsForResourceRequest < Struct.new(
       :resource)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5960,6 +6140,7 @@ module Aws::CloudFront
     #
     class ListTagsForResourceResult < Struct.new(
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6016,6 +6197,7 @@ module Aws::CloudFront
       :include_cookies,
       :bucket,
       :prefix)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6029,6 +6211,7 @@ module Aws::CloudFront
     #
     class MissingBody < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6041,6 +6224,7 @@ module Aws::CloudFront
     #
     class NoSuchCloudFrontOriginAccessIdentity < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6053,6 +6237,7 @@ module Aws::CloudFront
     #
     class NoSuchDistribution < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6065,6 +6250,7 @@ module Aws::CloudFront
     #
     class NoSuchFieldLevelEncryptionConfig < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6077,6 +6263,7 @@ module Aws::CloudFront
     #
     class NoSuchFieldLevelEncryptionProfile < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6089,6 +6276,7 @@ module Aws::CloudFront
     #
     class NoSuchInvalidation < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6101,6 +6289,7 @@ module Aws::CloudFront
     #
     class NoSuchOrigin < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6113,6 +6302,7 @@ module Aws::CloudFront
     #
     class NoSuchPublicKey < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6125,6 +6315,7 @@ module Aws::CloudFront
     #
     class NoSuchResource < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6137,22 +6328,40 @@ module Aws::CloudFront
     #
     class NoSuchStreamingDistribution < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # A complex type that describes the Amazon S3 bucket, HTTP server (for
-    # example, a web server), Amazon MediaStore, or other server from which
-    # CloudFront gets your files. This can also be an origin group, if
-    # you've created an origin group. You must specify at least one origin
-    # or origin group.
+    # An origin.
+    #
+    # An origin is the location where content is stored, and from which
+    # CloudFront gets content to serve to viewers. To specify an origin:
+    #
+    # * Use the `S3OriginConfig` type to specify an Amazon S3 bucket that is
+    #   <i> <b>not</b> </i> configured with static website hosting.
+    #
+    # * Use the `CustomOriginConfig` type to specify various other kinds of
+    #   content containers or HTTP servers, including:
+    #
+    #   * An Amazon S3 bucket that is configured with static website hosting
+    #
+    #   * An Elastic Load Balancing load balancer
+    #
+    #   * An AWS Elemental MediaPackage origin
+    #
+    #   * An AWS Elemental MediaStore container
     #
-    # For the current limit on the number of origins or origin groups that
-    # you can specify for a distribution, see [Amazon CloudFront Limits][1]
-    # in the *AWS General Reference*.
+    #   * Any other HTTP server, running on an Amazon EC2 instance or any
+    #     other kind of host
     #
+    # For the current maximum number of origins that you can specify per
+    # distribution, see [General Quotas on Web Distributions][1] in the
+    # *Amazon CloudFront Developer Guide* (quotas were formerly referred to
+    # as limits).
     #
     #
-    # [1]: https://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_cloudfront
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html#limits-web-distributions
     #
     # @note When making an API call, you may pass Origin
     #   data as a hash:
@@ -6184,108 +6393,101 @@ module Aws::CloudFront
     #           origin_read_timeout: 1,
     #           origin_keepalive_timeout: 1,
     #         },
+    #         connection_attempts: 1,
+    #         connection_timeout: 1,
     #       }
     #
     # @!attribute [rw] id
-    #   A unique identifier for the origin or origin group. The value of
-    #   `Id` must be unique within the distribution.
-    #
-    #   When you specify the value of `TargetOriginId` for the default cache
-    #   behavior or for another cache behavior, you indicate the origin to
-    #   which you want the cache behavior to route requests by specifying
-    #   the value of the `Id` element for that origin. When a request
-    #   matches the path pattern for that cache behavior, CloudFront routes
-    #   the request to the specified origin. For more information, see
-    #   [Cache Behavior Settings][1] in the *Amazon CloudFront Developer
-    #   Guide*.
+    #   A unique identifier for the origin. This value must be unique within
+    #   the distribution.
     #
+    #   Use this value to specify the `TargetOriginId` in a `CacheBehavior`
+    #   or `DefaultCacheBehavior`.
+    #   @return [String]
     #
+    # @!attribute [rw] domain_name
+    #   The domain name for the origin.
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesCacheBehavior
+    #   For more information, see [Origin Domain Name][1] in the *Amazon
+    #   CloudFront Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesDomainName
     #   @return [String]
     #
-    # @!attribute [rw] domain_name
-    #   **Amazon S3 origins**\: The DNS name of the Amazon S3 bucket from
-    #   which you want CloudFront to get objects for this origin, for
-    #   example, `myawsbucket.s3.amazonaws.com`. If you set up your bucket
-    #   to be configured as a website endpoint, enter the Amazon S3 static
-    #   website hosting endpoint for the bucket.
-    #
-    #   For more information about specifying this value for different types
-    #   of origins, see [Origin Domain Name][1] in the *Amazon CloudFront
-    #   Developer Guide*.
+    # @!attribute [rw] origin_path
+    #   An optional path that CloudFront appends to the origin domain name
+    #   when CloudFront requests content from the origin.
     #
-    #   Constraints for Amazon S3 origins:
+    #   For more information, see [Origin Path][1] in the *Amazon CloudFront
+    #   Developer Guide*.
     #
-    #   * If you configured Amazon S3 Transfer Acceleration for your bucket,
-    #     don't specify the `s3-accelerate` endpoint for `DomainName`.
     #
-    #   * The bucket name must be between 3 and 63 characters long
-    #     (inclusive).
     #
-    #   * The bucket name must contain only lowercase characters, numbers,
-    #     periods, underscores, and dashes.
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesOriginPath
+    #   @return [String]
     #
-    #   * The bucket name must not contain adjacent periods.
+    # @!attribute [rw] custom_headers
+    #   A list of HTTP header names and values that CloudFront adds to
+    #   requests it sends to the origin.
     #
-    #   **Custom Origins**\: The DNS domain name for the HTTP server from
-    #   which you want CloudFront to get objects for this origin, for
-    #   example, `www.example.com`.
+    #   For more information, see [Adding Custom Headers to Origin
+    #   Requests][1] in the *Amazon CloudFront Developer Guide*.
     #
-    #   Constraints for custom origins:
     #
-    #   * `DomainName` must be a valid DNS name that contains only a-z, A-Z,
-    #     0-9, dot (.), hyphen (-), or underscore (\_) characters.
     #
-    #   * The name cannot exceed 128 characters.
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/add-origin-custom-headers.html
+    #   @return [Types::CustomHeaders]
     #
+    # @!attribute [rw] s3_origin_config
+    #   Use this type to specify an origin that is an Amazon S3 bucket that
+    #   is <i> <b>not</b> </i> configured with static website hosting. To
+    #   specify any other type of origin, including an Amazon S3 bucket that
+    #   is configured with static website hosting, use the
+    #   `CustomOriginConfig` type instead.
+    #   @return [Types::S3OriginConfig]
     #
+    # @!attribute [rw] custom_origin_config
+    #   Use this type to specify an origin that is a content container or
+    #   HTTP server, including an Amazon S3 bucket that is configured with
+    #   static website hosting. To specify an Amazon S3 bucket that is <i>
+    #   <b>not</b> </i> configured with static website hosting, use the
+    #   `S3OriginConfig` type instead.
+    #   @return [Types::CustomOriginConfig]
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesDomainName
-    #   @return [String]
+    # @!attribute [rw] connection_attempts
+    #   The number of times that CloudFront attempts to connect to the
+    #   origin. The minimum number is 1, the maximum is 3, and the default
+    #   (if you don’t specify otherwise) is 3.
     #
-    # @!attribute [rw] origin_path
-    #   An optional element that causes CloudFront to request your content
-    #   from a directory in your Amazon S3 bucket or your custom origin.
-    #   When you include the `OriginPath` element, specify the directory
-    #   name, beginning with a `/`. CloudFront appends the directory name to
-    #   the value of `DomainName`, for example, `example.com/production`. Do
-    #   not include a `/` at the end of the directory name.
+    #   For a custom origin (including an Amazon S3 bucket that’s configured
+    #   with static website hosting), this value also specifies the number
+    #   of times that CloudFront attempts to get a response from the origin,
+    #   in the case of an [Origin Response Timeout][1].
     #
-    #   For example, suppose you've specified the following values for your
-    #   distribution:
+    #   For more information, see [Origin Connection Attempts][2] in the
+    #   *Amazon CloudFront Developer Guide*.
     #
-    #   * `DomainName`\: An Amazon S3 bucket named `myawsbucket`.
     #
-    #   * `OriginPath`\: `/production`
     #
-    #   * `CNAME`\: `example.com`
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesOriginResponseTimeout
+    #   [2]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#origin-connection-attempts
+    #   @return [Integer]
     #
-    #   When a user enters `example.com/index.html` in a browser, CloudFront
-    #   sends a request to Amazon S3 for
-    #   `myawsbucket/production/index.html`.
+    # @!attribute [rw] connection_timeout
+    #   The number of seconds that CloudFront waits when trying to establish
+    #   a connection to the origin. The minimum timeout is 1 second, the
+    #   maximum is 10 seconds, and the default (if you don’t specify
+    #   otherwise) is 10 seconds.
     #
-    #   When a user enters `example.com/acme/index.html` in a browser,
-    #   CloudFront sends a request to Amazon S3 for
-    #   `myawsbucket/production/acme/index.html`.
-    #   @return [String]
+    #   For more information, see [Origin Connection Timeout][1] in the
+    #   *Amazon CloudFront Developer Guide*.
     #
-    # @!attribute [rw] custom_headers
-    #   A complex type that contains names and values for the custom headers
-    #   that you want.
-    #   @return [Types::CustomHeaders]
     #
-    # @!attribute [rw] s3_origin_config
-    #   A complex type that contains information about the Amazon S3 origin.
-    #   If the origin is a custom origin, use the `CustomOriginConfig`
-    #   element instead.
-    #   @return [Types::S3OriginConfig]
     #
-    # @!attribute [rw] custom_origin_config
-    #   A complex type that contains information about a custom origin. If
-    #   the origin is an Amazon S3 bucket, use the `S3OriginConfig` element
-    #   instead.
-    #   @return [Types::CustomOriginConfig]
+    #   [1]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#origin-connection-timeout
+    #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/cloudfront-2019-03-26/Origin AWS API Documentation
     #
@@ -6295,7 +6497,10 @@ module Aws::CloudFront
       :origin_path,
       :custom_headers,
       :s3_origin_config,
-      :custom_origin_config)
+      :custom_origin_config,
+      :connection_attempts,
+      :connection_timeout)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6331,6 +6536,7 @@ module Aws::CloudFront
     class OriginCustomHeader < Struct.new(
       :header_name,
       :header_value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6383,6 +6589,7 @@ module Aws::CloudFront
       :id,
       :failover_criteria,
       :members)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6409,6 +6616,7 @@ module Aws::CloudFront
     #
     class OriginGroupFailoverCriteria < Struct.new(
       :status_codes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6429,6 +6637,7 @@ module Aws::CloudFront
     #
     class OriginGroupMember < Struct.new(
       :origin_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6459,6 +6668,7 @@ module Aws::CloudFront
     class OriginGroupMembers < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6504,6 +6714,7 @@ module Aws::CloudFront
     class OriginGroups < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6534,6 +6745,7 @@ module Aws::CloudFront
     class OriginSslProtocols < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6573,6 +6785,8 @@ module Aws::CloudFront
     #               origin_read_timeout: 1,
     #               origin_keepalive_timeout: 1,
     #             },
+    #             connection_attempts: 1,
+    #             connection_timeout: 1,
     #           },
     #         ],
     #       }
@@ -6591,6 +6805,7 @@ module Aws::CloudFront
     class Origins < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6625,10 +6840,11 @@ module Aws::CloudFront
     class Paths < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # The precondition given in one or more of the request-header fields
+    # The precondition given in one or more of the request header fields
     # evaluated to `false`.
     #
     # @!attribute [rw] message
@@ -6638,6 +6854,7 @@ module Aws::CloudFront
     #
     class PreconditionFailed < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6663,6 +6880,7 @@ module Aws::CloudFront
       :id,
       :created_time,
       :public_key_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6675,6 +6893,7 @@ module Aws::CloudFront
     #
     class PublicKeyAlreadyExists < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6716,6 +6935,7 @@ module Aws::CloudFront
       :name,
       :encoded_key,
       :comment)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6728,6 +6948,7 @@ module Aws::CloudFront
     #
     class PublicKeyInUse < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6761,6 +6982,7 @@ module Aws::CloudFront
       :max_items,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6794,6 +7016,7 @@ module Aws::CloudFront
       :created_time,
       :encoded_key,
       :comment)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6822,6 +7045,7 @@ module Aws::CloudFront
     class QueryArgProfile < Struct.new(
       :query_arg,
       :profile_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6860,6 +7084,7 @@ module Aws::CloudFront
     class QueryArgProfileConfig < Struct.new(
       :forward_when_query_arg_profile_is_unknown,
       :query_arg_profiles)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6872,6 +7097,7 @@ module Aws::CloudFront
     #
     class QueryArgProfileEmpty < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6905,6 +7131,7 @@ module Aws::CloudFront
     class QueryArgProfiles < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6936,6 +7163,7 @@ module Aws::CloudFront
     class QueryStringCacheKeys < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6963,6 +7191,7 @@ module Aws::CloudFront
     #
     class Restrictions < Struct.new(
       :geo_restriction)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7013,12 +7242,13 @@ module Aws::CloudFront
     class S3Origin < Struct.new(
       :domain_name,
       :origin_access_identity)
+      SENSITIVE = []
       include Aws::Structure
     end
 
     # A complex type that contains information about the Amazon S3 origin.
-    # If the origin is a custom origin, use the `CustomOriginConfig` element
-    # instead.
+    # If the origin is a custom origin or an S3 bucket that is configured as
+    # a website endpoint, use the `CustomOriginConfig` element instead.
     #
     # @note When making an API call, you may pass S3OriginConfig
     #   data as a hash:
@@ -7063,6 +7293,7 @@ module Aws::CloudFront
     #
     class S3OriginConfig < Struct.new(
       :origin_access_identity)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7089,6 +7320,7 @@ module Aws::CloudFront
     class Signer < Struct.new(
       :aws_account_number,
       :key_pair_ids)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7117,6 +7349,7 @@ module Aws::CloudFront
     class StatusCodes < Struct.new(
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7185,6 +7418,7 @@ module Aws::CloudFront
       :domain_name,
       :active_trusted_signers,
       :streaming_distribution_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7198,6 +7432,7 @@ module Aws::CloudFront
     #
     class StreamingDistributionAlreadyExists < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7298,6 +7533,7 @@ module Aws::CloudFront
       :trusted_signers,
       :price_class,
       :enabled)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7355,6 +7591,7 @@ module Aws::CloudFront
     class StreamingDistributionConfigWithTags < Struct.new(
       :streaming_distribution_config,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7401,6 +7638,7 @@ module Aws::CloudFront
       :is_truncated,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7414,6 +7652,7 @@ module Aws::CloudFront
     #
     class StreamingDistributionNotDisabled < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7506,6 +7745,7 @@ module Aws::CloudFront
       :comment,
       :price_class,
       :enabled)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7550,6 +7790,7 @@ module Aws::CloudFront
       :enabled,
       :bucket,
       :prefix)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7584,6 +7825,7 @@ module Aws::CloudFront
     class Tag < Struct.new(
       :key,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7604,6 +7846,7 @@ module Aws::CloudFront
     #
     class TagKeys < Struct.new(
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7637,6 +7880,7 @@ module Aws::CloudFront
     class TagResourceRequest < Struct.new(
       :resource,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7662,6 +7906,7 @@ module Aws::CloudFront
     #
     class Tags < Struct.new(
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7674,6 +7919,7 @@ module Aws::CloudFront
     #
     class TooManyCacheBehaviors < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7686,6 +7932,7 @@ module Aws::CloudFront
     #
     class TooManyCertificates < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7699,6 +7946,7 @@ module Aws::CloudFront
     #
     class TooManyCloudFrontOriginAccessIdentities < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7712,6 +7960,7 @@ module Aws::CloudFront
     #
     class TooManyCookieNamesInWhiteList < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7724,6 +7973,7 @@ module Aws::CloudFront
     #
     class TooManyDistributionCNAMEs < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7737,6 +7987,7 @@ module Aws::CloudFront
     #
     class TooManyDistributions < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7750,6 +8001,7 @@ module Aws::CloudFront
     #
     class TooManyDistributionsAssociatedToFieldLevelEncryptionConfig < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7764,6 +8016,7 @@ module Aws::CloudFront
     #
     class TooManyDistributionsWithLambdaAssociations < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7777,6 +8030,7 @@ module Aws::CloudFront
     #
     class TooManyFieldLevelEncryptionConfigs < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7790,6 +8044,7 @@ module Aws::CloudFront
     #
     class TooManyFieldLevelEncryptionContentTypeProfiles < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7803,6 +8058,7 @@ module Aws::CloudFront
     #
     class TooManyFieldLevelEncryptionEncryptionEntities < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7816,6 +8072,7 @@ module Aws::CloudFront
     #
     class TooManyFieldLevelEncryptionFieldPatterns < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7829,6 +8086,7 @@ module Aws::CloudFront
     #
     class TooManyFieldLevelEncryptionProfiles < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7842,6 +8100,7 @@ module Aws::CloudFront
     #
     class TooManyFieldLevelEncryptionQueryArgProfiles < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7854,6 +8113,7 @@ module Aws::CloudFront
     #
     class TooManyHeadersInForwardedValues < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7867,6 +8127,7 @@ module Aws::CloudFront
     #
     class TooManyInvalidationsInProgress < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7880,6 +8141,7 @@ module Aws::CloudFront
     #
     class TooManyLambdaFunctionAssociations < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7892,6 +8154,7 @@ module Aws::CloudFront
     #
     class TooManyOriginCustomHeaders < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7905,6 +8168,7 @@ module Aws::CloudFront
     #
     class TooManyOriginGroupsPerDistribution < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7917,6 +8181,7 @@ module Aws::CloudFront
     #
     class TooManyOrigins < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7930,6 +8195,7 @@ module Aws::CloudFront
     #
     class TooManyPublicKeys < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7942,6 +8208,7 @@ module Aws::CloudFront
     #
     class TooManyQueryStringParameters < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7954,6 +8221,7 @@ module Aws::CloudFront
     #
     class TooManyStreamingDistributionCNAMEs < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7967,6 +8235,7 @@ module Aws::CloudFront
     #
     class TooManyStreamingDistributions < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7980,6 +8249,7 @@ module Aws::CloudFront
     #
     class TooManyTrustedSigners < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7992,6 +8262,7 @@ module Aws::CloudFront
     #
     class TrustedSignerDoesNotExist < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8051,6 +8322,7 @@ module Aws::CloudFront
       :enabled,
       :quantity,
       :items)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8079,6 +8351,7 @@ module Aws::CloudFront
     class UntagResourceRequest < Struct.new(
       :resource,
       :tag_keys)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8115,6 +8388,7 @@ module Aws::CloudFront
       :cloud_front_origin_access_identity_config,
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8134,6 +8408,7 @@ module Aws::CloudFront
     class UpdateCloudFrontOriginAccessIdentityResult < Struct.new(
       :cloud_front_origin_access_identity,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8180,6 +8455,8 @@ module Aws::CloudFront
     #                   origin_read_timeout: 1,
     #                   origin_keepalive_timeout: 1,
     #                 },
+    #                 connection_attempts: 1,
+    #                 connection_timeout: 1,
     #               },
     #             ],
     #           },
@@ -8376,6 +8653,7 @@ module Aws::CloudFront
       :distribution_config,
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8395,6 +8673,7 @@ module Aws::CloudFront
     class UpdateDistributionResult < Struct.new(
       :distribution,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8454,6 +8733,7 @@ module Aws::CloudFront
       :field_level_encryption_config,
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8471,6 +8751,7 @@ module Aws::CloudFront
     class UpdateFieldLevelEncryptionConfigResult < Struct.new(
       :field_level_encryption,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8519,6 +8800,7 @@ module Aws::CloudFront
       :field_level_encryption_profile_config,
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8535,6 +8817,7 @@ module Aws::CloudFront
     class UpdateFieldLevelEncryptionProfileResult < Struct.new(
       :field_level_encryption_profile,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8571,6 +8854,7 @@ module Aws::CloudFront
       :public_key_config,
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8588,6 +8872,7 @@ module Aws::CloudFront
     class UpdatePublicKeyResult < Struct.new(
       :public_key,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8645,6 +8930,7 @@ module Aws::CloudFront
       :streaming_distribution_config,
       :id,
       :if_match)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8664,6 +8950,7 @@ module Aws::CloudFront
     class UpdateStreamingDistributionResult < Struct.new(
       :streaming_distribution,
       :etag)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8876,6 +9163,7 @@ module Aws::CloudFront
       :minimum_protocol_version,
       :certificate,
       :certificate_source)
+      SENSITIVE = []
       include Aws::Structure
     end