aws-cdk-lib 2.204.0__py3-none-any.whl → 2.205.0__py3-none-any.whl

aws_cdk/aws_cloudfront/__init__.py

@@ -70,6 +70,299 @@ cloudfront.Distribution(self, "myDist",
 )
 ```
 
+### CloudFront SaaS Manager resources
+
+#### Multi-tenant distribution and tenant providing ACM certificates
+
+You can use Cloudfront to build multi-tenant distributions to house applications.
+
+To create a multi-tenant distribution w/parameters, create a Distribution construct, and then update DistributionConfig in the CfnDistribution to use connectionMode: "tenant-only"
+
+Then create a tenant
+
+```python
+# Create the simple Origin
+my_bucket = s3.Bucket(self, "myBucket")
+s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+    origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+)
+
+# Create the Distribution construct
+my_multi_tenant_distribution = cloudfront.Distribution(self, "distribution",
+    default_behavior=cloudfront.BehaviorOptions(
+        origin=s3_origin
+    ),
+    default_root_object="index.html"
+)
+
+# Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+cfn_distribution = my_multi_tenant_distribution.node.default_child
+
+default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+    target_origin_id=my_bucket.bucket_arn,
+    viewer_protocol_policy="allow-all",
+    compress=False,
+    allowed_methods=["GET", "HEAD"],
+    cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+)
+# Create the updated distributionConfig
+distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+    default_cache_behavior=default_cache_behavior,
+    enabled=True,
+    # the properties below are optional
+    connection_mode="tenant-only",
+    origins=[cloudfront.CfnDistribution.OriginProperty(
+        id=my_bucket.bucket_arn,
+        domain_name=my_bucket.bucket_domain_name,
+        s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+        origin_path="/{{tenantName}}"
+    )
+    ],
+    tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+        parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+            definition=cloudfront.CfnDistribution.DefinitionProperty(
+                string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                    required=False,
+                    # the properties below are optional
+                    comment="tenantName",
+                    default_value="root"
+                )
+            ),
+            name="tenantName"
+        )
+        ]
+    )
+)
+
+# Override the distribution configuration to enable multi-tenancy.
+cfn_distribution.distribution_config = distribution_config
+
+# Create a distribution tenant using an existing ACM certificate
+cfn_distribution_tenant = cloudfront.CfnDistributionTenant(self, "distribution-tenant",
+    distribution_id=my_multi_tenant_distribution.distribution_id,
+    domains=["my-tenant.my.domain.com"],
+    name="my-tenant",
+    enabled=True,
+    parameters=[cloudfront.CfnDistributionTenant.ParameterProperty(
+        name="tenantName",
+        value="app"
+    )],
+    customizations=cloudfront.CfnDistributionTenant.CustomizationsProperty(
+        certificate=cloudfront.CfnDistributionTenant.CertificateProperty(
+            arn="REPLACE_WITH_ARN"
+        )
+    )
+)
+```
+
+#### Multi-tenant distribution and tenant with CloudFront-hosted certificate
+
+A distribution tenant with CloudFront-hosted domain validation is useful if you don't currently have traffic to the domain.
+
+Start by creating a parent multi-tenant distribution, then create the distribution tenant.
+
+```python
+import aws_cdk.aws_route53 as route53
+
+
+# Create the simple Origin
+my_bucket = s3.Bucket(self, "myBucket")
+s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+    origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+)
+
+# Create the Distribution construct
+my_multi_tenant_distribution = cloudfront.Distribution(self, "cf-hosted-distribution",
+    default_behavior=cloudfront.BehaviorOptions(
+        origin=s3_origin
+    ),
+    default_root_object="index.html"
+)
+
+# Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+cfn_distribution = my_multi_tenant_distribution.node.default_child
+
+default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+    target_origin_id=my_bucket.bucket_arn,
+    viewer_protocol_policy="allow-all",
+    compress=False,
+    allowed_methods=["GET", "HEAD"],
+    cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+)
+# Create the updated distributionConfig
+distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+    default_cache_behavior=default_cache_behavior,
+    enabled=True,
+    # the properties below are optional
+    connection_mode="tenant-only",
+    origins=[cloudfront.CfnDistribution.OriginProperty(
+        id=my_bucket.bucket_arn,
+        domain_name=my_bucket.bucket_domain_name,
+        s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+        origin_path="/{{tenantName}}"
+    )
+    ],
+    tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+        parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+            definition=cloudfront.CfnDistribution.DefinitionProperty(
+                string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                    required=False,
+                    # the properties below are optional
+                    comment="tenantName",
+                    default_value="root"
+                )
+            ),
+            name="tenantName"
+        )
+        ]
+    )
+)
+
+# Override the distribution configuration to enable multi-tenancy.
+cfn_distribution.distribution_config = distribution_config
+
+# Create a connection group and a cname record in an existing hosted zone to validate domain ownership
+connection_group = cloudfront.CfnConnectionGroup(self, "cf-hosted-connection-group",
+    enabled=True,
+    ipv6_enabled=True,
+    name="my-connection-group"
+)
+
+# Import the existing hosted zone info, replacing with your hostedZoneId and zoneName
+hosted_zone_id = "YOUR_HOSTED_ZONE_ID"
+zone_name = "my.domain.com"
+hosted_zone = route53.HostedZone.from_hosted_zone_attributes(self, "hosted-zone",
+    hosted_zone_id=hosted_zone_id,
+    zone_name=zone_name
+)
+
+record = route53.CnameRecord(self, "cname-record",
+    domain_name=connection_group.attr_routing_endpoint,
+    zone=hosted_zone,
+    record_name="cf-hosted-tenant.my.domain.com"
+)
+
+# Create the cloudfront-hosted tenant, passing in the previously created connection group
+cloudfront_hosted_tenant = cloudfront.CfnDistributionTenant(self, "cf-hosted-tenant",
+    distribution_id=my_multi_tenant_distribution.distribution_id,
+    name="cf-hosted-tenant",
+    domains=["cf-hosted-tenant.my.domain.com"],
+    connection_group_id=connection_group.attr_id,
+    enabled=True,
+    managed_certificate_request=cloudfront.CfnDistributionTenant.ManagedCertificateRequestProperty(
+        validation_token_host="cloudfront"
+    )
+)
+```
+
+#### Multi-tenant distribution and tenant with self-hosted certificate
+
+A tenant with self-hosted domain validation is useful if you already have traffic to the domain and can't tolerate downtime during migration to multi-tenant architecture.
+
+The tenant will be created, and the managed certificate will be awaiting validation of domain ownership.  You can then validate domain ownership via http redirect or token file upload.  [More details here](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/managed-cloudfront-certificates.html#complete-domain-ownership)
+
+Traffic won't be migrated until you update your hosted zone to point the tenant domain to the CloudFront RoutingEndpoint.
+
+Start by creating a parent multi-tenant distribution
+
+```python
+# Create the simple Origin
+my_bucket = s3.Bucket(self, "myBucket")
+s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+    origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+)
+
+# Create the Distribution construct
+my_multi_tenant_distribution = cloudfront.Distribution(self, "cf-hosted-distribution",
+    default_behavior=cloudfront.BehaviorOptions(
+        origin=s3_origin
+    ),
+    default_root_object="index.html"
+)
+
+# Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+cfn_distribution = my_multi_tenant_distribution.node.default_child
+
+default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+    target_origin_id=my_bucket.bucket_arn,
+    viewer_protocol_policy="allow-all",
+    compress=False,
+    allowed_methods=["GET", "HEAD"],
+    cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+)
+# Create the updated distributionConfig
+distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+    default_cache_behavior=default_cache_behavior,
+    enabled=True,
+    # the properties below are optional
+    connection_mode="tenant-only",
+    origins=[cloudfront.CfnDistribution.OriginProperty(
+        id=my_bucket.bucket_arn,
+        domain_name=my_bucket.bucket_domain_name,
+        s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+        origin_path="/{{tenantName}}"
+    )
+    ],
+    tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+        parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+            definition=cloudfront.CfnDistribution.DefinitionProperty(
+                string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                    required=False,
+                    # the properties below are optional
+                    comment="tenantName",
+                    default_value="root"
+                )
+            ),
+            name="tenantName"
+        )
+        ]
+    )
+)
+
+# Override the distribution configuration to enable multi-tenancy.
+cfn_distribution.distribution_config = distribution_config
+
+# Create a connection group so we have access to the RoutingEndpoint associated with the tenant we are about to create
+connection_group = cloudfront.CfnConnectionGroup(self, "self-hosted-connection-group",
+    enabled=True,
+    ipv6_enabled=True,
+    name="self-hosted-connection-group"
+)
+
+# Export the RoutingEndpoint, skip this step if you'd prefer to fetch it from the CloudFront console or via Cloudfront.ListConnectionGroups API
+CfnOutput(self, "RoutingEndpoint",
+    value=connection_group.attr_routing_endpoint,
+    description="CloudFront Routing Endpoint to be added to my hosted zone CNAME records"
+)
+
+# Create a distribution tenant with a self-hosted domain.
+self_hosted_tenant = cloudfront.CfnDistributionTenant(self, "self-hosted-tenant",
+    distribution_id=my_multi_tenant_distribution.distribution_id,
+    connection_group_id=connection_group.attr_id,
+    name="self-hosted-tenant",
+    domains=["self-hosted-tenant.my.domain.com"],
+    enabled=True,
+    managed_certificate_request=cloudfront.CfnDistributionTenant.ManagedCertificateRequestProperty(
+        primary_domain_name="self-hosted-tenant.my.domain.com",
+        validation_token_host="self-hosted"
+    )
+)
+```
+
+While CDK is deploying, it will attempt to validate domain ownership by confirming that a validation token is served directly from your domain, or via http redirect.
+
+[follow the steps here](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/managed-cloudfront-certificates.html#complete-domain-ownership) to complete domain setup before deploying this CDK stack, or while CDK is in the waiting state during tenant creation. Refer to the section "I have existing traffic"
+
+A simple option for validating via http redirect, would be to add a rewrite rule like so to your server (Apache in this example)
+
+```
+RewriteEngine On
+RewriteCond %{REQUEST_URI} ^/\.well-known/pki-validation/(.+)$ [NC]
+RewriteRule ^(.*)$ https://validation.us-east-1.acm-validations.aws/%{ENV:AWS_ACCOUNT_ID}/.well-known/pki-validation/%1 [R=301,L]
+```
+
+Then, when you are ready to accept traffic, follow the steps [here](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/managed-cloudfront-certificates.html#point-domains-to-cloudfront) using the RoutingEndpoint from above to configure DNS to point to CloudFront.
+
 ### VPC origins
 
 You can use CloudFront to deliver content from applications that are hosted in your virtual private cloud (VPC) private subnets.
@@ -558,7 +851,7 @@ function_version = lambda_.Version.from_version_arn(self, "Version", "arn:aws:la
 
 cloudfront.Distribution(self, "distro",
     default_behavior=cloudfront.BehaviorOptions(
-        origin=origins.S3Origin(s3_bucket),
+        origin=origins.S3BucketOrigin.with_origin_access_control(s3_bucket),
         edge_lambdas=[cloudfront.EdgeLambda(
             function_version=function_version,
             event_type=cloudfront.LambdaEdgeEventType.VIEWER_REQUEST
@@ -1402,8 +1695,78 @@ class AccessLevel(enum.Enum):
 
     Example::
 
+        # Create the simple Origin
         my_bucket = s3.Bucket(self, "myBucket")
-        s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket, origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.READ_VERSIONED, cloudfront.AccessLevel.WRITE, cloudfront.AccessLevel.DELETE])
+        s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+            origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+        )
+        
+        # Create the Distribution construct
+        my_multi_tenant_distribution = cloudfront.Distribution(self, "distribution",
+            default_behavior=cloudfront.BehaviorOptions(
+                origin=s3_origin
+            ),
+            default_root_object="index.html"
+        )
+        
+        # Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+        cfn_distribution = my_multi_tenant_distribution.node.default_child
+        
+        default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+            target_origin_id=my_bucket.bucket_arn,
+            viewer_protocol_policy="allow-all",
+            compress=False,
+            allowed_methods=["GET", "HEAD"],
+            cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+        )
+        # Create the updated distributionConfig
+        distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+            default_cache_behavior=default_cache_behavior,
+            enabled=True,
+            # the properties below are optional
+            connection_mode="tenant-only",
+            origins=[cloudfront.CfnDistribution.OriginProperty(
+                id=my_bucket.bucket_arn,
+                domain_name=my_bucket.bucket_domain_name,
+                s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+                origin_path="/{{tenantName}}"
+            )
+            ],
+            tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+                parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+                    definition=cloudfront.CfnDistribution.DefinitionProperty(
+                        string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                            required=False,
+                            # the properties below are optional
+                            comment="tenantName",
+                            default_value="root"
+                        )
+                    ),
+                    name="tenantName"
+                )
+                ]
+            )
+        )
+        
+        # Override the distribution configuration to enable multi-tenancy.
+        cfn_distribution.distribution_config = distribution_config
+        
+        # Create a distribution tenant using an existing ACM certificate
+        cfn_distribution_tenant = cloudfront.CfnDistributionTenant(self, "distribution-tenant",
+            distribution_id=my_multi_tenant_distribution.distribution_id,
+            domains=["my-tenant.my.domain.com"],
+            name="my-tenant",
+            enabled=True,
+            parameters=[cloudfront.CfnDistributionTenant.ParameterProperty(
+                name="tenantName",
+                value="app"
+            )],
+            customizations=cloudfront.CfnDistributionTenant.CustomizationsProperty(
+                certificate=cloudfront.CfnDistributionTenant.CertificateProperty(
+                    arn="REPLACE_WITH_ARN"
+                )
+            )
+        )
     '''
 
     READ = "READ"
@@ -2098,17 +2461,20 @@ class BehaviorOptions(AddBehaviorOptions):
 
         Example::
 
-            # Creates a distribution from an Application Load Balancer
-            # vpc: ec2.Vpc
-            
-            # Create an application load balancer in a VPC. 'internetFacing' can be 'false'.
-            alb = elbv2.ApplicationLoadBalancer(self, "ALB",
-                vpc=vpc,
-                internet_facing=False,
-                vpc_subnets=ec2.SubnetSelection(subnet_type=ec2.SubnetType.PRIVATE_ISOLATED)
+            # s3_bucket: s3.Bucket
+            # Add a cloudfront Function to a Distribution
+            cf_function = cloudfront.Function(self, "Function",
+                code=cloudfront.FunctionCode.from_inline("function handler(event) { return event.request }"),
+                runtime=cloudfront.FunctionRuntime.JS_2_0
             )
-            cloudfront.Distribution(self, "myDist",
-                default_behavior=cloudfront.BehaviorOptions(origin=origins.VpcOrigin.with_application_load_balancer(alb))
+            cloudfront.Distribution(self, "distro",
+                default_behavior=cloudfront.BehaviorOptions(
+                    origin=origins.S3Origin(s3_bucket),
+                    function_associations=[cloudfront.FunctionAssociation(
+                        function=cf_function,
+                        event_type=cloudfront.FunctionEventType.VIEWER_REQUEST
+                    )]
+                )
             )
         '''
         if __debug__:
@@ -4385,25 +4751,100 @@ class CfnConnectionGroup(
 
     :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-connectiongroup.html
     :cloudformationResource: AWS::CloudFront::ConnectionGroup
-    :exampleMetadata: fixture=_generated
+    :exampleMetadata: infused
 
     Example::
 
-        # The code below shows an example of how to instantiate this type.
-        # The values are placeholders you should change.
-        from aws_cdk import aws_cloudfront as cloudfront
+        import aws_cdk.aws_route53 as route53
         
-        cfn_connection_group = cloudfront.CfnConnectionGroup(self, "MyCfnConnectionGroup",
-            name="name",
         
+        # Create the simple Origin
+        my_bucket = s3.Bucket(self, "myBucket")
+        s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+            origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+        )
+        
+        # Create the Distribution construct
+        my_multi_tenant_distribution = cloudfront.Distribution(self, "cf-hosted-distribution",
+            default_behavior=cloudfront.BehaviorOptions(
+                origin=s3_origin
+            ),
+            default_root_object="index.html"
+        )
+        
+        # Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+        cfn_distribution = my_multi_tenant_distribution.node.default_child
+        
+        default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+            target_origin_id=my_bucket.bucket_arn,
+            viewer_protocol_policy="allow-all",
+            compress=False,
+            allowed_methods=["GET", "HEAD"],
+            cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+        )
+        # Create the updated distributionConfig
+        distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+            default_cache_behavior=default_cache_behavior,
+            enabled=True,
             # the properties below are optional
-            anycast_ip_list_id="anycastIpListId",
-            enabled=False,
-            ipv6_enabled=False,
-            tags=[CfnTag(
-                key="key",
-                value="value"
-            )]
+            connection_mode="tenant-only",
+            origins=[cloudfront.CfnDistribution.OriginProperty(
+                id=my_bucket.bucket_arn,
+                domain_name=my_bucket.bucket_domain_name,
+                s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+                origin_path="/{{tenantName}}"
+            )
+            ],
+            tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+                parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+                    definition=cloudfront.CfnDistribution.DefinitionProperty(
+                        string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                            required=False,
+                            # the properties below are optional
+                            comment="tenantName",
+                            default_value="root"
+                        )
+                    ),
+                    name="tenantName"
+                )
+                ]
+            )
+        )
+        
+        # Override the distribution configuration to enable multi-tenancy.
+        cfn_distribution.distribution_config = distribution_config
+        
+        # Create a connection group and a cname record in an existing hosted zone to validate domain ownership
+        connection_group = cloudfront.CfnConnectionGroup(self, "cf-hosted-connection-group",
+            enabled=True,
+            ipv6_enabled=True,
+            name="my-connection-group"
+        )
+        
+        # Import the existing hosted zone info, replacing with your hostedZoneId and zoneName
+        hosted_zone_id = "YOUR_HOSTED_ZONE_ID"
+        zone_name = "my.domain.com"
+        hosted_zone = route53.HostedZone.from_hosted_zone_attributes(self, "hosted-zone",
+            hosted_zone_id=hosted_zone_id,
+            zone_name=zone_name
+        )
+        
+        record = route53.CnameRecord(self, "cname-record",
+            domain_name=connection_group.attr_routing_endpoint,
+            zone=hosted_zone,
+            record_name="cf-hosted-tenant.my.domain.com"
+        )
+        
+        # Create the cloudfront-hosted tenant, passing in the previously created connection group
+        cloudfront_hosted_tenant = cloudfront.CfnDistributionTenant(self, "cf-hosted-tenant",
+            distribution_id=my_multi_tenant_distribution.distribution_id,
+            name="cf-hosted-tenant",
+            domains=["cf-hosted-tenant.my.domain.com"],
+            connection_group_id=connection_group.attr_id,
+            enabled=True,
+            managed_certificate_request=cloudfront.CfnDistributionTenant.ManagedCertificateRequestProperty(
+                validation_token_host="cloudfront"
+            )
         )
     '''
 
@@ -4660,25 +5101,100 @@ class CfnConnectionGroupProps:
         :param tags: A complex type that contains zero or more ``Tag`` elements.
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-connectiongroup.html
-        :exampleMetadata: fixture=_generated
+        :exampleMetadata: infused
 
         Example::
 
-            # The code below shows an example of how to instantiate this type.
-            # The values are placeholders you should change.
-            from aws_cdk import aws_cloudfront as cloudfront
+            import aws_cdk.aws_route53 as route53
             
-            cfn_connection_group_props = cloudfront.CfnConnectionGroupProps(
-                name="name",
             
+            # Create the simple Origin
+            my_bucket = s3.Bucket(self, "myBucket")
+            s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+                origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+            )
+            
+            # Create the Distribution construct
+            my_multi_tenant_distribution = cloudfront.Distribution(self, "cf-hosted-distribution",
+                default_behavior=cloudfront.BehaviorOptions(
+                    origin=s3_origin
+                ),
+                default_root_object="index.html"
+            )
+            
+            # Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+            cfn_distribution = my_multi_tenant_distribution.node.default_child
+            
+            default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+                target_origin_id=my_bucket.bucket_arn,
+                viewer_protocol_policy="allow-all",
+                compress=False,
+                allowed_methods=["GET", "HEAD"],
+                cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+            )
+            # Create the updated distributionConfig
+            distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+                default_cache_behavior=default_cache_behavior,
+                enabled=True,
                 # the properties below are optional
-                anycast_ip_list_id="anycastIpListId",
-                enabled=False,
-                ipv6_enabled=False,
-                tags=[CfnTag(
-                    key="key",
-                    value="value"
-                )]
+                connection_mode="tenant-only",
+                origins=[cloudfront.CfnDistribution.OriginProperty(
+                    id=my_bucket.bucket_arn,
+                    domain_name=my_bucket.bucket_domain_name,
+                    s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+                    origin_path="/{{tenantName}}"
+                )
+                ],
+                tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+                    parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+                        definition=cloudfront.CfnDistribution.DefinitionProperty(
+                            string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                                required=False,
+                                # the properties below are optional
+                                comment="tenantName",
+                                default_value="root"
+                            )
+                        ),
+                        name="tenantName"
+                    )
+                    ]
+                )
+            )
+            
+            # Override the distribution configuration to enable multi-tenancy.
+            cfn_distribution.distribution_config = distribution_config
+            
+            # Create a connection group and a cname record in an existing hosted zone to validate domain ownership
+            connection_group = cloudfront.CfnConnectionGroup(self, "cf-hosted-connection-group",
+                enabled=True,
+                ipv6_enabled=True,
+                name="my-connection-group"
+            )
+            
+            # Import the existing hosted zone info, replacing with your hostedZoneId and zoneName
+            hosted_zone_id = "YOUR_HOSTED_ZONE_ID"
+            zone_name = "my.domain.com"
+            hosted_zone = route53.HostedZone.from_hosted_zone_attributes(self, "hosted-zone",
+                hosted_zone_id=hosted_zone_id,
+                zone_name=zone_name
+            )
+            
+            record = route53.CnameRecord(self, "cname-record",
+                domain_name=connection_group.attr_routing_endpoint,
+                zone=hosted_zone,
+                record_name="cf-hosted-tenant.my.domain.com"
+            )
+            
+            # Create the cloudfront-hosted tenant, passing in the previously created connection group
+            cloudfront_hosted_tenant = cloudfront.CfnDistributionTenant(self, "cf-hosted-tenant",
+                distribution_id=my_multi_tenant_distribution.distribution_id,
+                name="cf-hosted-tenant",
+                domains=["cf-hosted-tenant.my.domain.com"],
+                connection_group_id=connection_group.attr_id,
+                enabled=True,
+                managed_certificate_request=cloudfront.CfnDistributionTenant.ManagedCertificateRequestProperty(
+                    validation_token_host="cloudfront"
+                )
             )
         '''
         if __debug__:
@@ -5697,23 +6213,85 @@ class CfnDistribution(
 
     Example::
 
-        # source_bucket: s3.Bucket
-        
+        # Create the simple Origin
+        my_bucket = s3.Bucket(self, "myBucket")
+        s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+            origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+        )
         
-        my_distribution = cloudfront.Distribution(self, "MyCfWebDistribution",
+        # Create the Distribution construct
+        my_multi_tenant_distribution = cloudfront.Distribution(self, "distribution",
             default_behavior=cloudfront.BehaviorOptions(
-                origin=origins.S3Origin(source_bucket)
-            )
+                origin=s3_origin
+            ),
+            default_root_object="index.html"
         )
-        cfn_distribution = my_distribution.node.default_child
-        cfn_distribution.override_logical_id("MyDistributionCFDistribution3H55TI9Q")
-    '''
-
-    def __init__(
-        self,
-        scope: _constructs_77d1e7e8.Construct,
-        id: builtins.str,
-        *,
+        
+        # Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+        cfn_distribution = my_multi_tenant_distribution.node.default_child
+        
+        default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+            target_origin_id=my_bucket.bucket_arn,
+            viewer_protocol_policy="allow-all",
+            compress=False,
+            allowed_methods=["GET", "HEAD"],
+            cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+        )
+        # Create the updated distributionConfig
+        distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+            default_cache_behavior=default_cache_behavior,
+            enabled=True,
+            # the properties below are optional
+            connection_mode="tenant-only",
+            origins=[cloudfront.CfnDistribution.OriginProperty(
+                id=my_bucket.bucket_arn,
+                domain_name=my_bucket.bucket_domain_name,
+                s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+                origin_path="/{{tenantName}}"
+            )
+            ],
+            tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+                parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+                    definition=cloudfront.CfnDistribution.DefinitionProperty(
+                        string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                            required=False,
+                            # the properties below are optional
+                            comment="tenantName",
+                            default_value="root"
+                        )
+                    ),
+                    name="tenantName"
+                )
+                ]
+            )
+        )
+        
+        # Override the distribution configuration to enable multi-tenancy.
+        cfn_distribution.distribution_config = distribution_config
+        
+        # Create a distribution tenant using an existing ACM certificate
+        cfn_distribution_tenant = cloudfront.CfnDistributionTenant(self, "distribution-tenant",
+            distribution_id=my_multi_tenant_distribution.distribution_id,
+            domains=["my-tenant.my.domain.com"],
+            name="my-tenant",
+            enabled=True,
+            parameters=[cloudfront.CfnDistributionTenant.ParameterProperty(
+                name="tenantName",
+                value="app"
+            )],
+            customizations=cloudfront.CfnDistributionTenant.CustomizationsProperty(
+                certificate=cloudfront.CfnDistributionTenant.CertificateProperty(
+                    arn="REPLACE_WITH_ARN"
+                )
+            )
+        )
+    '''
+
+    def __init__(
+        self,
+        scope: _constructs_77d1e7e8.Construct,
+        id: builtins.str,
+        *,
         distribution_config: typing.Union[_IResolvable_da3f097b, typing.Union["CfnDistribution.DistributionConfigProperty", typing.Dict[builtins.str, typing.Any]]],
         tags: typing.Optional[typing.Sequence[typing.Union[_CfnTag_f6864754, typing.Dict[builtins.str, typing.Any]]]] = None,
     ) -> None:
@@ -5899,20 +6477,20 @@ class CfnDistribution(
             :param cached_methods: A complex type that controls whether CloudFront caches the response to requests using the specified HTTP methods. There are two choices: - CloudFront caches responses to ``GET`` and ``HEAD`` requests. - CloudFront caches responses to ``GET`` , ``HEAD`` , and ``OPTIONS`` requests. If you pick the second choice for your Amazon S3 Origin, you may need to forward Access-Control-Request-Method, Access-Control-Request-Headers, and Origin headers for the responses to be cached correctly.
             :param cache_policy_id: The unique identifier of the cache policy that is attached to this cache behavior. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . A ``CacheBehavior`` must include either a ``CachePolicyId`` or ``ForwardedValues`` . We recommend that you use a ``CachePolicyId`` .
             :param compress: Whether you want CloudFront to automatically compress certain files for this cache behavior. If so, specify true; if not, specify false. For more information, see `Serving Compressed Files <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/ServingCompressedFiles.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - false
-            :param default_ttl: This field is deprecated. We recommend that you use the ``DefaultTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The default amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin does not add HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - 86400
+            :param default_ttl: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . This field is deprecated. We recommend that you use the ``DefaultTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The default amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin does not add HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - 86400
             :param 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 this cache behavior. Default: - ""
             :param forwarded_values: This field is deprecated. We recommend that you use a cache policy or an origin request policy instead of this field. For more information, see `Working with policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/working-with-policies.html>`_ in the *Amazon CloudFront Developer Guide* . If you want to include values in the cache key, use a cache policy. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . If you want to send values to the origin but not include them in the cache key, use an origin request policy. For more information, see `Creating origin request policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-origin-requests.html#origin-request-create-origin-request-policy>`_ or `Using the managed origin request policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-origin-request-policies.html>`_ in the *Amazon CloudFront Developer Guide* . A ``CacheBehavior`` must include either a ``CachePolicyId`` or ``ForwardedValues`` . We recommend that you use a ``CachePolicyId`` . A complex type that specifies how CloudFront handles query strings, cookies, and HTTP headers.
             :param function_associations: A list of CloudFront functions that are associated with this cache behavior. CloudFront functions must be published to the ``LIVE`` stage to associate them with a cache behavior.
             :param grpc_config: The gRPC configuration for your cache behavior.
             :param lambda_function_associations: A complex type that contains zero or more Lambda@Edge function associations for a cache behavior.
-            :param max_ttl: This field is deprecated. We recommend that you use the ``MaxTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The maximum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin adds HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - 31536000
-            :param min_ttl: This field is deprecated. We recommend that you use the ``MinTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The minimum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . You must specify ``0`` for ``MinTTL`` if you configure CloudFront to forward all headers to your origin (under ``Headers`` , if you specify ``1`` for ``Quantity`` and ``*`` for ``Name`` ). Default: - 0
+            :param max_ttl: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . This field is deprecated. We recommend that you use the ``MaxTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The maximum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin adds HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - 31536000
+            :param min_ttl: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . This field is deprecated. We recommend that you use the ``MinTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The minimum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . You must specify ``0`` for ``MinTTL`` if you configure CloudFront to forward all headers to your origin (under ``Headers`` , if you specify ``1`` for ``Quantity`` and ``*`` for ``Name`` ). Default: - 0
             :param origin_request_policy_id: The unique identifier of the origin request policy that is attached to this cache behavior. For more information, see `Creating origin request policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-origin-requests.html#origin-request-create-origin-request-policy>`_ or `Using the managed origin request policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-origin-request-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
             :param realtime_log_config_arn: The Amazon Resource Name (ARN) of the real-time log configuration that is attached to this cache behavior. For more information, see `Real-time logs <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/real-time-logs.html>`_ in the *Amazon CloudFront Developer Guide* .
             :param response_headers_policy_id: The identifier for a response headers policy.
-            :param smooth_streaming: Indicates whether you want to distribute media files in the Microsoft Smooth Streaming format using the origin that is associated with this cache behavior. If so, specify ``true`` ; if not, specify ``false`` . If you specify ``true`` for ``SmoothStreaming`` , you can still distribute other content using this cache behavior if the content matches the value of ``PathPattern`` . Default: - false
+            :param smooth_streaming: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . Indicates whether you want to distribute media files in the Microsoft Smooth Streaming format using the origin that is associated with this cache behavior. If so, specify ``true`` ; if not, specify ``false`` . If you specify ``true`` for ``SmoothStreaming`` , you can still distribute other content using this cache behavior if the content matches the value of ``PathPattern`` . Default: - false
             :param trusted_key_groups: A list of key groups that CloudFront can use to validate signed URLs or signed cookies. When a cache behavior contains trusted key groups, CloudFront requires signed URLs or signed cookies for all requests that match the cache behavior. The URLs or cookies must be signed with a private key whose corresponding public key is in the key group. The signed URL or cookie contains information about which public key CloudFront should use to verify the signature. For more information, see `Serving private content <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html>`_ in the *Amazon CloudFront Developer Guide* .
-            :param trusted_signers: .. epigraph:: We recommend using ``TrustedKeyGroups`` instead of ``TrustedSigners`` . A list of AWS account IDs whose public keys CloudFront can use to validate signed URLs or signed cookies. When a cache behavior contains trusted signers, CloudFront requires signed URLs or signed cookies for all requests that match the cache behavior. The URLs or cookies must be signed with the private key of a CloudFront key pair in the trusted signer's AWS account . The signed URL or cookie contains information about which public key CloudFront should use to verify the signature. For more information, see `Serving private content <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html>`_ in the *Amazon CloudFront Developer Guide* .
+            :param trusted_signers: .. epigraph:: We recommend using ``TrustedKeyGroups`` instead of ``TrustedSigners`` . .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . A list of AWS account IDs whose public keys CloudFront can use to validate signed URLs or signed cookies. When a cache behavior contains trusted signers, CloudFront requires signed URLs or signed cookies for all requests that match the cache behavior. The URLs or cookies must be signed with the private key of a CloudFront key pair in the trusted signer's AWS account . The signed URL or cookie contains information about which public key CloudFront should use to verify the signature. For more information, see `Serving private content <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html>`_ in the *Amazon CloudFront Developer Guide* .
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html
             :exampleMetadata: fixture=_generated
@@ -6147,9 +6725,13 @@ class CfnDistribution(
 
         @builtins.property
         def default_ttl(self) -> typing.Optional[jsii.Number]:
-            '''This field is deprecated.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
+
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
 
-            We recommend that you use the ``DefaultTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
+            This field is deprecated. We recommend that you use the ``DefaultTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
 
             The default amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin does not add HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -6229,9 +6811,13 @@ class CfnDistribution(
 
         @builtins.property
         def max_ttl(self) -> typing.Optional[jsii.Number]:
-            '''This field is deprecated.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
 
-            We recommend that you use the ``MaxTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            This field is deprecated. We recommend that you use the ``MaxTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
 
             The maximum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin adds HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -6244,9 +6830,13 @@ class CfnDistribution(
 
         @builtins.property
         def min_ttl(self) -> typing.Optional[jsii.Number]:
-            '''This field is deprecated.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
+
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
 
-            We recommend that you use the ``MinTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
+            This field is deprecated. We recommend that you use the ``MinTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
 
             The minimum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -6294,9 +6884,13 @@ class CfnDistribution(
         def smooth_streaming(
             self,
         ) -> typing.Optional[typing.Union[builtins.bool, _IResolvable_da3f097b]]:
-            '''Indicates whether you want to distribute media files in the Microsoft Smooth Streaming format using the origin that is associated with this cache behavior.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
+
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
 
-            If so, specify ``true`` ; if not, specify ``false`` . If you specify ``true`` for ``SmoothStreaming`` , you can still distribute other content using this cache behavior if the content matches the value of ``PathPattern`` .
+            Indicates whether you want to distribute media files in the Microsoft Smooth Streaming format using the origin that is associated with this cache behavior. If so, specify ``true`` ; if not, specify ``false`` . If you specify ``true`` for ``SmoothStreaming`` , you can still distribute other content using this cache behavior if the content matches the value of ``PathPattern`` .
 
             :default: - false
 
@@ -6322,6 +6916,10 @@ class CfnDistribution(
 
    We recommend using ``TrustedKeyGroups`` instead of ``TrustedSigners`` .
 
+            .. epigraph::
+
+               This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
             A list of AWS account IDs whose public keys CloudFront can use to validate signed URLs or signed cookies.
 
             When a cache behavior contains trusted signers, CloudFront requires signed URLs or signed cookies for all requests that match the cache behavior. The URLs or cookies must be signed with the private key of a CloudFront key pair in the trusted signer's AWS account . The signed URL or cookie contains information about which public key CloudFront should use to verify the signature. For more information, see `Serving private content <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html>`_ in the *Amazon CloudFront Developer Guide* .
@@ -6609,8 +7207,8 @@ class CfnDistribution(
             :param origin_protocol_policy: 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.
             :param http_port: The HTTP port that CloudFront uses to connect to the origin. Specify the HTTP port that the origin listens on. Default: - 80
             :param https_port: The HTTPS port that CloudFront uses to connect to the origin. Specify the HTTPS port that the origin listens on. Default: - 443
-            :param origin_keepalive_timeout: 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. For more information, see `Keep-alive timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginKeepaliveTimeout>`_ in the *Amazon CloudFront Developer Guide* . Default: - 5
-            :param origin_read_timeout: 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. For more information, see `Response timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginResponseTimeout>`_ in the *Amazon CloudFront Developer Guide* . Default: - 30
+            :param origin_keepalive_timeout: Specifies how long, in seconds, CloudFront persists its connection to the origin. The minimum timeout is 1 second, the maximum is 120 seconds, and the default (if you don't specify otherwise) is 5 seconds. For more information, see `Keep-alive timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginKeepaliveTimeout>`_ in the *Amazon CloudFront Developer Guide* . Default: - 5
+            :param origin_read_timeout: 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 120 seconds, and the default (if you don't specify otherwise) is 30 seconds. For more information, see `Response timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginResponseTimeout>`_ in the *Amazon CloudFront Developer Guide* . Default: - 30
             :param origin_ssl_protocols: 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 <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginSSLProtocols>`_ in the *Amazon CloudFront Developer Guide* .
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customoriginconfig.html
@@ -6699,7 +7297,7 @@ class CfnDistribution(
         def origin_keepalive_timeout(self) -> typing.Optional[jsii.Number]:
             '''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.
+            The minimum timeout is 1 second, the maximum is 120 seconds, and the default (if you don't specify otherwise) is 5 seconds.
 
             For more information, see `Keep-alive timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginKeepaliveTimeout>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -6714,7 +7312,7 @@ class CfnDistribution(
         def origin_read_timeout(self) -> typing.Optional[jsii.Number]:
             '''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.
+            This is also known as the *origin response timeout* . The minimum timeout is 1 second, the maximum is 120 seconds, and the default (if you don't specify otherwise) is 30 seconds.
 
             For more information, see `Response timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginResponseTimeout>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -6810,74 +7408,106 @@ class CfnDistribution(
             :param cached_methods: A complex type that controls whether CloudFront caches the response to requests using the specified HTTP methods. There are two choices: - CloudFront caches responses to ``GET`` and ``HEAD`` requests. - CloudFront caches responses to ``GET`` , ``HEAD`` , and ``OPTIONS`` requests. If you pick the second choice for your Amazon S3 Origin, you may need to forward Access-Control-Request-Method, Access-Control-Request-Headers, and Origin headers for the responses to be cached correctly.
             :param cache_policy_id: The unique identifier of the cache policy that is attached to the default cache behavior. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . A ``DefaultCacheBehavior`` must include either a ``CachePolicyId`` or ``ForwardedValues`` . We recommend that you use a ``CachePolicyId`` . Default: - ""
             :param compress: Whether you want CloudFront to automatically compress certain files for this cache behavior. If so, specify ``true`` ; if not, specify ``false`` . For more information, see `Serving Compressed Files <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/ServingCompressedFiles.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - false
-            :param default_ttl: This field is deprecated. We recommend that you use the ``DefaultTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The default amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin does not add HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - 86400
+            :param default_ttl: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . This field is deprecated. We recommend that you use the ``DefaultTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The default amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin does not add HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - 86400
             :param 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 the default cache behavior. Default: - ""
             :param forwarded_values: This field is deprecated. We recommend that you use a cache policy or an origin request policy instead of this field. For more information, see `Working with policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/working-with-policies.html>`_ in the *Amazon CloudFront Developer Guide* . If you want to include values in the cache key, use a cache policy. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . If you want to send values to the origin but not include them in the cache key, use an origin request policy. For more information, see `Creating origin request policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-origin-requests.html#origin-request-create-origin-request-policy>`_ or `Using the managed origin request policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-origin-request-policies.html>`_ in the *Amazon CloudFront Developer Guide* . A ``DefaultCacheBehavior`` must include either a ``CachePolicyId`` or ``ForwardedValues`` . We recommend that you use a ``CachePolicyId`` . A complex type that specifies how CloudFront handles query strings, cookies, and HTTP headers.
             :param function_associations: A list of CloudFront functions that are associated with this cache behavior. Your functions must be published to the ``LIVE`` stage to associate them with a cache behavior.
             :param grpc_config: The gRPC configuration for your cache behavior.
             :param lambda_function_associations: A complex type that contains zero or more Lambda@Edge function associations for a cache behavior.
-            :param max_ttl: This field is deprecated. We recommend that you use the ``MaxTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The maximum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin adds HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - 31536000
-            :param min_ttl: This field is deprecated. We recommend that you use the ``MinTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The minimum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . You must specify ``0`` for ``MinTTL`` if you configure CloudFront to forward all headers to your origin (under ``Headers`` , if you specify ``1`` for ``Quantity`` and ``*`` for ``Name`` ). Default: - 0
+            :param max_ttl: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . This field is deprecated. We recommend that you use the ``MaxTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The maximum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin adds HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - 31536000
+            :param min_ttl: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . This field is deprecated. We recommend that you use the ``MinTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* . The minimum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* . You must specify ``0`` for ``MinTTL`` if you configure CloudFront to forward all headers to your origin (under ``Headers`` , if you specify ``1`` for ``Quantity`` and ``*`` for ``Name`` ). Default: - 0
             :param origin_request_policy_id: The unique identifier of the origin request policy that is attached to the default cache behavior. For more information, see `Creating origin request policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-origin-requests.html#origin-request-create-origin-request-policy>`_ or `Using the managed origin request policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-origin-request-policies.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - ""
             :param realtime_log_config_arn: The Amazon Resource Name (ARN) of the real-time log configuration that is attached to this cache behavior. For more information, see `Real-time logs <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/real-time-logs.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - ""
             :param response_headers_policy_id: The identifier for a response headers policy. Default: - ""
-            :param smooth_streaming: Indicates whether you want to distribute media files in the Microsoft Smooth Streaming format using the origin that is associated with this cache behavior. If so, specify ``true`` ; if not, specify ``false`` . If you specify ``true`` for ``SmoothStreaming`` , you can still distribute other content using this cache behavior if the content matches the value of ``PathPattern`` . Default: - false
+            :param smooth_streaming: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . Indicates whether you want to distribute media files in the Microsoft Smooth Streaming format using the origin that is associated with this cache behavior. If so, specify ``true`` ; if not, specify ``false`` . If you specify ``true`` for ``SmoothStreaming`` , you can still distribute other content using this cache behavior if the content matches the value of ``PathPattern`` . Default: - false
             :param trusted_key_groups: A list of key groups that CloudFront can use to validate signed URLs or signed cookies. When a cache behavior contains trusted key groups, CloudFront requires signed URLs or signed cookies for all requests that match the cache behavior. The URLs or cookies must be signed with a private key whose corresponding public key is in the key group. The signed URL or cookie contains information about which public key CloudFront should use to verify the signature. For more information, see `Serving private content <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html>`_ in the *Amazon CloudFront Developer Guide* .
-            :param trusted_signers: .. epigraph:: We recommend using ``TrustedKeyGroups`` instead of ``TrustedSigners`` . A list of AWS account IDs whose public keys CloudFront can use to validate signed URLs or signed cookies. When a cache behavior contains trusted signers, CloudFront requires signed URLs or signed cookies for all requests that match the cache behavior. The URLs or cookies must be signed with the private key of a CloudFront key pair in a trusted signer's AWS account . The signed URL or cookie contains information about which public key CloudFront should use to verify the signature. For more information, see `Serving private content <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html>`_ in the *Amazon CloudFront Developer Guide* .
+            :param trusted_signers: .. epigraph:: We recommend using ``TrustedKeyGroups`` instead of ``TrustedSigners`` . .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . A list of AWS account IDs whose public keys CloudFront can use to validate signed URLs or signed cookies. When a cache behavior contains trusted signers, CloudFront requires signed URLs or signed cookies for all requests that match the cache behavior. The URLs or cookies must be signed with the private key of a CloudFront key pair in a trusted signer's AWS account . The signed URL or cookie contains information about which public key CloudFront should use to verify the signature. For more information, see `Serving private content <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html>`_ in the *Amazon CloudFront Developer Guide* .
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html
-            :exampleMetadata: fixture=_generated
+            :exampleMetadata: infused
 
             Example::
 
-                # The code below shows an example of how to instantiate this type.
-                # The values are placeholders you should change.
-                from aws_cdk import aws_cloudfront as cloudfront
+                # Create the simple Origin
+                my_bucket = s3.Bucket(self, "myBucket")
+                s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+                    origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+                )
                 
-                default_cache_behavior_property = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
-                    target_origin_id="targetOriginId",
-                    viewer_protocol_policy="viewerProtocolPolicy",
+                # Create the Distribution construct
+                my_multi_tenant_distribution = cloudfront.Distribution(self, "cf-hosted-distribution",
+                    default_behavior=cloudfront.BehaviorOptions(
+                        origin=s3_origin
+                    ),
+                    default_root_object="index.html"
+                )
                 
-                    # the properties below are optional
-                    allowed_methods=["allowedMethods"],
-                    cached_methods=["cachedMethods"],
-                    cache_policy_id="cachePolicyId",
+                # Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+                cfn_distribution = my_multi_tenant_distribution.node.default_child
+                
+                default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+                    target_origin_id=my_bucket.bucket_arn,
+                    viewer_protocol_policy="allow-all",
                     compress=False,
-                    default_ttl=123,
-                    field_level_encryption_id="fieldLevelEncryptionId",
-                    forwarded_values=cloudfront.CfnDistribution.ForwardedValuesProperty(
-                        query_string=False,
+                    allowed_methods=["GET", "HEAD"],
+                    cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+                )
+                # Create the updated distributionConfig
+                distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+                    default_cache_behavior=default_cache_behavior,
+                    enabled=True,
+                    # the properties below are optional
+                    connection_mode="tenant-only",
+                    origins=[cloudfront.CfnDistribution.OriginProperty(
+                        id=my_bucket.bucket_arn,
+                        domain_name=my_bucket.bucket_domain_name,
+                        s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+                        origin_path="/{{tenantName}}"
+                    )
+                    ],
+                    tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+                        parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+                            definition=cloudfront.CfnDistribution.DefinitionProperty(
+                                string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                                    required=False,
+                                    # the properties below are optional
+                                    comment="tenantName",
+                                    default_value="root"
+                                )
+                            ),
+                            name="tenantName"
+                        )
+                        ]
+                    )
+                )
                 
-                        # the properties below are optional
-                        cookies=cloudfront.CfnDistribution.CookiesProperty(
-                            forward="forward",
+                # Override the distribution configuration to enable multi-tenancy.
+                cfn_distribution.distribution_config = distribution_config
                 
-                            # the properties below are optional
-                            whitelisted_names=["whitelistedNames"]
-                        ),
-                        headers=["headers"],
-                        query_string_cache_keys=["queryStringCacheKeys"]
-                    ),
-                    function_associations=[cloudfront.CfnDistribution.FunctionAssociationProperty(
-                        event_type="eventType",
-                        function_arn="functionArn"
-                    )],
-                    grpc_config=cloudfront.CfnDistribution.GrpcConfigProperty(
-                        enabled=False
-                    ),
-                    lambda_function_associations=[cloudfront.CfnDistribution.LambdaFunctionAssociationProperty(
-                        event_type="eventType",
-                        include_body=False,
-                        lambda_function_arn="lambdaFunctionArn"
-                    )],
-                    max_ttl=123,
-                    min_ttl=123,
-                    origin_request_policy_id="originRequestPolicyId",
-                    realtime_log_config_arn="realtimeLogConfigArn",
-                    response_headers_policy_id="responseHeadersPolicyId",
-                    smooth_streaming=False,
-                    trusted_key_groups=["trustedKeyGroups"],
-                    trusted_signers=["trustedSigners"]
+                # Create a connection group so we have access to the RoutingEndpoint associated with the tenant we are about to create
+                connection_group = cloudfront.CfnConnectionGroup(self, "self-hosted-connection-group",
+                    enabled=True,
+                    ipv6_enabled=True,
+                    name="self-hosted-connection-group"
+                )
+                
+                # Export the RoutingEndpoint, skip this step if you'd prefer to fetch it from the CloudFront console or via Cloudfront.ListConnectionGroups API
+                CfnOutput(self, "RoutingEndpoint",
+                    value=connection_group.attr_routing_endpoint,
+                    description="CloudFront Routing Endpoint to be added to my hosted zone CNAME records"
+                )
+                
+                # Create a distribution tenant with a self-hosted domain.
+                self_hosted_tenant = cloudfront.CfnDistributionTenant(self, "self-hosted-tenant",
+                    distribution_id=my_multi_tenant_distribution.distribution_id,
+                    connection_group_id=connection_group.attr_id,
+                    name="self-hosted-tenant",
+                    domains=["self-hosted-tenant.my.domain.com"],
+                    enabled=True,
+                    managed_certificate_request=cloudfront.CfnDistributionTenant.ManagedCertificateRequestProperty(
+                        primary_domain_name="self-hosted-tenant.my.domain.com",
+                        validation_token_host="self-hosted"
+                    )
                 )
             '''
             if __debug__:
@@ -7039,9 +7669,13 @@ class CfnDistribution(
 
         @builtins.property
         def default_ttl(self) -> typing.Optional[jsii.Number]:
-            '''This field is deprecated.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
 
-            We recommend that you use the ``DefaultTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            This field is deprecated. We recommend that you use the ``DefaultTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
 
             The default amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin does not add HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -7121,9 +7755,13 @@ class CfnDistribution(
 
         @builtins.property
         def max_ttl(self) -> typing.Optional[jsii.Number]:
-            '''This field is deprecated.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
+
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
 
-            We recommend that you use the ``MaxTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
+            This field is deprecated. We recommend that you use the ``MaxTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
 
             The maximum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. The value that you specify applies only when your origin adds HTTP headers such as ``Cache-Control max-age`` , ``Cache-Control s-maxage`` , and ``Expires`` to objects. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -7136,9 +7774,13 @@ class CfnDistribution(
 
         @builtins.property
         def min_ttl(self) -> typing.Optional[jsii.Number]:
-            '''This field is deprecated.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
 
-            We recommend that you use the ``MinTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            This field is deprecated. We recommend that you use the ``MinTTL`` field in a cache policy instead of this field. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ or `Using the managed cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html>`_ in the *Amazon CloudFront Developer Guide* .
 
             The minimum amount of time that you want objects to stay in CloudFront caches before CloudFront forwards another request to your origin to determine whether the object has been updated. For more information, see `Managing How Long Content Stays in an Edge Cache (Expiration) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -7192,9 +7834,13 @@ class CfnDistribution(
         def smooth_streaming(
             self,
         ) -> typing.Optional[typing.Union[builtins.bool, _IResolvable_da3f097b]]:
-            '''Indicates whether you want to distribute media files in the Microsoft Smooth Streaming format using the origin that is associated with this cache behavior.
+            '''.. epigraph::
 
-            If so, specify ``true`` ; if not, specify ``false`` . If you specify ``true`` for ``SmoothStreaming`` , you can still distribute other content using this cache behavior if the content matches the value of ``PathPattern`` .
+   This field only supports standard distributions.
+
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            Indicates whether you want to distribute media files in the Microsoft Smooth Streaming format using the origin that is associated with this cache behavior. If so, specify ``true`` ; if not, specify ``false`` . If you specify ``true`` for ``SmoothStreaming`` , you can still distribute other content using this cache behavior if the content matches the value of ``PathPattern`` .
 
             :default: - false
 
@@ -7220,6 +7866,10 @@ class CfnDistribution(
 
    We recommend using ``TrustedKeyGroups`` instead of ``TrustedSigners`` .
 
+            .. epigraph::
+
+               This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
             A list of AWS account IDs whose public keys CloudFront can use to validate signed URLs or signed cookies.
 
             When a cache behavior contains trusted signers, CloudFront requires signed URLs or signed cookies for all requests that match the cache behavior. The URLs or cookies must be signed with the private key of a CloudFront key pair in a trusted signer's AWS account . The signed URL or cookie contains information about which public key CloudFront should use to verify the signature. For more information, see `Serving private content <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PrivateContent.html>`_ in the *Amazon CloudFront Developer Guide* .
@@ -7365,265 +8015,114 @@ class CfnDistribution(
 
             :param default_cache_behavior: 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.
             :param enabled: From this field, you can enable or disable the selected distribution.
-            :param aliases: A complex type that contains information about CNAMEs (alternate domain names), if any, for this distribution.
-            :param anycast_ip_list_id: ID of the Anycast static IP list that is associated with the distribution.
+            :param aliases: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . A complex type that contains information about CNAMEs (alternate domain names), if any, for this distribution.
+            :param anycast_ip_list_id: .. epigraph:: To use this field for a multi-tenant distribution, use a connection group instead. For more information, see `ConnectionGroup <https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ConnectionGroup.html>`_ . ID of the Anycast static IP list that is associated with the distribution.
             :param cache_behaviors: A complex type that contains zero or more ``CacheBehavior`` elements.
             :param cnam_es: An alias for the CloudFront distribution's domain name. .. epigraph:: This property is legacy. We recommend that you use `Aliases <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-aliases>`_ instead.
             :param comment: A comment to describe the distribution. The comment cannot be longer than 128 characters. Default: - ""
-            :param connection_mode: The connection mode to filter distributions by.
-            :param continuous_deployment_policy_id: The identifier of a continuous deployment policy. For more information, see ``CreateContinuousDeploymentPolicy`` .
+            :param connection_mode: This field specifies whether the connection mode is through a standard distribution (direct) or a multi-tenant distribution with distribution tenants(tenant-only).
+            :param continuous_deployment_policy_id: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . The identifier of a continuous deployment policy. For more information, see ``CreateContinuousDeploymentPolicy`` .
             :param custom_error_responses: A complex type that controls the following:. - Whether CloudFront replaces HTTP status codes in the 4xx and 5xx range with custom error messages before returning the response to the viewer. - How long CloudFront caches HTTP status codes in the 4xx and 5xx range. For more information about custom error pages, see `Customizing Error Responses <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/custom-error-pages.html>`_ in the *Amazon CloudFront Developer Guide* .
             :param custom_origin: The user-defined HTTP server that serves as the origin for content that CloudFront distributes. .. epigraph:: This property is legacy. We recommend that you use `Origin <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html>`_ instead.
-            :param default_root_object: When a viewer requests the root URL for your distribution, the default root object is the object that you want CloudFront to request from your origin. For example, if your root URL is ``https://www.example.com`` , you can specify CloudFront to return the ``index.html`` file as the default root object. You can specify a default root object so that viewers see a specific file or object, instead of another object in your distribution (for example, ``https://www.example.com/product-description.html`` ). A default root object avoids exposing the contents of your distribution. You can specify the object name or a path to the object name (for example, ``index.html`` or ``exampleFolderName/index.html`` ). Your string can't begin with a forward slash ( ``/`` ). Only specify the object name or the path to the object. If you don't want to specify a default root object when you create a distribution, include an empty ``DefaultRootObject`` element. To delete the default root object from an existing distribution, update the distribution configuration and include an empty ``DefaultRootObject`` element. To replace the default root object, update the distribution configuration and specify the new object. For more information about the default root object, see `Specify a default root object <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DefaultRootObject.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - ""
-            :param http_version: (Optional) Specify the HTTP version(s) that you want viewers to use to communicate with CloudFront . The default value for new distributions is ``http1.1`` . For viewers and CloudFront to use HTTP/2, viewers must support TLSv1.2 or later, and must support Server Name Indication (SNI). For viewers and CloudFront to use HTTP/3, viewers must support TLSv1.3 and Server Name Indication (SNI). CloudFront supports HTTP/3 connection migration to allow the viewer to switch networks without losing connection. For more information about connection migration, see `Connection Migration <https://docs.aws.amazon.com/https://www.rfc-editor.org/rfc/rfc9000.html#name-connection-migration>`_ at RFC 9000. For more information about supported TLSv1.3 ciphers, see `Supported protocols and ciphers between viewers and CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/secure-connections-supported-viewer-protocols-ciphers.html>`_ . Default: - "http1.1"
-            :param ipv6_enabled: If you want CloudFront to respond to IPv6 DNS requests with an IPv6 address for your distribution, specify ``true`` . If you specify ``false`` , CloudFront responds to IPv6 DNS requests with the DNS response code ``NOERROR`` and with no IP addresses. This allows viewers to submit a second request, for an IPv4 address for your distribution. In general, you should enable IPv6 if you have users on IPv6 networks who want to access your content. However, if you're using signed URLs or signed cookies to restrict access to your content, and if you're using a custom policy that includes the ``IpAddress`` parameter to restrict the IP addresses that can access your content, don't enable IPv6. If you want to restrict access to some content by IP address and not restrict access to other content (or restrict access but not by IP address), you can create two distributions. For more information, see `Creating a Signed URL Using a Custom Policy <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-creating-signed-url-custom-policy.html>`_ in the *Amazon CloudFront Developer Guide* . If you're using an Amazon Route 53 AWS Integration alias resource record set to route traffic to your CloudFront distribution, you need to create a second alias resource record set when both of the following are true: - You enable IPv6 for the distribution - You're using alternate domain names in the URLs for your objects For more information, see `Routing Traffic to an Amazon CloudFront Web Distribution by Using Your Domain Name <https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-to-cloudfront-distribution.html>`_ in the *Amazon Route 53 AWS Integration Developer Guide* . If you created a CNAME resource record set, either with Amazon Route 53 AWS Integration or with another DNS service, you don't need to make any changes. A CNAME record will route traffic to your distribution regardless of the IP address format of the viewer request.
-            :param logging: A complex type that controls whether access logs are written for the distribution. For more information about logging, see `Access Logs <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/AccessLogs.html>`_ in the *Amazon CloudFront Developer Guide* .
-            :param origin_groups: A complex type that contains information about origin groups for this distribution. Specify a value for either the ``Origins`` or ``OriginGroups`` property.
-            :param origins: A complex type that contains information about origins for this distribution. Specify a value for either the ``Origins`` or ``OriginGroups`` property.
-            :param price_class: The price class that corresponds with the maximum price that you want to pay for CloudFront service. If you specify ``PriceClass_All`` , CloudFront responds to requests for your objects from all CloudFront edge locations. If you specify a price class other than ``PriceClass_All`` , CloudFront serves your objects from the CloudFront edge location that has the lowest latency among the edge locations in your price class. Viewers who are in or near regions that are excluded from your specified price class may encounter slower performance. For more information about price classes, see `Choosing the Price Class for a CloudFront Distribution <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PriceClass.html>`_ in the *Amazon CloudFront Developer Guide* . For information about CloudFront pricing, including how price classes (such as Price Class 100) map to CloudFront regions, see `Amazon CloudFront Pricing <https://docs.aws.amazon.com/cloudfront/pricing/>`_ . Default: - "PriceClass_All"
-            :param restrictions: A complex type that identifies ways in which you want to restrict distribution of your content.
-            :param s3_origin: The origin as an Amazon S3 bucket. .. epigraph:: This property is legacy. We recommend that you use `Origin <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html>`_ instead.
-            :param staging: A Boolean that indicates whether this is a staging distribution. When this value is ``true`` , this is a staging distribution. When this value is ``false`` , this is not a staging distribution.
-            :param tenant_config: A distribution tenant configuration.
-            :param viewer_certificate: A complex type that determines the distribution's SSL/TLS configuration for communicating with viewers.
-            :param web_acl_id: A unique identifier that specifies the AWS WAF web ACL, if any, to associate with this distribution. To specify a web ACL created using the latest version of AWS WAF , use the ACL ARN, for example ``arn:aws:wafv2:us-east-1:123456789012:global/webacl/ExampleWebACL/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111`` . To specify a web ACL created using AWS WAF Classic, use the ACL ID, for example ``a1b2c3d4-5678-90ab-cdef-EXAMPLE11111`` . AWS WAF is a web application firewall that lets you monitor the HTTP and HTTPS requests that are forwarded to CloudFront, and lets you control access to your content. Based on conditions that you specify, such as the IP addresses that requests originate from or the values of query strings, CloudFront responds to requests either with the requested content or with an HTTP 403 status code (Forbidden). You can also configure CloudFront to return a custom error page when a request is blocked. For more information about AWS WAF , see the `AWS WAF Developer Guide <https://docs.aws.amazon.com/waf/latest/developerguide/what-is-aws-waf.html>`_ . Default: - ""
-
-            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html
-            :exampleMetadata: fixture=_generated
-
-            Example::
-
-                # The code below shows an example of how to instantiate this type.
-                # The values are placeholders you should change.
-                from aws_cdk import aws_cloudfront as cloudfront
-                
-                distribution_config_property = cloudfront.CfnDistribution.DistributionConfigProperty(
-                    default_cache_behavior=cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
-                        target_origin_id="targetOriginId",
-                        viewer_protocol_policy="viewerProtocolPolicy",
-                
-                        # the properties below are optional
-                        allowed_methods=["allowedMethods"],
-                        cached_methods=["cachedMethods"],
-                        cache_policy_id="cachePolicyId",
-                        compress=False,
-                        default_ttl=123,
-                        field_level_encryption_id="fieldLevelEncryptionId",
-                        forwarded_values=cloudfront.CfnDistribution.ForwardedValuesProperty(
-                            query_string=False,
-                
-                            # the properties below are optional
-                            cookies=cloudfront.CfnDistribution.CookiesProperty(
-                                forward="forward",
-                
-                                # the properties below are optional
-                                whitelisted_names=["whitelistedNames"]
-                            ),
-                            headers=["headers"],
-                            query_string_cache_keys=["queryStringCacheKeys"]
-                        ),
-                        function_associations=[cloudfront.CfnDistribution.FunctionAssociationProperty(
-                            event_type="eventType",
-                            function_arn="functionArn"
-                        )],
-                        grpc_config=cloudfront.CfnDistribution.GrpcConfigProperty(
-                            enabled=False
-                        ),
-                        lambda_function_associations=[cloudfront.CfnDistribution.LambdaFunctionAssociationProperty(
-                            event_type="eventType",
-                            include_body=False,
-                            lambda_function_arn="lambdaFunctionArn"
-                        )],
-                        max_ttl=123,
-                        min_ttl=123,
-                        origin_request_policy_id="originRequestPolicyId",
-                        realtime_log_config_arn="realtimeLogConfigArn",
-                        response_headers_policy_id="responseHeadersPolicyId",
-                        smooth_streaming=False,
-                        trusted_key_groups=["trustedKeyGroups"],
-                        trusted_signers=["trustedSigners"]
-                    ),
-                    enabled=False,
-                
-                    # the properties below are optional
-                    aliases=["aliases"],
-                    anycast_ip_list_id="anycastIpListId",
-                    cache_behaviors=[cloudfront.CfnDistribution.CacheBehaviorProperty(
-                        path_pattern="pathPattern",
-                        target_origin_id="targetOriginId",
-                        viewer_protocol_policy="viewerProtocolPolicy",
-                
-                        # the properties below are optional
-                        allowed_methods=["allowedMethods"],
-                        cached_methods=["cachedMethods"],
-                        cache_policy_id="cachePolicyId",
-                        compress=False,
-                        default_ttl=123,
-                        field_level_encryption_id="fieldLevelEncryptionId",
-                        forwarded_values=cloudfront.CfnDistribution.ForwardedValuesProperty(
-                            query_string=False,
-                
-                            # the properties below are optional
-                            cookies=cloudfront.CfnDistribution.CookiesProperty(
-                                forward="forward",
-                
-                                # the properties below are optional
-                                whitelisted_names=["whitelistedNames"]
-                            ),
-                            headers=["headers"],
-                            query_string_cache_keys=["queryStringCacheKeys"]
-                        ),
-                        function_associations=[cloudfront.CfnDistribution.FunctionAssociationProperty(
-                            event_type="eventType",
-                            function_arn="functionArn"
-                        )],
-                        grpc_config=cloudfront.CfnDistribution.GrpcConfigProperty(
-                            enabled=False
-                        ),
-                        lambda_function_associations=[cloudfront.CfnDistribution.LambdaFunctionAssociationProperty(
-                            event_type="eventType",
-                            include_body=False,
-                            lambda_function_arn="lambdaFunctionArn"
-                        )],
-                        max_ttl=123,
-                        min_ttl=123,
-                        origin_request_policy_id="originRequestPolicyId",
-                        realtime_log_config_arn="realtimeLogConfigArn",
-                        response_headers_policy_id="responseHeadersPolicyId",
-                        smooth_streaming=False,
-                        trusted_key_groups=["trustedKeyGroups"],
-                        trusted_signers=["trustedSigners"]
-                    )],
-                    cnam_es=["cnamEs"],
-                    comment="comment",
-                    connection_mode="connectionMode",
-                    continuous_deployment_policy_id="continuousDeploymentPolicyId",
-                    custom_error_responses=[cloudfront.CfnDistribution.CustomErrorResponseProperty(
-                        error_code=123,
-                
-                        # the properties below are optional
-                        error_caching_min_ttl=123,
-                        response_code=123,
-                        response_page_path="responsePagePath"
-                    )],
-                    custom_origin=cloudfront.CfnDistribution.LegacyCustomOriginProperty(
-                        dns_name="dnsName",
-                        origin_protocol_policy="originProtocolPolicy",
-                        origin_ssl_protocols=["originSslProtocols"],
-                
-                        # the properties below are optional
-                        http_port=123,
-                        https_port=123
-                    ),
-                    default_root_object="defaultRootObject",
-                    http_version="httpVersion",
-                    ipv6_enabled=False,
-                    logging=cloudfront.CfnDistribution.LoggingProperty(
-                        bucket="bucket",
-                        include_cookies=False,
-                        prefix="prefix"
-                    ),
-                    origin_groups=cloudfront.CfnDistribution.OriginGroupsProperty(
-                        quantity=123,
-                
-                        # the properties below are optional
-                        items=[cloudfront.CfnDistribution.OriginGroupProperty(
-                            failover_criteria=cloudfront.CfnDistribution.OriginGroupFailoverCriteriaProperty(
-                                status_codes=cloudfront.CfnDistribution.StatusCodesProperty(
-                                    items=[123],
-                                    quantity=123
-                                )
-                            ),
-                            id="id",
-                            members=cloudfront.CfnDistribution.OriginGroupMembersProperty(
-                                items=[cloudfront.CfnDistribution.OriginGroupMemberProperty(
-                                    origin_id="originId"
-                                )],
-                                quantity=123
-                            ),
-                
-                            # the properties below are optional
-                            selection_criteria="selectionCriteria"
-                        )]
-                    ),
-                    origins=[cloudfront.CfnDistribution.OriginProperty(
-                        domain_name="domainName",
-                        id="id",
-                
-                        # the properties below are optional
-                        connection_attempts=123,
-                        connection_timeout=123,
-                        custom_origin_config=cloudfront.CfnDistribution.CustomOriginConfigProperty(
-                            origin_protocol_policy="originProtocolPolicy",
-                
-                            # the properties below are optional
-                            http_port=123,
-                            https_port=123,
-                            origin_keepalive_timeout=123,
-                            origin_read_timeout=123,
-                            origin_ssl_protocols=["originSslProtocols"]
-                        ),
-                        origin_access_control_id="originAccessControlId",
-                        origin_custom_headers=[cloudfront.CfnDistribution.OriginCustomHeaderProperty(
-                            header_name="headerName",
-                            header_value="headerValue"
-                        )],
-                        origin_path="originPath",
-                        origin_shield=cloudfront.CfnDistribution.OriginShieldProperty(
-                            enabled=False,
-                            origin_shield_region="originShieldRegion"
-                        ),
-                        response_completion_timeout=123,
-                        s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(
-                            origin_access_identity="originAccessIdentity",
-                            origin_read_timeout=123
-                        ),
-                        vpc_origin_config=cloudfront.CfnDistribution.VpcOriginConfigProperty(
-                            vpc_origin_id="vpcOriginId",
-                
-                            # the properties below are optional
-                            origin_keepalive_timeout=123,
-                            origin_read_timeout=123
-                        )
-                    )],
-                    price_class="priceClass",
-                    restrictions=cloudfront.CfnDistribution.RestrictionsProperty(
-                        geo_restriction=cloudfront.CfnDistribution.GeoRestrictionProperty(
-                            restriction_type="restrictionType",
+            :param default_root_object: When a viewer requests the root URL for your distribution, the default root object is the object that you want CloudFront to request from your origin. For example, if your root URL is ``https://www.example.com`` , you can specify CloudFront to return the ``index.html`` file as the default root object. You can specify a default root object so that viewers see a specific file or object, instead of another object in your distribution (for example, ``https://www.example.com/product-description.html`` ). A default root object avoids exposing the contents of your distribution. You can specify the object name or a path to the object name (for example, ``index.html`` or ``exampleFolderName/index.html`` ). Your string can't begin with a forward slash ( ``/`` ). Only specify the object name or the path to the object. If you don't want to specify a default root object when you create a distribution, include an empty ``DefaultRootObject`` element. To delete the default root object from an existing distribution, update the distribution configuration and include an empty ``DefaultRootObject`` element. To replace the default root object, update the distribution configuration and specify the new object. For more information about the default root object, see `Specify a default root object <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DefaultRootObject.html>`_ in the *Amazon CloudFront Developer Guide* . Default: - ""
+            :param http_version: (Optional) Specify the HTTP version(s) that you want viewers to use to communicate with CloudFront . The default value for new distributions is ``http1.1`` . For viewers and CloudFront to use HTTP/2, viewers must support TLSv1.2 or later, and must support Server Name Indication (SNI). For viewers and CloudFront to use HTTP/3, viewers must support TLSv1.3 and Server Name Indication (SNI). CloudFront supports HTTP/3 connection migration to allow the viewer to switch networks without losing connection. For more information about connection migration, see `Connection Migration <https://docs.aws.amazon.com/https://www.rfc-editor.org/rfc/rfc9000.html#name-connection-migration>`_ at RFC 9000. For more information about supported TLSv1.3 ciphers, see `Supported protocols and ciphers between viewers and CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/secure-connections-supported-viewer-protocols-ciphers.html>`_ . Default: - "http1.1"
+            :param ipv6_enabled: .. epigraph:: To use this field for a multi-tenant distribution, use a connection group instead. For more information, see `ConnectionGroup <https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ConnectionGroup.html>`_ . If you want CloudFront to respond to IPv6 DNS requests with an IPv6 address for your distribution, specify ``true`` . If you specify ``false`` , CloudFront responds to IPv6 DNS requests with the DNS response code ``NOERROR`` and with no IP addresses. This allows viewers to submit a second request, for an IPv4 address for your distribution. In general, you should enable IPv6 if you have users on IPv6 networks who want to access your content. However, if you're using signed URLs or signed cookies to restrict access to your content, and if you're using a custom policy that includes the ``IpAddress`` parameter to restrict the IP addresses that can access your content, don't enable IPv6. If you want to restrict access to some content by IP address and not restrict access to other content (or restrict access but not by IP address), you can create two distributions. For more information, see `Creating a Signed URL Using a Custom Policy <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-creating-signed-url-custom-policy.html>`_ in the *Amazon CloudFront Developer Guide* . If you're using an Amazon Route 53 AWS Integration alias resource record set to route traffic to your CloudFront distribution, you need to create a second alias resource record set when both of the following are true: - You enable IPv6 for the distribution - You're using alternate domain names in the URLs for your objects For more information, see `Routing Traffic to an Amazon CloudFront Web Distribution by Using Your Domain Name <https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-to-cloudfront-distribution.html>`_ in the *Amazon Route 53 AWS Integration Developer Guide* . If you created a CNAME resource record set, either with Amazon Route 53 AWS Integration or with another DNS service, you don't need to make any changes. A CNAME record will route traffic to your distribution regardless of the IP address format of the viewer request.
+            :param logging: A complex type that controls whether access logs are written for the distribution. For more information about logging, see `Access Logs <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/AccessLogs.html>`_ in the *Amazon CloudFront Developer Guide* .
+            :param origin_groups: A complex type that contains information about origin groups for this distribution. Specify a value for either the ``Origins`` or ``OriginGroups`` property.
+            :param origins: A complex type that contains information about origins for this distribution. Specify a value for either the ``Origins`` or ``OriginGroups`` property.
+            :param price_class: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . The price class that corresponds with the maximum price that you want to pay for CloudFront service. If you specify ``PriceClass_All`` , CloudFront responds to requests for your objects from all CloudFront edge locations. If you specify a price class other than ``PriceClass_All`` , CloudFront serves your objects from the CloudFront edge location that has the lowest latency among the edge locations in your price class. Viewers who are in or near regions that are excluded from your specified price class may encounter slower performance. For more information about price classes, see `Choosing the Price Class for a CloudFront Distribution <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/PriceClass.html>`_ in the *Amazon CloudFront Developer Guide* . For information about CloudFront pricing, including how price classes (such as Price Class 100) map to CloudFront regions, see `Amazon CloudFront Pricing <https://docs.aws.amazon.com/cloudfront/pricing/>`_ . Default: - "PriceClass_All"
+            :param restrictions: A complex type that identifies ways in which you want to restrict distribution of your content.
+            :param s3_origin: The origin as an Amazon S3 bucket. .. epigraph:: This property is legacy. We recommend that you use `Origin <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html>`_ instead.
+            :param staging: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . A Boolean that indicates whether this is a staging distribution. When this value is ``true`` , this is a staging distribution. When this value is ``false`` , this is not a staging distribution.
+            :param tenant_config: .. epigraph:: This field only supports multi-tenant distributions. You can't specify this field for standard distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . A distribution tenant configuration.
+            :param viewer_certificate: A complex type that determines the distribution's SSL/TLS configuration for communicating with viewers.
+            :param web_acl_id: .. epigraph:: Multi-tenant distributions only support AWS WAF V2 web ACLs. A unique identifier that specifies the AWS WAF web ACL, if any, to associate with this distribution. To specify a web ACL created using the latest version of AWS WAF , use the ACL ARN, for example ``arn:aws:wafv2:us-east-1:123456789012:global/webacl/ExampleWebACL/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111`` . To specify a web ACL created using AWS WAF Classic, use the ACL ID, for example ``a1b2c3d4-5678-90ab-cdef-EXAMPLE11111`` . AWS WAF is a web application firewall that lets you monitor the HTTP and HTTPS requests that are forwarded to CloudFront, and lets you control access to your content. Based on conditions that you specify, such as the IP addresses that requests originate from or the values of query strings, CloudFront responds to requests either with the requested content or with an HTTP 403 status code (Forbidden). You can also configure CloudFront to return a custom error page when a request is blocked. For more information about AWS WAF , see the `AWS WAF Developer Guide <https://docs.aws.amazon.com/waf/latest/developerguide/what-is-aws-waf.html>`_ . Default: - ""
+
+            :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html
+            :exampleMetadata: infused
+
+            Example::
+
+                # Create the simple Origin
+                my_bucket = s3.Bucket(self, "myBucket")
+                s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+                    origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+                )
                 
-                            # the properties below are optional
-                            locations=["locations"]
-                        )
+                # Create the Distribution construct
+                my_multi_tenant_distribution = cloudfront.Distribution(self, "cf-hosted-distribution",
+                    default_behavior=cloudfront.BehaviorOptions(
+                        origin=s3_origin
                     ),
-                    s3_origin=cloudfront.CfnDistribution.LegacyS3OriginProperty(
-                        dns_name="dnsName",
+                    default_root_object="index.html"
+                )
                 
-                        # the properties below are optional
-                        origin_access_identity="originAccessIdentity"
-                    ),
-                    staging=False,
+                # Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+                cfn_distribution = my_multi_tenant_distribution.node.default_child
+                
+                default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+                    target_origin_id=my_bucket.bucket_arn,
+                    viewer_protocol_policy="allow-all",
+                    compress=False,
+                    allowed_methods=["GET", "HEAD"],
+                    cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+                )
+                # Create the updated distributionConfig
+                distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+                    default_cache_behavior=default_cache_behavior,
+                    enabled=True,
+                    # the properties below are optional
+                    connection_mode="tenant-only",
+                    origins=[cloudfront.CfnDistribution.OriginProperty(
+                        id=my_bucket.bucket_arn,
+                        domain_name=my_bucket.bucket_domain_name,
+                        s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+                        origin_path="/{{tenantName}}"
+                    )
+                    ],
                     tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
                         parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
                             definition=cloudfront.CfnDistribution.DefinitionProperty(
                                 string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
                                     required=False,
-                
                                     # the properties below are optional
-                                    comment="comment",
-                                    default_value="defaultValue"
+                                    comment="tenantName",
+                                    default_value="root"
                                 )
                             ),
-                            name="name"
-                        )]
-                    ),
-                    viewer_certificate=cloudfront.CfnDistribution.ViewerCertificateProperty(
-                        acm_certificate_arn="acmCertificateArn",
-                        cloud_front_default_certificate=False,
-                        iam_certificate_id="iamCertificateId",
-                        minimum_protocol_version="minimumProtocolVersion",
-                        ssl_support_method="sslSupportMethod"
-                    ),
-                    web_acl_id="webAclId"
+                            name="tenantName"
+                        )
+                        ]
+                    )
+                )
+                
+                # Override the distribution configuration to enable multi-tenancy.
+                cfn_distribution.distribution_config = distribution_config
+                
+                # Create a connection group so we have access to the RoutingEndpoint associated with the tenant we are about to create
+                connection_group = cloudfront.CfnConnectionGroup(self, "self-hosted-connection-group",
+                    enabled=True,
+                    ipv6_enabled=True,
+                    name="self-hosted-connection-group"
+                )
+                
+                # Export the RoutingEndpoint, skip this step if you'd prefer to fetch it from the CloudFront console or via Cloudfront.ListConnectionGroups API
+                CfnOutput(self, "RoutingEndpoint",
+                    value=connection_group.attr_routing_endpoint,
+                    description="CloudFront Routing Endpoint to be added to my hosted zone CNAME records"
+                )
+                
+                # Create a distribution tenant with a self-hosted domain.
+                self_hosted_tenant = cloudfront.CfnDistributionTenant(self, "self-hosted-tenant",
+                    distribution_id=my_multi_tenant_distribution.distribution_id,
+                    connection_group_id=connection_group.attr_id,
+                    name="self-hosted-tenant",
+                    domains=["self-hosted-tenant.my.domain.com"],
+                    enabled=True,
+                    managed_certificate_request=cloudfront.CfnDistributionTenant.ManagedCertificateRequestProperty(
+                        primary_domain_name="self-hosted-tenant.my.domain.com",
+                        validation_token_host="self-hosted"
+                    )
                 )
             '''
             if __debug__:
@@ -7727,7 +8226,13 @@ class CfnDistribution(
 
         @builtins.property
         def aliases(self) -> typing.Optional[typing.List[builtins.str]]:
-            '''A complex type that contains information about CNAMEs (alternate domain names), if any, for this distribution.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
+
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            A complex type that contains information about CNAMEs (alternate domain names), if any, for this distribution.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-aliases
             '''
@@ -7736,7 +8241,13 @@ class CfnDistribution(
 
         @builtins.property
         def anycast_ip_list_id(self) -> typing.Optional[builtins.str]:
-            '''ID of the Anycast static IP list that is associated with the distribution.
+            '''.. epigraph::
+
+   To use this field for a multi-tenant distribution, use a connection group instead.
+
+            For more information, see `ConnectionGroup <https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ConnectionGroup.html>`_ .
+
+            ID of the Anycast static IP list that is associated with the distribution.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-anycastiplistid
             '''
@@ -7782,7 +8293,7 @@ class CfnDistribution(
 
         @builtins.property
         def connection_mode(self) -> typing.Optional[builtins.str]:
-            '''The connection mode to filter distributions by.
+            '''This field specifies whether the connection mode is through a standard distribution (direct) or a multi-tenant distribution with distribution tenants(tenant-only).
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-connectionmode
             '''
@@ -7791,9 +8302,13 @@ class CfnDistribution(
 
         @builtins.property
         def continuous_deployment_policy_id(self) -> typing.Optional[builtins.str]:
-            '''The identifier of a continuous deployment policy.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
 
-            For more information, see ``CreateContinuousDeploymentPolicy`` .
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            The identifier of a continuous deployment policy. For more information, see ``CreateContinuousDeploymentPolicy`` .
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-continuousdeploymentpolicyid
             '''
@@ -7875,9 +8390,13 @@ class CfnDistribution(
         def ipv6_enabled(
             self,
         ) -> typing.Optional[typing.Union[builtins.bool, _IResolvable_da3f097b]]:
-            '''If you want CloudFront to respond to IPv6 DNS requests with an IPv6 address for your distribution, specify ``true`` .
+            '''.. epigraph::
+
+   To use this field for a multi-tenant distribution, use a connection group instead.
+
+            For more information, see `ConnectionGroup <https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ConnectionGroup.html>`_ .
 
-            If you specify ``false`` , CloudFront responds to IPv6 DNS requests with the DNS response code ``NOERROR`` and with no IP addresses. This allows viewers to submit a second request, for an IPv4 address for your distribution.
+            If you want CloudFront to respond to IPv6 DNS requests with an IPv6 address for your distribution, specify ``true`` . If you specify ``false`` , CloudFront responds to IPv6 DNS requests with the DNS response code ``NOERROR`` and with no IP addresses. This allows viewers to submit a second request, for an IPv4 address for your distribution.
 
             In general, you should enable IPv6 if you have users on IPv6 networks who want to access your content. However, if you're using signed URLs or signed cookies to restrict access to your content, and if you're using a custom policy that includes the ``IpAddress`` parameter to restrict the IP addresses that can access your content, don't enable IPv6. If you want to restrict access to some content by IP address and not restrict access to other content (or restrict access but not by IP address), you can create two distributions. For more information, see `Creating a Signed URL Using a Custom Policy <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-creating-signed-url-custom-policy.html>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -7936,9 +8455,13 @@ class CfnDistribution(
 
         @builtins.property
         def price_class(self) -> typing.Optional[builtins.str]:
-            '''The price class that corresponds with the maximum price that you want to pay for CloudFront service.
+            '''.. epigraph::
+
+   This field only supports standard distributions.
 
-            If you specify ``PriceClass_All`` , CloudFront responds to requests for your objects from all CloudFront edge locations.
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            The price class that corresponds with the maximum price that you want to pay for CloudFront service. If you specify ``PriceClass_All`` , CloudFront responds to requests for your objects from all CloudFront edge locations.
 
             If you specify a price class other than ``PriceClass_All`` , CloudFront serves your objects from the CloudFront edge location that has the lowest latency among the edge locations in your price class. Viewers who are in or near regions that are excluded from your specified price class may encounter slower performance.
 
@@ -7981,9 +8504,13 @@ class CfnDistribution(
         def staging(
             self,
         ) -> typing.Optional[typing.Union[builtins.bool, _IResolvable_da3f097b]]:
-            '''A Boolean that indicates whether this is a staging distribution.
+            '''.. epigraph::
 
-            When this value is ``true`` , this is a staging distribution. When this value is ``false`` , this is not a staging distribution.
+   This field only supports standard distributions.
+
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            A Boolean that indicates whether this is a staging distribution. When this value is ``true`` , this is a staging distribution. When this value is ``false`` , this is not a staging distribution.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-staging
             '''
@@ -7994,7 +8521,13 @@ class CfnDistribution(
         def tenant_config(
             self,
         ) -> typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnDistribution.TenantConfigProperty"]]:
-            '''A distribution tenant configuration.
+            '''.. epigraph::
+
+   This field only supports multi-tenant distributions.
+
+            You can't specify this field for standard distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            A distribution tenant configuration.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-tenantconfig
             '''
@@ -8014,9 +8547,11 @@ class CfnDistribution(
 
         @builtins.property
         def web_acl_id(self) -> typing.Optional[builtins.str]:
-            '''A unique identifier that specifies the AWS WAF web ACL, if any, to associate with this distribution.
+            '''.. epigraph::
+
+   Multi-tenant distributions only support AWS WAF V2 web ACLs.
 
-            To specify a web ACL created using the latest version of AWS WAF , use the ACL ARN, for example ``arn:aws:wafv2:us-east-1:123456789012:global/webacl/ExampleWebACL/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111`` . To specify a web ACL created using AWS WAF Classic, use the ACL ID, for example ``a1b2c3d4-5678-90ab-cdef-EXAMPLE11111`` .
+            A unique identifier that specifies the AWS WAF web ACL, if any, to associate with this distribution. To specify a web ACL created using the latest version of AWS WAF , use the ACL ARN, for example ``arn:aws:wafv2:us-east-1:123456789012:global/webacl/ExampleWebACL/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111`` . To specify a web ACL created using AWS WAF Classic, use the ACL ID, for example ``a1b2c3d4-5678-90ab-cdef-EXAMPLE11111`` .
 
             AWS WAF is a web application firewall that lets you monitor the HTTP and HTTPS requests that are forwarded to CloudFront, and lets you control access to your content. Based on conditions that you specify, such as the IP addresses that requests originate from or the values of query strings, CloudFront responds to requests either with the requested content or with an HTTP 403 status code (Forbidden). You can also configure CloudFront to return a custom error page when a request is blocked. For more information about AWS WAF , see the `AWS WAF Developer Guide <https://docs.aws.amazon.com/waf/latest/developerguide/what-is-aws-waf.html>`_ .
 
@@ -8057,9 +8592,13 @@ class CfnDistribution(
             headers: typing.Optional[typing.Sequence[builtins.str]] = None,
             query_string_cache_keys: typing.Optional[typing.Sequence[builtins.str]] = None,
         ) -> None:
-            '''This field is deprecated.
+            '''.. epigraph::
 
-            We recommend that you use a cache policy or an origin request policy instead of this field.
+   This field only supports standard distributions.
+
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            This field is deprecated. We recommend that you use a cache policy or an origin request policy instead of this field.
 
             If you want to include values in the cache key, use a cache policy. For more information, see `Creating cache policies <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html#cache-key-create-cache-policy>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -10141,7 +10680,13 @@ class CfnDistribution(
             *,
             parameter_definitions: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Sequence[typing.Union[_IResolvable_da3f097b, typing.Union["CfnDistribution.ParameterDefinitionProperty", typing.Dict[builtins.str, typing.Any]]]]]] = None,
         ) -> None:
-            '''The configuration for a distribution tenant.
+            '''.. epigraph::
+
+   This field only supports multi-tenant distributions.
+
+            You can't specify this field for standard distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* .
+
+            The configuration for a distribution tenant.
 
             :param parameter_definitions: The parameters that you specify for a distribution tenant.
 
@@ -10239,7 +10784,7 @@ class CfnDistribution(
 
             :param acm_certificate_arn: .. epigraph:: In CloudFormation, this field name is ``AcmCertificateArn`` . Note the different capitalization. If the distribution uses ``Aliases`` (alternate domain names or CNAMEs) and the SSL/TLS certificate is stored in `AWS Certificate Manager (ACM) <https://docs.aws.amazon.com/acm/latest/userguide/acm-overview.html>`_ , provide the Amazon Resource Name (ARN) of the ACM certificate. CloudFront only supports ACM certificates in the US East (N. Virginia) Region ( ``us-east-1`` ). If you specify an ACM certificate ARN, you must also specify values for ``MinimumProtocolVersion`` and ``SSLSupportMethod`` . (In CloudFormation, the field name is ``SslSupportMethod`` . Note the different capitalization.)
             :param cloud_front_default_certificate: If the distribution uses the CloudFront domain name such as ``d111111abcdef8.cloudfront.net`` , set this field to ``true`` . If the distribution uses ``Aliases`` (alternate domain names or CNAMEs), omit this field and specify values for the following fields: - ``AcmCertificateArn`` or ``IamCertificateId`` (specify a value for one, not both) - ``MinimumProtocolVersion`` - ``SslSupportMethod``
-            :param iam_certificate_id: .. epigraph:: In CloudFormation, this field name is ``IamCertificateId`` . Note the different capitalization. If the distribution uses ``Aliases`` (alternate domain names or CNAMEs) and the SSL/TLS certificate is stored in `AWS Identity and Access Management (IAM) <https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html>`_ , provide the ID of the IAM certificate. If you specify an IAM certificate ID, you must also specify values for ``MinimumProtocolVersion`` and ``SSLSupportMethod`` . (In CloudFormation, the field name is ``SslSupportMethod`` . Note the different capitalization.)
+            :param iam_certificate_id: .. epigraph:: This field only supports standard distributions. You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . > In CloudFormation, this field name is ``IamCertificateId`` . Note the different capitalization. If the distribution uses ``Aliases`` (alternate domain names or CNAMEs) and the SSL/TLS certificate is stored in `AWS Identity and Access Management (IAM) <https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html>`_ , provide the ID of the IAM certificate. If you specify an IAM certificate ID, you must also specify values for ``MinimumProtocolVersion`` and ``SSLSupportMethod`` . (In CloudFormation, the field name is ``SslSupportMethod`` . Note the different capitalization.)
             :param minimum_protocol_version: If the distribution uses ``Aliases`` (alternate domain names or CNAMEs), specify the security policy that you want CloudFront to use for HTTPS connections with viewers. The security policy determines two settings: - The minimum SSL/TLS protocol that CloudFront can use to communicate with viewers. - The ciphers that CloudFront can use to encrypt the content that it returns to viewers. For more information, see `Security Policy <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValues-security-policy>`_ and `Supported Protocols and Ciphers Between Viewers and CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/secure-connections-supported-viewer-protocols-ciphers.html#secure-connections-supported-ciphers>`_ in the *Amazon CloudFront Developer Guide* . .. epigraph:: On the CloudFront console, this setting is called *Security Policy* . When you're using SNI only (you set ``SSLSupportMethod`` to ``sni-only`` ), you must specify ``TLSv1`` or higher. (In CloudFormation, the field name is ``SslSupportMethod`` . Note the different capitalization.) If the distribution uses the CloudFront domain name such as ``d111111abcdef8.cloudfront.net`` (you set ``CloudFrontDefaultCertificate`` to ``true`` ), CloudFront automatically sets the security policy to ``TLSv1`` regardless of the value that you set here.
             :param ssl_support_method: .. epigraph:: In CloudFormation, this field name is ``SslSupportMethod`` . Note the different capitalization. If the distribution uses ``Aliases`` (alternate domain names or CNAMEs), specify which viewers the distribution accepts HTTPS connections from. - ``sni-only`` – The distribution accepts HTTPS connections from only viewers that support `server name indication (SNI) <https://docs.aws.amazon.com/https://en.wikipedia.org/wiki/Server_Name_Indication>`_ . This is recommended. Most browsers and clients support SNI. - ``vip`` – The distribution accepts HTTPS connections from all viewers including those that don't support SNI. This is not recommended, and results in additional monthly charges from CloudFront. - ``static-ip`` - Do not specify this value unless your distribution has been enabled for this feature by the CloudFront team. If you have a use case that requires static IP addresses for a distribution, contact CloudFront through the `Support Center <https://docs.aws.amazon.com/support/home>`_ . If the distribution uses the CloudFront domain name such as ``d111111abcdef8.cloudfront.net`` , don't set a value for this field.
 
@@ -10315,7 +10860,9 @@ class CfnDistribution(
         def iam_certificate_id(self) -> typing.Optional[builtins.str]:
             '''.. epigraph::
 
-   In CloudFormation, this field name is ``IamCertificateId`` . Note the different capitalization.
+   This field only supports standard distributions.
+
+            You can't specify this field for multi-tenant distributions. For more information, see `Unsupported features for SaaS Manager for Amazon CloudFront <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-config-options.html#unsupported-saas>`_ in the *Amazon CloudFront Developer Guide* . > In CloudFormation, this field name is ``IamCertificateId`` . Note the different capitalization.
 
             If the distribution uses ``Aliases`` (alternate domain names or CNAMEs) and the SSL/TLS certificate is stored in `AWS Identity and Access Management (IAM) <https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html>`_ , provide the ID of the IAM certificate.
 
@@ -10399,8 +10946,8 @@ class CfnDistribution(
             '''An Amazon CloudFront VPC origin configuration.
 
             :param vpc_origin_id: The VPC origin ID.
-            :param origin_keepalive_timeout: 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. For more information, see `Keep-alive timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginKeepaliveTimeout>`_ in the *Amazon CloudFront Developer Guide* . Default: - 5
-            :param origin_read_timeout: 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. For more information, see `Response timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginResponseTimeout>`_ in the *Amazon CloudFront Developer Guide* . Default: - 30
+            :param origin_keepalive_timeout: Specifies how long, in seconds, CloudFront persists its connection to the origin. The minimum timeout is 1 second, the maximum is 120 seconds, and the default (if you don't specify otherwise) is 5 seconds. For more information, see `Keep-alive timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginKeepaliveTimeout>`_ in the *Amazon CloudFront Developer Guide* . Default: - 5
+            :param origin_read_timeout: 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 120 seconds, and the default (if you don't specify otherwise) is 30 seconds. For more information, see `Response timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginResponseTimeout>`_ in the *Amazon CloudFront Developer Guide* . Default: - 30
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-vpcoriginconfig.html
             :exampleMetadata: fixture=_generated
@@ -10446,7 +10993,7 @@ class CfnDistribution(
         def origin_keepalive_timeout(self) -> typing.Optional[jsii.Number]:
             '''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.
+            The minimum timeout is 1 second, the maximum is 120 seconds, and the default (if you don't specify otherwise) is 5 seconds.
 
             For more information, see `Keep-alive timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginKeepaliveTimeout>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -10461,7 +11008,7 @@ class CfnDistribution(
         def origin_read_timeout(self) -> typing.Optional[jsii.Number]:
             '''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.
+            This is also known as the *origin response timeout* . The minimum timeout is 1 second, the maximum is 120 seconds, and the default (if you don't specify otherwise) is 30 seconds.
 
             For more information, see `Response timeout (custom origins only) <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginResponseTimeout>`_ in the *Amazon CloudFront Developer Guide* .
 
@@ -10800,48 +11347,90 @@ class CfnDistributionTenant(
 
     :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distributiontenant.html
     :cloudformationResource: AWS::CloudFront::DistributionTenant
-    :exampleMetadata: fixture=_generated
+    :exampleMetadata: infused
 
     Example::
 
-        # The code below shows an example of how to instantiate this type.
-        # The values are placeholders you should change.
-        from aws_cdk import aws_cloudfront as cloudfront
+        # Create the simple Origin
+        my_bucket = s3.Bucket(self, "myBucket")
+        s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+            origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+        )
         
-        cfn_distribution_tenant = cloudfront.CfnDistributionTenant(self, "MyCfnDistributionTenant",
-            distribution_id="distributionId",
-            domains=["domains"],
-            name="name",
+        # Create the Distribution construct
+        my_multi_tenant_distribution = cloudfront.Distribution(self, "cf-hosted-distribution",
+            default_behavior=cloudfront.BehaviorOptions(
+                origin=s3_origin
+            ),
+            default_root_object="index.html"
+        )
         
+        # Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+        cfn_distribution = my_multi_tenant_distribution.node.default_child
+        
+        default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+            target_origin_id=my_bucket.bucket_arn,
+            viewer_protocol_policy="allow-all",
+            compress=False,
+            allowed_methods=["GET", "HEAD"],
+            cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+        )
+        # Create the updated distributionConfig
+        distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+            default_cache_behavior=default_cache_behavior,
+            enabled=True,
             # the properties below are optional
-            connection_group_id="connectionGroupId",
-            customizations=cloudfront.CfnDistributionTenant.CustomizationsProperty(
-                certificate=cloudfront.CfnDistributionTenant.CertificateProperty(
-                    arn="arn"
-                ),
-                geo_restrictions=cloudfront.CfnDistributionTenant.GeoRestrictionCustomizationProperty(
-                    locations=["locations"],
-                    restriction_type="restrictionType"
-                ),
-                web_acl=cloudfront.CfnDistributionTenant.WebAclCustomizationProperty(
-                    action="action",
-                    arn="arn"
+            connection_mode="tenant-only",
+            origins=[cloudfront.CfnDistribution.OriginProperty(
+                id=my_bucket.bucket_arn,
+                domain_name=my_bucket.bucket_domain_name,
+                s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+                origin_path="/{{tenantName}}"
+            )
+            ],
+            tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+                parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+                    definition=cloudfront.CfnDistribution.DefinitionProperty(
+                        string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                            required=False,
+                            # the properties below are optional
+                            comment="tenantName",
+                            default_value="root"
+                        )
+                    ),
+                    name="tenantName"
                 )
-            ),
-            enabled=False,
+                ]
+            )
+        )
+        
+        # Override the distribution configuration to enable multi-tenancy.
+        cfn_distribution.distribution_config = distribution_config
+        
+        # Create a connection group so we have access to the RoutingEndpoint associated with the tenant we are about to create
+        connection_group = cloudfront.CfnConnectionGroup(self, "self-hosted-connection-group",
+            enabled=True,
+            ipv6_enabled=True,
+            name="self-hosted-connection-group"
+        )
+        
+        # Export the RoutingEndpoint, skip this step if you'd prefer to fetch it from the CloudFront console or via Cloudfront.ListConnectionGroups API
+        CfnOutput(self, "RoutingEndpoint",
+            value=connection_group.attr_routing_endpoint,
+            description="CloudFront Routing Endpoint to be added to my hosted zone CNAME records"
+        )
+        
+        # Create a distribution tenant with a self-hosted domain.
+        self_hosted_tenant = cloudfront.CfnDistributionTenant(self, "self-hosted-tenant",
+            distribution_id=my_multi_tenant_distribution.distribution_id,
+            connection_group_id=connection_group.attr_id,
+            name="self-hosted-tenant",
+            domains=["self-hosted-tenant.my.domain.com"],
+            enabled=True,
             managed_certificate_request=cloudfront.CfnDistributionTenant.ManagedCertificateRequestProperty(
-                certificate_transparency_logging_preference="certificateTransparencyLoggingPreference",
-                primary_domain_name="primaryDomainName",
-                validation_token_host="validationTokenHost"
-            ),
-            parameters=[cloudfront.CfnDistributionTenant.ParameterProperty(
-                name="name",
-                value="value"
-            )],
-            tags=[CfnTag(
-                key="key",
-                value="value"
-            )]
+                primary_domain_name="self-hosted-tenant.my.domain.com",
+                validation_token_host="self-hosted"
+            )
         )
     '''
 
@@ -11714,48 +12303,90 @@ class CfnDistributionTenantProps:
         :param tags: A complex type that contains zero or more ``Tag`` elements.
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distributiontenant.html
-        :exampleMetadata: fixture=_generated
+        :exampleMetadata: infused
 
         Example::
 
-            # The code below shows an example of how to instantiate this type.
-            # The values are placeholders you should change.
-            from aws_cdk import aws_cloudfront as cloudfront
+            # Create the simple Origin
+            my_bucket = s3.Bucket(self, "myBucket")
+            s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+                origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+            )
             
-            cfn_distribution_tenant_props = cloudfront.CfnDistributionTenantProps(
-                distribution_id="distributionId",
-                domains=["domains"],
-                name="name",
+            # Create the Distribution construct
+            my_multi_tenant_distribution = cloudfront.Distribution(self, "cf-hosted-distribution",
+                default_behavior=cloudfront.BehaviorOptions(
+                    origin=s3_origin
+                ),
+                default_root_object="index.html"
+            )
+            
+            # Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+            cfn_distribution = my_multi_tenant_distribution.node.default_child
             
+            default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+                target_origin_id=my_bucket.bucket_arn,
+                viewer_protocol_policy="allow-all",
+                compress=False,
+                allowed_methods=["GET", "HEAD"],
+                cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+            )
+            # Create the updated distributionConfig
+            distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+                default_cache_behavior=default_cache_behavior,
+                enabled=True,
                 # the properties below are optional
-                connection_group_id="connectionGroupId",
-                customizations=cloudfront.CfnDistributionTenant.CustomizationsProperty(
-                    certificate=cloudfront.CfnDistributionTenant.CertificateProperty(
-                        arn="arn"
-                    ),
-                    geo_restrictions=cloudfront.CfnDistributionTenant.GeoRestrictionCustomizationProperty(
-                        locations=["locations"],
-                        restriction_type="restrictionType"
-                    ),
-                    web_acl=cloudfront.CfnDistributionTenant.WebAclCustomizationProperty(
-                        action="action",
-                        arn="arn"
+                connection_mode="tenant-only",
+                origins=[cloudfront.CfnDistribution.OriginProperty(
+                    id=my_bucket.bucket_arn,
+                    domain_name=my_bucket.bucket_domain_name,
+                    s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+                    origin_path="/{{tenantName}}"
+                )
+                ],
+                tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+                    parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+                        definition=cloudfront.CfnDistribution.DefinitionProperty(
+                            string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                                required=False,
+                                # the properties below are optional
+                                comment="tenantName",
+                                default_value="root"
+                            )
+                        ),
+                        name="tenantName"
                     )
-                ),
-                enabled=False,
+                    ]
+                )
+            )
+            
+            # Override the distribution configuration to enable multi-tenancy.
+            cfn_distribution.distribution_config = distribution_config
+            
+            # Create a connection group so we have access to the RoutingEndpoint associated with the tenant we are about to create
+            connection_group = cloudfront.CfnConnectionGroup(self, "self-hosted-connection-group",
+                enabled=True,
+                ipv6_enabled=True,
+                name="self-hosted-connection-group"
+            )
+            
+            # Export the RoutingEndpoint, skip this step if you'd prefer to fetch it from the CloudFront console or via Cloudfront.ListConnectionGroups API
+            CfnOutput(self, "RoutingEndpoint",
+                value=connection_group.attr_routing_endpoint,
+                description="CloudFront Routing Endpoint to be added to my hosted zone CNAME records"
+            )
+            
+            # Create a distribution tenant with a self-hosted domain.
+            self_hosted_tenant = cloudfront.CfnDistributionTenant(self, "self-hosted-tenant",
+                distribution_id=my_multi_tenant_distribution.distribution_id,
+                connection_group_id=connection_group.attr_id,
+                name="self-hosted-tenant",
+                domains=["self-hosted-tenant.my.domain.com"],
+                enabled=True,
                 managed_certificate_request=cloudfront.CfnDistributionTenant.ManagedCertificateRequestProperty(
-                    certificate_transparency_logging_preference="certificateTransparencyLoggingPreference",
-                    primary_domain_name="primaryDomainName",
-                    validation_token_host="validationTokenHost"
-                ),
-                parameters=[cloudfront.CfnDistributionTenant.ParameterProperty(
-                    name="name",
-                    value="value"
-                )],
-                tags=[CfnTag(
-                    key="key",
-                    value="value"
-                )]
+                    primary_domain_name="self-hosted-tenant.my.domain.com",
+                    validation_token_host="self-hosted"
+                )
             )
         '''
         if __debug__:
@@ -18999,17 +19630,20 @@ class DistributionProps:
 
         Example::
 
-            # Creates a distribution from an Application Load Balancer
-            # vpc: ec2.Vpc
-            
-            # Create an application load balancer in a VPC. 'internetFacing' can be 'false'.
-            alb = elbv2.ApplicationLoadBalancer(self, "ALB",
-                vpc=vpc,
-                internet_facing=False,
-                vpc_subnets=ec2.SubnetSelection(subnet_type=ec2.SubnetType.PRIVATE_ISOLATED)
+            # s3_bucket: s3.Bucket
+            # Add a cloudfront Function to a Distribution
+            cf_function = cloudfront.Function(self, "Function",
+                code=cloudfront.FunctionCode.from_inline("function handler(event) { return event.request }"),
+                runtime=cloudfront.FunctionRuntime.JS_2_0
             )
-            cloudfront.Distribution(self, "myDist",
-                default_behavior=cloudfront.BehaviorOptions(origin=origins.VpcOrigin.with_application_load_balancer(alb))
+            cloudfront.Distribution(self, "distro",
+                default_behavior=cloudfront.BehaviorOptions(
+                    origin=origins.S3Origin(s3_bucket),
+                    function_associations=[cloudfront.FunctionAssociation(
+                        function=cf_function,
+                        event_type=cloudfront.FunctionEventType.VIEWER_REQUEST
+                    )]
+                )
             )
         '''
         if isinstance(default_behavior, dict):
@@ -27269,13 +27903,76 @@ class CachePolicy(
 
     Example::
 
-        # Using an existing cache policy for a Distribution
-        # bucket_origin: origins.S3Origin
+        # Create the simple Origin
+        my_bucket = s3.Bucket(self, "myBucket")
+        s3_origin = origins.S3BucketOrigin.with_origin_access_control(my_bucket,
+            origin_access_levels=[cloudfront.AccessLevel.READ, cloudfront.AccessLevel.LIST]
+        )
         
-        cloudfront.Distribution(self, "myDistManagedPolicy",
+        # Create the Distribution construct
+        my_multi_tenant_distribution = cloudfront.Distribution(self, "distribution",
             default_behavior=cloudfront.BehaviorOptions(
-                origin=bucket_origin,
-                cache_policy=cloudfront.CachePolicy.CACHING_OPTIMIZED
+                origin=s3_origin
+            ),
+            default_root_object="index.html"
+        )
+        
+        # Access the underlying L1 CfnDistribution to configure SaaS Manager properties which are not yet available in the L2 Distribution construct
+        cfn_distribution = my_multi_tenant_distribution.node.default_child
+        
+        default_cache_behavior = cloudfront.CfnDistribution.DefaultCacheBehaviorProperty(
+            target_origin_id=my_bucket.bucket_arn,
+            viewer_protocol_policy="allow-all",
+            compress=False,
+            allowed_methods=["GET", "HEAD"],
+            cache_policy_id=cloudfront.CachePolicy.CACHING_OPTIMIZED.cache_policy_id
+        )
+        # Create the updated distributionConfig
+        distribution_config = cloudfront.CfnDistribution.DistributionConfigProperty(
+            default_cache_behavior=default_cache_behavior,
+            enabled=True,
+            # the properties below are optional
+            connection_mode="tenant-only",
+            origins=[cloudfront.CfnDistribution.OriginProperty(
+                id=my_bucket.bucket_arn,
+                domain_name=my_bucket.bucket_domain_name,
+                s3_origin_config=cloudfront.CfnDistribution.S3OriginConfigProperty(),
+                origin_path="/{{tenantName}}"
+            )
+            ],
+            tenant_config=cloudfront.CfnDistribution.TenantConfigProperty(
+                parameter_definitions=[cloudfront.CfnDistribution.ParameterDefinitionProperty(
+                    definition=cloudfront.CfnDistribution.DefinitionProperty(
+                        string_schema=cloudfront.CfnDistribution.StringSchemaProperty(
+                            required=False,
+                            # the properties below are optional
+                            comment="tenantName",
+                            default_value="root"
+                        )
+                    ),
+                    name="tenantName"
+                )
+                ]
+            )
+        )
+        
+        # Override the distribution configuration to enable multi-tenancy.
+        cfn_distribution.distribution_config = distribution_config
+        
+        # Create a distribution tenant using an existing ACM certificate
+        cfn_distribution_tenant = cloudfront.CfnDistributionTenant(self, "distribution-tenant",
+            distribution_id=my_multi_tenant_distribution.distribution_id,
+            domains=["my-tenant.my.domain.com"],
+            name="my-tenant",
+            enabled=True,
+            parameters=[cloudfront.CfnDistributionTenant.ParameterProperty(
+                name="tenantName",
+                value="app"
+            )],
+            customizations=cloudfront.CfnDistributionTenant.CustomizationsProperty(
+                certificate=cloudfront.CfnDistributionTenant.CertificateProperty(
+                    arn="REPLACE_WITH_ARN"
+                )
             )
         )
     '''
@@ -27656,20 +28353,19 @@ class Distribution(
 
     Example::
 
-        # Adding an existing Lambda@Edge function created in a different stack
-        # to a CloudFront distribution.
         # s3_bucket: s3.Bucket
-        
-        function_version = lambda_.Version.from_version_arn(self, "Version", "arn:aws:lambda:us-east-1:123456789012:function:functionName:1")
-        
+        # Add a cloudfront Function to a Distribution
+        cf_function = cloudfront.Function(self, "Function",
+            code=cloudfront.FunctionCode.from_inline("function handler(event) { return event.request }"),
+            runtime=cloudfront.FunctionRuntime.JS_2_0
+        )
         cloudfront.Distribution(self, "distro",
             default_behavior=cloudfront.BehaviorOptions(
                 origin=origins.S3Origin(s3_bucket),
-                edge_lambdas=[cloudfront.EdgeLambda(
-                    function_version=function_version,
-                    event_type=cloudfront.LambdaEdgeEventType.VIEWER_REQUEST
-                )
-                ]
+                function_associations=[cloudfront.FunctionAssociation(
+                    function=cf_function,
+                    event_type=cloudfront.FunctionEventType.VIEWER_REQUEST
+                )]
             )
         )
     '''