Skip to content

Commit bcb256f

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into nodejs-charset
2 parents b78d13d + 56974ac commit bcb256f

29 files changed

Lines changed: 296 additions & 74 deletions

‎packages/@aws-cdk-containers/ecs-service-extensions/test/integ.all-service-addons.expected.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@
102102
"productionenvironmentvpcPublicSubnet1NATGateway6075E4CA": {
103103
"Type": "AWS::EC2::NatGateway",
104104
"Properties": {
105+
"SubnetId": {
106+
"Ref": "productionenvironmentvpcPublicSubnet1Subnet8D92C089"
107+
},
105108
"AllocationId": {
106109
"Fn::GetAtt": [
107110
"productionenvironmentvpcPublicSubnet1EIP54BA88DB",
108111
"AllocationId"
109112
]
110113
},
111-
"SubnetId": {
112-
"Ref": "productionenvironmentvpcPublicSubnet1Subnet8D92C089"
113-
},
114114
"Tags": [
115115
{
116116
"Key": "Name",
@@ -199,15 +199,15 @@
199199
"productionenvironmentvpcPublicSubnet2NATGatewayE1850FCC": {
200200
"Type": "AWS::EC2::NatGateway",
201201
"Properties": {
202+
"SubnetId": {
203+
"Ref": "productionenvironmentvpcPublicSubnet2Subnet298E6C31"
204+
},
202205
"AllocationId": {
203206
"Fn::GetAtt": [
204207
"productionenvironmentvpcPublicSubnet2EIP14CA46AA",
205208
"AllocationId"
206209
]
207210
},
208-
"SubnetId": {
209-
"Ref": "productionenvironmentvpcPublicSubnet2Subnet298E6C31"
210-
},
211211
"Tags": [
212212
{
213213
"Key": "Name",
@@ -296,15 +296,15 @@
296296
"productionenvironmentvpcPublicSubnet3NATGateway94604057": {
297297
"Type": "AWS::EC2::NatGateway",
298298
"Properties": {
299+
"SubnetId": {
300+
"Ref": "productionenvironmentvpcPublicSubnet3SubnetC7B5665D"
301+
},
299302
"AllocationId": {
300303
"Fn::GetAtt": [
301304
"productionenvironmentvpcPublicSubnet3EIP53405AED",
302305
"AllocationId"
303306
]
304307
},
305-
"SubnetId": {
306-
"Ref": "productionenvironmentvpcPublicSubnet3SubnetC7B5665D"
307-
},
308308
"Tags": [
309309
{
310310
"Key": "Name",
@@ -2391,6 +2391,10 @@
23912391
{
23922392
"Key": "deregistration_delay.timeout_seconds",
23932393
"Value": "10"
2394+
},
2395+
{
2396+
"Key": "stickiness.enabled",
2397+
"Value": "false"
23942398
}
23952399
],
23962400
"TargetType": "ip",

‎packages/@aws-cdk-containers/ecs-service-extensions/test/integ.imported-environment.expected.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"/",
1919
{
20-
"Ref": "AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3Bucket60C7B412"
20+
"Ref": "AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3Bucket85F9E22A"
2121
},
2222
"/",
2323
{
@@ -27,7 +27,7 @@
2727
"Fn::Split": [
2828
"||",
2929
{
30-
"Ref": "AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3VersionKey6900DC52"
30+
"Ref": "AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3VersionKey8103F967"
3131
}
3232
]
3333
}
@@ -40,7 +40,7 @@
4040
"Fn::Split": [
4141
"||",
4242
{
43-
"Ref": "AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3VersionKey6900DC52"
43+
"Ref": "AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3VersionKey8103F967"
4444
}
4545
]
4646
}
@@ -163,6 +163,10 @@
163163
{
164164
"Key": "deregistration_delay.timeout_seconds",
165165
"Value": "10"
166+
},
167+
{
168+
"Key": "stickiness.enabled",
169+
"Value": "false"
166170
}
167171
],
168172
"TargetType": "ip",
@@ -358,17 +362,17 @@
358362
}
359363
},
360364
"Parameters": {
361-
"AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3Bucket60C7B412": {
365+
"AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3Bucket85F9E22A": {
362366
"Type": "String",
363-
"Description": "S3 bucket for asset \"b537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8\""
367+
"Description": "S3 bucket for asset \"e2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886\""
364368
},
365-
"AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8S3VersionKey6900DC52": {
369+
"AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886S3VersionKey8103F967": {
366370
"Type": "String",
367-
"Description": "S3 key for asset version \"b537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8\""
371+
"Description": "S3 key for asset version \"e2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886\""
368372
},
369-
"AssetParametersb537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8ArtifactHash5EEB924C": {
373+
"AssetParameterse2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886ArtifactHash6FA4ABA8": {
370374
"Type": "String",
371-
"Description": "Artifact hash for asset \"b537a3d3462b62d59d4661ff456403d270823b5c9974ea4f4264ff95683a8ba8\""
375+
"Description": "Artifact hash for asset \"e2fc78c01b63f40b6bbcc8ce3c0eaccd3bf8f0aa6196b65f8ee87fb97e343886\""
372376
}
373377
}
374378
}

‎packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.alb.expected.json‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@
9595
"VPCPublicSubnet1NATGatewayE0556630": {
9696
"Type": "AWS::EC2::NatGateway",
9797
"Properties": {
98+
"SubnetId": {
99+
"Ref": "VPCPublicSubnet1SubnetB4246D30"
100+
},
98101
"AllocationId": {
99102
"Fn::GetAtt": [
100103
"VPCPublicSubnet1EIP6AD938E8",
101104
"AllocationId"
102105
]
103106
},
104-
"SubnetId": {
105-
"Ref": "VPCPublicSubnet1SubnetB4246D30"
106-
},
107107
"Tags": [
108108
{
109109
"Key": "Name",
@@ -192,15 +192,15 @@
192192
"VPCPublicSubnet2NATGateway3C070193": {
193193
"Type": "AWS::EC2::NatGateway",
194194
"Properties": {
195+
"SubnetId": {
196+
"Ref": "VPCPublicSubnet2Subnet74179F39"
197+
},
195198
"AllocationId": {
196199
"Fn::GetAtt": [
197200
"VPCPublicSubnet2EIP4947BC00",
198201
"AllocationId"
199202
]
200203
},
201-
"SubnetId": {
202-
"Ref": "VPCPublicSubnet2Subnet74179F39"
203-
},
204204
"Tags": [
205205
{
206206
"Key": "Name",
@@ -289,15 +289,15 @@
289289
"VPCPublicSubnet3NATGatewayD3048F5C": {
290290
"Type": "AWS::EC2::NatGateway",
291291
"Properties": {
292+
"SubnetId": {
293+
"Ref": "VPCPublicSubnet3Subnet631C5E25"
294+
},
292295
"AllocationId": {
293296
"Fn::GetAtt": [
294297
"VPCPublicSubnet3EIPAD4BC883",
295298
"AllocationId"
296299
]
297300
},
298-
"SubnetId": {
299-
"Ref": "VPCPublicSubnet3Subnet631C5E25"
300-
},
301301
"Tags": [
302302
{
303303
"Key": "Name",
@@ -596,6 +596,12 @@
596596
"Properties": {
597597
"Port": 80,
598598
"Protocol": "HTTP",
599+
"TargetGroupAttributes": [
600+
{
601+
"Key": "stickiness.enabled",
602+
"Value": "false"
603+
}
604+
],
599605
"VpcId": {
600606
"Ref": "VPCB9E5F0B4"
601607
}

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@
9595
"VPCPublicSubnet1NATGatewayE0556630": {
9696
"Type": "AWS::EC2::NatGateway",
9797
"Properties": {
98+
"SubnetId": {
99+
"Ref": "VPCPublicSubnet1SubnetB4246D30"
100+
},
98101
"AllocationId": {
99102
"Fn::GetAtt": [
100103
"VPCPublicSubnet1EIP6AD938E8",
101104
"AllocationId"
102105
]
103106
},
104-
"SubnetId": {
105-
"Ref": "VPCPublicSubnet1SubnetB4246D30"
106-
},
107107
"Tags": [
108108
{
109109
"Key": "Name",
@@ -192,15 +192,15 @@
192192
"VPCPublicSubnet2NATGateway3C070193": {
193193
"Type": "AWS::EC2::NatGateway",
194194
"Properties": {
195+
"SubnetId": {
196+
"Ref": "VPCPublicSubnet2Subnet74179F39"
197+
},
195198
"AllocationId": {
196199
"Fn::GetAtt": [
197200
"VPCPublicSubnet2EIP4947BC00",
198201
"AllocationId"
199202
]
200203
},
201-
"SubnetId": {
202-
"Ref": "VPCPublicSubnet2Subnet74179F39"
203-
},
204204
"Tags": [
205205
{
206206
"Key": "Name",
@@ -671,6 +671,12 @@
671671
"Properties": {
672672
"Port": 80,
673673
"Protocol": "HTTP",
674+
"TargetGroupAttributes": [
675+
{
676+
"Key": "stickiness.enabled",
677+
"Value": "false"
678+
}
679+
],
674680
"TargetType": "instance",
675681
"VpcId": {
676682
"Ref": "VPCB9E5F0B4"

‎packages/@aws-cdk/aws-ecs-patterns/test/ec2/integ.multiple-application-load-balanced-ecs-service.expected.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,12 @@
954954
"Properties": {
955955
"Port": 80,
956956
"Protocol": "HTTP",
957+
"TargetGroupAttributes": [
958+
{
959+
"Key": "stickiness.enabled",
960+
"Value": "false"
961+
}
962+
],
957963
"TargetType": "instance",
958964
"VpcId": {
959965
"Ref": "Vpc8378EB38"
@@ -965,6 +971,12 @@
965971
"Properties": {
966972
"Port": 80,
967973
"Protocol": "HTTP",
974+
"TargetGroupAttributes": [
975+
{
976+
"Key": "stickiness.enabled",
977+
"Value": "false"
978+
}
979+
],
968980
"TargetType": "instance",
969981
"VpcId": {
970982
"Ref": "Vpc8378EB38"

‎packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.alb-fargate-service-https.expected.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,12 @@
467467
"Properties": {
468468
"Port": 80,
469469
"Protocol": "HTTP",
470+
"TargetGroupAttributes": [
471+
{
472+
"Key": "stickiness.enabled",
473+
"Value": "false"
474+
}
475+
],
470476
"TargetType": "ip",
471477
"VpcId": {
472478
"Ref": "Vpc8378EB38"

‎packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.asset-image.expected.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,12 @@
453453
"Properties": {
454454
"Port": 80,
455455
"Protocol": "HTTP",
456+
"TargetGroupAttributes": [
457+
{
458+
"Key": "stickiness.enabled",
459+
"Value": "false"
460+
}
461+
],
456462
"TargetType": "ip",
457463
"VpcId": {
458464
"Ref": "Vpc8378EB38"

‎packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.circuit-breaker-load-balanced-fargate-service.expected.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,12 @@
453453
"Properties": {
454454
"Port": 80,
455455
"Protocol": "HTTP",
456+
"TargetGroupAttributes": [
457+
{
458+
"Key": "stickiness.enabled",
459+
"Value": "false"
460+
}
461+
],
456462
"TargetType": "ip",
457463
"VpcId": {
458464
"Ref": "Vpc8378EB38"

‎packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.executionrole.expected.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,12 @@
502502
"Properties": {
503503
"Port": 80,
504504
"Protocol": "HTTP",
505+
"TargetGroupAttributes": [
506+
{
507+
"Key": "stickiness.enabled",
508+
"Value": "false"
509+
}
510+
],
505511
"TargetType": "ip",
506512
"VpcId": {
507513
"Ref": "Vpc8378EB38"

‎packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3-autocreate.expected.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@
9595
"Properties": {
9696
"Port": 80,
9797
"Protocol": "HTTP",
98+
"TargetGroupAttributes": [
99+
{
100+
"Key": "stickiness.enabled",
101+
"Value": "false"
102+
}
103+
],
98104
"TargetType": "ip",
99105
"VpcId": {
100106
"Ref": "EcsDefaultClusterMnL3mNNYNVpc7788A521"

0 commit comments

Comments
 (0)