Merge branch 'main' into vpcv2_readme

Author: mergify[bot]

CHANGELOG.v2.alpha.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.154.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.154.0-alpha.0...v2.154.1-alpha.0) (2024-08-23)
+
 ## [2.154.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.153.0-alpha.0...v2.154.0-alpha.0) (2024-08-22)
 
 

CHANGELOG.v2.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.154.1](https://github.com/aws/aws-cdk/compare/v2.154.0...v2.154.1) (2024-08-23)
+
+
+### Features
+
+* update L1 CloudFormation resource definitions ([#31193](https://github.com/aws/aws-cdk/issues/31193)) ([aa97525](https://github.com/aws/aws-cdk/commit/aa975253fe7f21f20c1d0a92f0b9c4fd28ed3236))
+* update L1 CloudFormation resource definitions ([#31194](https://github.com/aws/aws-cdk/issues/31194)) ([2191264](https://github.com/aws/aws-cdk/commit/2191264491dbf373c0678f6984a1beab7d913d5f))
+
+
+### Bug Fixes
+
+* **cloudfront:** requirement of domainNames prevents moving a domain name between distributions ([#31001](https://github.com/aws/aws-cdk/issues/31001)) ([1255ce3](https://github.com/aws/aws-cdk/commit/1255ce3b68341755f1bd8f44d68d0da8558a1a5e)), closes [#29960](https://github.com/aws/aws-cdk/issues/29960) [#29329](https://github.com/aws/aws-cdk/issues/29329)
+
 ## [2.154.0](https://github.com/aws/aws-cdk/compare/v2.153.0...v2.154.0) (2024-08-22)
 
 
@@ -28,7 +41,6 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### Bug Fixes
 
-* **cloudfront:** requirement of domainNames prevents moving a domain name between distributions ([#31001](https://github.com/aws/aws-cdk/issues/31001)) ([acdf7d3](https://github.com/aws/aws-cdk/commit/acdf7d3a1ffe2cbc8239cd0b788dc47b99e35184)), closes [#29960](https://github.com/aws/aws-cdk/issues/29960) [#29329](https://github.com/aws/aws-cdk/issues/29329)
 * **elasticloadbalancingv2-targets:** add AlbListenerTarget for NLBs, deprecate AlbTarget due to ALB listener race conditions ([#17208](https://github.com/aws/aws-cdk/issues/17208)) ([#30396](https://github.com/aws/aws-cdk/issues/30396)) ([1fca1e5](https://github.com/aws/aws-cdk/commit/1fca1e5b92ba760a33652f39c2345f6aa1eaa9f7)), closes [/github.com/aws/aws-cdk/issues/17208#issuecomment-1681475590](https://github.com/aws//github.com/aws/aws-cdk/issues/17208/issues/issuecomment-1681475590)
 * **lambda:** validate localMountPath format and length ([#31019](https://github.com/aws/aws-cdk/issues/31019)) ([c159e77](https://github.com/aws/aws-cdk/commit/c159e77ab34701fc6780b9501f1692fbf2366b04))
 * **vpc-v2:** fixing default scope id ([#31102](https://github.com/aws/aws-cdk/issues/31102)) ([0007a29](https://github.com/aws/aws-cdk/commit/0007a29714cf04abb307845874dde27c813d45dd))

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-run-task.assets.json

@@ -828,7 +828,7 @@
          "GroupId"
         ]
        },
-       "\"]}},\"Overrides\":{\"ContainerOverrides\":[{\"Name\":\"TheContainer\",\"Environment\":[{\"Name\":\"SOME_KEY\",\"Value.$\":\"$.SomeKey\"}]}]},\"LaunchType\":\"FARGATE\",\"PlatformVersion\":\"1.4.0\"}},\"FargateTaskSetRevisionNumber\":{\"Next\":\"FargateTaskWithPropagatedTag\",\"Type\":\"Task\",\"Resource\":\"arn:",
+       "\"]}},\"Overrides\":{\"Cpu\":\"1024\",\"Memory\":\"2048\",\"ContainerOverrides\":[{\"Name\":\"TheContainer\",\"Environment\":[{\"Name\":\"SOME_KEY\",\"Value.$\":\"$.SomeKey\"}]}]},\"LaunchType\":\"FARGATE\",\"PlatformVersion\":\"1.4.0\"}},\"FargateTaskSetRevisionNumber\":{\"Next\":\"FargateTaskWithPropagatedTag\",\"Type\":\"Task\",\"Resource\":\"arn:",
        {
         "Ref": "AWS::Partition"
        },

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-run-task.template.json

@@ -57,6 +57,8 @@ const definition = new sfn.Pass(stack, 'Start', {
       platformVersion: ecs.FargatePlatformVersion.VERSION1_4,
     }),
     taskTimeout: sfn.Timeout.at('$.Timeout'),
+    cpu: '1024',
+    memoryMiB: '2048',
   }),
 ).next(
   new tasks.EcsRunTask(stack, 'FargateTaskSetRevisionNumber', {

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/manifest.json

@@ -23,8 +23,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.1.18",
-    "@aws-cdk/service-spec-types": "^0.0.86",
+    "@aws-cdk/aws-service-spec": "^0.1.20",
+    "@aws-cdk/service-spec-types": "^0.0.87",
     "chalk": "^4",
     "diff": "^5.2.0",
     "fast-deep-equal": "^3.1.3",

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/tree.json

@@ -74,7 +74,7 @@
     "@aws-cdk/cloud-assembly-schema": "^36.0.5",
     "@aws-cdk/cloudformation-diff": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
-    "@aws-cdk/aws-service-spec": "^0.1.18",
+    "@aws-cdk/aws-service-spec": "^0.1.20",
     "cdk-assets": "^2.151.2",
     "@aws-cdk/cdk-cli-wrapper": "0.0.0",
     "aws-cdk": "0.0.0",

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.ts

@@ -25,7 +25,7 @@ export class Annotations {
   /**
    * Assert that an error with the given message exists in the synthesized CDK `Stack`.
    *
-   * @param constructPath the construct path to the error. Provide `'*'` to match all errors in the template.
+   * @param constructPath the construct path to the error, provide `'*'` to match all errors in the template.
    * @param message the error message as should be expected. This should be a string or Matcher object.
    */
   public hasError(constructPath: string, message: any): void {
@@ -38,7 +38,7 @@ export class Annotations {
   /**
    * Assert that an error with the given message does not exist in the synthesized CDK `Stack`.
    *
-   * @param constructPath the construct path to the error. Provide `'*'` to match all errors in the template.
+   * @param constructPath the construct path to the error, provide `'*'` to match all errors in the template.
    * @param message the error message as should be expected. This should be a string or Matcher object.
    */
   public hasNoError(constructPath: string, message: any): void {
@@ -51,7 +51,7 @@ export class Annotations {
   /**
    * Get the set of matching errors of a given construct path and message.
    *
-   * @param constructPath the construct path to the error. Provide `'*'` to match all errors in the template.
+   * @param constructPath the construct path to the error, provide `'*'` to match all errors in the template.
    * @param message the error message as should be expected. This should be a string or Matcher object.
    */
   public findError(constructPath: string, message: any): SynthesisMessage[] {
@@ -61,7 +61,7 @@ export class Annotations {
   /**
    * Assert that an warning with the given message exists in the synthesized CDK `Stack`.
    *
-   * @param constructPath the construct path to the warning. Provide `'*'` to match all warnings in the template.
+   * @param constructPath the construct path to the warning, provide `'*'` to match all warnings in the template.
    * @param message the warning message as should be expected. This should be a string or Matcher object.
    */
   public hasWarning(constructPath: string, message: any): void {
@@ -74,7 +74,7 @@ export class Annotations {
   /**
    * Assert that an warning with the given message does not exist in the synthesized CDK `Stack`.
    *
-   * @param constructPath the construct path to the warning. Provide `'*'` to match all warnings in the template.
+   * @param constructPath the construct path to the warning, provide `'*'` to match all warnings in the template.
    * @param message the warning message as should be expected. This should be a string or Matcher object.
    */
   public hasNoWarning(constructPath: string, message: any): void {
@@ -87,7 +87,7 @@ export class Annotations {
   /**
    * Get the set of matching warning of a given construct path and message.
    *
-   * @param constructPath the construct path to the warning. Provide `'*'` to match all warnings in the template.
+   * @param constructPath the construct path to the warning, provide `'*'` to match all warnings in the template.
    * @param message the warning message as should be expected. This should be a string or Matcher object.
    */
   public findWarning(constructPath: string, message: any): SynthesisMessage[] {
@@ -97,7 +97,7 @@ export class Annotations {
   /**
    * Assert that an info with the given message exists in the synthesized CDK `Stack`.
    *
-   * @param constructPath the construct path to the info. Provide `'*'` to match all info in the template.
+   * @param constructPath the construct path to the info, provide `'*'` to match all info in the template.
    * @param message the info message as should be expected. This should be a string or Matcher object.
    */
   public hasInfo(constructPath: string, message: any): void {
@@ -110,7 +110,7 @@ export class Annotations {
   /**
    * Assert that an info with the given message does not exist in the synthesized CDK `Stack`.
    *
-   * @param constructPath the construct path to the info. Provide `'*'` to match all info in the template.
+   * @param constructPath the construct path to the info, provide `'*'` to match all info in the template.
    * @param message the info message as should be expected. This should be a string or Matcher object.
    */
   public hasNoInfo(constructPath: string, message: any): void {
@@ -123,7 +123,7 @@ export class Annotations {
   /**
    * Get the set of matching infos of a given construct path and message.
    *
-   * @param constructPath the construct path to the info. Provide `'*'` to match all infos in the template.
+   * @param constructPath the construct path to the info, provide `'*'` to match all infos in the template.
    * @param message the info message as should be expected. This should be a string or Matcher object.
    */
   public findInfo(constructPath: string, message: any): SynthesisMessage[] {

packages/@aws-cdk/cloudformation-diff/package.json

@@ -168,7 +168,7 @@ export class Template {
    * Assert that a Parameter with the given properties exists in the CloudFormation template.
    * By default, performs partial matching on the parameter, via the `Match.objectLike()`.
    * To configure different behavior, use other matchers in the `Match` class.
-   * @param logicalId the name of the parameter. Provide `'*'` to match all parameters in the template.
+   * @param logicalId the name of the parameter, provide `'*'` to match all parameters in the template.
    * @param props the parameter as should be expected in the template.
    */
   public hasParameter(logicalId: string, props: any): void {
@@ -180,7 +180,7 @@ export class Template {
 
   /**
    * Get the set of matching Parameters that match the given properties in the CloudFormation template.
-   * @param logicalId the name of the parameter. Provide `'*'` to match all parameters in the template.
+   * @param logicalId the name of the parameter, provide `'*'` to match all parameters in the template.
    * @param props by default, matches all Parameters in the template.
    * When a literal object is provided, performs a partial match via `Match.objectLike()`.
    * Use the `Match` APIs to configure a different behaviour.
@@ -193,7 +193,7 @@ export class Template {
    * Assert that an Output with the given properties exists in the CloudFormation template.
    * By default, performs partial matching on the resource, via the `Match.objectLike()`.
    * To configure different behavior, use other matchers in the `Match` class.
-   * @param logicalId the name of the output. Provide `'*'` to match all outputs in the template.
+   * @param logicalId the name of the output, provide `'*'` to match all outputs in the template.
    * @param props the output as should be expected in the template.
    */
   public hasOutput(logicalId: string, props: any): void {
@@ -205,7 +205,7 @@ export class Template {
 
   /**
    * Get the set of matching Outputs that match the given properties in the CloudFormation template.
-   * @param logicalId the name of the output. Provide `'*'` to match all outputs in the template.
+   * @param logicalId the name of the output, provide `'*'` to match all outputs in the template.
    * @param props by default, matches all Outputs in the template.
    * When a literal object is provided, performs a partial match via `Match.objectLike()`.
    * Use the `Match` APIs to configure a different behaviour.
@@ -218,7 +218,7 @@ export class Template {
    * Assert that a Mapping with the given properties exists in the CloudFormation template.
    * By default, performs partial matching on the resource, via the `Match.objectLike()`.
    * To configure different behavior, use other matchers in the `Match` class.
-   * @param logicalId the name of the mapping. Provide `'*'` to match all mappings in the template.
+   * @param logicalId the name of the mapping, provide `'*'` to match all mappings in the template.
    * @param props the output as should be expected in the template.
    */
   public hasMapping(logicalId: string, props: any): void {
@@ -230,7 +230,7 @@ export class Template {
 
   /**
    * Get the set of matching Mappings that match the given properties in the CloudFormation template.
-   * @param logicalId the name of the mapping. Provide `'*'` to match all mappings in the template.
+   * @param logicalId the name of the mapping, provide `'*'` to match all mappings in the template.
    * @param props by default, matches all Mappings in the template.
    * When a literal object is provided, performs a partial match via `Match.objectLike()`.
    * Use the `Match` APIs to configure a different behaviour.
@@ -243,7 +243,7 @@ export class Template {
    * Assert that a Condition with the given properties exists in the CloudFormation template.
    * By default, performs partial matching on the resource, via the `Match.objectLike()`.
    * To configure different behavior, use other matchers in the `Match` class.
-   * @param logicalId the name of the mapping. Provide `'*'` to match all conditions in the template.
+   * @param logicalId the name of the mapping, provide `'*'` to match all conditions in the template.
    * @param props the output as should be expected in the template.
    */
   public hasCondition(logicalId: string, props: any): void {
@@ -255,7 +255,7 @@ export class Template {
 
   /**
    * Get the set of matching Conditions that match the given properties in the CloudFormation template.
-   * @param logicalId the name of the condition. Provide `'*'` to match all conditions in the template.
+   * @param logicalId the name of the condition, provide `'*'` to match all conditions in the template.
    * @param props by default, matches all Conditions in the template.
    * When a literal object is provided, performs a partial match via `Match.objectLike()`.
    * Use the `Match` APIs to configure a different behaviour.

packages/@aws-cdk/integ-runner/package.json

@@ -701,6 +701,39 @@ const runTask = new tasks.EcsRunTask(this, 'RunFargate', {
 });
 ```
 
+#### Override CPU and Memory Parameter
+
+By setting the property cpu or memoryMiB, you can override the Fargate or EC2 task instance size at runtime.
+
+see: https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_TaskOverride.html
+
+```ts
+const vpc = ec2.Vpc.fromLookup(this, 'Vpc', {
+  isDefault: true,
+});
+const cluster = new ecs.Cluster(this, 'ECSCluster', { vpc });
+
+const taskDefinition = new ecs.TaskDefinition(this, 'TD', {
+  compatibility: ecs.Compatibility.FARGATE,
+  cpu: '256',
+  memoryMiB: '512'
+});
+
+taskDefinition.addContainer('TheContainer', {
+  image: ecs.ContainerImage.fromRegistry('foo/bar'),
+});
+
+const runTask = new tasks.EcsRunTask(this, 'Run', {
+  integrationPattern: sfn.IntegrationPattern.RUN_JOB,
+  cluster,
+  taskDefinition,
+  launchTarget: new tasks.EcsFargateLaunchTarget(),
+  cpu: '1024',
+  memoryMiB: '1048'
+});
+```
+
+
 #### ECS enable Exec
 
 By setting the property [`enableExecuteCommand`](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_RunTask.html#ECS-RunTask-request-enableExecuteCommand) to `true`, you can enable the [ECS Exec feature](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html) for the task for either Fargate or EC2 launch types.