Skip to content

Commit 27de0a0

Browse files
skinny85mergify[bot]
authored andcommitted
feat: upgrade to CloudFormation specification 6.0.0 (#3942)
* feat: upgrade to CloudFormation specification 6.0.0. * Add tags for the EC2 expectations. * Add tags for Autoscaling expectations. * Add tags for CodeDeploy expectations. * Add tags for EKS expectations. * Add tags for ECS expectations. * Add tags for events-targets expectations. * Add tags for stepfunctions-tasks expectations. * Add tags for ecs-patterns expectations.
1 parent 1f589a3 commit 27de0a0

22 files changed

+855
-49
lines changed

packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.expected.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,13 @@
395395
}
396396
],
397397
"Version": "2012-10-17"
398-
}
398+
},
399+
"Tags": [
400+
{
401+
"Key": "Name",
402+
"Value": "aws-cdk-autoscaling-integ/Fleet"
403+
}
404+
]
399405
}
400406
},
401407
"FleetInstanceProfileC6192A66": {

packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.expected.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,13 @@
569569
}
570570
],
571571
"Version": "2012-10-17"
572-
}
572+
},
573+
"Tags": [
574+
{
575+
"Key": "Name",
576+
"Value": "aws-cdk-asg-integ/Fleet"
577+
}
578+
]
573579
}
574580
},
575581
"FleetInstanceProfileC6192A66": {

packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.expected.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,13 @@
416416
}
417417
],
418418
"Version": "2012-10-17"
419-
}
419+
},
420+
"Tags": [
421+
{
422+
"Key": "Name",
423+
"Value": "aws-cdk-asg-integ/Fleet"
424+
}
425+
]
420426
}
421427
},
422428
"FleetInstanceProfileC6192A66": {

packages/@aws-cdk/aws-autoscaling/test/integ.custom-scaling.expected.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,13 @@
395395
}
396396
],
397397
"Version": "2012-10-17"
398-
}
398+
},
399+
"Tags": [
400+
{
401+
"Key": "Name",
402+
"Value": "aws-cdk-autoscaling-integ/Fleet"
403+
}
404+
]
399405
}
400406
},
401407
"FleetInstanceProfileC6192A66": {

packages/@aws-cdk/aws-autoscaling/test/integ.spot-instances.expected.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,13 @@
395395
}
396396
],
397397
"Version": "2012-10-17"
398-
}
398+
},
399+
"Tags": [
400+
{
401+
"Key": "Name",
402+
"Value": "aws-cdk-autoscaling-integ/Fleet"
403+
}
404+
]
399405
}
400406
},
401407
"FleetInstanceProfileC6192A66": {

packages/@aws-cdk/aws-autoscaling/test/test.auto-scaling-group.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,13 @@ export = {
6363
}
6464
],
6565
"Version": "2012-10-17"
66-
}
66+
},
67+
"Tags": [
68+
{
69+
"Key": "Name",
70+
"Value": "MyFleet"
71+
}
72+
],
6773
}
6874
},
6975
"MyFleetInstanceProfile70A58496": {

packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.expected.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,13 @@
548548
}
549549
],
550550
"Version": "2012-10-17"
551-
}
551+
},
552+
"Tags": [
553+
{
554+
"Key": "Name",
555+
"Value": "aws-cdk-codedeploy-server-dg/ASG"
556+
}
557+
]
552558
}
553559
},
554560
"ASGInstanceRoleDefaultPolicy7636D8BF": {
@@ -859,4 +865,4 @@
859865
}
860866
}
861867
}
862-
}
868+
}

packages/@aws-cdk/aws-ec2/test/integ.bastion-host.expected.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,13 @@
542542
}
543543
],
544544
"Version": "2012-10-17"
545-
}
545+
},
546+
"Tags": [
547+
{
548+
"Key": "Name",
549+
"Value": "BastionHost"
550+
}
551+
]
546552
}
547553
},
548554
"BastionHostInstanceRoleDefaultPolicy17347525": {
@@ -632,4 +638,4 @@
632638
"Default": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2"
633639
}
634640
}
635-
}
641+
}

packages/@aws-cdk/aws-ec2/test/integ.instance.expected.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,13 @@
551551
}
552552
],
553553
"Version": "2012-10-17"
554-
}
554+
},
555+
"Tags": [
556+
{
557+
"Key": "Name",
558+
"Value": "TestStack/Instance"
559+
}
560+
]
555561
}
556562
},
557563
"InstanceInstanceRoleDefaultPolicy4ACE9290": {
@@ -629,4 +635,4 @@
629635
"Default": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2"
630636
}
631637
}
632-
}
638+
}

packages/@aws-cdk/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.lit.expected.json

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,13 @@
239239
}
240240
],
241241
"Version": "2012-10-17"
242-
}
242+
},
243+
"Tags": [
244+
{
245+
"Key": "Name",
246+
"Value": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup"
247+
}
248+
]
243249
}
244250
},
245251
"EcsClusterDefaultAutoScalingGroupInstanceRoleDefaultPolicy04DC6C80": {
@@ -381,6 +387,12 @@
381387
]
382388
]
383389
}
390+
],
391+
"Tags": [
392+
{
393+
"Key": "Name",
394+
"Value": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup"
395+
}
384396
]
385397
}
386398
},
@@ -556,7 +568,13 @@
556568
}
557569
],
558570
"Version": "2012-10-17"
559-
}
571+
},
572+
"Tags": [
573+
{
574+
"Key": "Name",
575+
"Value": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup"
576+
}
577+
]
560578
}
561579
},
562580
"EcsClusterDefaultAutoScalingGroupLifecycleHookDrainHookRoleDefaultPolicy75002F88": {
@@ -824,4 +842,4 @@
824842
"Default": "/aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id"
825843
}
826844
}
827-
}
845+
}

0 commit comments

Comments
 (0)