Skip to content

Commit

Permalink
feat(ecs): container dependencies (aws#3032)
Browse files Browse the repository at this point in the history 
Add new addContainerDependencies method to allow for container dependencies
Fixes aws#2490
  • Loading branch information
@Don-CA
Don-CA authored and Elad Ben-Israel committed Aug 5, 2019
1 parent 8381683 commit 56656e0
Show file tree
Hide file tree
Showing 26 changed files with 259 additions and 191 deletions.
7 changes: 1 addition & 6 deletions packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,7 @@
{
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Links": [],
"MountPoints": [],
"Name": "Container",
"PortMappings": [],
"Ulimits": [],
"VolumesFrom": []
"Name": "Container"
}
],
"Cpu": "256",
Expand Down
7 changes: 1 addition & 6 deletions packages/@aws-cdk/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.lit.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,6 @@
],
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -685,11 +684,7 @@
}
},
"Memory": 512,
"MountPoints": [],
"Name": "ScheduledContainer",
"PortMappings": [],
"Ulimits": [],
"VolumesFrom": []
"Name": "ScheduledContainer"
}
],
"ExecutionRoleArn": {
Expand Down
28 changes: 4 additions & 24 deletions packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.scheduled-ecs-task.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export = {
{
Essential: true,
Image: "henk",
Links: [],
LogConfiguration: {
LogDriver: "awslogs",
Options: {
Expand All @@ -58,11 +57,7 @@ export = {
}
},
Memory: 512,
MountPoints: [],
Name: "ScheduledContainer",
PortMappings: [],
Ulimits: [],
VolumesFrom: []
Name: "ScheduledContainer"
}
]
}));
Expand Down Expand Up @@ -117,7 +112,6 @@ export = {
],
Essential: true,
Image: "henk",
Links: [],
LogConfiguration: {
LogDriver: "awslogs",
Options: {
Expand All @@ -131,11 +125,7 @@ export = {
}
},
Memory: 512,
MountPoints: [],
Name: "ScheduledContainer",
PortMappings: [],
Ulimits: [],
VolumesFrom: []
Name: "ScheduledContainer"
}
]
}));
Expand Down Expand Up @@ -165,7 +155,6 @@ export = {
{
Essential: true,
Image: "henk",
Links: [],
LogConfiguration: {
LogDriver: "awslogs",
Options: {
Expand All @@ -179,11 +168,7 @@ export = {
}
},
MemoryReservation: 512,
MountPoints: [],
Name: "ScheduledContainer",
PortMappings: [],
Ulimits: [],
VolumesFrom: []
Name: "ScheduledContainer"
}
]
}));
Expand Down Expand Up @@ -219,7 +204,6 @@ export = {
],
Essential: true,
Image: "henk",
Links: [],
LogConfiguration: {
LogDriver: "awslogs",
Options: {
Expand All @@ -233,11 +217,7 @@ export = {
}
},
MemoryReservation: 512,
MountPoints: [],
Name: "ScheduledContainer",
PortMappings: [],
Ulimits: [],
VolumesFrom: []
Name: "ScheduledContainer"
}
]
}));
Expand Down
6 changes: 1 addition & 5 deletions packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.asset-image.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@
]
]
},
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -597,16 +596,13 @@
}
}
},
"MountPoints": [],
"Name": "web",
"PortMappings": [
{
"ContainerPort": 8000,
"Protocol": "tcp"
}
],
"Ulimits": [],
"VolumesFrom": []
]
}
],
"Cpu": "256",
Expand Down
6 changes: 1 addition & 5 deletions packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.executionrole.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,6 @@
{
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -562,16 +561,13 @@
}
}
},
"MountPoints": [],
"Name": "web",
"PortMappings": [
{
"ContainerPort": 80,
"Protocol": "tcp"
}
],
"Ulimits": [],
"VolumesFrom": []
]
}
],
"Cpu": "512",
Expand Down
12 changes: 2 additions & 10 deletions packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3-autocreate.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@
{
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -147,16 +146,13 @@
}
}
},
"MountPoints": [],
"Name": "web",
"PortMappings": [
{
"ContainerPort": 80,
"Protocol": "tcp"
}
],
"Ulimits": [],
"VolumesFrom": []
]
}
],
"Cpu": "512",
Expand Down Expand Up @@ -813,7 +809,6 @@
{
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -826,16 +821,13 @@
}
}
},
"MountPoints": [],
"Name": "web",
"PortMappings": [
{
"ContainerPort": 80,
"Protocol": "tcp"
}
],
"Ulimits": [],
"VolumesFrom": []
]
}
],
"Cpu": "512",
Expand Down
18 changes: 3 additions & 15 deletions packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3-vpconly.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,6 @@
{
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -490,16 +489,13 @@
}
}
},
"MountPoints": [],
"Name": "web",
"PortMappings": [
{
"ContainerPort": 80,
"Protocol": "tcp"
}
],
"Ulimits": [],
"VolumesFrom": []
]
}
],
"Cpu": "512",
Expand Down Expand Up @@ -1156,7 +1152,6 @@
{
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -1169,16 +1164,13 @@
}
}
},
"MountPoints": [],
"Name": "web",
"PortMappings": [
{
"ContainerPort": 80,
"Protocol": "tcp"
}
],
"Ulimits": [],
"VolumesFrom": []
]
}
],
"Cpu": "512",
Expand Down Expand Up @@ -1492,7 +1484,6 @@
{
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -1505,16 +1496,13 @@
}
}
},
"MountPoints": [],
"Name": "web",
"PortMappings": [
{
"ContainerPort": 80,
"Protocol": "tcp"
}
],
"Ulimits": [],
"VolumesFrom": []
]
}
],
"Cpu": "512",
Expand Down
6 changes: 1 addition & 5 deletions packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.l3.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,6 @@
{
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -493,16 +492,13 @@
}
}
},
"MountPoints": [],
"Name": "web",
"PortMappings": [
{
"ContainerPort": 80,
"Protocol": "tcp"
}
],
"Ulimits": [],
"VolumesFrom": []
]
}
],
"Cpu": "512",
Expand Down
7 changes: 1 addition & 6 deletions ...ges/@aws-cdk/aws-ecs-patterns/test/fargate/integ.scheduled-fargate-task.lit.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@
]
]
},
"Links": [],
"LogConfiguration": {
"LogDriver": "awslogs",
"Options": {
Expand All @@ -381,11 +380,7 @@
}
}
},
"MountPoints": [],
"Name": "ScheduledContainer",
"PortMappings": [],
"Ulimits": [],
"VolumesFrom": []
"Name": "ScheduledContainer"
}
],
"Cpu": "256",
Expand Down
Loading

0 comments on commit 56656e0

Please sign in to comment.