aws-cdk-lib 2.141.0__py3-none-any.whl → 2.142.1__py3-none-any.whl

aws_cdk/aws_autoscaling/__init__.py

@@ -24,7 +24,8 @@ autoscaling.AutoScalingGroup(self, "ASG",
 Creating an `AutoScalingGroup` from a Launch Configuration has been deprecated. All new accounts created after December 31, 2023 will no longer be able to create Launch Configurations. With the `@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig` feature flag set to true, `AutoScalingGroup` properties used to create a Launch Configuration will now be used to create a `LaunchTemplate` using a [Launch Configuration to `LaunchTemplate` mapping](https://docs.aws.amazon.com/autoscaling/ec2/userguide/migrate-launch-configurations-with-cloudformation.html#launch-configuration-mapping-reference). Specifically, the following `AutoScalingGroup` properties will be used to generate a `LaunchTemplate`:
 
 * machineImage
-* keyName
+* keyName (deprecated, prefer keyPair)
+* keyPair
 * instanceType
 * instanceMonitoring
 * securityGroup
@@ -753,6 +754,31 @@ autoscaling.AutoScalingGroup(self, "ASG",
 )
 ```
 
+## Configuring KeyPair for instances
+
+You can use a keyPair to build your asg when you decide not to use a ready-made LanchTemplate.
+
+To configure KeyPair for an autoscaling group, pass the `keyPair` as a prop:
+
+```python
+# vpc: ec2.Vpc
+# instance_type: ec2.InstanceType
+# machine_image: ec2.IMachineImage
+
+
+my_key_pair = ec2.KeyPair(self, "MyKeyPair")
+
+autoscaling.AutoScalingGroup(self, "ASG",
+    vpc=vpc,
+    instance_type=instance_type,
+    machine_image=machine_image,
+
+    # ...
+
+    key_pair=my_key_pair
+)
+```
+
 ## Future work
 
 * [ ] CloudWatch Events (impossible to add currently as the AutoScalingGroup ARN is
@@ -794,6 +820,7 @@ from ..aws_ec2 import (
     CloudFormationInit as _CloudFormationInit_2bb1d1b2,
     Connections as _Connections_0f31fce8,
     IConnectable as _IConnectable_10015a05,
+    IKeyPair as _IKeyPair_bc344eda,
     ILaunchTemplate as _ILaunchTemplate_f32c0fd7,
     IMachineImage as _IMachineImage_0e8bd50b,
     ISecurityGroup as _ISecurityGroup_acf8a799,
@@ -11884,6 +11911,7 @@ class CfnWarmPoolProps:
         "ignore_unmodified_size_properties": "ignoreUnmodifiedSizeProperties",
         "instance_monitoring": "instanceMonitoring",
         "key_name": "keyName",
+        "key_pair": "keyPair",
         "max_capacity": "maxCapacity",
         "max_instance_lifetime": "maxInstanceLifetime",
         "min_capacity": "minCapacity",
@@ -11915,6 +11943,7 @@ class CommonAutoScalingGroupProps:
         ignore_unmodified_size_properties: typing.Optional[builtins.bool] = None,
         instance_monitoring: typing.Optional["Monitoring"] = None,
         key_name: typing.Optional[builtins.str] = None,
+        key_pair: typing.Optional[_IKeyPair_bc344eda] = None,
         max_capacity: typing.Optional[jsii.Number] = None,
         max_instance_lifetime: typing.Optional[_Duration_4839e8c3] = None,
         min_capacity: typing.Optional[jsii.Number] = None,
@@ -11945,7 +11974,8 @@ class CommonAutoScalingGroupProps:
         :param health_check: Configuration for health checks. Default: - HealthCheck.ec2 with no grace period
         :param ignore_unmodified_size_properties: If the ASG has scheduled actions, don't reset unchanged group sizes. Only used if the ASG has scheduled actions (which may scale your ASG up or down regardless of cdk deployments). If true, the size of the group will only be reset if it has been changed in the CDK app. If false, the sizes will always be changed back to what they were in the CDK app on deployment. Default: true
         :param instance_monitoring: Controls whether instances in this group are launched with detailed or basic monitoring. When detailed monitoring is enabled, Amazon CloudWatch generates metrics every minute and your account is charged a fee. When you disable detailed monitoring, CloudWatch generates metrics every 5 minutes. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified Default: - Monitoring.DETAILED
-        :param key_name: Name of SSH keypair to grant access to instances. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified Default: - No SSH access will be possible.
+        :param key_name: (deprecated) Name of SSH keypair to grant access to instances. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified You can either specify ``keyPair`` or ``keyName``, not both. Default: - No SSH access will be possible.
+        :param key_pair: The SSH keypair to grant access to the instance. Feature flag ``AUTOSCALING_GENERATE_LAUNCH_TEMPLATE`` must be enabled to use this property. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified. You can either specify ``keyPair`` or ``keyName``, not both. Default: - No SSH access will be possible.
         :param max_capacity: Maximum number of instances in the fleet. Default: desiredCapacity
         :param max_instance_lifetime: The maximum amount of time that an instance can be in service. The maximum duration applies to all current and future instances in the group. As an instance approaches its maximum duration, it is terminated and replaced, and cannot be used again. You must specify a value of at least 604,800 seconds (7 days). To clear a previously set value, leave this property undefined. Default: none
         :param min_capacity: Minimum number of instances in the fleet. Default: 1
@@ -11973,6 +12003,7 @@ class CommonAutoScalingGroupProps:
             # block_device_volume: autoscaling.BlockDeviceVolume
             # group_metrics: autoscaling.GroupMetrics
             # health_check: autoscaling.HealthCheck
+            # key_pair: ec2.KeyPair
             # scaling_events: autoscaling.ScalingEvents
             # signals: autoscaling.Signals
             # subnet: ec2.Subnet
@@ -11997,6 +12028,7 @@ class CommonAutoScalingGroupProps:
                 ignore_unmodified_size_properties=False,
                 instance_monitoring=autoscaling.Monitoring.BASIC,
                 key_name="keyName",
+                key_pair=key_pair,
                 max_capacity=123,
                 max_instance_lifetime=cdk.Duration.minutes(30),
                 min_capacity=123,
@@ -12040,6 +12072,7 @@ class CommonAutoScalingGroupProps:
             check_type(argname="argument ignore_unmodified_size_properties", value=ignore_unmodified_size_properties, expected_type=type_hints["ignore_unmodified_size_properties"])
             check_type(argname="argument instance_monitoring", value=instance_monitoring, expected_type=type_hints["instance_monitoring"])
             check_type(argname="argument key_name", value=key_name, expected_type=type_hints["key_name"])
+            check_type(argname="argument key_pair", value=key_pair, expected_type=type_hints["key_pair"])
             check_type(argname="argument max_capacity", value=max_capacity, expected_type=type_hints["max_capacity"])
             check_type(argname="argument max_instance_lifetime", value=max_instance_lifetime, expected_type=type_hints["max_instance_lifetime"])
             check_type(argname="argument min_capacity", value=min_capacity, expected_type=type_hints["min_capacity"])
@@ -12079,6 +12112,8 @@ class CommonAutoScalingGroupProps:
             self._values["instance_monitoring"] = instance_monitoring
         if key_name is not None:
             self._values["key_name"] = key_name
+        if key_pair is not None:
+            self._values["key_pair"] = key_pair
         if max_capacity is not None:
             self._values["max_capacity"] = max_capacity
         if max_instance_lifetime is not None:
@@ -12265,15 +12300,36 @@ class CommonAutoScalingGroupProps:
 
     @builtins.property
     def key_name(self) -> typing.Optional[builtins.str]:
-        '''Name of SSH keypair to grant access to instances.
+        '''(deprecated) Name of SSH keypair to grant access to instances.
 
         ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified
 
+        You can either specify ``keyPair`` or ``keyName``, not both.
+
         :default: - No SSH access will be possible.
+
+        :deprecated: - Use ``keyPair`` instead - https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ec2-readme.html#using-an-existing-ec2-key-pair
+
+        :stability: deprecated
         '''
         result = self._values.get("key_name")
         return typing.cast(typing.Optional[builtins.str], result)
 
+    @builtins.property
+    def key_pair(self) -> typing.Optional[_IKeyPair_bc344eda]:
+        '''The SSH keypair to grant access to the instance.
+
+        Feature flag ``AUTOSCALING_GENERATE_LAUNCH_TEMPLATE`` must be enabled to use this property.
+
+        ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified.
+
+        You can either specify ``keyPair`` or ``keyName``, not both.
+
+        :default: - No SSH access will be possible.
+        '''
+        result = self._values.get("key_pair")
+        return typing.cast(typing.Optional[_IKeyPair_bc344eda], result)
+
     @builtins.property
     def max_capacity(self) -> typing.Optional[jsii.Number]:
         '''Maximum number of instances in the fleet.
@@ -16376,7 +16432,7 @@ class StepScalingAction(
         :param id: -
         :param auto_scaling_group: The auto scaling group.
         :param adjustment_type: How the adjustment numbers are interpreted. Default: ChangeInCapacity
-        :param cooldown: Period after a scaling completes before another scaling activity can start. Default: The default cooldown configured on the AutoScalingGroup
+        :param cooldown: (deprecated) Period after a scaling completes before another scaling activity can start. Default: The default cooldown configured on the AutoScalingGroup
         :param estimated_instance_warmup: Estimated time until a newly launched instance can send metrics to CloudWatch. Default: Same as the cooldown
         :param metric_aggregation_type: The aggregation type for the CloudWatch metrics. Default: Average
         :param min_adjustment_magnitude: Minimum absolute number to adjust capacity with as result of percentage scaling. Only when using AdjustmentType = PercentChangeInCapacity, this number controls the minimum absolute effect size. Default: No minimum scaling effect
@@ -16450,7 +16506,7 @@ class StepScalingActionProps:
 
         :param auto_scaling_group: The auto scaling group.
         :param adjustment_type: How the adjustment numbers are interpreted. Default: ChangeInCapacity
-        :param cooldown: Period after a scaling completes before another scaling activity can start. Default: The default cooldown configured on the AutoScalingGroup
+        :param cooldown: (deprecated) Period after a scaling completes before another scaling activity can start. Default: The default cooldown configured on the AutoScalingGroup
         :param estimated_instance_warmup: Estimated time until a newly launched instance can send metrics to CloudWatch. Default: Same as the cooldown
         :param metric_aggregation_type: The aggregation type for the CloudWatch metrics. Default: Average
         :param min_adjustment_magnitude: Minimum absolute number to adjust capacity with as result of percentage scaling. Only when using AdjustmentType = PercentChangeInCapacity, this number controls the minimum absolute effect size. Default: No minimum scaling effect
@@ -16517,9 +16573,13 @@ class StepScalingActionProps:
 
     @builtins.property
     def cooldown(self) -> typing.Optional[_Duration_4839e8c3]:
-        '''Period after a scaling completes before another scaling activity can start.
+        '''(deprecated) Period after a scaling completes before another scaling activity can start.
 
         :default: The default cooldown configured on the AutoScalingGroup
+
+        :deprecated: cooldown is not valid with step scaling action
+
+        :stability: deprecated
         '''
         result = self._values.get("cooldown")
         return typing.cast(typing.Optional[_Duration_4839e8c3], result)
@@ -17627,24 +17687,15 @@ class AutoScalingGroup(
 
     Example::
 
-        # vpc: ec2.Vpc
-        # instance_type: ec2.InstanceType
-        # machine_image: ec2.IMachineImage
-        
-        
-        autoscaling.AutoScalingGroup(self, "ASG",
-            vpc=vpc,
-            instance_type=instance_type,
-            machine_image=machine_image,
+        # cluster: eks.Cluster
+        # asg: autoscaling.AutoScalingGroup
         
-            # ...
-        
-            init=ec2.CloudFormationInit.from_elements(
-                ec2.InitFile.from_string("/etc/my_instance", "This got written during instance startup")),
-            signals=autoscaling.Signals.wait_for_all(
-                timeout=Duration.minutes(10)
-            )
+        imported_cluster = eks.Cluster.from_cluster_attributes(self, "ImportedCluster",
+            cluster_name=cluster.cluster_name,
+            cluster_security_group_id=cluster.cluster_security_group_id
         )
+        
+        imported_cluster.connect_auto_scaling_group_capacity(asg)
     '''
 
     def __init__(
@@ -17678,6 +17729,7 @@ class AutoScalingGroup(
         ignore_unmodified_size_properties: typing.Optional[builtins.bool] = None,
         instance_monitoring: typing.Optional[Monitoring] = None,
         key_name: typing.Optional[builtins.str] = None,
+        key_pair: typing.Optional[_IKeyPair_bc344eda] = None,
         max_capacity: typing.Optional[jsii.Number] = None,
         max_instance_lifetime: typing.Optional[_Duration_4839e8c3] = None,
         min_capacity: typing.Optional[jsii.Number] = None,
@@ -17719,7 +17771,8 @@ class AutoScalingGroup(
         :param health_check: Configuration for health checks. Default: - HealthCheck.ec2 with no grace period
         :param ignore_unmodified_size_properties: If the ASG has scheduled actions, don't reset unchanged group sizes. Only used if the ASG has scheduled actions (which may scale your ASG up or down regardless of cdk deployments). If true, the size of the group will only be reset if it has been changed in the CDK app. If false, the sizes will always be changed back to what they were in the CDK app on deployment. Default: true
         :param instance_monitoring: Controls whether instances in this group are launched with detailed or basic monitoring. When detailed monitoring is enabled, Amazon CloudWatch generates metrics every minute and your account is charged a fee. When you disable detailed monitoring, CloudWatch generates metrics every 5 minutes. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified Default: - Monitoring.DETAILED
-        :param key_name: Name of SSH keypair to grant access to instances. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified Default: - No SSH access will be possible.
+        :param key_name: (deprecated) Name of SSH keypair to grant access to instances. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified You can either specify ``keyPair`` or ``keyName``, not both. Default: - No SSH access will be possible.
+        :param key_pair: The SSH keypair to grant access to the instance. Feature flag ``AUTOSCALING_GENERATE_LAUNCH_TEMPLATE`` must be enabled to use this property. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified. You can either specify ``keyPair`` or ``keyName``, not both. Default: - No SSH access will be possible.
         :param max_capacity: Maximum number of instances in the fleet. Default: desiredCapacity
         :param max_instance_lifetime: The maximum amount of time that an instance can be in service. The maximum duration applies to all current and future instances in the group. As an instance approaches its maximum duration, it is terminated and replaced, and cannot be used again. You must specify a value of at least 604,800 seconds (7 days). To clear a previously set value, leave this property undefined. Default: none
         :param min_capacity: Minimum number of instances in the fleet. Default: 1
@@ -17764,6 +17817,7 @@ class AutoScalingGroup(
             ignore_unmodified_size_properties=ignore_unmodified_size_properties,
             instance_monitoring=instance_monitoring,
             key_name=key_name,
+            key_pair=key_pair,
             max_capacity=max_capacity,
             max_instance_lifetime=max_instance_lifetime,
             min_capacity=min_capacity,
@@ -18356,6 +18410,7 @@ class AutoScalingGroup(
         "ignore_unmodified_size_properties": "ignoreUnmodifiedSizeProperties",
         "instance_monitoring": "instanceMonitoring",
         "key_name": "keyName",
+        "key_pair": "keyPair",
         "max_capacity": "maxCapacity",
         "max_instance_lifetime": "maxInstanceLifetime",
         "min_capacity": "minCapacity",
@@ -18400,6 +18455,7 @@ class AutoScalingGroupProps(CommonAutoScalingGroupProps):
         ignore_unmodified_size_properties: typing.Optional[builtins.bool] = None,
         instance_monitoring: typing.Optional[Monitoring] = None,
         key_name: typing.Optional[builtins.str] = None,
+        key_pair: typing.Optional[_IKeyPair_bc344eda] = None,
         max_capacity: typing.Optional[jsii.Number] = None,
         max_instance_lifetime: typing.Optional[_Duration_4839e8c3] = None,
         min_capacity: typing.Optional[jsii.Number] = None,
@@ -18440,7 +18496,8 @@ class AutoScalingGroupProps(CommonAutoScalingGroupProps):
         :param health_check: Configuration for health checks. Default: - HealthCheck.ec2 with no grace period
         :param ignore_unmodified_size_properties: If the ASG has scheduled actions, don't reset unchanged group sizes. Only used if the ASG has scheduled actions (which may scale your ASG up or down regardless of cdk deployments). If true, the size of the group will only be reset if it has been changed in the CDK app. If false, the sizes will always be changed back to what they were in the CDK app on deployment. Default: true
         :param instance_monitoring: Controls whether instances in this group are launched with detailed or basic monitoring. When detailed monitoring is enabled, Amazon CloudWatch generates metrics every minute and your account is charged a fee. When you disable detailed monitoring, CloudWatch generates metrics every 5 minutes. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified Default: - Monitoring.DETAILED
-        :param key_name: Name of SSH keypair to grant access to instances. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified Default: - No SSH access will be possible.
+        :param key_name: (deprecated) Name of SSH keypair to grant access to instances. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified You can either specify ``keyPair`` or ``keyName``, not both. Default: - No SSH access will be possible.
+        :param key_pair: The SSH keypair to grant access to the instance. Feature flag ``AUTOSCALING_GENERATE_LAUNCH_TEMPLATE`` must be enabled to use this property. ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified. You can either specify ``keyPair`` or ``keyName``, not both. Default: - No SSH access will be possible.
         :param max_capacity: Maximum number of instances in the fleet. Default: desiredCapacity
         :param max_instance_lifetime: The maximum amount of time that an instance can be in service. The maximum duration applies to all current and future instances in the group. As an instance approaches its maximum duration, it is terminated and replaced, and cannot be used again. You must specify a value of at least 604,800 seconds (7 days). To clear a previously set value, leave this property undefined. Default: none
         :param min_capacity: Minimum number of instances in the fleet. Default: 1
@@ -18511,6 +18568,7 @@ class AutoScalingGroupProps(CommonAutoScalingGroupProps):
             check_type(argname="argument ignore_unmodified_size_properties", value=ignore_unmodified_size_properties, expected_type=type_hints["ignore_unmodified_size_properties"])
             check_type(argname="argument instance_monitoring", value=instance_monitoring, expected_type=type_hints["instance_monitoring"])
             check_type(argname="argument key_name", value=key_name, expected_type=type_hints["key_name"])
+            check_type(argname="argument key_pair", value=key_pair, expected_type=type_hints["key_pair"])
             check_type(argname="argument max_capacity", value=max_capacity, expected_type=type_hints["max_capacity"])
             check_type(argname="argument max_instance_lifetime", value=max_instance_lifetime, expected_type=type_hints["max_instance_lifetime"])
             check_type(argname="argument min_capacity", value=min_capacity, expected_type=type_hints["min_capacity"])
@@ -18565,6 +18623,8 @@ class AutoScalingGroupProps(CommonAutoScalingGroupProps):
             self._values["instance_monitoring"] = instance_monitoring
         if key_name is not None:
             self._values["key_name"] = key_name
+        if key_pair is not None:
+            self._values["key_pair"] = key_pair
         if max_capacity is not None:
             self._values["max_capacity"] = max_capacity
         if max_instance_lifetime is not None:
@@ -18775,15 +18835,36 @@ class AutoScalingGroupProps(CommonAutoScalingGroupProps):
 
     @builtins.property
     def key_name(self) -> typing.Optional[builtins.str]:
-        '''Name of SSH keypair to grant access to instances.
+        '''(deprecated) Name of SSH keypair to grant access to instances.
 
         ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified
 
+        You can either specify ``keyPair`` or ``keyName``, not both.
+
         :default: - No SSH access will be possible.
+
+        :deprecated: - Use ``keyPair`` instead - https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ec2-readme.html#using-an-existing-ec2-key-pair
+
+        :stability: deprecated
         '''
         result = self._values.get("key_name")
         return typing.cast(typing.Optional[builtins.str], result)
 
+    @builtins.property
+    def key_pair(self) -> typing.Optional[_IKeyPair_bc344eda]:
+        '''The SSH keypair to grant access to the instance.
+
+        Feature flag ``AUTOSCALING_GENERATE_LAUNCH_TEMPLATE`` must be enabled to use this property.
+
+        ``launchTemplate`` and ``mixedInstancesPolicy`` must not be specified when this property is specified.
+
+        You can either specify ``keyPair`` or ``keyName``, not both.
+
+        :default: - No SSH access will be possible.
+        '''
+        result = self._values.get("key_pair")
+        return typing.cast(typing.Optional[_IKeyPair_bc344eda], result)
+
     @builtins.property
     def max_capacity(self) -> typing.Optional[jsii.Number]:
         '''Maximum number of instances in the fleet.
@@ -20873,6 +20954,7 @@ def _typecheckingstub__e7df3cbef8de53a463241b6e60846fac6e519118c7118785f8f4efb6d
     ignore_unmodified_size_properties: typing.Optional[builtins.bool] = None,
     instance_monitoring: typing.Optional[Monitoring] = None,
     key_name: typing.Optional[builtins.str] = None,
+    key_pair: typing.Optional[_IKeyPair_bc344eda] = None,
     max_capacity: typing.Optional[jsii.Number] = None,
     max_instance_lifetime: typing.Optional[_Duration_4839e8c3] = None,
     min_capacity: typing.Optional[jsii.Number] = None,
@@ -21418,6 +21500,7 @@ def _typecheckingstub__82981fc74407321badee3133fda3bd0a016f4ab7634f761219c1c808c
     ignore_unmodified_size_properties: typing.Optional[builtins.bool] = None,
     instance_monitoring: typing.Optional[Monitoring] = None,
     key_name: typing.Optional[builtins.str] = None,
+    key_pair: typing.Optional[_IKeyPair_bc344eda] = None,
     max_capacity: typing.Optional[jsii.Number] = None,
     max_instance_lifetime: typing.Optional[_Duration_4839e8c3] = None,
     min_capacity: typing.Optional[jsii.Number] = None,
@@ -21624,6 +21707,7 @@ def _typecheckingstub__186ff14d58334848486a7ecd802c6b72a1b76f272f25349712b95361e
     ignore_unmodified_size_properties: typing.Optional[builtins.bool] = None,
     instance_monitoring: typing.Optional[Monitoring] = None,
     key_name: typing.Optional[builtins.str] = None,
+    key_pair: typing.Optional[_IKeyPair_bc344eda] = None,
     max_capacity: typing.Optional[jsii.Number] = None,
     max_instance_lifetime: typing.Optional[_Duration_4839e8c3] = None,
     min_capacity: typing.Optional[jsii.Number] = None,

aws_cdk/aws_cloudfront/__init__.py

@@ -544,13 +544,12 @@ Additionally, you can load the function's code from a file using the `FunctionCo
 
 If you set `autoPublish` to false, the function will not be automatically published to the LIVE stage when it’s created.
 
-``ts
-new cloudfront.Function(this, 'Function', {
-code: cloudfront.FunctionCode.fromInline('function handler(event) { return event.request }'),
-runtime: cloudfront.FunctionRuntime.JS_2_0,
-autoPublish: false
-});
-
+```python
+cloudfront.Function(self, "Function",
+    code=cloudfront.FunctionCode.from_inline("function handler(event) { return event.request }"),
+    runtime=cloudfront.FunctionRuntime.JS_2_0,
+    auto_publish=False
+)
 ```
 
 ### Key Value Store
@@ -560,8 +559,8 @@ by default.
 
 To create an empty Key Value Store:
 
-```ts
-const store = new cloudfront.KeyValueStore(this, 'KeyValueStore');
+```python
+store = cloudfront.KeyValueStore(self, "KeyValueStore")
 ```
 
 To also include an initial set of values, the `source` property can be specified, either from a
@@ -16480,20 +16479,12 @@ class FunctionCode(
 
     Example::
 
-        # s3_bucket: s3.Bucket
-        # Add a cloudfront Function to a Distribution
-        cf_function = cloudfront.Function(self, "Function",
+        store = cloudfront.KeyValueStore(self, "KeyValueStore")
+        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),
-                function_associations=[cloudfront.FunctionAssociation(
-                    function=cf_function,
-                    event_type=cloudfront.FunctionEventType.VIEWER_REQUEST
-                )]
-            )
+            # Note that JS_2_0 must be used for Key Value Store support
+            runtime=cloudfront.FunctionRuntime.JS_2_0,
+            key_value_store=store
         )
     '''
 
@@ -16611,20 +16602,12 @@ class FunctionProps:
 
         Example::
 
-            # s3_bucket: s3.Bucket
-            # Add a cloudfront Function to a Distribution
-            cf_function = cloudfront.Function(self, "Function",
+            store = cloudfront.KeyValueStore(self, "KeyValueStore")
+            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),
-                    function_associations=[cloudfront.FunctionAssociation(
-                        function=cf_function,
-                        event_type=cloudfront.FunctionEventType.VIEWER_REQUEST
-                    )]
-                )
+                # Note that JS_2_0 must be used for Key Value Store support
+                runtime=cloudfront.FunctionRuntime.JS_2_0,
+                key_value_store=store
             )
         '''
         if __debug__:
@@ -16726,20 +16709,12 @@ class FunctionRuntime(
 
     Example::
 
-        # s3_bucket: s3.Bucket
-        # Add a cloudfront Function to a Distribution
-        cf_function = cloudfront.Function(self, "Function",
+        store = cloudfront.KeyValueStore(self, "KeyValueStore")
+        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),
-                function_associations=[cloudfront.FunctionAssociation(
-                    function=cf_function,
-                    event_type=cloudfront.FunctionEventType.VIEWER_REQUEST
-                )]
-            )
+            # Note that JS_2_0 must be used for Key Value Store support
+            runtime=cloudfront.FunctionRuntime.JS_2_0,
+            key_value_store=store
         )
     '''
 
@@ -17941,23 +17916,12 @@ class KeyValueStore(
 
     Example::
 
-        store_asset = cloudfront.KeyValueStore(self, "KeyValueStoreAsset",
-            key_value_store_name="KeyValueStoreAsset",
-            source=cloudfront.ImportSource.from_asset("path-to-data.json")
-        )
-        
-        store_inline = cloudfront.KeyValueStore(self, "KeyValueStoreInline",
-            key_value_store_name="KeyValueStoreInline",
-            source=cloudfront.ImportSource.from_inline(JSON.stringify({
-                "data": [{
-                    "key": "key1",
-                    "value": "value1"
-                }, {
-                    "key": "key2",
-                    "value": "value2"
-                }
-                ]
-            }))
+        store = cloudfront.KeyValueStore(self, "KeyValueStore")
+        cloudfront.Function(self, "Function",
+            code=cloudfront.FunctionCode.from_inline("function handler(event) { return event.request }"),
+            # Note that JS_2_0 must be used for Key Value Store support
+            runtime=cloudfront.FunctionRuntime.JS_2_0,
+            key_value_store=store
         )
     '''
 
@@ -23802,20 +23766,12 @@ class Function(
 
     Example::
 
-        # s3_bucket: s3.Bucket
-        # Add a cloudfront Function to a Distribution
-        cf_function = cloudfront.Function(self, "Function",
+        store = cloudfront.KeyValueStore(self, "KeyValueStore")
+        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),
-                function_associations=[cloudfront.FunctionAssociation(
-                    function=cf_function,
-                    event_type=cloudfront.FunctionEventType.VIEWER_REQUEST
-                )]
-            )
+            # Note that JS_2_0 must be used for Key Value Store support
+            runtime=cloudfront.FunctionRuntime.JS_2_0,
+            key_value_store=store
         )
     '''