Merge branch 'main' into flink-120

aws · Sep 18, 2024 · 89e6428 · 89e6428
2 parents 19b6510 + de7ab7c
commit 89e6428
Show file tree

Hide file tree

Showing 29 changed files with 6,883 additions and 20 deletions.
diff --git a/...cs-patterns/test/ec2/integ.multiple-application-load-balanced-ecs-service-idle-timeout.ts b/...cs-patterns/test/ec2/integ.multiple-application-load-balanced-ecs-service-idle-timeout.ts
@@ -11,6 +11,7 @@ import { AUTOSCALING_GENERATE_LAUNCH_TEMPLATE } from 'aws-cdk-lib/cx-api';
 const app = new App({
   postCliContext: {
     '@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm': false,
+    '@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions': false,
   },
 });
 const stack = new Stack(app, 'aws-ecs-integ-alb-idle-timeout');

diff --git a/...eg/test/aws-ecs-patterns/test/ec2/integ.multiple-application-load-balanced-ecs-service.ts b/...eg/test/aws-ecs-patterns/test/ec2/integ.multiple-application-load-balanced-ecs-service.ts
@@ -3,9 +3,14 @@ import { Cluster, ContainerImage } from 'aws-cdk-lib/aws-ecs';
 import { App, Stack } from 'aws-cdk-lib';
 import * as integ from '@aws-cdk/integ-tests-alpha';
 import { ApplicationMultipleTargetGroupsEc2Service } from 'aws-cdk-lib/aws-ecs-patterns';
-import { AUTOSCALING_GENERATE_LAUNCH_TEMPLATE } from 'aws-cdk-lib/cx-api';
+import { AUTOSCALING_GENERATE_LAUNCH_TEMPLATE, REDUCE_EC2_FARGATE_CLOUDWATCH_PERMISSIONS } from 'aws-cdk-lib/cx-api';
 
-const app = new App({ postCliContext: { [AUTOSCALING_GENERATE_LAUNCH_TEMPLATE]: false } });
+const app = new App({
+  postCliContext: {
+    [AUTOSCALING_GENERATE_LAUNCH_TEMPLATE]: false,
+    [REDUCE_EC2_FARGATE_CLOUDWATCH_PERMISSIONS]: false,
+  },
+});
 const stack = new Stack(app, 'aws-ecs-integ-multiple-alb');
 const vpc = new Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
 const cluster = new Cluster(stack, 'Cluster', { vpc });

diff --git a/...ing/framework-integ/test/aws-ecs-patterns/test/fargate/integ.alb-fargate-service-https.ts b/...ing/framework-integ/test/aws-ecs-patterns/test/fargate/integ.alb-fargate-service-https.ts
@@ -6,7 +6,11 @@ import { App, Stack } from 'aws-cdk-lib';
 import * as integ from '@aws-cdk/integ-tests-alpha';
 import { ApplicationLoadBalancedFargateService } from 'aws-cdk-lib/aws-ecs-patterns';
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions': false,
+  },
+});
 const stack = new Stack(app, 'aws-ecs-integ-alb-fg-https');
 const vpc = new Vpc(stack, 'Vpc', { maxAzs: 2, restrictDefaultSecurityGroup: false });
 const cluster = new Cluster(stack, 'Cluster', { vpc });

diff --git a/.../asset.bde7b5c89cb43285f884c94f0b9e17cdb0f5eb5345005114dd60342e0b8a85a1/__entrypoint__.js b/.../asset.bde7b5c89cb43285f884c94f0b9e17cdb0f5eb5345005114dd60342e0b8a85a1/__entrypoint__.js
diff --git a/....snapshot/asset.bde7b5c89cb43285f884c94f0b9e17cdb0f5eb5345005114dd60342e0b8a85a1/index.js b/....snapshot/asset.bde7b5c89cb43285f884c94f0b9e17cdb0f5eb5345005114dd60342e0b8a85a1/index.js
diff --git a/...integ.enable-execute-command.js.snapshot/aws-ecs-integ-enable-execute-command.assets.json b/...integ.enable-execute-command.js.snapshot/aws-ecs-integ-enable-execute-command.assets.json