aws-cdk-lib 2.213.0__py3-none-any.whl → 2.214.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of aws-cdk-lib might be problematic. Click here for more details.
- aws_cdk/__init__.py +23 -3
- aws_cdk/_jsii/__init__.py +1 -1
- aws_cdk/_jsii/{aws-cdk-lib@2.213.0.jsii.tgz → aws-cdk-lib@2.214.0.jsii.tgz} +0 -0
- aws_cdk/aws_appconfig/__init__.py +18 -6
- aws_cdk/aws_appintegrations/__init__.py +4 -4
- aws_cdk/aws_apprunner/__init__.py +5 -8
- aws_cdk/aws_aps/__init__.py +243 -10
- aws_cdk/aws_b2bi/__init__.py +1015 -128
- aws_cdk/aws_batch/__init__.py +33 -11
- aws_cdk/aws_bedrock/__init__.py +22 -216
- aws_cdk/aws_budgets/__init__.py +18 -0
- aws_cdk/aws_certificatemanager/__init__.py +96 -15
- aws_cdk/aws_cloudformation/__init__.py +3 -3
- aws_cdk/aws_cloudwatch/__init__.py +80 -49
- aws_cdk/aws_cognito/__init__.py +76 -5
- aws_cdk/aws_connect/__init__.py +188 -2
- aws_cdk/aws_datazone/__init__.py +2267 -0
- aws_cdk/aws_deadline/__init__.py +6 -5
- aws_cdk/aws_dynamodb/__init__.py +27 -16
- aws_cdk/aws_ec2/__init__.py +51 -10
- aws_cdk/aws_ecs/__init__.py +288 -25
- aws_cdk/aws_ecs_patterns/__init__.py +2 -0
- aws_cdk/aws_eks/__init__.py +124 -0
- aws_cdk/aws_elasticloadbalancingv2/__init__.py +6 -2
- aws_cdk/aws_entityresolution/__init__.py +107 -0
- aws_cdk/aws_events/__init__.py +153 -55
- aws_cdk/aws_events_targets/__init__.py +87 -36
- aws_cdk/aws_fsx/__init__.py +62 -0
- aws_cdk/aws_gameliftstreams/__init__.py +1 -1
- aws_cdk/aws_glue/__init__.py +205 -23
- aws_cdk/aws_guardduty/__init__.py +205 -100
- aws_cdk/aws_iam/__init__.py +24 -21
- aws_cdk/aws_inspectorv2/__init__.py +125 -80
- aws_cdk/aws_iot/__init__.py +37 -19
- aws_cdk/aws_iotsitewise/__init__.py +111 -75
- aws_cdk/aws_ivs/__init__.py +17 -17
- aws_cdk/aws_kinesisanalytics/__init__.py +122 -3
- aws_cdk/aws_kinesisanalyticsv2/__init__.py +122 -3
- aws_cdk/aws_lambda/__init__.py +23 -2
- aws_cdk/aws_logs/__init__.py +20 -15
- aws_cdk/aws_mediapackagev2/__init__.py +2 -2
- aws_cdk/aws_networkfirewall/__init__.py +6 -6
- aws_cdk/aws_omics/__init__.py +477 -2
- aws_cdk/aws_qbusiness/__init__.py +4 -2
- aws_cdk/aws_rds/__init__.py +132 -4
- aws_cdk/aws_route53/__init__.py +18 -11
- aws_cdk/aws_s3/__init__.py +4 -4
- aws_cdk/aws_s3_deployment/__init__.py +45 -0
- aws_cdk/aws_sagemaker/__init__.py +653 -0
- aws_cdk/aws_servicediscovery/__init__.py +22 -37
- aws_cdk/aws_sns/__init__.py +12 -2
- aws_cdk/aws_sns_subscriptions/__init__.py +3 -1
- aws_cdk/aws_sqs/__init__.py +5 -5
- aws_cdk/aws_ssm/__init__.py +8 -3
- aws_cdk/aws_ssmquicksetup/__init__.py +2 -2
- aws_cdk/aws_synthetics/__init__.py +222 -12
- aws_cdk/aws_transfer/__init__.py +15 -2
- aws_cdk/aws_vpclattice/__init__.py +41 -0
- aws_cdk/aws_workspacesweb/__init__.py +71 -41
- {aws_cdk_lib-2.213.0.dist-info → aws_cdk_lib-2.214.0.dist-info}/METADATA +2 -2
- {aws_cdk_lib-2.213.0.dist-info → aws_cdk_lib-2.214.0.dist-info}/RECORD +65 -65
- {aws_cdk_lib-2.213.0.dist-info → aws_cdk_lib-2.214.0.dist-info}/LICENSE +0 -0
- {aws_cdk_lib-2.213.0.dist-info → aws_cdk_lib-2.214.0.dist-info}/NOTICE +0 -0
- {aws_cdk_lib-2.213.0.dist-info → aws_cdk_lib-2.214.0.dist-info}/WHEEL +0 -0
- {aws_cdk_lib-2.213.0.dist-info → aws_cdk_lib-2.214.0.dist-info}/top_level.txt +0 -0
aws_cdk/aws_batch/__init__.py
CHANGED
|
@@ -1333,7 +1333,7 @@ class CfnComputeEnvironment(
|
|
|
1333
1333
|
:param ec2_key_pair: The Amazon EC2 key pair that's used for instances launched in the compute environment. You can use this key pair to log in to your instances with SSH. To remove the Amazon EC2 key pair, set this value to an empty string. When updating a compute environment, changing the Amazon EC2 key pair requires an infrastructure update of the compute environment. For more information, see `Updating compute environments <https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html>`_ in the *AWS Batch User Guide* . .. epigraph:: This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it.
|
|
1334
1334
|
:param image_id: The Amazon Machine Image (AMI) ID used for instances launched in the compute environment. This parameter is overridden by the ``imageIdOverride`` member of the ``Ec2Configuration`` structure. To remove the custom AMI ID and use the default AMI ID, set this value to an empty string. When updating a compute environment, changing the AMI ID requires an infrastructure update of the compute environment. For more information, see `Updating compute environments <https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html>`_ in the *AWS Batch User Guide* . .. epigraph:: This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it. > The AMI that you choose for a compute environment must match the architecture of the instance types that you intend to use for that compute environment. For example, if your compute environment uses A1 instance types, the compute resource AMI that you choose must support ARM instances. Amazon ECS vends both x86 and ARM versions of the Amazon ECS-optimized Amazon Linux 2 AMI. For more information, see `Amazon ECS-optimized Amazon Linux 2 AMI <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#ecs-optimized-ami-linux-variants.html>`_ in the *Amazon Elastic Container Service Developer Guide* .
|
|
1335
1335
|
:param instance_role: The Amazon ECS instance profile applied to Amazon EC2 instances in a compute environment. Required for Amazon EC2 instances. You can specify the short name or full Amazon Resource Name (ARN) of an instance profile. For example, ``*ecsInstanceRole*`` or ``arn:aws:iam:: *<aws_account_id>* :instance-profile/ *ecsInstanceRole*`` . For more information, see `Amazon ECS instance role <https://docs.aws.amazon.com/batch/latest/userguide/instance_IAM_role.html>`_ in the *AWS Batch User Guide* . When updating a compute environment, changing this setting requires an infrastructure update of the compute environment. For more information, see `Updating compute environments <https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html>`_ in the *AWS Batch User Guide* . .. epigraph:: This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it.
|
|
1336
|
-
:param instance_types: The instances types that can be launched. You can specify instance families to launch any instance type within those families (for example, ``c5`` or ``p3`` ), or you can specify specific sizes within a family (such as ``c5.8xlarge`` ).
|
|
1336
|
+
:param instance_types: The instances types that can be launched. You can specify instance families to launch any instance type within those families (for example, ``c5`` or ``p3`` ), or you can specify specific sizes within a family (such as ``c5.8xlarge`` ). AWS Batch can select the instance type for you if you choose one of the following: - ``optimal`` to select instance types (from the ``c4`` , ``m4`` , ``r4`` , ``c5`` , ``m5`` , and ``r5`` instance families) that match the demand of your job queues. - ``default_x86_64`` to choose x86 based instance types (from the ``m6i`` , ``c6i`` , ``r6i`` , and ``c7i`` instance families) that matches the resource demands of the job queue. - ``default_arm64`` to choose x86 based instance types (from the ``m6g`` , ``c6g`` , ``r6g`` , and ``c7g`` instance families) that matches the resource demands of the job queue. .. epigraph:: Starting on 11/01/2025 the behavior of ``optimal`` is going to be changed to match ``default_x86_64`` . During the change your instance families could be updated to a newer generation. You do not need to perform any actions for the upgrade to happen. For more information about change, see `Optimal instance type configuration to receive automatic instance family updates <https://docs.aws.amazon.com/batch/latest/userguide/optimal-default-instance-troubleshooting.html>`_ . > Instance family availability varies by AWS Region . For example, some AWS Region s may not have any fourth generation instance families but have fifth and sixth generation instance families. When using ``default_x86_64`` or ``default_arm64`` instance bundles, AWS Batch selects instance families based on a balance of cost-effectiveness and performance. While newer generation instances often provide better price-performance, AWS Batch may choose an earlier generation instance family if it provides the optimal combination of availability, cost, and performance for your workload. For example, in an AWS Region where both c6i and c7i instances are available, AWS Batch might select c6i instances if they offer better cost-effectiveness for your specific job requirements. For more information on AWS Batch instance types and AWS Region availability, see `Instance type compute table <https://docs.aws.amazon.com/batch/latest/userguide/instance-type-compute-table.html>`_ in the *AWS Batch User Guide* . AWS Batch periodically updates your instances in default bundles to newer, more cost-effective options. Updates happen automatically without requiring any action from you. Your workloads continue running during updates with no interruption > This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it. > When you create a compute environment, the instance types that you select for the compute environment must share the same architecture. For example, you can't mix x86 and ARM instances in the same compute environment.
|
|
1337
1337
|
:param launch_template: The launch template to use for your compute resources. Any other compute resource parameters that you specify in a `CreateComputeEnvironment <https://docs.aws.amazon.com/batch/latest/APIReference/API_CreateComputeEnvironment.html>`_ API operation override the same parameters in the launch template. You must specify either the launch template ID or launch template name in the request, but not both. For more information, see `Launch Template Support <https://docs.aws.amazon.com/batch/latest/userguide/launch-templates.html>`_ in the ** . Removing the launch template from a compute environment will not remove the AMI specified in the launch template. In order to update the AMI specified in a launch template, the ``updateToLatestImageVersion`` parameter must be set to ``true`` . When updating a compute environment, changing the launch template requires an infrastructure update of the compute environment. For more information, see `Updating compute environments <https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html>`_ in the ** . .. epigraph:: This parameter isn't applicable to jobs running on Fargate resources, and shouldn't be specified.
|
|
1338
1338
|
:param minv_cpus: The minimum number of vCPUs that an environment should maintain (even if the compute environment is ``DISABLED`` ). .. epigraph:: This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it.
|
|
1339
1339
|
:param placement_group: The Amazon EC2 placement group to associate with your compute resources. If you intend to submit multi-node parallel jobs to your compute environment, you should consider creating a cluster placement group and associate it with your compute resources. This keeps your multi-node parallel job on a logical grouping of instances within a single Availability Zone with high network flow potential. For more information, see `Placement groups <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html>`_ in the *Amazon EC2 User Guide for Linux Instances* . When updating a compute environment, changing the placement group requires an infrastructure update of the compute environment. For more information, see `Updating compute environments <https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html>`_ in the *AWS Batch User Guide* . .. epigraph:: This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it.
|
|
@@ -1632,12 +1632,21 @@ class CfnComputeEnvironment(
|
|
|
1632
1632
|
def instance_types(self) -> typing.Optional[typing.List[builtins.str]]:
|
|
1633
1633
|
'''The instances types that can be launched.
|
|
1634
1634
|
|
|
1635
|
-
You can specify instance families to launch any instance type within those families (for example, ``c5`` or ``p3`` ), or you can specify specific sizes within a family (such as ``c5.8xlarge`` ).
|
|
1635
|
+
You can specify instance families to launch any instance type within those families (for example, ``c5`` or ``p3`` ), or you can specify specific sizes within a family (such as ``c5.8xlarge`` ).
|
|
1636
|
+
|
|
1637
|
+
AWS Batch can select the instance type for you if you choose one of the following:
|
|
1638
|
+
|
|
1639
|
+
- ``optimal`` to select instance types (from the ``c4`` , ``m4`` , ``r4`` , ``c5`` , ``m5`` , and ``r5`` instance families) that match the demand of your job queues.
|
|
1640
|
+
- ``default_x86_64`` to choose x86 based instance types (from the ``m6i`` , ``c6i`` , ``r6i`` , and ``c7i`` instance families) that matches the resource demands of the job queue.
|
|
1641
|
+
- ``default_arm64`` to choose x86 based instance types (from the ``m6g`` , ``c6g`` , ``r6g`` , and ``c7g`` instance families) that matches the resource demands of the job queue.
|
|
1636
1642
|
|
|
1637
|
-
When updating a compute environment, changing this setting requires an infrastructure update of the compute environment. For more information, see `Updating compute environments <https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html>`_ in the *AWS Batch User Guide* .
|
|
1638
1643
|
.. epigraph::
|
|
1639
1644
|
|
|
1640
|
-
|
|
1645
|
+
Starting on 11/01/2025 the behavior of ``optimal`` is going to be changed to match ``default_x86_64`` . During the change your instance families could be updated to a newer generation. You do not need to perform any actions for the upgrade to happen. For more information about change, see `Optimal instance type configuration to receive automatic instance family updates <https://docs.aws.amazon.com/batch/latest/userguide/optimal-default-instance-troubleshooting.html>`_ . > Instance family availability varies by AWS Region . For example, some AWS Region s may not have any fourth generation instance families but have fifth and sixth generation instance families.
|
|
1646
|
+
|
|
1647
|
+
When using ``default_x86_64`` or ``default_arm64`` instance bundles, AWS Batch selects instance families based on a balance of cost-effectiveness and performance. While newer generation instances often provide better price-performance, AWS Batch may choose an earlier generation instance family if it provides the optimal combination of availability, cost, and performance for your workload. For example, in an AWS Region where both c6i and c7i instances are available, AWS Batch might select c6i instances if they offer better cost-effectiveness for your specific job requirements. For more information on AWS Batch instance types and AWS Region availability, see `Instance type compute table <https://docs.aws.amazon.com/batch/latest/userguide/instance-type-compute-table.html>`_ in the *AWS Batch User Guide* .
|
|
1648
|
+
|
|
1649
|
+
AWS Batch periodically updates your instances in default bundles to newer, more cost-effective options. Updates happen automatically without requiring any action from you. Your workloads continue running during updates with no interruption > This parameter isn't applicable to jobs that are running on Fargate resources. Don't specify it. > When you create a compute environment, the instance types that you select for the compute environment must share the same architecture. For example, you can't mix x86 and ARM instances in the same compute environment.
|
|
1641
1650
|
|
|
1642
1651
|
:see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancetypes
|
|
1643
1652
|
'''
|
|
@@ -1789,7 +1798,7 @@ class CfnComputeEnvironment(
|
|
|
1789
1798
|
|
|
1790
1799
|
This object isn't applicable to jobs that are running on Fargate resources.
|
|
1791
1800
|
|
|
1792
|
-
:param image_type: The image type to match with the instance type to select an AMI. The supported values are different for ``ECS`` and ``EKS`` resources. - **ECS** - If the ``imageIdOverride`` parameter isn't specified, then a recent `Amazon ECS-optimized Amazon Linux 2 AMI <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami>`_ ( ``ECS_AL2`` ) is used. If a new image type is specified in an update, but neither an ``imageId`` nor a ``imageIdOverride`` parameter is specified, then the latest Amazon ECS optimized AMI for that image type that's supported by AWS Batch is used. - **ECS_AL2** - `Amazon Linux 2 <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami>`_ : Default for all non-GPU instance families. - **ECS_AL2_NVIDIA** - `Amazon Linux 2 (GPU) <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#gpuami>`_ : Default for all GPU instance families (for example ``P4`` and ``G4`` ) and can be used for all non AWS Graviton-based instance types. - **ECS_AL2023** - `Amazon Linux 2023 <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html>`_ : AWS Batch supports Amazon Linux 2023. .. epigraph:: Amazon Linux 2023 does not support ``A1`` instances. - **ECS_AL1** - `Amazon Linux <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#alami>`_ . Amazon Linux has reached the end-of-life of standard support. For more information, see `Amazon Linux AMI <https://docs.aws.amazon.com/amazon-linux-ami/>`_ . - **EKS** - If the ``imageIdOverride`` parameter isn't specified, then a recent `Amazon EKS-optimized Amazon Linux AMI <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ ( ``EKS_AL2`` ) is used. If a new image type is specified in an update, but neither an ``imageId`` nor a ``imageIdOverride`` parameter is specified, then the latest Amazon EKS optimized AMI for that image type that AWS Batch supports is used. - **EKS_AL2** - `Amazon Linux 2 <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : Default for all non-GPU instance families. - **EKS_AL2_NVIDIA** - `Amazon Linux 2 (accelerated) <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : Default for all GPU instance families (for example, ``P4`` and ``G4`` ) and can be used for all non AWS Graviton-based instance types. - **EKS_AL2023** - `Amazon Linux 2023 <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : AWS Batch supports Amazon Linux 2023. .. epigraph:: Amazon Linux 2023 does not support ``A1`` instances. - **EKS_AL2023_NVIDIA** - `Amazon Linux 2023 (accelerated) <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : GPU instance families and can be used for all non AWS Graviton-based instance types.
|
|
1801
|
+
:param image_type: The image type to match with the instance type to select an AMI. The supported values are different for ``ECS`` and ``EKS`` resources. - **ECS** - If the ``imageIdOverride`` parameter isn't specified, then a recent `Amazon ECS-optimized Amazon Linux 2 AMI <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami>`_ ( ``ECS_AL2`` ) is used. If a new image type is specified in an update, but neither an ``imageId`` nor a ``imageIdOverride`` parameter is specified, then the latest Amazon ECS optimized AMI for that image type that's supported by AWS Batch is used. - **ECS_AL2** - `Amazon Linux 2 <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami>`_ : Default for all non-GPU instance families. - **ECS_AL2_NVIDIA** - `Amazon Linux 2 (GPU) <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#gpuami>`_ : Default for all GPU instance families (for example ``P4`` and ``G4`` ) and can be used for all non AWS Graviton-based instance types. - **ECS_AL2023** - `Amazon Linux 2023 <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html>`_ : AWS Batch supports Amazon Linux 2023. .. epigraph:: Amazon Linux 2023 does not support ``A1`` instances. - **ECS_AL2023_NVIDIA** - `Amazon Linux 2023 (GPU) <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#gpuami>`_ : For all GPU instance families and can be used for all non AWS Graviton-based instance types. .. epigraph:: ECS_AL2023_NVIDIA doesn't support ``p3`` and ``g3`` instance types. - **ECS_AL1** - `Amazon Linux <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#alami>`_ . Amazon Linux has reached the end-of-life of standard support. For more information, see `Amazon Linux AMI <https://docs.aws.amazon.com/amazon-linux-ami/>`_ . - **EKS** - If the ``imageIdOverride`` parameter isn't specified, then a recent `Amazon EKS-optimized Amazon Linux AMI <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ ( ``EKS_AL2`` ) is used. If a new image type is specified in an update, but neither an ``imageId`` nor a ``imageIdOverride`` parameter is specified, then the latest Amazon EKS optimized AMI for that image type that AWS Batch supports is used. .. epigraph:: Starting end of October 2025 Amazon EKS optimized Amazon Linux 2023 AMIs will be the default on AWS Batch for EKS versions prior to 1.33. Starting from Kubernetes version 1.33, EKS optimized Amazon Linux 2023 AMIs will be the default when it becomes supported on AWS Batch . AWS will end support for Amazon EKS AL2-optimized and AL2-accelerated AMIs, starting 11/26/25. You can continue using AWS Batch -provided Amazon EKS optimized Amazon Linux 2 AMIs on your Amazon EKS compute environments beyond the 11/26/25 end-of-support date, these compute environments will no longer receive any new software updates, security patches, or bug fixes from AWS . For more information on upgrading from AL2 to AL2023, see `How to upgrade from EKS AL2 to EKS AL2023 <https://docs.aws.amazon.com/>`_ in the *AWS Batch User Guide* . - **EKS_AL2** - `Amazon Linux 2 <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : Default for all non-GPU instance families. - **EKS_AL2_NVIDIA** - `Amazon Linux 2 (accelerated) <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : Default for all GPU instance families (for example, ``P4`` and ``G4`` ) and can be used for all non AWS Graviton-based instance types. - **EKS_AL2023** - `Amazon Linux 2023 <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : AWS Batch supports Amazon Linux 2023. .. epigraph:: Amazon Linux 2023 does not support ``A1`` instances. - **EKS_AL2023_NVIDIA** - `Amazon Linux 2023 (accelerated) <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : GPU instance families and can be used for all non AWS Graviton-based instance types.
|
|
1793
1802
|
:param image_id_override: The AMI ID used for instances launched in the compute environment that match the image type. This setting overrides the ``imageId`` set in the ``computeResource`` object. .. epigraph:: The AMI that you choose for a compute environment must match the architecture of the instance types that you intend to use for that compute environment. For example, if your compute environment uses A1 instance types, the compute resource AMI that you choose must support ARM instances. Amazon ECS vends both x86 and ARM versions of the Amazon ECS-optimized Amazon Linux 2 AMI. For more information, see `Amazon ECS-optimized Amazon Linux 2 AMI <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#ecs-optimized-ami-linux-variants.html>`_ in the *Amazon Elastic Container Service Developer Guide* .
|
|
1794
1803
|
:param image_kubernetes_version: The Kubernetes version for the compute environment. If you don't specify a value, the latest version that AWS Batch supports is used.
|
|
1795
1804
|
|
|
@@ -1838,8 +1847,21 @@ class CfnComputeEnvironment(
|
|
|
1838
1847
|
|
|
1839
1848
|
Amazon Linux 2023 does not support ``A1`` instances.
|
|
1840
1849
|
|
|
1850
|
+
- **ECS_AL2023_NVIDIA** - `Amazon Linux 2023 (GPU) <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#gpuami>`_ : For all GPU instance families and can be used for all non AWS Graviton-based instance types.
|
|
1851
|
+
|
|
1852
|
+
.. epigraph::
|
|
1853
|
+
|
|
1854
|
+
ECS_AL2023_NVIDIA doesn't support ``p3`` and ``g3`` instance types.
|
|
1855
|
+
|
|
1841
1856
|
- **ECS_AL1** - `Amazon Linux <https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#alami>`_ . Amazon Linux has reached the end-of-life of standard support. For more information, see `Amazon Linux AMI <https://docs.aws.amazon.com/amazon-linux-ami/>`_ .
|
|
1842
1857
|
- **EKS** - If the ``imageIdOverride`` parameter isn't specified, then a recent `Amazon EKS-optimized Amazon Linux AMI <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ ( ``EKS_AL2`` ) is used. If a new image type is specified in an update, but neither an ``imageId`` nor a ``imageIdOverride`` parameter is specified, then the latest Amazon EKS optimized AMI for that image type that AWS Batch supports is used.
|
|
1858
|
+
|
|
1859
|
+
.. epigraph::
|
|
1860
|
+
|
|
1861
|
+
Starting end of October 2025 Amazon EKS optimized Amazon Linux 2023 AMIs will be the default on AWS Batch for EKS versions prior to 1.33. Starting from Kubernetes version 1.33, EKS optimized Amazon Linux 2023 AMIs will be the default when it becomes supported on AWS Batch .
|
|
1862
|
+
|
|
1863
|
+
AWS will end support for Amazon EKS AL2-optimized and AL2-accelerated AMIs, starting 11/26/25. You can continue using AWS Batch -provided Amazon EKS optimized Amazon Linux 2 AMIs on your Amazon EKS compute environments beyond the 11/26/25 end-of-support date, these compute environments will no longer receive any new software updates, security patches, or bug fixes from AWS . For more information on upgrading from AL2 to AL2023, see `How to upgrade from EKS AL2 to EKS AL2023 <https://docs.aws.amazon.com/>`_ in the *AWS Batch User Guide* .
|
|
1864
|
+
|
|
1843
1865
|
- **EKS_AL2** - `Amazon Linux 2 <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : Default for all non-GPU instance families.
|
|
1844
1866
|
- **EKS_AL2_NVIDIA** - `Amazon Linux 2 (accelerated) <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : Default for all GPU instance families (for example, ``P4`` and ``G4`` ) and can be used for all non AWS Graviton-based instance types.
|
|
1845
1867
|
- **EKS_AL2023** - `Amazon Linux 2023 <https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html>`_ : AWS Batch supports Amazon Linux 2023.
|
|
@@ -2006,7 +2028,7 @@ class CfnComputeEnvironment(
|
|
|
2006
2028
|
|
|
2007
2029
|
:param launch_template_id: The ID of the launch template. *Note:* If you specify the ``launchTemplateId`` you can't specify the ``launchTemplateName`` as well.
|
|
2008
2030
|
:param launch_template_name: The name of the launch template. *Note:* If you specify the ``launchTemplateName`` you can't specify the ``launchTemplateId`` as well.
|
|
2009
|
-
:param target_instance_types: The instance type or family that this override launch template should be applied to. This parameter is required when defining a launch template override. Information included in this parameter must meet the following requirements: - Must be a valid Amazon EC2 instance type or family. - ``optimal``
|
|
2031
|
+
:param target_instance_types: The instance type or family that this override launch template should be applied to. This parameter is required when defining a launch template override. Information included in this parameter must meet the following requirements: - Must be a valid Amazon EC2 instance type or family. - The following AWS Batch ``InstanceTypes`` are not allowed: ``optimal`` , ``default_x86_64`` , and ``default_arm64`` . - ``targetInstanceTypes`` can target only instance types and families that are included within the ```ComputeResource.instanceTypes`` <https://docs.aws.amazon.com/batch/latest/APIReference/API_ComputeResource.html#Batch-Type-ComputeResource-instanceTypes>`_ set. ``targetInstanceTypes`` doesn't need to include all of the instances from the ``instanceType`` set, but at least a subset. For example, if ``ComputeResource.instanceTypes`` includes ``[m5, g5]`` , ``targetInstanceTypes`` can include ``[m5.2xlarge]`` and ``[m5.large]`` but not ``[c5.large]`` . - ``targetInstanceTypes`` included within the same launch template override or across launch template overrides can't overlap for the same compute environment. For example, you can't define one launch template override to target an instance family and another define an instance type within this same family.
|
|
2010
2032
|
:param userdata_type: The EKS node initialization process to use. You only need to specify this value if you are using a custom AMI. The default value is ``EKS_BOOTSTRAP_SH`` . If *imageType* is a custom AMI based on EKS_AL2023 or EKS_AL2023_NVIDIA then you must choose ``EKS_NODEADM`` .
|
|
2011
2033
|
:param version: The version number of the launch template, ``$Default`` , or ``$Latest`` . If the value is ``$Default`` , the default version of the launch template is used. If the value is ``$Latest`` , the latest version of the launch template is used. .. epigraph:: If the AMI ID that's used in a compute environment is from the launch template, the AMI isn't changed when the compute environment is updated. It's only changed if the ``updateToLatestImageVersion`` parameter for the compute environment is set to ``true`` . During an infrastructure update, if either ``$Default`` or ``$Latest`` is specified, AWS Batch re-evaluates the launch template version, and it might use a different version of the launch template. This is the case even if the launch template isn't specified in the update. When updating a compute environment, changing the launch template requires an infrastructure update of the compute environment. For more information, see `Updating compute environments <https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html>`_ in the *AWS Batch User Guide* . Default: ``$Default`` Latest: ``$Latest``
|
|
2012
2034
|
|
|
@@ -2077,7 +2099,7 @@ class CfnComputeEnvironment(
|
|
|
2077
2099
|
Information included in this parameter must meet the following requirements:
|
|
2078
2100
|
|
|
2079
2101
|
- Must be a valid Amazon EC2 instance type or family.
|
|
2080
|
-
- ``optimal``
|
|
2102
|
+
- The following AWS Batch ``InstanceTypes`` are not allowed: ``optimal`` , ``default_x86_64`` , and ``default_arm64`` .
|
|
2081
2103
|
- ``targetInstanceTypes`` can target only instance types and families that are included within the ```ComputeResource.instanceTypes`` <https://docs.aws.amazon.com/batch/latest/APIReference/API_ComputeResource.html#Batch-Type-ComputeResource-instanceTypes>`_ set. ``targetInstanceTypes`` doesn't need to include all of the instances from the ``instanceType`` set, but at least a subset. For example, if ``ComputeResource.instanceTypes`` includes ``[m5, g5]`` , ``targetInstanceTypes`` can include ``[m5.2xlarge]`` and ``[m5.large]`` but not ``[c5.large]`` .
|
|
2082
2104
|
- ``targetInstanceTypes`` included within the same launch template override or across launch template overrides can't overlap for the same compute environment. For example, you can't define one launch template override to target an instance family and another define an instance type within this same family.
|
|
2083
2105
|
|
|
@@ -6656,7 +6678,7 @@ class CfnJobDefinition(
|
|
|
6656
6678
|
) -> None:
|
|
6657
6679
|
'''Log configuration options to send to a custom log driver for the container.
|
|
6658
6680
|
|
|
6659
|
-
:param log_driver: The log driver to use for the container. The valid values that are listed for this parameter are log drivers that the Amazon ECS container agent can communicate with by default. The supported log drivers are ``awslogs`` , ``fluentd`` , ``gelf`` , ``json-file`` , ``journald`` , ``logentries`` , ``syslog`` , and ``splunk`` . .. epigraph:: Jobs that are running on Fargate resources are restricted to the ``awslogs`` and ``splunk`` log drivers. - **awsfirelens** - Specifies the firelens logging driver. For more information on configuring Firelens, see `Send Amazon ECS logs to an AWS service or AWS Partner <https://docs.aws.amazon.com//AmazonECS/latest/developerguide/using_firelens.html>`_ in the *Amazon Elastic Container Service Developer Guide* . - **awslogs** - Specifies the Amazon CloudWatch Logs logging driver. For more information, see `Using the awslogs log driver <https://docs.aws.amazon.com/batch/latest/userguide/using_awslogs.html>`_ in the *AWS Batch User Guide* and `Amazon CloudWatch Logs logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/awslogs/>`_ in the Docker documentation. - **fluentd** - Specifies the Fluentd logging driver. For more information including usage and options, see `Fluentd logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/fluentd/>`_ in the *Docker documentation* . - **gelf** - Specifies the Graylog Extended Format (GELF) logging driver. For more information including usage and options, see `Graylog Extended Format logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/gelf/>`_ in the *Docker documentation* . - **journald** - Specifies the journald logging driver. For more information including usage and options, see `Journald logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/journald/>`_ in the *Docker documentation* . - **json-file** - Specifies the JSON file logging driver. For more information including usage and options, see `JSON File logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/json-file/>`_ in the *Docker documentation* . - **splunk** - Specifies the Splunk logging driver. For more information including usage and options, see `Splunk logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/splunk/>`_ in the *Docker documentation* . - **syslog** - Specifies the syslog logging driver. For more information including usage and options, see `Syslog logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/syslog/>`_ in the *Docker documentation* . .. epigraph:: If you have a custom driver that's not listed earlier that you want to work with the Amazon ECS container agent, you can fork the Amazon ECS container agent project that's `available on GitHub <https://docs.aws.amazon.com/https://github.com/aws/amazon-ecs-agent>`_ and customize it to work with that driver. We encourage you to submit pull requests for changes that you want to have included. However, Amazon Web Services doesn't currently support running modified copies of this software. This parameter requires version 1.18 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: ``sudo docker version | grep "Server API version"``
|
|
6681
|
+
:param log_driver: The log driver to use for the container. The valid values that are listed for this parameter are log drivers that the Amazon ECS container agent can communicate with by default. The supported log drivers are ``awsfirelens`` , ``awslogs`` , ``fluentd`` , ``gelf`` , ``json-file`` , ``journald`` , ``logentries`` , ``syslog`` , and ``splunk`` . .. epigraph:: Jobs that are running on Fargate resources are restricted to the ``awslogs`` and ``splunk`` log drivers. - **awsfirelens** - Specifies the firelens logging driver. For more information on configuring Firelens, see `Send Amazon ECS logs to an AWS service or AWS Partner <https://docs.aws.amazon.com//AmazonECS/latest/developerguide/using_firelens.html>`_ in the *Amazon Elastic Container Service Developer Guide* . - **awslogs** - Specifies the Amazon CloudWatch Logs logging driver. For more information, see `Using the awslogs log driver <https://docs.aws.amazon.com/batch/latest/userguide/using_awslogs.html>`_ in the *AWS Batch User Guide* and `Amazon CloudWatch Logs logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/awslogs/>`_ in the Docker documentation. - **fluentd** - Specifies the Fluentd logging driver. For more information including usage and options, see `Fluentd logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/fluentd/>`_ in the *Docker documentation* . - **gelf** - Specifies the Graylog Extended Format (GELF) logging driver. For more information including usage and options, see `Graylog Extended Format logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/gelf/>`_ in the *Docker documentation* . - **journald** - Specifies the journald logging driver. For more information including usage and options, see `Journald logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/journald/>`_ in the *Docker documentation* . - **json-file** - Specifies the JSON file logging driver. For more information including usage and options, see `JSON File logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/json-file/>`_ in the *Docker documentation* . - **splunk** - Specifies the Splunk logging driver. For more information including usage and options, see `Splunk logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/splunk/>`_ in the *Docker documentation* . - **syslog** - Specifies the syslog logging driver. For more information including usage and options, see `Syslog logging driver <https://docs.aws.amazon.com/https://docs.docker.com/config/containers/logging/syslog/>`_ in the *Docker documentation* . .. epigraph:: If you have a custom driver that's not listed earlier that you want to work with the Amazon ECS container agent, you can fork the Amazon ECS container agent project that's `available on GitHub <https://docs.aws.amazon.com/https://github.com/aws/amazon-ecs-agent>`_ and customize it to work with that driver. We encourage you to submit pull requests for changes that you want to have included. However, Amazon Web Services doesn't currently support running modified copies of this software. This parameter requires version 1.18 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: ``sudo docker version | grep "Server API version"``
|
|
6660
6682
|
:param options: The configuration options to send to the log driver. This parameter requires version 1.19 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: ``sudo docker version | grep "Server API version"``
|
|
6661
6683
|
:param secret_options: The secrets to pass to the log configuration. For more information, see `Specifying sensitive data <https://docs.aws.amazon.com/batch/latest/userguide/specifying-sensitive-data.html>`_ in the *AWS Batch User Guide* .
|
|
6662
6684
|
|
|
@@ -6701,7 +6723,7 @@ class CfnJobDefinition(
|
|
|
6701
6723
|
|
|
6702
6724
|
The valid values that are listed for this parameter are log drivers that the Amazon ECS container agent can communicate with by default.
|
|
6703
6725
|
|
|
6704
|
-
The supported log drivers are ``awslogs`` , ``fluentd`` , ``gelf`` , ``json-file`` , ``journald`` , ``logentries`` , ``syslog`` , and ``splunk`` .
|
|
6726
|
+
The supported log drivers are ``awsfirelens`` , ``awslogs`` , ``fluentd`` , ``gelf`` , ``json-file`` , ``journald`` , ``logentries`` , ``syslog`` , and ``splunk`` .
|
|
6705
6727
|
.. epigraph::
|
|
6706
6728
|
|
|
6707
6729
|
Jobs that are running on Fargate resources are restricted to the ``awslogs`` and ``splunk`` log drivers.
|
|
@@ -11598,7 +11620,7 @@ class CfnSchedulingPolicy(
|
|
|
11598
11620
|
|
|
11599
11621
|
Share identifiers that aren't included have a default weight of ``1.0`` .
|
|
11600
11622
|
|
|
11601
|
-
:param share_identifier: A share identifier or share identifier prefix. If the string ends with an asterisk (*), this entry specifies the weight factor to use for share identifiers that start with that prefix. The list of share identifiers in a fair-share policy can't overlap. For example, you can't have one that specifies a ``shareIdentifier`` of ``UserA*`` and another that specifies a ``shareIdentifier`` of ``
|
|
11623
|
+
:param share_identifier: A share identifier or share identifier prefix. If the string ends with an asterisk (*), this entry specifies the weight factor to use for share identifiers that start with that prefix. The list of share identifiers in a fair-share policy can't overlap. For example, you can't have one that specifies a ``shareIdentifier`` of ``UserA*`` and another that specifies a ``shareIdentifier`` of ``UserA1`` . There can be no more than 500 share identifiers active in a job queue. The string is limited to 255 alphanumeric characters, and can be followed by an asterisk (*).
|
|
11602
11624
|
:param weight_factor: The weight factor for the share identifier. The default value is 1.0. A lower value has a higher priority for compute resources. For example, jobs that use a share identifier with a weight factor of 0.125 (1/8) get 8 times the compute resources of jobs that use a share identifier with a weight factor of 1. The smallest supported value is 0.0001, and the largest supported value is 999.9999.
|
|
11603
11625
|
|
|
11604
11626
|
:see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-schedulingpolicy-shareattributes.html
|
|
@@ -11629,7 +11651,7 @@ class CfnSchedulingPolicy(
|
|
|
11629
11651
|
def share_identifier(self) -> typing.Optional[builtins.str]:
|
|
11630
11652
|
'''A share identifier or share identifier prefix.
|
|
11631
11653
|
|
|
11632
|
-
If the string ends with an asterisk (*), this entry specifies the weight factor to use for share identifiers that start with that prefix. The list of share identifiers in a fair-share policy can't overlap. For example, you can't have one that specifies a ``shareIdentifier`` of ``UserA*`` and another that specifies a ``shareIdentifier`` of ``
|
|
11654
|
+
If the string ends with an asterisk (*), this entry specifies the weight factor to use for share identifiers that start with that prefix. The list of share identifiers in a fair-share policy can't overlap. For example, you can't have one that specifies a ``shareIdentifier`` of ``UserA*`` and another that specifies a ``shareIdentifier`` of ``UserA1`` .
|
|
11633
11655
|
|
|
11634
11656
|
There can be no more than 500 share identifiers active in a job queue.
|
|
11635
11657
|
|
aws_cdk/aws_bedrock/__init__.py
CHANGED
|
@@ -23248,123 +23248,26 @@ class CfnGuardrail(
|
|
|
23248
23248
|
|
|
23249
23249
|
:see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html
|
|
23250
23250
|
:cloudformationResource: AWS::Bedrock::Guardrail
|
|
23251
|
-
:exampleMetadata: fixture=
|
|
23251
|
+
:exampleMetadata: fixture=default infused
|
|
23252
23252
|
|
|
23253
23253
|
Example::
|
|
23254
23254
|
|
|
23255
|
-
|
|
23256
|
-
# The values are placeholders you should change.
|
|
23257
|
-
from aws_cdk import aws_bedrock as bedrock
|
|
23255
|
+
import aws_cdk.aws_bedrock as bedrockl1
|
|
23258
23256
|
|
|
23259
|
-
|
|
23257
|
+
# Import a guardrail created through the L1 CDK CfnGuardrail construct
|
|
23258
|
+
l1guardrail = bedrockl1.CfnGuardrail(self, "MyCfnGuardrail",
|
|
23260
23259
|
blocked_input_messaging="blockedInputMessaging",
|
|
23261
23260
|
blocked_outputs_messaging="blockedOutputsMessaging",
|
|
23262
|
-
name="
|
|
23263
|
-
|
|
23264
|
-
|
|
23265
|
-
|
|
23266
|
-
filters_config=[bedrock.CfnGuardrail.ContentFilterConfigProperty(
|
|
23267
|
-
input_strength="inputStrength",
|
|
23268
|
-
output_strength="outputStrength",
|
|
23269
|
-
type="type",
|
|
23270
|
-
|
|
23271
|
-
# the properties below are optional
|
|
23272
|
-
input_action="inputAction",
|
|
23273
|
-
input_enabled=False,
|
|
23274
|
-
input_modalities=["inputModalities"],
|
|
23275
|
-
output_action="outputAction",
|
|
23276
|
-
output_enabled=False,
|
|
23277
|
-
output_modalities=["outputModalities"]
|
|
23278
|
-
)],
|
|
23279
|
-
|
|
23280
|
-
# the properties below are optional
|
|
23281
|
-
content_filters_tier_config=bedrock.CfnGuardrail.ContentFiltersTierConfigProperty(
|
|
23282
|
-
tier_name="tierName"
|
|
23261
|
+
name="namemycfnguardrails",
|
|
23262
|
+
word_policy_config=bedrockl1.CfnGuardrail.WordPolicyConfigProperty(
|
|
23263
|
+
words_config=[bedrockl1.CfnGuardrail.WordConfigProperty(
|
|
23264
|
+
text="drugs"
|
|
23283
23265
|
)
|
|
23284
|
-
|
|
23285
|
-
contextual_grounding_policy_config=bedrock.CfnGuardrail.ContextualGroundingPolicyConfigProperty(
|
|
23286
|
-
filters_config=[bedrock.CfnGuardrail.ContextualGroundingFilterConfigProperty(
|
|
23287
|
-
threshold=123,
|
|
23288
|
-
type="type",
|
|
23289
|
-
|
|
23290
|
-
# the properties below are optional
|
|
23291
|
-
action="action",
|
|
23292
|
-
enabled=False
|
|
23293
|
-
)]
|
|
23294
|
-
),
|
|
23295
|
-
cross_region_config=bedrock.CfnGuardrail.GuardrailCrossRegionConfigProperty(
|
|
23296
|
-
guardrail_profile_arn="guardrailProfileArn"
|
|
23297
|
-
),
|
|
23298
|
-
description="description",
|
|
23299
|
-
kms_key_arn="kmsKeyArn",
|
|
23300
|
-
sensitive_information_policy_config=bedrock.CfnGuardrail.SensitiveInformationPolicyConfigProperty(
|
|
23301
|
-
pii_entities_config=[bedrock.CfnGuardrail.PiiEntityConfigProperty(
|
|
23302
|
-
action="action",
|
|
23303
|
-
type="type",
|
|
23304
|
-
|
|
23305
|
-
# the properties below are optional
|
|
23306
|
-
input_action="inputAction",
|
|
23307
|
-
input_enabled=False,
|
|
23308
|
-
output_action="outputAction",
|
|
23309
|
-
output_enabled=False
|
|
23310
|
-
)],
|
|
23311
|
-
regexes_config=[bedrock.CfnGuardrail.RegexConfigProperty(
|
|
23312
|
-
action="action",
|
|
23313
|
-
name="name",
|
|
23314
|
-
pattern="pattern",
|
|
23315
|
-
|
|
23316
|
-
# the properties below are optional
|
|
23317
|
-
description="description",
|
|
23318
|
-
input_action="inputAction",
|
|
23319
|
-
input_enabled=False,
|
|
23320
|
-
output_action="outputAction",
|
|
23321
|
-
output_enabled=False
|
|
23322
|
-
)]
|
|
23323
|
-
),
|
|
23324
|
-
tags=[CfnTag(
|
|
23325
|
-
key="key",
|
|
23326
|
-
value="value"
|
|
23327
|
-
)],
|
|
23328
|
-
topic_policy_config=bedrock.CfnGuardrail.TopicPolicyConfigProperty(
|
|
23329
|
-
topics_config=[bedrock.CfnGuardrail.TopicConfigProperty(
|
|
23330
|
-
definition="definition",
|
|
23331
|
-
name="name",
|
|
23332
|
-
type="type",
|
|
23333
|
-
|
|
23334
|
-
# the properties below are optional
|
|
23335
|
-
examples=["examples"],
|
|
23336
|
-
input_action="inputAction",
|
|
23337
|
-
input_enabled=False,
|
|
23338
|
-
output_action="outputAction",
|
|
23339
|
-
output_enabled=False
|
|
23340
|
-
)],
|
|
23341
|
-
|
|
23342
|
-
# the properties below are optional
|
|
23343
|
-
topics_tier_config=bedrock.CfnGuardrail.TopicsTierConfigProperty(
|
|
23344
|
-
tier_name="tierName"
|
|
23345
|
-
)
|
|
23346
|
-
),
|
|
23347
|
-
word_policy_config=bedrock.CfnGuardrail.WordPolicyConfigProperty(
|
|
23348
|
-
managed_word_lists_config=[bedrock.CfnGuardrail.ManagedWordsConfigProperty(
|
|
23349
|
-
type="type",
|
|
23350
|
-
|
|
23351
|
-
# the properties below are optional
|
|
23352
|
-
input_action="inputAction",
|
|
23353
|
-
input_enabled=False,
|
|
23354
|
-
output_action="outputAction",
|
|
23355
|
-
output_enabled=False
|
|
23356
|
-
)],
|
|
23357
|
-
words_config=[bedrock.CfnGuardrail.WordConfigProperty(
|
|
23358
|
-
text="text",
|
|
23359
|
-
|
|
23360
|
-
# the properties below are optional
|
|
23361
|
-
input_action="inputAction",
|
|
23362
|
-
input_enabled=False,
|
|
23363
|
-
output_action="outputAction",
|
|
23364
|
-
output_enabled=False
|
|
23365
|
-
)]
|
|
23266
|
+
]
|
|
23366
23267
|
)
|
|
23367
23268
|
)
|
|
23269
|
+
|
|
23270
|
+
imported_guardrail = bedrock.Guardrail.from_cfn_guardrail(l1guardrail)
|
|
23368
23271
|
'''
|
|
23369
23272
|
|
|
23370
23273
|
def __init__(
|
|
@@ -25672,123 +25575,26 @@ class CfnGuardrailProps:
|
|
|
25672
25575
|
:param word_policy_config: The word policy you configure for the guardrail.
|
|
25673
25576
|
|
|
25674
25577
|
:see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html
|
|
25675
|
-
:exampleMetadata: fixture=
|
|
25578
|
+
:exampleMetadata: fixture=default infused
|
|
25676
25579
|
|
|
25677
25580
|
Example::
|
|
25678
25581
|
|
|
25679
|
-
|
|
25680
|
-
# The values are placeholders you should change.
|
|
25681
|
-
from aws_cdk import aws_bedrock as bedrock
|
|
25582
|
+
import aws_cdk.aws_bedrock as bedrockl1
|
|
25682
25583
|
|
|
25683
|
-
|
|
25584
|
+
# Import a guardrail created through the L1 CDK CfnGuardrail construct
|
|
25585
|
+
l1guardrail = bedrockl1.CfnGuardrail(self, "MyCfnGuardrail",
|
|
25684
25586
|
blocked_input_messaging="blockedInputMessaging",
|
|
25685
25587
|
blocked_outputs_messaging="blockedOutputsMessaging",
|
|
25686
|
-
name="
|
|
25687
|
-
|
|
25688
|
-
|
|
25689
|
-
|
|
25690
|
-
filters_config=[bedrock.CfnGuardrail.ContentFilterConfigProperty(
|
|
25691
|
-
input_strength="inputStrength",
|
|
25692
|
-
output_strength="outputStrength",
|
|
25693
|
-
type="type",
|
|
25694
|
-
|
|
25695
|
-
# the properties below are optional
|
|
25696
|
-
input_action="inputAction",
|
|
25697
|
-
input_enabled=False,
|
|
25698
|
-
input_modalities=["inputModalities"],
|
|
25699
|
-
output_action="outputAction",
|
|
25700
|
-
output_enabled=False,
|
|
25701
|
-
output_modalities=["outputModalities"]
|
|
25702
|
-
)],
|
|
25703
|
-
|
|
25704
|
-
# the properties below are optional
|
|
25705
|
-
content_filters_tier_config=bedrock.CfnGuardrail.ContentFiltersTierConfigProperty(
|
|
25706
|
-
tier_name="tierName"
|
|
25588
|
+
name="namemycfnguardrails",
|
|
25589
|
+
word_policy_config=bedrockl1.CfnGuardrail.WordPolicyConfigProperty(
|
|
25590
|
+
words_config=[bedrockl1.CfnGuardrail.WordConfigProperty(
|
|
25591
|
+
text="drugs"
|
|
25707
25592
|
)
|
|
25708
|
-
|
|
25709
|
-
contextual_grounding_policy_config=bedrock.CfnGuardrail.ContextualGroundingPolicyConfigProperty(
|
|
25710
|
-
filters_config=[bedrock.CfnGuardrail.ContextualGroundingFilterConfigProperty(
|
|
25711
|
-
threshold=123,
|
|
25712
|
-
type="type",
|
|
25713
|
-
|
|
25714
|
-
# the properties below are optional
|
|
25715
|
-
action="action",
|
|
25716
|
-
enabled=False
|
|
25717
|
-
)]
|
|
25718
|
-
),
|
|
25719
|
-
cross_region_config=bedrock.CfnGuardrail.GuardrailCrossRegionConfigProperty(
|
|
25720
|
-
guardrail_profile_arn="guardrailProfileArn"
|
|
25721
|
-
),
|
|
25722
|
-
description="description",
|
|
25723
|
-
kms_key_arn="kmsKeyArn",
|
|
25724
|
-
sensitive_information_policy_config=bedrock.CfnGuardrail.SensitiveInformationPolicyConfigProperty(
|
|
25725
|
-
pii_entities_config=[bedrock.CfnGuardrail.PiiEntityConfigProperty(
|
|
25726
|
-
action="action",
|
|
25727
|
-
type="type",
|
|
25728
|
-
|
|
25729
|
-
# the properties below are optional
|
|
25730
|
-
input_action="inputAction",
|
|
25731
|
-
input_enabled=False,
|
|
25732
|
-
output_action="outputAction",
|
|
25733
|
-
output_enabled=False
|
|
25734
|
-
)],
|
|
25735
|
-
regexes_config=[bedrock.CfnGuardrail.RegexConfigProperty(
|
|
25736
|
-
action="action",
|
|
25737
|
-
name="name",
|
|
25738
|
-
pattern="pattern",
|
|
25739
|
-
|
|
25740
|
-
# the properties below are optional
|
|
25741
|
-
description="description",
|
|
25742
|
-
input_action="inputAction",
|
|
25743
|
-
input_enabled=False,
|
|
25744
|
-
output_action="outputAction",
|
|
25745
|
-
output_enabled=False
|
|
25746
|
-
)]
|
|
25747
|
-
),
|
|
25748
|
-
tags=[CfnTag(
|
|
25749
|
-
key="key",
|
|
25750
|
-
value="value"
|
|
25751
|
-
)],
|
|
25752
|
-
topic_policy_config=bedrock.CfnGuardrail.TopicPolicyConfigProperty(
|
|
25753
|
-
topics_config=[bedrock.CfnGuardrail.TopicConfigProperty(
|
|
25754
|
-
definition="definition",
|
|
25755
|
-
name="name",
|
|
25756
|
-
type="type",
|
|
25757
|
-
|
|
25758
|
-
# the properties below are optional
|
|
25759
|
-
examples=["examples"],
|
|
25760
|
-
input_action="inputAction",
|
|
25761
|
-
input_enabled=False,
|
|
25762
|
-
output_action="outputAction",
|
|
25763
|
-
output_enabled=False
|
|
25764
|
-
)],
|
|
25765
|
-
|
|
25766
|
-
# the properties below are optional
|
|
25767
|
-
topics_tier_config=bedrock.CfnGuardrail.TopicsTierConfigProperty(
|
|
25768
|
-
tier_name="tierName"
|
|
25769
|
-
)
|
|
25770
|
-
),
|
|
25771
|
-
word_policy_config=bedrock.CfnGuardrail.WordPolicyConfigProperty(
|
|
25772
|
-
managed_word_lists_config=[bedrock.CfnGuardrail.ManagedWordsConfigProperty(
|
|
25773
|
-
type="type",
|
|
25774
|
-
|
|
25775
|
-
# the properties below are optional
|
|
25776
|
-
input_action="inputAction",
|
|
25777
|
-
input_enabled=False,
|
|
25778
|
-
output_action="outputAction",
|
|
25779
|
-
output_enabled=False
|
|
25780
|
-
)],
|
|
25781
|
-
words_config=[bedrock.CfnGuardrail.WordConfigProperty(
|
|
25782
|
-
text="text",
|
|
25783
|
-
|
|
25784
|
-
# the properties below are optional
|
|
25785
|
-
input_action="inputAction",
|
|
25786
|
-
input_enabled=False,
|
|
25787
|
-
output_action="outputAction",
|
|
25788
|
-
output_enabled=False
|
|
25789
|
-
)]
|
|
25593
|
+
]
|
|
25790
25594
|
)
|
|
25791
25595
|
)
|
|
25596
|
+
|
|
25597
|
+
imported_guardrail = bedrock.Guardrail.from_cfn_guardrail(l1guardrail)
|
|
25792
25598
|
'''
|
|
25793
25599
|
if __debug__:
|
|
25794
25600
|
type_hints = typing.get_type_hints(_typecheckingstub__e16800cc7473874d0d58b13a772dade51a596e19ff440f95ad243d23606a6cea)
|
aws_cdk/aws_budgets/__init__.py
CHANGED
|
@@ -106,6 +106,7 @@ class CfnBudget(
|
|
|
106
106
|
budget_adjustment_period=123
|
|
107
107
|
)
|
|
108
108
|
),
|
|
109
|
+
billing_view_arn="billingViewArn",
|
|
109
110
|
budget_limit=budgets.CfnBudget.SpendProperty(
|
|
110
111
|
amount=123,
|
|
111
112
|
unit="unit"
|
|
@@ -389,6 +390,7 @@ class CfnBudget(
|
|
|
389
390
|
"budget_type": "budgetType",
|
|
390
391
|
"time_unit": "timeUnit",
|
|
391
392
|
"auto_adjust_data": "autoAdjustData",
|
|
393
|
+
"billing_view_arn": "billingViewArn",
|
|
392
394
|
"budget_limit": "budgetLimit",
|
|
393
395
|
"budget_name": "budgetName",
|
|
394
396
|
"cost_filters": "costFilters",
|
|
@@ -406,6 +408,7 @@ class CfnBudget(
|
|
|
406
408
|
budget_type: builtins.str,
|
|
407
409
|
time_unit: builtins.str,
|
|
408
410
|
auto_adjust_data: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnBudget.AutoAdjustDataProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
|
|
411
|
+
billing_view_arn: typing.Optional[builtins.str] = None,
|
|
409
412
|
budget_limit: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union["CfnBudget.SpendProperty", typing.Dict[builtins.str, typing.Any]]]] = None,
|
|
410
413
|
budget_name: typing.Optional[builtins.str] = None,
|
|
411
414
|
cost_filters: typing.Any = None,
|
|
@@ -426,6 +429,7 @@ class CfnBudget(
|
|
|
426
429
|
:param budget_type: Specifies whether this budget tracks costs, usage, RI utilization, RI coverage, Savings Plans utilization, or Savings Plans coverage.
|
|
427
430
|
:param time_unit: The length of time until a budget resets the actual and forecasted spend. ``DAILY`` is available only for ``RI_UTILIZATION`` and ``RI_COVERAGE`` budgets.
|
|
428
431
|
:param auto_adjust_data: Determine the budget amount for an auto-adjusting budget.
|
|
432
|
+
:param billing_view_arn:
|
|
429
433
|
:param budget_limit: The total amount of cost, usage, RI utilization, RI coverage, Savings Plans utilization, or Savings Plans coverage that you want to track with your budget. ``BudgetLimit`` is required for cost or usage budgets, but optional for RI or Savings Plans utilization or coverage budgets. RI and Savings Plans utilization or coverage budgets default to ``100`` . This is the only valid value for RI or Savings Plans utilization or coverage budgets. You can't use ``BudgetLimit`` with ``PlannedBudgetLimits`` for ``CreateBudget`` and ``UpdateBudget`` actions.
|
|
430
434
|
:param budget_name: The name of a budget. The value must be unique within an account. ``BudgetName`` can't include ``:`` and ``\\`` characters. If you don't include value for ``BudgetName`` in the template, Billing and Cost Management assigns your budget a randomly generated name.
|
|
431
435
|
:param cost_filters: The cost filters, such as ``Region`` , ``Service`` , ``LinkedAccount`` , ``Tag`` , or ``CostCategory`` , that are applied to a budget. AWS Budgets supports the following services as a ``Service`` filter for RI budgets: - Amazon EC2 - Amazon Redshift - Amazon Relational Database Service - Amazon ElastiCache - Amazon OpenSearch Service
|
|
@@ -461,6 +465,7 @@ class CfnBudget(
|
|
|
461
465
|
budget_adjustment_period=123
|
|
462
466
|
)
|
|
463
467
|
),
|
|
468
|
+
billing_view_arn="billingViewArn",
|
|
464
469
|
budget_limit=budgets.CfnBudget.SpendProperty(
|
|
465
470
|
amount=123,
|
|
466
471
|
unit="unit"
|
|
@@ -513,6 +518,7 @@ class CfnBudget(
|
|
|
513
518
|
check_type(argname="argument budget_type", value=budget_type, expected_type=type_hints["budget_type"])
|
|
514
519
|
check_type(argname="argument time_unit", value=time_unit, expected_type=type_hints["time_unit"])
|
|
515
520
|
check_type(argname="argument auto_adjust_data", value=auto_adjust_data, expected_type=type_hints["auto_adjust_data"])
|
|
521
|
+
check_type(argname="argument billing_view_arn", value=billing_view_arn, expected_type=type_hints["billing_view_arn"])
|
|
516
522
|
check_type(argname="argument budget_limit", value=budget_limit, expected_type=type_hints["budget_limit"])
|
|
517
523
|
check_type(argname="argument budget_name", value=budget_name, expected_type=type_hints["budget_name"])
|
|
518
524
|
check_type(argname="argument cost_filters", value=cost_filters, expected_type=type_hints["cost_filters"])
|
|
@@ -527,6 +533,8 @@ class CfnBudget(
|
|
|
527
533
|
}
|
|
528
534
|
if auto_adjust_data is not None:
|
|
529
535
|
self._values["auto_adjust_data"] = auto_adjust_data
|
|
536
|
+
if billing_view_arn is not None:
|
|
537
|
+
self._values["billing_view_arn"] = billing_view_arn
|
|
530
538
|
if budget_limit is not None:
|
|
531
539
|
self._values["budget_limit"] = budget_limit
|
|
532
540
|
if budget_name is not None:
|
|
@@ -577,6 +585,14 @@ class CfnBudget(
|
|
|
577
585
|
result = self._values.get("auto_adjust_data")
|
|
578
586
|
return typing.cast(typing.Optional[typing.Union[_IResolvable_da3f097b, "CfnBudget.AutoAdjustDataProperty"]], result)
|
|
579
587
|
|
|
588
|
+
@builtins.property
|
|
589
|
+
def billing_view_arn(self) -> typing.Optional[builtins.str]:
|
|
590
|
+
'''
|
|
591
|
+
:see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-billingviewarn
|
|
592
|
+
'''
|
|
593
|
+
result = self._values.get("billing_view_arn")
|
|
594
|
+
return typing.cast(typing.Optional[builtins.str], result)
|
|
595
|
+
|
|
580
596
|
@builtins.property
|
|
581
597
|
def budget_limit(
|
|
582
598
|
self,
|
|
@@ -2029,6 +2045,7 @@ class CfnBudgetProps:
|
|
|
2029
2045
|
budget_adjustment_period=123
|
|
2030
2046
|
)
|
|
2031
2047
|
),
|
|
2048
|
+
billing_view_arn="billingViewArn",
|
|
2032
2049
|
budget_limit=budgets.CfnBudget.SpendProperty(
|
|
2033
2050
|
amount=123,
|
|
2034
2051
|
unit="unit"
|
|
@@ -3344,6 +3361,7 @@ def _typecheckingstub__b2c7f5c59209a2623bf116ca3a20b23835ececd0df52736e4f148622f
|
|
|
3344
3361
|
budget_type: builtins.str,
|
|
3345
3362
|
time_unit: builtins.str,
|
|
3346
3363
|
auto_adjust_data: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnBudget.AutoAdjustDataProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
|
|
3364
|
+
billing_view_arn: typing.Optional[builtins.str] = None,
|
|
3347
3365
|
budget_limit: typing.Optional[typing.Union[_IResolvable_da3f097b, typing.Union[CfnBudget.SpendProperty, typing.Dict[builtins.str, typing.Any]]]] = None,
|
|
3348
3366
|
budget_name: typing.Optional[builtins.str] = None,
|
|
3349
3367
|
cost_filters: typing.Any = None,
|