forked from aws/aws-cdk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 (aws#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 aws#25275 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
- Loading branch information
Showing
11 changed files
with
551 additions
and
4 deletions.
There are no files selected for viewing
19 changes: 19 additions & 0 deletions
19
...shot/TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "version": "32.0.0", | ||
| "files": { | ||
| "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { | ||
| "source": { | ||
| "path": "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.template.json", | ||
| "packaging": "file" | ||
| }, | ||
| "destinations": { | ||
| "current_account-current_region": { | ||
| "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", | ||
| "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "dockerImages": {} | ||
| } |
36 changes: 36 additions & 0 deletions
36
...ot/TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "Parameters": { | ||
| "BootstrapVersion": { | ||
| "Type": "AWS::SSM::Parameter::Value<String>", | ||
| "Default": "/cdk-bootstrap/hnb659fds/version", | ||
| "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
| } | ||
| }, | ||
| "Rules": { | ||
| "CheckBootstrapVersion": { | ||
| "Assertions": [ | ||
| { | ||
| "Assert": { | ||
| "Fn::Not": [ | ||
| { | ||
| "Fn::Contains": [ | ||
| [ | ||
| "1", | ||
| "2", | ||
| "3", | ||
| "4", | ||
| "5" | ||
| ], | ||
| { | ||
| "Ref": "BootstrapVersion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
...vel-memory.js.snapshot/aws-ecs-task-definition-without-container-level-memory.assets.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "version": "32.0.0", | ||
| "files": { | ||
| "f0418187a9bb20f94c9c34694a64572ac4e7cb61962e83798b4266d0351e1f69": { | ||
| "source": { | ||
| "path": "aws-ecs-task-definition-without-container-level-memory.template.json", | ||
| "packaging": "file" | ||
| }, | ||
| "destinations": { | ||
| "current_account-current_region": { | ||
| "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", | ||
| "objectKey": "f0418187a9bb20f94c9c34694a64572ac4e7cb61962e83798b4266d0351e1f69.json", | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "dockerImages": {} | ||
| } |
80 changes: 80 additions & 0 deletions
80
...l-memory.js.snapshot/aws-ecs-task-definition-without-container-level-memory.template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| { | ||
| "Resources": { | ||
| "TaskDefTaskRole1EDB4A67": { | ||
| "Type": "AWS::IAM::Role", | ||
| "Properties": { | ||
| "AssumeRolePolicyDocument": { | ||
| "Statement": [ | ||
| { | ||
| "Action": "sts:AssumeRole", | ||
| "Effect": "Allow", | ||
| "Principal": { | ||
| "Service": "ecs-tasks.amazonaws.com" | ||
| } | ||
| } | ||
| ], | ||
| "Version": "2012-10-17" | ||
| } | ||
| } | ||
| }, | ||
| "TaskDef54694570": { | ||
| "Type": "AWS::ECS::TaskDefinition", | ||
| "Properties": { | ||
| "ContainerDefinitions": [ | ||
| { | ||
| "Essential": true, | ||
| "Image": "public.ecr.aws/ecs-sample-image/amazon-ecs-sample:latest", | ||
| "Name": "Container" | ||
| } | ||
| ], | ||
| "Cpu": "256", | ||
| "Family": "app", | ||
| "Memory": "512", | ||
| "NetworkMode": "bridge", | ||
| "RequiresCompatibilities": [ | ||
| "EC2" | ||
| ], | ||
| "TaskRoleArn": { | ||
| "Fn::GetAtt": [ | ||
| "TaskDefTaskRole1EDB4A67", | ||
| "Arn" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "Parameters": { | ||
| "BootstrapVersion": { | ||
| "Type": "AWS::SSM::Parameter::Value<String>", | ||
| "Default": "/cdk-bootstrap/hnb659fds/version", | ||
| "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
| } | ||
| }, | ||
| "Rules": { | ||
| "CheckBootstrapVersion": { | ||
| "Assertions": [ | ||
| { | ||
| "Assert": { | ||
| "Fn::Not": [ | ||
| { | ||
| "Fn::Contains": [ | ||
| [ | ||
| "1", | ||
| "2", | ||
| "3", | ||
| "4", | ||
| "5" | ||
| ], | ||
| { | ||
| "Ref": "BootstrapVersion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
...aws-ecs/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/cdk.out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {"version":"32.0.0"} |
12 changes: 12 additions & 0 deletions
12
...-ecs/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/integ.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "version": "32.0.0", | ||
| "testCases": { | ||
| "TaskDefinitionWithoutContainerLevelMemory/DefaultTest": { | ||
| "stacks": [ | ||
| "aws-ecs-task-definition-without-container-level-memory" | ||
| ], | ||
| "assertionStack": "TaskDefinitionWithoutContainerLevelMemory/DefaultTest/DeployAssert", | ||
| "assertionStackName": "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE" | ||
| } | ||
| } | ||
| } |
117 changes: 117 additions & 0 deletions
117
...s/test/ec2/integ.task-definition-without-container-level-memory.js.snapshot/manifest.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| { | ||
| "version": "32.0.0", | ||
| "artifacts": { | ||
| "aws-ecs-task-definition-without-container-level-memory.assets": { | ||
| "type": "cdk:asset-manifest", | ||
| "properties": { | ||
| "file": "aws-ecs-task-definition-without-container-level-memory.assets.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "aws-ecs-task-definition-without-container-level-memory": { | ||
| "type": "aws:cloudformation:stack", | ||
| "environment": "aws://unknown-account/unknown-region", | ||
| "properties": { | ||
| "templateFile": "aws-ecs-task-definition-without-container-level-memory.template.json", | ||
| "validateOnSynth": false, | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", | ||
| "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", | ||
| "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f0418187a9bb20f94c9c34694a64572ac4e7cb61962e83798b4266d0351e1f69.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", | ||
| "additionalDependencies": [ | ||
| "aws-ecs-task-definition-without-container-level-memory.assets" | ||
| ], | ||
| "lookupRole": { | ||
| "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", | ||
| "requiresBootstrapStackVersion": 8, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "dependencies": [ | ||
| "aws-ecs-task-definition-without-container-level-memory.assets" | ||
| ], | ||
| "metadata": { | ||
| "/aws-ecs-task-definition-without-container-level-memory/TaskDef/TaskRole/Resource": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "TaskDefTaskRole1EDB4A67" | ||
| } | ||
| ], | ||
| "/aws-ecs-task-definition-without-container-level-memory/TaskDef/Resource": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "TaskDef54694570" | ||
| } | ||
| ], | ||
| "/aws-ecs-task-definition-without-container-level-memory/BootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "BootstrapVersion" | ||
| } | ||
| ], | ||
| "/aws-ecs-task-definition-without-container-level-memory/CheckBootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "CheckBootstrapVersion" | ||
| } | ||
| ] | ||
| }, | ||
| "displayName": "aws-ecs-task-definition-without-container-level-memory" | ||
| }, | ||
| "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets": { | ||
| "type": "cdk:asset-manifest", | ||
| "properties": { | ||
| "file": "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE": { | ||
| "type": "aws:cloudformation:stack", | ||
| "environment": "aws://unknown-account/unknown-region", | ||
| "properties": { | ||
| "templateFile": "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.template.json", | ||
| "validateOnSynth": false, | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", | ||
| "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", | ||
| "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", | ||
| "additionalDependencies": [ | ||
| "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets" | ||
| ], | ||
| "lookupRole": { | ||
| "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", | ||
| "requiresBootstrapStackVersion": 8, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "dependencies": [ | ||
| "TaskDefinitionWithoutContainerLevelMemoryDefaultTestDeployAssert5CA048EE.assets" | ||
| ], | ||
| "metadata": { | ||
| "/TaskDefinitionWithoutContainerLevelMemory/DefaultTest/DeployAssert/BootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "BootstrapVersion" | ||
| } | ||
| ], | ||
| "/TaskDefinitionWithoutContainerLevelMemory/DefaultTest/DeployAssert/CheckBootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "CheckBootstrapVersion" | ||
| } | ||
| ] | ||
| }, | ||
| "displayName": "TaskDefinitionWithoutContainerLevelMemory/DefaultTest/DeployAssert" | ||
| }, | ||
| "Tree": { | ||
| "type": "cdk:tree", | ||
| "properties": { | ||
| "file": "tree.json" | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.