Skip to content

Commit 56656e0

Browse files
Don-CAElad Ben-Israel
Don-CA
authored and
Elad Ben-Israel
committed
feat(ecs): container dependencies (#3032)
Add new addContainerDependencies method to allow for container dependencies Fixes #2490
1 parent 8381683 commit 56656e0

26 files changed

+259
-191
lines changed

‎packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,7 @@
232232
{
233233
"Essential": true,
234234
"Image": "amazon/amazon-ecs-sample",
235-
"Links": [],
236-
"MountPoints": [],
237-
"Name": "Container",
238-
"PortMappings": [],
239-
"Ulimits": [],
240-
"VolumesFrom": []
235+
"Name": "Container"
241236
}
242237
],
243238
"Cpu": "256",

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,6 @@
671671
],
672672
"Essential": true,
673673
"Image": "amazon/amazon-ecs-sample",
674-
"Links": [],
675674
"LogConfiguration": {
676675
"LogDriver": "awslogs",
677676
"Options": {
@@ -685,11 +684,7 @@
685684
}
686685
},
687686
"Memory": 512,
688-
"MountPoints": [],
689-
"Name": "ScheduledContainer",
690-
"PortMappings": [],
691-
"Ulimits": [],
692-
"VolumesFrom": []
687+
"Name": "ScheduledContainer"
693688
}
694689
],
695690
"ExecutionRoleArn": {

‎packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.scheduled-ecs-task.ts

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ export = {
4444
{
4545
Essential: true,
4646
Image: "henk",
47-
Links: [],
4847
LogConfiguration: {
4948
LogDriver: "awslogs",
5049
Options: {
@@ -58,11 +57,7 @@ export = {
5857
}
5958
},
6059
Memory: 512,
61-
MountPoints: [],
62-
Name: "ScheduledContainer",
63-
PortMappings: [],
64-
Ulimits: [],
65-
VolumesFrom: []
60+
Name: "ScheduledContainer"
6661
}
6762
]
6863
}));
@@ -117,7 +112,6 @@ export = {
117112
],
118113
Essential: true,
119114
Image: "henk",
120-
Links: [],
121115
LogConfiguration: {
122116
LogDriver: "awslogs",
123117
Options: {
@@ -131,11 +125,7 @@ export = {
131125
}
132126
},
133127
Memory: 512,
134-
MountPoints: [],
135-
Name: "ScheduledContainer",
136-
PortMappings: [],
137-
Ulimits: [],
138-
VolumesFrom: []
128+
Name: "ScheduledContainer"
139129
}
140130
]
141131
}));
@@ -165,7 +155,6 @@ export = {
165155
{
166156
Essential: true,
167157
Image: "henk",
168-
Links: [],
169158
LogConfiguration: {
170159
LogDriver: "awslogs",
171160
Options: {
@@ -179,11 +168,7 @@ export = {
179168
}
180169
},
181170
MemoryReservation: 512,
182-
MountPoints: [],
183-
Name: "ScheduledContainer",
184-
PortMappings: [],
185-
Ulimits: [],
186-
VolumesFrom: []
171+
Name: "ScheduledContainer"
187172
}
188173
]
189174
}));
@@ -219,7 +204,6 @@ export = {
219204
],
220205
Essential: true,
221206
Image: "henk",
222-
Links: [],
223207
LogConfiguration: {
224208
LogDriver: "awslogs",
225209
Options: {
@@ -233,11 +217,7 @@ export = {
233217
}
234218
},
235219
MemoryReservation: 512,
236-
MountPoints: [],
237-
Name: "ScheduledContainer",
238-
PortMappings: [],
239-
Ulimits: [],
240-
VolumesFrom: []
220+
Name: "ScheduledContainer"
241221
}
242222
]
243223
}));

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,6 @@
584584
]
585585
]
586586
},
587-
"Links": [],
588587
"LogConfiguration": {
589588
"LogDriver": "awslogs",
590589
"Options": {
@@ -597,16 +596,13 @@
597596
}
598597
}
599598
},
600-
"MountPoints": [],
601599
"Name": "web",
602600
"PortMappings": [
603601
{
604602
"ContainerPort": 8000,
605603
"Protocol": "tcp"
606604
}
607-
],
608-
"Ulimits": [],
609-
"VolumesFrom": []
605+
]
610606
}
611607
],
612608
"Cpu": "256",

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,6 @@
549549
{
550550
"Essential": true,
551551
"Image": "amazon/amazon-ecs-sample",
552-
"Links": [],
553552
"LogConfiguration": {
554553
"LogDriver": "awslogs",
555554
"Options": {
@@ -562,16 +561,13 @@
562561
}
563562
}
564563
},
565-
"MountPoints": [],
566564
"Name": "web",
567565
"PortMappings": [
568566
{
569567
"ContainerPort": 80,
570568
"Protocol": "tcp"
571569
}
572-
],
573-
"Ulimits": [],
574-
"VolumesFrom": []
570+
]
575571
}
576572
],
577573
"Cpu": "512",

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
{
135135
"Essential": true,
136136
"Image": "amazon/amazon-ecs-sample",
137-
"Links": [],
138137
"LogConfiguration": {
139138
"LogDriver": "awslogs",
140139
"Options": {
@@ -147,16 +146,13 @@
147146
}
148147
}
149148
},
150-
"MountPoints": [],
151149
"Name": "web",
152150
"PortMappings": [
153151
{
154152
"ContainerPort": 80,
155153
"Protocol": "tcp"
156154
}
157-
],
158-
"Ulimits": [],
159-
"VolumesFrom": []
155+
]
160156
}
161157
],
162158
"Cpu": "512",
@@ -813,7 +809,6 @@
813809
{
814810
"Essential": true,
815811
"Image": "amazon/amazon-ecs-sample",
816-
"Links": [],
817812
"LogConfiguration": {
818813
"LogDriver": "awslogs",
819814
"Options": {
@@ -826,16 +821,13 @@
826821
}
827822
}
828823
},
829-
"MountPoints": [],
830824
"Name": "web",
831825
"PortMappings": [
832826
{
833827
"ContainerPort": 80,
834828
"Protocol": "tcp"
835829
}
836-
],
837-
"Ulimits": [],
838-
"VolumesFrom": []
830+
]
839831
}
840832
],
841833
"Cpu": "512",

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,6 @@
477477
{
478478
"Essential": true,
479479
"Image": "amazon/amazon-ecs-sample",
480-
"Links": [],
481480
"LogConfiguration": {
482481
"LogDriver": "awslogs",
483482
"Options": {
@@ -490,16 +489,13 @@
490489
}
491490
}
492491
},
493-
"MountPoints": [],
494492
"Name": "web",
495493
"PortMappings": [
496494
{
497495
"ContainerPort": 80,
498496
"Protocol": "tcp"
499497
}
500-
],
501-
"Ulimits": [],
502-
"VolumesFrom": []
498+
]
503499
}
504500
],
505501
"Cpu": "512",
@@ -1156,7 +1152,6 @@
11561152
{
11571153
"Essential": true,
11581154
"Image": "amazon/amazon-ecs-sample",
1159-
"Links": [],
11601155
"LogConfiguration": {
11611156
"LogDriver": "awslogs",
11621157
"Options": {
@@ -1169,16 +1164,13 @@
11691164
}
11701165
}
11711166
},
1172-
"MountPoints": [],
11731167
"Name": "web",
11741168
"PortMappings": [
11751169
{
11761170
"ContainerPort": 80,
11771171
"Protocol": "tcp"
11781172
}
1179-
],
1180-
"Ulimits": [],
1181-
"VolumesFrom": []
1173+
]
11821174
}
11831175
],
11841176
"Cpu": "512",
@@ -1492,7 +1484,6 @@
14921484
{
14931485
"Essential": true,
14941486
"Image": "amazon/amazon-ecs-sample",
1495-
"Links": [],
14961487
"LogConfiguration": {
14971488
"LogDriver": "awslogs",
14981489
"Options": {
@@ -1505,16 +1496,13 @@
15051496
}
15061497
}
15071498
},
1508-
"MountPoints": [],
15091499
"Name": "web",
15101500
"PortMappings": [
15111501
{
15121502
"ContainerPort": 80,
15131503
"Protocol": "tcp"
15141504
}
1515-
],
1516-
"Ulimits": [],
1517-
"VolumesFrom": []
1505+
]
15181506
}
15191507
],
15201508
"Cpu": "512",

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@
480480
{
481481
"Essential": true,
482482
"Image": "amazon/amazon-ecs-sample",
483-
"Links": [],
484483
"LogConfiguration": {
485484
"LogDriver": "awslogs",
486485
"Options": {
@@ -493,16 +492,13 @@
493492
}
494493
}
495494
},
496-
"MountPoints": [],
497495
"Name": "web",
498496
"PortMappings": [
499497
{
500498
"ContainerPort": 80,
501499
"Protocol": "tcp"
502500
}
503-
],
504-
"Ulimits": [],
505-
"VolumesFrom": []
501+
]
506502
}
507503
],
508504
"Cpu": "512",

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@
368368
]
369369
]
370370
},
371-
"Links": [],
372371
"LogConfiguration": {
373372
"LogDriver": "awslogs",
374373
"Options": {
@@ -381,11 +380,7 @@
381380
}
382381
}
383382
},
384-
"MountPoints": [],
385-
"Name": "ScheduledContainer",
386-
"PortMappings": [],
387-
"Ulimits": [],
388-
"VolumesFrom": []
383+
"Name": "ScheduledContainer"
389384
}
390385
],
391386
"Cpu": "256",

0 commit comments

Comments
 (0)