Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(events-targets): Add tagging for ECS tasks triggered by an event #23838

Merged
merged 16 commits into from
Apr 18, 2023
Merged

feat(events-targets): Add tagging for ECS tasks triggered by an event #23838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
680dcc5
Add the ability to propagate tags on ECS tasks triggered by a schedul…
rdbatch Jan 25, 2023
66dc94e
Added README snippet for triggering an ECS task from an Event
rdbatch Jan 25, 2023
20b1ddc
Remove README cleanups that aren't required for Rosetta, to be re-add…
rdbatch Jan 25, 2023
9395fd0
Merge branch 'main' into events-targets-ecs-propagate-tags
mergify[bot] Jan 26, 2023
7230673
Update propagateTags to take the enum of valid values instead of a bo…
rdbatch Jan 26, 2023
d3fe4bd
Merge branch 'main' into events-targets-ecs-propagate-tags
rdbatch Feb 16, 2023
0b0644f
Merge branch 'main' into events-targets-ecs-propagate-tags
TheRealAmazonKendra Mar 2, 2023
652373d
Merge branch 'main' into events-targets-ecs-propagate-tags
rdbatch Apr 1, 2023
c012487
Merge branch 'main' into events-targets-ecs-propagate-tags
rdbatch Apr 7, 2023
81c729e
Merge branch 'main' into events-targets-ecs-propagate-tags
rdbatch Apr 18, 2023
acf5cf2
Update docstrings per PR feedback
rdbatch Apr 18, 2023
ab72e36
Merge branch 'aws:main' into events-targets-ecs-propagate-tags
rdbatch Apr 18, 2023
58e31cc
Merge branch 'main' into events-targets-ecs-propagate-tags
rdbatch Apr 18, 2023
373ada2
Update organization around tagging comment
rdbatch Apr 18, 2023
f509634
Merge branch 'main' into events-targets-ecs-propagate-tags
rdbatch Apr 18, 2023
b55edb1
Merge branch 'main' into events-targets-ecs-propagate-tags
mergify[bot] Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...g/framework-integ/test/aws-apigateway/test/integ.api-definition.asset.js.snapshot/cdk.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"21.0.0"}
{"version":"29.0.0"}
2 changes: 1 addition & 1 deletion ...t/ecs/integ.event-ec2-task.js.snapshot/EcsTestDefaultTestDeployAssert8B2741C4.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "21.0.0",
"version": "29.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
Expand Down
6 changes: 3 additions & 3 deletions ...ws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/aws-ecs-integ-ecs.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "21.0.0",
"version": "29.0.0",
"files": {
"0872557613b8f4b6c7ef173ce71b7a0f06895bacc709f34d5a62ffabcc0f5700": {
"07b921a20dfe7af7de139cb4595c2f46d90f9625f61d13cff19dffca84918cd7": {
"source": {
"path": "aws-ecs-integ-ecs.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "0872557613b8f4b6c7ef173ce71b7a0f06895bacc709f34d5a62ffabcc0f5700.json",
"objectKey": "07b921a20dfe7af7de139cb4595c2f46d90f9625f61d13cff19dffca84918cd7.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
7 changes: 7 additions & 0 deletions ...-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/aws-ecs-integ-ecs.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,13 @@
}
},
"EcsParameters": {
"PropagateTags": "TASK_DEFINITION",
"TagList": [
{
"Key": "my-tag",
"Value": "my-tag-value"
}
],
"TaskCount": 1,
"TaskDefinitionArn": {
"Ref": "TaskDef54694570"
Expand Down
2 changes: 1 addition & 1 deletion ...mework-integ/test/aws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/integ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "21.0.0",
"version": "29.0.0",
"testCases": {
"EcsTest/DefaultTest": {
"stacks": [
Expand Down
16 changes: 8 additions & 8 deletions ...ork-integ/test/aws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"version": "21.0.0",
"version": "29.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
},
"aws-ecs-integ-ecs.assets": {
"type": "cdk:asset-manifest",
"properties": {
Expand All @@ -23,7 +17,7 @@
"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}/0872557613b8f4b6c7ef173ce71b7a0f06895bacc709f34d5a62ffabcc0f5700.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/07b921a20dfe7af7de139cb4595c2f46d90f9625f61d13cff19dffca84918cd7.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -340,6 +334,12 @@
]
},
"displayName": "EcsTest/DefaultTest/DeployAssert"
},
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
}
}
}
111 changes: 100 additions & 11 deletions ...amework-integ/test/aws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@
"id": "App",
"path": "",
"children": {
"Tree": {
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.140"
}
},
"aws-ecs-integ-ecs": {
"id": "aws-ecs-integ-ecs",
"path": "aws-ecs-integ-ecs",
Expand Down Expand Up @@ -437,6 +429,14 @@
"id": "InstanceRole",
"path": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup/InstanceRole",
"children": {
"ImportInstanceRole": {
"id": "ImportInstanceRole",
"path": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup/InstanceRole/ImportInstanceRole",
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup/InstanceRole/Resource",
Expand Down Expand Up @@ -652,6 +652,14 @@
"id": "ServiceRole",
"path": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup/DrainECSHook/Function/ServiceRole",
"children": {
"ImportServiceRole": {
"id": "ImportServiceRole",
"path": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup/DrainECSHook/Function/ServiceRole/ImportServiceRole",
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup/DrainECSHook/Function/ServiceRole/Resource",
Expand Down Expand Up @@ -912,7 +920,7 @@
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.140"
"version": "10.1.216"
}
},
"LifecycleHookDrainHook": {
Expand Down Expand Up @@ -952,6 +960,14 @@
"id": "Role",
"path": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup/LifecycleHookDrainHook/Role",
"children": {
"ImportRole": {
"id": "ImportRole",
"path": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup/LifecycleHookDrainHook/Role/ImportRole",
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup/LifecycleHookDrainHook/Role/Resource",
Expand Down Expand Up @@ -1179,6 +1195,14 @@
"id": "TaskRole",
"path": "aws-ecs-integ-ecs/TaskDef/TaskRole",
"children": {
"ImportTaskRole": {
"id": "ImportTaskRole",
"path": "aws-ecs-integ-ecs/TaskDef/TaskRole/ImportTaskRole",
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ-ecs/TaskDef/TaskRole/Resource",
Expand Down Expand Up @@ -1324,6 +1348,14 @@
"id": "ExecutionRole",
"path": "aws-ecs-integ-ecs/TaskDef/ExecutionRole",
"children": {
"ImportExecutionRole": {
"id": "ImportExecutionRole",
"path": "aws-ecs-integ-ecs/TaskDef/ExecutionRole/ImportExecutionRole",
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ-ecs/TaskDef/ExecutionRole/Resource",
Expand Down Expand Up @@ -1442,6 +1474,14 @@
"id": "EventsRole",
"path": "aws-ecs-integ-ecs/TaskDef/EventsRole",
"children": {
"ImportEventsRole": {
"id": "ImportEventsRole",
"path": "aws-ecs-integ-ecs/TaskDef/EventsRole/ImportEventsRole",
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ-ecs/TaskDef/EventsRole/Resource",
Expand Down Expand Up @@ -1571,7 +1611,14 @@
"taskCount": 1,
"taskDefinitionArn": {
"Ref": "TaskDef54694570"
}
},
"propagateTags": "TASK_DEFINITION",
"tagList": [
{
"key": "my-tag",
"value": "my-tag-value"
}
]
},
"deadLetterConfig": {
"arn": {
Expand All @@ -1596,6 +1643,22 @@
"fqn": "@aws-cdk/aws-events.Rule",
"version": "0.0.0"
}
},
"BootstrapVersion": {
"id": "BootstrapVersion",
"path": "aws-ecs-integ-ecs/BootstrapVersion",
"constructInfo": {
"fqn": "@aws-cdk/core.CfnParameter",
"version": "0.0.0"
}
},
"CheckBootstrapVersion": {
"id": "CheckBootstrapVersion",
"path": "aws-ecs-integ-ecs/CheckBootstrapVersion",
"constructInfo": {
"fqn": "@aws-cdk/core.CfnRule",
"version": "0.0.0"
}
}
},
"constructInfo": {
Expand All @@ -1616,12 +1679,30 @@
"path": "EcsTest/DefaultTest/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.140"
"version": "10.1.216"
}
},
"DeployAssert": {
"id": "DeployAssert",
"path": "EcsTest/DefaultTest/DeployAssert",
"children": {
"BootstrapVersion": {
"id": "BootstrapVersion",
"path": "EcsTest/DefaultTest/DeployAssert/BootstrapVersion",
"constructInfo": {
"fqn": "@aws-cdk/core.CfnParameter",
"version": "0.0.0"
}
},
"CheckBootstrapVersion": {
"id": "CheckBootstrapVersion",
"path": "EcsTest/DefaultTest/DeployAssert/CheckBootstrapVersion",
"constructInfo": {
"fqn": "@aws-cdk/core.CfnRule",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Stack",
"version": "0.0.0"
Expand All @@ -1638,6 +1719,14 @@
"fqn": "@aws-cdk/integ-tests.IntegTest",
"version": "0.0.0"
}
},
"Tree": {
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.216"
}
}
},
"constructInfo": {
Expand Down
7 changes: 7 additions & 0 deletions ...@aws-cdk-testing/framework-integ/test/aws-events-targets/test/ecs/integ.event-ec2-task.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ rule.addTarget(new targets.EcsTask({
],
}],
deadLetterQueue,
propagateTags: ecs.PropagatedTagSource.TASK_DEFINITION,
tags: [
{
key: 'my-tag',
value: 'my-tag-value',
},
],
}));

new integ.IntegTest(app, 'EcsTest', {
Expand Down
2 changes: 1 addition & 1 deletion ....event-fargate-task.js.snapshot/EcsFargateTestDefaultTestDeployAssert36341BFB.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "20.0.0",
"version": "29.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
Expand Down
6 changes: 3 additions & 3 deletions ...s-targets/test/ecs/integ.event-fargate-task.js.snapshot/aws-ecs-integ-fargate.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "20.0.0",
"version": "29.0.0",
"files": {
"21e73448eb441396f1651456a83004f72f1f50583a8c6e054fc95fc99118d943": {
"30cd2908bd974e2e1f17ce2fd217f78c8377a301b45a4b7a471e00c77fdff513": {
"source": {
"path": "aws-ecs-integ-fargate.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "21e73448eb441396f1651456a83004f72f1f50583a8c6e054fc95fc99118d943.json",
"objectKey": "30cd2908bd974e2e1f17ce2fd217f78c8377a301b45a4b7a471e00c77fdff513.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
7 changes: 7 additions & 0 deletions ...targets/test/ecs/integ.event-fargate-task.js.snapshot/aws-ecs-integ-fargate.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,13 @@
]
}
},
"PropagateTags": "TASK_DEFINITION",
"TagList": [
{
"Key": "my-tag",
"Value": "my-tag-value"
}
],
"TaskCount": 1,
"TaskDefinitionArn": {
"Ref": "TaskDef54694570"
Expand Down
5 changes: 3 additions & 2 deletions ...rk-integ/test/aws-events-targets/test/ecs/integ.event-fargate-task.js.snapshot/integ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"version": "20.0.0",
"version": "29.0.0",
"testCases": {
"EcsFargateTest/DefaultTest": {
"stacks": [
"aws-ecs-integ-fargate"
],
"assertionStack": "EcsFargateTest/DefaultTest/DeployAssert"
"assertionStack": "EcsFargateTest/DefaultTest/DeployAssert",
"assertionStackName": "EcsFargateTestDefaultTestDeployAssert36341BFB"
}
}
}
Loading