Skip to content

Commit 0e251e6

Browse files
tam0ritam0ri
authored
fix(ecs): validation for task definition fails when task-level memory is defined but container-level memory and memoryReservation are not defined with EC2 compatibility (#26027)
Currently, validation for ECS task definition fails when task-level memory is defined but container-level memory and memoryReservation are not defined with EC2 compatibility. On the other hand, if we specify task-level memory, we can omit container-level memory and memoryReservation parameters from ECS API perspective. This PR solves the issue by skipping the validation when task-level memory is defined. Closes #25275 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent f8a94d8 commit 0e251e6

11 files changed

+551
-4
lines changed

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "32.0.0",
3+
"files": {
4+
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
5+
"source": {
6+
"path": "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
}
17+
},
18+
"dockerImages": {}
19+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.template.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"Parameters": {
3+
"BootstrapVersion": {
4+
"Type": "AWS::SSM::Parameter::Value<String>",
5+
"Default": "/cdk-bootstrap/hnb659fds/version",
6+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
7+
}
8+
},
9+
"Rules": {
10+
"CheckBootstrapVersion": {
11+
"Assertions": [
12+
{
13+
"Assert": {
14+
"Fn::Not": [
15+
{
16+
"Fn::Contains": [
17+
[
18+
"1",
19+
"2",
20+
"3",
21+
"4",
22+
"5"
23+
],
24+
{
25+
"Ref": "BootstrapVersion"
26+
}
27+
]
28+
}
29+
]
30+
},
31+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
32+
}
33+
]
34+
}
35+
}
36+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/aws-ecs-task-definition-without-container-level-memory.assets.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "32.0.0",
3+
"files": {
4+
"f0418187a9bb20f94c9c34694a64572ac4e7cb61962e83798b4266d0351e1f69": {
5+
"source": {
6+
"path": "aws-ecs-task-definition-without-container-level-memory.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "f0418187a9bb20f94c9c34694a64572ac4e7cb61962e83798b4266d0351e1f69.json",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
}
17+
},
18+
"dockerImages": {}
19+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/aws-ecs-task-definition-without-container-level-memory.template.json

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"Resources": {
3+
"TaskDefTaskRole1EDB4A67": {
4+
"Type": "AWS::IAM::Role",
5+
"Properties": {
6+
"AssumeRolePolicyDocument": {
7+
"Statement": [
8+
{
9+
"Action": "sts:AssumeRole",
10+
"Effect": "Allow",
11+
"Principal": {
12+
"Service": "ecs-tasks.amazonaws.com"
13+
}
14+
}
15+
],
16+
"Version": "2012-10-17"
17+
}
18+
}
19+
},
20+
"TaskDef54694570": {
21+
"Type": "AWS::ECS::TaskDefinition",
22+
"Properties": {
23+
"ContainerDefinitions": [
24+
{
25+
"Essential": true,
26+
"Image": "public.ecr.aws/ecs-sample-image/amazon-ecs-sample:latest",
27+
"Name": "Container"
28+
}
29+
],
30+
"Cpu": "256",
31+
"Family": "app",
32+
"Memory": "512",
33+
"NetworkMode": "bridge",
34+
"RequiresCompatibilities": [
35+
"EC2"
36+
],
37+
"TaskRoleArn": {
38+
"Fn::GetAtt": [
39+
"TaskDefTaskRole1EDB4A67",
40+
"Arn"
41+
]
42+
}
43+
}
44+
}
45+
},
46+
"Parameters": {
47+
"BootstrapVersion": {
48+
"Type": "AWS::SSM::Parameter::Value<String>",
49+
"Default": "/cdk-bootstrap/hnb659fds/version",
50+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
51+
}
52+
},
53+
"Rules": {
54+
"CheckBootstrapVersion": {
55+
"Assertions": [
56+
{
57+
"Assert": {
58+
"Fn::Not": [
59+
{
60+
"Fn::Contains": [
61+
[
62+
"1",
63+
"2",
64+
"3",
65+
"4",
66+
"5"
67+
],
68+
{
69+
"Ref": "BootstrapVersion"
70+
}
71+
]
72+
}
73+
]
74+
},
75+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
76+
}
77+
]
78+
}
79+
}
80+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/cdk.out

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":"32.0.0"}

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/integ.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": "32.0.0",
3+
"testCases": {
4+
"TaskDefinitionWithoutContainerLevelMemory/DefaultTest": {
5+
"stacks": [
6+
"aws-ecs-task-definition-without-container-level-memory"
7+
],
8+
"assertionStack": "TaskDefinitionWithoutContainerLevelMemory/DefaultTest/DeployAssert",
9+
"assertionStackName": "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE"
10+
}
11+
}
12+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/manifest.json

+117
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
{
2+
"version": "32.0.0",
3+
"artifacts": {
4+
"aws-ecs-task-definition-without-container-level-memory.assets": {
5+
"type": "cdk:asset-manifest",
6+
"properties": {
7+
"file": "aws-ecs-task-definition-without-container-level-memory.assets.json",
8+
"requiresBootstrapStackVersion": 6,
9+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
10+
}
11+
},
12+
"aws-ecs-task-definition-without-container-level-memory": {
13+
"type": "aws:cloudformation:stack",
14+
"environment": "aws://unknown-account/unknown-region",
15+
"properties": {
16+
"templateFile": "aws-ecs-task-definition-without-container-level-memory.template.json",
17+
"validateOnSynth": false,
18+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
19+
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f0418187a9bb20f94c9c34694a64572ac4e7cb61962e83798b4266d0351e1f69.json",
21+
"requiresBootstrapStackVersion": 6,
22+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
23+
"additionalDependencies": [
24+
"aws-ecs-task-definition-without-container-level-memory.assets"
25+
],
26+
"lookupRole": {
27+
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
28+
"requiresBootstrapStackVersion": 8,
29+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
30+
}
31+
},
32+
"dependencies": [
33+
"aws-ecs-task-definition-without-container-level-memory.assets"
34+
],
35+
"metadata": {
36+
"/aws-ecs-task-definition-without-container-level-memory/TaskDef/TaskRole/Resource": [
37+
{
38+
"type": "aws:cdk:logicalId",
39+
"data": "TaskDefTaskRole1EDB4A67"
40+
}
41+
],
42+
"/aws-ecs-task-definition-without-container-level-memory/TaskDef/Resource": [
43+
{
44+
"type": "aws:cdk:logicalId",
45+
"data": "TaskDef54694570"
46+
}
47+
],
48+
"/aws-ecs-task-definition-without-container-level-memory/BootstrapVersion": [
49+
{
50+
"type": "aws:cdk:logicalId",
51+
"data": "BootstrapVersion"
52+
}
53+
],
54+
"/aws-ecs-task-definition-without-container-level-memory/CheckBootstrapVersion": [
55+
{
56+
"type": "aws:cdk:logicalId",
57+
"data": "CheckBootstrapVersion"
58+
}
59+
]
60+
},
61+
"displayName": "aws-ecs-task-definition-without-container-level-memory"
62+
},
63+
"TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets": {
64+
"type": "cdk:asset-manifest",
65+
"properties": {
66+
"file": "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets.json",
67+
"requiresBootstrapStackVersion": 6,
68+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
69+
}
70+
},
71+
"TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE": {
72+
"type": "aws:cloudformation:stack",
73+
"environment": "aws://unknown-account/unknown-region",
74+
"properties": {
75+
"templateFile": "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.template.json",
76+
"validateOnSynth": false,
77+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
78+
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
79+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
80+
"requiresBootstrapStackVersion": 6,
81+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
82+
"additionalDependencies": [
83+
"TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets"
84+
],
85+
"lookupRole": {
86+
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
87+
"requiresBootstrapStackVersion": 8,
88+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
89+
}
90+
},
91+
"dependencies": [
92+
"TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets"
93+
],
94+
"metadata": {
95+
"/TaskDefinitionWithoutContainerLevelMemory/DefaultTest/DeployAssert/BootstrapVersion": [
96+
{
97+
"type": "aws:cdk:logicalId",
98+
"data": "BootstrapVersion"
99+
}
100+
],
101+
"/TaskDefinitionWithoutContainerLevelMemory/DefaultTest/DeployAssert/CheckBootstrapVersion": [
102+
{
103+
"type": "aws:cdk:logicalId",
104+
"data": "CheckBootstrapVersion"
105+
}
106+
]
107+
},
108+
"displayName": "TaskDefinitionWithoutContainerLevelMemory/DefaultTest/DeployAssert"
109+
},
110+
"Tree": {
111+
"type": "cdk:tree",
112+
"properties": {
113+
"file": "tree.json"
114+
}
115+
}
116+
}
117+
}

0 commit comments

Comments
 (0)