aws-cdk-lib 2.140.0__py3-none-any.whl → 2.142.0__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_bedrock/__init__.py

@@ -984,11 +984,11 @@ class CfnAgent(
             top_k: typing.Optional[jsii.Number] = None,
             top_p: typing.Optional[jsii.Number] = None,
         ) -> None:
-            '''Contains inference parameters to use when the agent invokes a foundation model in the part of the agent sequence defined by the ``promptType`` .
+            '''Specifications about the inference parameters that were provided alongside the prompt.
 
-            For more information, see `Inference parameters for foundation models <https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html>`_ .
+            These are specified in the `PromptOverrideConfiguration <https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_PromptOverrideConfiguration.html>`_ object that was set when the agent was created or updated. For more information, see `Inference parameters for foundation models <https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html>`_ .
 
-            :param maximum_length: The maximum number of tokens to allow in the generated response.
+            :param maximum_length: The maximum number of tokens allowed in the generated response.
             :param stop_sequences: A list of stop sequences. A stop sequence is a sequence of characters that causes the model to stop generating the response.
             :param temperature: The likelihood of the model selecting higher-probability options while generating a response. A lower value makes the model more likely to choose higher-probability options, while a higher value makes the model more likely to choose lower-probability options.
             :param top_k: While generating a response, the model determines the probability of the following token at each point of generation. The value that you set for ``topK`` is the number of most-likely candidates from which the model chooses the next token in the sequence. For example, if you set ``topK`` to 50, the model selects the next token from among the top 50 most likely choices.
@@ -1032,7 +1032,7 @@ class CfnAgent(
 
         @builtins.property
         def maximum_length(self) -> typing.Optional[jsii.Number]:
-            '''The maximum number of tokens to allow in the generated response.
+            '''The maximum number of tokens allowed in the generated response.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-inferenceconfiguration.html#cfn-bedrock-agent-inferenceconfiguration-maximumlength
             '''
@@ -2381,7 +2381,7 @@ class CfnDataSource(
         :param data_source_configuration: Contains details about how the data source is stored.
         :param knowledge_base_id: The unique identifier of the knowledge base to which the data source belongs.
         :param name: The name of the data source.
-        :param data_deletion_policy: The deletion policy for the data source.
+        :param data_deletion_policy: The data deletion policy for a data source.
         :param description: The description of the data source.
         :param server_side_encryption_configuration: Contains details about the configuration of the server-side encryption.
         :param vector_ingestion_configuration: Contains details about how to ingest the documents in the data source.
@@ -2465,7 +2465,7 @@ class CfnDataSource(
     @builtins.property
     @jsii.member(jsii_name="attrFailureReasons")
     def attr_failure_reasons(self) -> typing.List[builtins.str]:
-        '''The details of the failure reasons related to the data source.
+        '''The detailed reasons on the failure to delete a data source.
 
         :cloudformationAttribute: FailureReasons
         '''
@@ -2532,7 +2532,7 @@ class CfnDataSource(
     @builtins.property
     @jsii.member(jsii_name="dataDeletionPolicy")
     def data_deletion_policy(self) -> typing.Optional[builtins.str]:
-        '''The deletion policy for the data source.'''
+        '''The data deletion policy for a data source.'''
         return typing.cast(typing.Optional[builtins.str], jsii.get(self, "dataDeletionPolicy"))
 
     @data_deletion_policy.setter
@@ -2856,7 +2856,7 @@ class CfnDataSource(
             '''Contains information about the S3 configuration of the data source.
 
             :param bucket_arn: The Amazon Resource Name (ARN) of the bucket that contains the data source.
-            :param bucket_owner_account_id: The account ID for the owner of the S3 bucket.
+            :param bucket_owner_account_id: The bucket account owner ID for the S3 bucket.
             :param inclusion_prefixes: A list of S3 prefixes that define the object containing the data sources. For more information, see `Organizing objects using prefixes <https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-prefixes.html>`_ .
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-s3datasourceconfiguration.html
@@ -2901,7 +2901,7 @@ class CfnDataSource(
 
         @builtins.property
         def bucket_owner_account_id(self) -> typing.Optional[builtins.str]:
-            '''The account ID for the owner of the S3 bucket.
+            '''The bucket account owner ID for the S3 bucket.
 
             :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-s3datasourceconfiguration.html#cfn-bedrock-datasource-s3datasourceconfiguration-bucketowneraccountid
             '''
@@ -3083,7 +3083,7 @@ class CfnDataSourceProps:
         :param data_source_configuration: Contains details about how the data source is stored.
         :param knowledge_base_id: The unique identifier of the knowledge base to which the data source belongs.
         :param name: The name of the data source.
-        :param data_deletion_policy: The deletion policy for the data source.
+        :param data_deletion_policy: The data deletion policy for a data source.
         :param description: The description of the data source.
         :param server_side_encryption_configuration: Contains details about the configuration of the server-side encryption.
         :param vector_ingestion_configuration: Contains details about how to ingest the documents in the data source.
@@ -3187,7 +3187,7 @@ class CfnDataSourceProps:
 
     @builtins.property
     def data_deletion_policy(self) -> typing.Optional[builtins.str]:
-        '''The deletion policy for the data source.
+        '''The data deletion policy for a data source.
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-datasource.html#cfn-bedrock-datasource-datadeletionpolicy
         '''
@@ -3243,7 +3243,9 @@ class CfnGuardrail(
     metaclass=jsii.JSIIMeta,
     jsii_type="aws-cdk-lib.aws_bedrock.CfnGuardrail",
 ):
-    '''Definition of AWS::Bedrock::Guardrail Resource Type.
+    '''Creates a guardrail to block topics and to implement safeguards for your generative AI applications.
+
+    You can configure denied topics to disallow undesirable topics and content filters to block harmful content in model inputs and responses. For more information, see `Guardrails for Amazon Bedrock <https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails.html>`_ in the *Amazon Bedrock User Guide*
 
     :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html
     :cloudformationResource: AWS::Bedrock::Guardrail
@@ -3328,14 +3330,14 @@ class CfnGuardrail(
         '''
         :param scope: Scope in which this resource is defined.
         :param id: Construct identifier for this resource (unique in its scope).
-        :param blocked_input_messaging: Messaging for when violations are detected in text.
-        :param blocked_outputs_messaging: Messaging for when violations are detected in text.
-        :param name: Name of the guardrail.
+        :param blocked_input_messaging: The message to return when the guardrail blocks a prompt.
+        :param blocked_outputs_messaging: The message to return when the guardrail blocks a model response.
+        :param name: The name of the guardrail.
         :param content_policy_config: Content policy config for a guardrail.
-        :param description: Description of the guardrail or its version.
-        :param kms_key_arn: The KMS key with which the guardrail was encrypted at rest.
+        :param description: A description of the guardrail.
+        :param kms_key_arn: The ARN of the AWS KMS key used to encrypt the guardrail.
         :param sensitive_information_policy_config: Sensitive information policy config for a guardrail.
-        :param tags: List of Tags.
+        :param tags: Metadata that you can assign to a guardrail as key-value pairs. For more information, see the following resources:. - `Tag naming limits and requirements <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-conventions>`_ - `Tagging best practices <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-best-practices>`_
         :param topic_policy_config: Topic policy config for a guardrail.
         :param word_policy_config: Word policy config for a guardrail.
         '''
@@ -3391,7 +3393,7 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="attrCreatedAt")
     def attr_created_at(self) -> builtins.str:
-        '''Time Stamp.
+        '''The date and time at which the guardrail was created.
 
         :cloudformationAttribute: CreatedAt
         '''
@@ -3409,7 +3411,9 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="attrGuardrailArn")
     def attr_guardrail_arn(self) -> builtins.str:
-        '''Arn representation for the guardrail.
+        '''The Amazon Resource Name (ARN) of the guardrail.
+
+        This a the primary identifier for the guardrail.
 
         :cloudformationAttribute: GuardrailArn
         '''
@@ -3418,7 +3422,7 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="attrGuardrailId")
     def attr_guardrail_id(self) -> builtins.str:
-        '''Unique id for the guardrail.
+        '''The unique identifier of the guardrail.
 
         :cloudformationAttribute: GuardrailId
         '''
@@ -3445,7 +3449,7 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="attrUpdatedAt")
     def attr_updated_at(self) -> builtins.str:
-        '''Time Stamp.
+        '''The date and time at which the guardrail was last updated.
 
         :cloudformationAttribute: UpdatedAt
         '''
@@ -3454,7 +3458,7 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="attrVersion")
     def attr_version(self) -> builtins.str:
-        '''Guardrail version.
+        '''The version of the guardrail.
 
         :cloudformationAttribute: Version
         '''
@@ -3474,7 +3478,7 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="blockedInputMessaging")
     def blocked_input_messaging(self) -> builtins.str:
-        '''Messaging for when violations are detected in text.'''
+        '''The message to return when the guardrail blocks a prompt.'''
         return typing.cast(builtins.str, jsii.get(self, "blockedInputMessaging"))
 
     @blocked_input_messaging.setter
@@ -3487,7 +3491,7 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="blockedOutputsMessaging")
     def blocked_outputs_messaging(self) -> builtins.str:
-        '''Messaging for when violations are detected in text.'''
+        '''The message to return when the guardrail blocks a model response.'''
         return typing.cast(builtins.str, jsii.get(self, "blockedOutputsMessaging"))
 
     @blocked_outputs_messaging.setter
@@ -3500,7 +3504,7 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="name")
     def name(self) -> builtins.str:
-        '''Name of the guardrail.'''
+        '''The name of the guardrail.'''
         return typing.cast(builtins.str, jsii.get(self, "name"))
 
     @name.setter
@@ -3531,7 +3535,7 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="description")
     def description(self) -> typing.Optional[builtins.str]:
-        '''Description of the guardrail or its version.'''
+        '''A description of the guardrail.'''
         return typing.cast(typing.Optional[builtins.str], jsii.get(self, "description"))
 
     @description.setter
@@ -3544,7 +3548,7 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="kmsKeyArn")
     def kms_key_arn(self) -> typing.Optional[builtins.str]:
-        '''The KMS key with which the guardrail was encrypted at rest.'''
+        '''The ARN of the AWS KMS key used to encrypt the guardrail.'''
         return typing.cast(typing.Optional[builtins.str], jsii.get(self, "kmsKeyArn"))
 
     @kms_key_arn.setter
@@ -3575,7 +3579,10 @@ class CfnGuardrail(
     @builtins.property
     @jsii.member(jsii_name="tags")
     def tags(self) -> typing.Optional[typing.List[_CfnTag_f6864754]]:
-        '''List of Tags.'''
+        '''Metadata that you can assign to a guardrail as key-value pairs.
+
+        For more information, see the following resources:.
+        '''
         return typing.cast(typing.Optional[typing.List[_CfnTag_f6864754]], jsii.get(self, "tags"))
 
     @tags.setter
@@ -4426,14 +4433,14 @@ class CfnGuardrailProps:
     ) -> None:
         '''Properties for defining a ``CfnGuardrail``.
 
-        :param blocked_input_messaging: Messaging for when violations are detected in text.
-        :param blocked_outputs_messaging: Messaging for when violations are detected in text.
-        :param name: Name of the guardrail.
+        :param blocked_input_messaging: The message to return when the guardrail blocks a prompt.
+        :param blocked_outputs_messaging: The message to return when the guardrail blocks a model response.
+        :param name: The name of the guardrail.
         :param content_policy_config: Content policy config for a guardrail.
-        :param description: Description of the guardrail or its version.
-        :param kms_key_arn: The KMS key with which the guardrail was encrypted at rest.
+        :param description: A description of the guardrail.
+        :param kms_key_arn: The ARN of the AWS KMS key used to encrypt the guardrail.
         :param sensitive_information_policy_config: Sensitive information policy config for a guardrail.
-        :param tags: List of Tags.
+        :param tags: Metadata that you can assign to a guardrail as key-value pairs. For more information, see the following resources:. - `Tag naming limits and requirements <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-conventions>`_ - `Tagging best practices <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-best-practices>`_
         :param topic_policy_config: Topic policy config for a guardrail.
         :param word_policy_config: Word policy config for a guardrail.
 
@@ -4533,7 +4540,7 @@ class CfnGuardrailProps:
 
     @builtins.property
     def blocked_input_messaging(self) -> builtins.str:
-        '''Messaging for when violations are detected in text.
+        '''The message to return when the guardrail blocks a prompt.
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html#cfn-bedrock-guardrail-blockedinputmessaging
         '''
@@ -4543,7 +4550,7 @@ class CfnGuardrailProps:
 
     @builtins.property
     def blocked_outputs_messaging(self) -> builtins.str:
-        '''Messaging for when violations are detected in text.
+        '''The message to return when the guardrail blocks a model response.
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html#cfn-bedrock-guardrail-blockedoutputsmessaging
         '''
@@ -4553,7 +4560,7 @@ class CfnGuardrailProps:
 
     @builtins.property
     def name(self) -> builtins.str:
-        '''Name of the guardrail.
+        '''The name of the guardrail.
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html#cfn-bedrock-guardrail-name
         '''
@@ -4574,7 +4581,7 @@ class CfnGuardrailProps:
 
     @builtins.property
     def description(self) -> typing.Optional[builtins.str]:
-        '''Description of the guardrail or its version.
+        '''A description of the guardrail.
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html#cfn-bedrock-guardrail-description
         '''
@@ -4583,7 +4590,7 @@ class CfnGuardrailProps:
 
     @builtins.property
     def kms_key_arn(self) -> typing.Optional[builtins.str]:
-        '''The KMS key with which the guardrail was encrypted at rest.
+        '''The ARN of the AWS KMS key used to encrypt the guardrail.
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html#cfn-bedrock-guardrail-kmskeyarn
         '''
@@ -4603,7 +4610,10 @@ class CfnGuardrailProps:
 
     @builtins.property
     def tags(self) -> typing.Optional[typing.List[_CfnTag_f6864754]]:
-        '''List of Tags.
+        '''Metadata that you can assign to a guardrail as key-value pairs. For more information, see the following resources:.
+
+        - `Tag naming limits and requirements <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-conventions>`_
+        - `Tagging best practices <https://docs.aws.amazon.com/tag-editor/latest/userguide/tagging.html#tag-best-practices>`_
 
         :see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html#cfn-bedrock-guardrail-tags
         '''