Skip to content

Commit f403e68

Browse files
committed
remove conflicts in index.js files
1 parent bf6760d commit f403e68

File tree

8 files changed

+38456
-9432
lines changed

8 files changed

+38456
-9432
lines changed
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/fargate/integ.service-connect.js.snapshot/aws-ecs-service-connect.template.json

+10
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,11 @@
547547
"Ref": "EcsCluster97242B84"
548548
},
549549
"DeploymentConfiguration": {
550+
"Alarms": {
551+
"AlarmNames": [],
552+
"Enable": false,
553+
"Rollback": false
554+
},
550555
"MaximumPercent": 200,
551556
"MinimumHealthyPercent": 50
552557
},
@@ -648,6 +653,11 @@
648653
"Ref": "EcsCluster97242B84"
649654
},
650655
"DeploymentConfiguration": {
656+
"Alarms": {
657+
"AlarmNames": [],
658+
"Enable": false,
659+
"Rollback": false
660+
},
651661
"MaximumPercent": 200,
652662
"MinimumHealthyPercent": 50
653663
},

packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/fargate/integ.service-connect.js.snapshot/cdk.out

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/fargate/integ.service-connect.js.snapshot/tree.json

+12-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/fargate/integ.service-connect.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ class ServiceConnect extends cdk.Stack {
7979
}
8080
}
8181

82-
const app = new cdk.App();
82+
const app = new cdk.App({
83+
postCliContext: {
84+
'@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm': false,
85+
},
86+
});
8387
const stack = new ServiceConnect(app, 'aws-ecs-service-connect');
8488

8589
const test = new integ.IntegTest(app, 'ServiceConnect', {

0 commit comments

Comments
 (0)