From 9306e0fa30573f28932031ddc1644dc2d5fa62e6 Mon Sep 17 00:00:00 2001 From: Michael Sambol Date: Tue, 9 Jan 2024 15:05:32 -0600 Subject: [PATCH] I guess I don't need platform? --- .../test/ecs/eventhandler-image/Dockerfile | 2 +- ...faultTestDeployAssert2569343D.assets.json} | 4 +- ...ultTestDeployAssert2569343D.template.json} | 0 .../Dockerfile | 3 - .../Dockerfile | 3 + .../index.py | 0 .../aws-sfn-tasks-ecs-ec2-integ.assets.json | 12 +- .../aws-sfn-tasks-ecs-ec2-integ.template.json | 336 +++------ .../integ.ec2-run-task.js.snapshot/cdk.out | 2 +- .../integ.ec2-run-task.js.snapshot/integ.json | 8 +- .../manifest.json | 22 +- .../integ.ec2-run-task.js.snapshot/tree.json | 358 ++++------ ...faultTestDeployAssert9E1A388C.assets.json} | 4 +- ...ultTestDeployAssert9E1A388C.template.json} | 0 .../Dockerfile | 3 - .../Dockerfile | 3 + .../index.py | 0 .../aws-ecs-integ2.assets.json | 12 +- .../aws-ecs-integ2.template.json | 2 +- .../ecs/integ.ec2-task.js.snapshot/cdk.out | 2 +- .../ecs/integ.ec2-task.js.snapshot/integ.json | 8 +- .../integ.ec2-task.js.snapshot/manifest.json | 22 +- .../ecs/integ.ec2-task.js.snapshot/tree.json | 24 +- ...faultTestDeployAssert9D97FD2B.assets.json} | 4 +- ...ultTestDeployAssert9D97FD2B.template.json} | 0 .../Dockerfile | 3 - .../Dockerfile | 3 + .../index.py | 0 ...ws-sfn-tasks-ecs-fargate-integ.assets.json | 12 +- ...-sfn-tasks-ecs-fargate-integ.template.json | 336 +++------ .../cdk.out | 2 +- .../integ.json | 8 +- .../manifest.json | 40 +- .../tree.json | 656 ++++++++---------- ...faultTestDeployAssert83C8E074.assets.json} | 4 +- ...ultTestDeployAssert83C8E074.template.json} | 0 .../Dockerfile | 3 - .../Dockerfile | 3 + .../index.py | 0 ...-tasks-ecs-fargate-integ-task.assets.json} | 14 +- ...asks-ecs-fargate-integ-task.template.json} | 34 +- .../integ.fargate-task.js.snapshot/cdk.out | 2 +- .../integ.fargate-task.js.snapshot/integ.json | 10 +- .../manifest.json | 106 +-- .../integ.fargate-task.js.snapshot/tree.json | 458 ++++++------ .../test/ecs/integ.fargate-task.ts | 2 +- .../test/ecs/eventhandler-image/Dockerfile | 2 +- 47 files changed, 1029 insertions(+), 1503 deletions(-) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/{integ.fargate-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json => integ.ec2-run-task.js.snapshot/SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.assets.json} (83%) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/{EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json => SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.template.json} (100%) delete mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/{asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594 => asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534}/index.py (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/{integ.ec2-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json => integ.ec2-task.js.snapshot/SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.assets.json} (84%) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/{EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json => SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.template.json} (100%) delete mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/{asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594 => asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534}/index.py (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/{integ.fargate-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json => integ.fargate-run-task.js.snapshot/SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.assets.json} (83%) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/{EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json => SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.template.json} (100%) delete mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/{asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594 => asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534}/index.py (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/{integ.ec2-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json => integ.fargate-task.js.snapshot/SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.assets.json} (83%) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/{EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json => SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.template.json} (100%) delete mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/{asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594 => asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534}/index.py (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/{aws-sfn-tasks-ecs-fargate-integ2.assets.json => aws-sfn-tasks-ecs-fargate-integ-task.assets.json} (59%) rename packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/{aws-sfn-tasks-ecs-fargate-integ2.template.json => aws-sfn-tasks-ecs-fargate-integ-task.template.json} (91%) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/eventhandler-image/Dockerfile b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/eventhandler-image/Dockerfile index c56a857762763..23cf9b3e22f5d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/eventhandler-image/Dockerfile +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/eventhandler-image/Dockerfile @@ -1,3 +1,3 @@ -FROM --platform=x86-64 public.ecr.aws/docker/library/python:3.12 +FROM public.ecr.aws/docker/library/python:3.12 ADD index.py . CMD [ "python3", "./index.py" ] diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.assets.json similarity index 83% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.assets.json index 4b62986ef80b7..d6f156a9e088c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.assets.json @@ -1,9 +1,9 @@ { - "version": "34.0.0", + "version": "36.0.0", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { - "path": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json", + "path": "SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.template.json", "packaging": "file" }, "destinations": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.template.json similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.template.json diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile deleted file mode 100644 index c56a857762763..0000000000000 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM --platform=x86-64 public.ecr.aws/docker/library/python:3.12 -ADD index.py . -CMD [ "python3", "./index.py" ] diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile new file mode 100644 index 0000000000000..23cf9b3e22f5d --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile @@ -0,0 +1,3 @@ +FROM public.ecr.aws/docker/library/python:3.12 +ADD index.py . +CMD [ "python3", "./index.py" ] diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/index.py b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/index.py similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/index.py rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/index.py diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/aws-sfn-tasks-ecs-ec2-integ.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/aws-sfn-tasks-ecs-ec2-integ.assets.json index 086b8e2472a13..16ddbfb3dae31 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/aws-sfn-tasks-ecs-ec2-integ.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/aws-sfn-tasks-ecs-ec2-integ.assets.json @@ -1,7 +1,7 @@ { - "version": "34.0.0", + "version": "36.0.0", "files": { - "6e8edd15bd3719d59d440e1545f7387007752e7c9b3597a0e052e4da7d5fe595": { + "4103112588b704aaef8ce19dd8aa6111f2955aa3d44479d378708ec35288ed35": { "source": { "path": "aws-sfn-tasks-ecs-ec2-integ.template.json", "packaging": "file" @@ -9,21 +9,21 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "6e8edd15bd3719d59d440e1545f7387007752e7c9b3597a0e052e4da7d5fe595.json", + "objectKey": "4103112588b704aaef8ce19dd8aa6111f2955aa3d44479d378708ec35288ed35.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } } }, "dockerImages": { - "2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594": { + "d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534": { "source": { - "directory": "asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "directory": "asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "destinations": { "current_account-current_region": { "repositoryName": "cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}", - "imageTag": "2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594", + "imageTag": "d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-image-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/aws-sfn-tasks-ecs-ec2-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/aws-sfn-tasks-ecs-ec2-integ.template.json index dfa012d407fae..4650a38114b6b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/aws-sfn-tasks-ecs-ec2-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/aws-sfn-tasks-ecs-ec2-integ.template.json @@ -921,7 +921,7 @@ { "Essential": true, "Image": { - "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "LogConfiguration": { "LogDriver": "awslogs", @@ -1070,231 +1070,117 @@ { "Action": "ecs:RunTask", "Effect": "Allow", - "Resource": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 2, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 0, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - "/", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - ":*" - ] - ] - }, - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 2, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 0, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - "/", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - } - ] + "Resource": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Fn::Select": [ + 1, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 3, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 4, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 0, + { + "Fn::Split": [ + "/", + { + "Fn::Select": [ + 5, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + } + ] + } + ] + }, + "/", + { + "Fn::Select": [ + 1, + { + "Fn::Split": [ + "/", + { + "Fn::Select": [ + 5, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + } + ] + } + ] + } ] - } - ] + ] + } }, { "Action": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/cdk.out index 2313ab5436501..1f0068d32659a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"34.0.0"} \ No newline at end of file +{"version":"36.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/integ.json index d9a08b881a2ad..11a716808e406 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/integ.json @@ -1,12 +1,12 @@ { - "version": "34.0.0", + "version": "36.0.0", "testCases": { - "EmrCreateClusterTest/DefaultTest": { + "SfnTasksEcsEc2RunTaskTest/DefaultTest": { "stacks": [ "aws-sfn-tasks-ecs-ec2-integ" ], - "assertionStack": "EmrCreateClusterTest/DefaultTest/DeployAssert", - "assertionStackName": "EmrCreateClusterTestDefaultTestDeployAssert697DC891" + "assertionStack": "SfnTasksEcsEc2RunTaskTest/DefaultTest/DeployAssert", + "assertionStackName": "SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/manifest.json index 86abc2406f772..9c5229a72a15c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "36.0.0", "artifacts": { "aws-sfn-tasks-ecs-ec2-integ.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,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}/6e8edd15bd3719d59d440e1545f7387007752e7c9b3597a0e052e4da7d5fe595.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4103112588b704aaef8ce19dd8aa6111f2955aa3d44479d378708ec35288ed35.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -343,19 +343,19 @@ }, "displayName": "aws-sfn-tasks-ecs-ec2-integ" }, - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets": { + "SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.assets": { "type": "cdk:asset-manifest", "properties": { - "file": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json", + "file": "SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.assets.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" } }, - "EmrCreateClusterTestDefaultTestDeployAssert697DC891": { + "SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D": { "type": "aws:cloudformation:stack", "environment": "aws://unknown-account/unknown-region", "properties": { - "templateFile": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json", + "templateFile": "SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.template.json", "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", @@ -364,7 +364,7 @@ "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets" + "SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.assets" ], "lookupRole": { "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", @@ -373,23 +373,23 @@ } }, "dependencies": [ - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets" + "SfnTasksEcsEc2RunTaskTestDefaultTestDeployAssert2569343D.assets" ], "metadata": { - "/EmrCreateClusterTest/DefaultTest/DeployAssert/BootstrapVersion": [ + "/SfnTasksEcsEc2RunTaskTest/DefaultTest/DeployAssert/BootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "BootstrapVersion" } ], - "/EmrCreateClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + "/SfnTasksEcsEc2RunTaskTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } ] }, - "displayName": "EmrCreateClusterTest/DefaultTest/DeployAssert" + "displayName": "SfnTasksEcsEc2RunTaskTest/DefaultTest/DeployAssert" }, "Tree": { "type": "cdk:tree", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/tree.json index 0657604909b40..6ed6b6a5506aa 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/tree.json @@ -1276,7 +1276,7 @@ }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } }, "LifecycleHookDrainHook": { @@ -1521,7 +1521,7 @@ { "essential": true, "image": { - "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "memory": 256, "name": "TheContainer", @@ -1825,231 +1825,117 @@ { "Action": "ecs:RunTask", "Effect": "Allow", - "Resource": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 2, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 0, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - "/", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - ":*" - ] - ] - }, - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 2, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 0, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - "/", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - } - ] + "Resource": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Fn::Select": [ + 1, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 3, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 4, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 0, + { + "Fn::Split": [ + "/", + { + "Fn::Select": [ + 5, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + } + ] + } + ] + }, + "/", + { + "Fn::Select": [ + 1, + { + "Fn::Split": [ + "/", + { + "Fn::Select": [ + 5, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + } + ] + } + ] + } ] - } - ] + ] + } }, { "Action": [ @@ -2207,29 +2093,29 @@ "version": "0.0.0" } }, - "EmrCreateClusterTest": { - "id": "EmrCreateClusterTest", - "path": "EmrCreateClusterTest", + "SfnTasksEcsEc2RunTaskTest": { + "id": "SfnTasksEcsEc2RunTaskTest", + "path": "SfnTasksEcsEc2RunTaskTest", "children": { "DefaultTest": { "id": "DefaultTest", - "path": "EmrCreateClusterTest/DefaultTest", + "path": "SfnTasksEcsEc2RunTaskTest/DefaultTest", "children": { "Default": { "id": "Default", - "path": "EmrCreateClusterTest/DefaultTest/Default", + "path": "SfnTasksEcsEc2RunTaskTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } }, "DeployAssert": { "id": "DeployAssert", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert", + "path": "SfnTasksEcsEc2RunTaskTest/DefaultTest/DeployAssert", "children": { "BootstrapVersion": { "id": "BootstrapVersion", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert/BootstrapVersion", + "path": "SfnTasksEcsEc2RunTaskTest/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -2237,7 +2123,7 @@ }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion", + "path": "SfnTasksEcsEc2RunTaskTest/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", "version": "0.0.0" @@ -2266,7 +2152,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.assets.json similarity index 84% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.assets.json index 4b62986ef80b7..be6172954b1a6 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.assets.json @@ -1,9 +1,9 @@ { - "version": "34.0.0", + "version": "36.0.0", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { - "path": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json", + "path": "SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.template.json", "packaging": "file" }, "destinations": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.template.json similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.template.json diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile deleted file mode 100644 index c56a857762763..0000000000000 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM --platform=x86-64 public.ecr.aws/docker/library/python:3.12 -ADD index.py . -CMD [ "python3", "./index.py" ] diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile new file mode 100644 index 0000000000000..23cf9b3e22f5d --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile @@ -0,0 +1,3 @@ +FROM public.ecr.aws/docker/library/python:3.12 +ADD index.py . +CMD [ "python3", "./index.py" ] diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/index.py b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/index.py similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/index.py rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/index.py diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/aws-ecs-integ2.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/aws-ecs-integ2.assets.json index d820151777518..cb0ede9562e98 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/aws-ecs-integ2.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/aws-ecs-integ2.assets.json @@ -1,7 +1,7 @@ { - "version": "34.0.0", + "version": "36.0.0", "files": { - "7a97ee8496ba99a7a2e733b188b64e8f72c25d48126c0087c625e7023adbef00": { + "b85d5c995f9a3fc462170dc202c85ffa350a76a665e2c48c6ab04f7a31587acb": { "source": { "path": "aws-ecs-integ2.template.json", "packaging": "file" @@ -9,21 +9,21 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "7a97ee8496ba99a7a2e733b188b64e8f72c25d48126c0087c625e7023adbef00.json", + "objectKey": "b85d5c995f9a3fc462170dc202c85ffa350a76a665e2c48c6ab04f7a31587acb.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } } }, "dockerImages": { - "2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594": { + "d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534": { "source": { - "directory": "asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "directory": "asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "destinations": { "current_account-current_region": { "repositoryName": "cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}", - "imageTag": "2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594", + "imageTag": "d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-image-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/aws-ecs-integ2.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/aws-ecs-integ2.template.json index a202499896906..4513b1c4070aa 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/aws-ecs-integ2.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/aws-ecs-integ2.template.json @@ -921,7 +921,7 @@ { "Essential": true, "Image": { - "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "LogConfiguration": { "LogDriver": "awslogs", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/cdk.out index 2313ab5436501..1f0068d32659a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"34.0.0"} \ No newline at end of file +{"version":"36.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/integ.json index 428d03d1a4eab..21153e57a0dfe 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/integ.json @@ -1,12 +1,12 @@ { - "version": "34.0.0", + "version": "36.0.0", "testCases": { - "EmrCreateClusterTest/DefaultTest": { + "SfnTasksEcsEc2TaskTest/DefaultTest": { "stacks": [ "aws-ecs-integ2" ], - "assertionStack": "EmrCreateClusterTest/DefaultTest/DeployAssert", - "assertionStackName": "EmrCreateClusterTestDefaultTestDeployAssert697DC891" + "assertionStack": "SfnTasksEcsEc2TaskTest/DefaultTest/DeployAssert", + "assertionStackName": "SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/manifest.json index 2335640e57e2a..3758a82b00cbc 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "36.0.0", "artifacts": { "aws-ecs-integ2.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,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}/7a97ee8496ba99a7a2e733b188b64e8f72c25d48126c0087c625e7023adbef00.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b85d5c995f9a3fc462170dc202c85ffa350a76a665e2c48c6ab04f7a31587acb.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -337,19 +337,19 @@ }, "displayName": "aws-ecs-integ2" }, - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets": { + "SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.assets": { "type": "cdk:asset-manifest", "properties": { - "file": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json", + "file": "SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.assets.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" } }, - "EmrCreateClusterTestDefaultTestDeployAssert697DC891": { + "SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C": { "type": "aws:cloudformation:stack", "environment": "aws://unknown-account/unknown-region", "properties": { - "templateFile": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json", + "templateFile": "SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.template.json", "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", @@ -358,7 +358,7 @@ "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets" + "SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.assets" ], "lookupRole": { "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", @@ -367,23 +367,23 @@ } }, "dependencies": [ - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets" + "SfnTasksEcsEc2TaskTestDefaultTestDeployAssert9E1A388C.assets" ], "metadata": { - "/EmrCreateClusterTest/DefaultTest/DeployAssert/BootstrapVersion": [ + "/SfnTasksEcsEc2TaskTest/DefaultTest/DeployAssert/BootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "BootstrapVersion" } ], - "/EmrCreateClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + "/SfnTasksEcsEc2TaskTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } ] }, - "displayName": "EmrCreateClusterTest/DefaultTest/DeployAssert" + "displayName": "SfnTasksEcsEc2TaskTest/DefaultTest/DeployAssert" }, "Tree": { "type": "cdk:tree", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/tree.json index d64c848d40aa7..826fe6ebb4dfd 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/tree.json @@ -1276,7 +1276,7 @@ }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } }, "LifecycleHookDrainHook": { @@ -1521,7 +1521,7 @@ { "essential": true, "image": { - "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "memory": 256, "name": "TheContainer", @@ -1981,29 +1981,29 @@ "version": "0.0.0" } }, - "EmrCreateClusterTest": { - "id": "EmrCreateClusterTest", - "path": "EmrCreateClusterTest", + "SfnTasksEcsEc2TaskTest": { + "id": "SfnTasksEcsEc2TaskTest", + "path": "SfnTasksEcsEc2TaskTest", "children": { "DefaultTest": { "id": "DefaultTest", - "path": "EmrCreateClusterTest/DefaultTest", + "path": "SfnTasksEcsEc2TaskTest/DefaultTest", "children": { "Default": { "id": "Default", - "path": "EmrCreateClusterTest/DefaultTest/Default", + "path": "SfnTasksEcsEc2TaskTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } }, "DeployAssert": { "id": "DeployAssert", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert", + "path": "SfnTasksEcsEc2TaskTest/DefaultTest/DeployAssert", "children": { "BootstrapVersion": { "id": "BootstrapVersion", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert/BootstrapVersion", + "path": "SfnTasksEcsEc2TaskTest/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnParameter", "version": "0.0.0" @@ -2011,7 +2011,7 @@ }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion", + "path": "SfnTasksEcsEc2TaskTest/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { "fqn": "aws-cdk-lib.CfnRule", "version": "0.0.0" @@ -2040,7 +2040,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.assets.json similarity index 83% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.assets.json index 4b62986ef80b7..d917df2e02b1d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.assets.json @@ -1,9 +1,9 @@ { - "version": "34.0.0", + "version": "36.0.0", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { - "path": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json", + "path": "SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.template.json", "packaging": "file" }, "destinations": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.template.json similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.template.json diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile deleted file mode 100644 index c56a857762763..0000000000000 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM --platform=x86-64 public.ecr.aws/docker/library/python:3.12 -ADD index.py . -CMD [ "python3", "./index.py" ] diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile new file mode 100644 index 0000000000000..23cf9b3e22f5d --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile @@ -0,0 +1,3 @@ +FROM public.ecr.aws/docker/library/python:3.12 +ADD index.py . +CMD [ "python3", "./index.py" ] diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/index.py b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/index.py similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/index.py rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/index.py diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ.assets.json index ce54f63d990e6..e43cf8fe87e94 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ.assets.json @@ -1,7 +1,7 @@ { - "version": "34.0.0", + "version": "36.0.0", "files": { - "14a95c425d15d633bded54e57599fe01fef04936cea029ad7e67a982f0d83922": { + "50850ee11513d44eaddc596ca115ffcbff7c1c0b22080e1f0ca70a137532e54f": { "source": { "path": "aws-sfn-tasks-ecs-fargate-integ.template.json", "packaging": "file" @@ -9,21 +9,21 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "14a95c425d15d633bded54e57599fe01fef04936cea029ad7e67a982f0d83922.json", + "objectKey": "50850ee11513d44eaddc596ca115ffcbff7c1c0b22080e1f0ca70a137532e54f.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } } }, "dockerImages": { - "2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594": { + "d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534": { "source": { - "directory": "asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "directory": "asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "destinations": { "current_account-current_region": { "repositoryName": "cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}", - "imageTag": "2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594", + "imageTag": "d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-image-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ.template.json index 68ba89f3ba50d..d26fc30f8b3d9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ.template.json @@ -418,7 +418,7 @@ { "Essential": true, "Image": { - "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "LogConfiguration": { "LogDriver": "awslogs", @@ -617,231 +617,117 @@ { "Action": "ecs:RunTask", "Effect": "Allow", - "Resource": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 2, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 0, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - "/", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - ":*" - ] - ] - }, - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 2, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 0, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - "/", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - } - ] + "Resource": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Fn::Select": [ + 1, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 3, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 4, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 0, + { + "Fn::Split": [ + "/", + { + "Fn::Select": [ + 5, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + } + ] + } + ] + }, + "/", + { + "Fn::Select": [ + 1, + { + "Fn::Split": [ + "/", + { + "Fn::Select": [ + 5, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + } + ] + } + ] + } ] - } - ] + ] + } }, { "Action": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/cdk.out index 2313ab5436501..1f0068d32659a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"34.0.0"} \ No newline at end of file +{"version":"36.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/integ.json index 5e2d1d1d034e9..26e771ebe52f6 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/integ.json @@ -1,12 +1,12 @@ { - "version": "34.0.0", + "version": "36.0.0", "testCases": { - "EmrCreateClusterTest/DefaultTest": { + "SfnTasksEcsFargateRunTaskTest/DefaultTest": { "stacks": [ "aws-sfn-tasks-ecs-fargate-integ" ], - "assertionStack": "EmrCreateClusterTest/DefaultTest/DeployAssert", - "assertionStackName": "EmrCreateClusterTestDefaultTestDeployAssert697DC891" + "assertionStack": "SfnTasksEcsFargateRunTaskTest/DefaultTest/DeployAssert", + "assertionStackName": "SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/manifest.json index 00582a0e44749..9068eca1fb68b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "36.0.0", "artifacts": { "aws-sfn-tasks-ecs-fargate-integ.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,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}/14a95c425d15d633bded54e57599fe01fef04936cea029ad7e67a982f0d83922.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/50850ee11513d44eaddc596ca115ffcbff7c1c0b22080e1f0ca70a137532e54f.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -261,41 +261,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } - ], - "FargeateTaskSetRevisionNumberSecurityGroup916C9B0B": [ - { - "type": "aws:cdk:logicalId", - "data": "FargeateTaskSetRevisionNumberSecurityGroup916C9B0B", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } - ], - "FargeateTaskWithPropagatedTagSecurityGroup94A6AE70": [ - { - "type": "aws:cdk:logicalId", - "data": "FargeateTaskWithPropagatedTagSecurityGroup94A6AE70", - "trace": [ - "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" - ] - } ] }, "displayName": "aws-sfn-tasks-ecs-fargate-integ" }, - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets": { + "SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.assets": { "type": "cdk:asset-manifest", "properties": { - "file": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json", + "file": "SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.assets.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" } }, - "EmrCreateClusterTestDefaultTestDeployAssert697DC891": { + "SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B": { "type": "aws:cloudformation:stack", "environment": "aws://unknown-account/unknown-region", "properties": { - "templateFile": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json", + "templateFile": "SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.template.json", "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", @@ -304,7 +286,7 @@ "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets" + "SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.assets" ], "lookupRole": { "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", @@ -313,23 +295,23 @@ } }, "dependencies": [ - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets" + "SfnTasksEcsFargateRunTaskTestDefaultTestDeployAssert9D97FD2B.assets" ], "metadata": { - "/EmrCreateClusterTest/DefaultTest/DeployAssert/BootstrapVersion": [ + "/SfnTasksEcsFargateRunTaskTest/DefaultTest/DeployAssert/BootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "BootstrapVersion" } ], - "/EmrCreateClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + "/SfnTasksEcsFargateRunTaskTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } ] }, - "displayName": "EmrCreateClusterTest/DefaultTest/DeployAssert" + "displayName": "SfnTasksEcsFargateRunTaskTest/DefaultTest/DeployAssert" }, "Tree": { "type": "cdk:tree", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/tree.json index a18d3cd9f3a92..9e64c8c0251b3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-run-task.js.snapshot/tree.json @@ -20,8 +20,8 @@ "aws:cdk:cloudformation:props": {} }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.CfnCluster", + "version": "0.0.0" } }, "Vpc": { @@ -47,8 +47,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", + "version": "0.0.0" } }, "PublicSubnet1": { @@ -91,16 +91,16 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" } }, "Acl": { "id": "Acl", "path": "aws-sfn-tasks-ecs-fargate-integ/FargateCluster/Vpc/PublicSubnet1/Acl", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "RouteTable": { @@ -121,8 +121,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" } }, "RouteTableAssociation": { @@ -140,8 +140,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" } }, "DefaultRoute": { @@ -160,8 +160,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" } }, "EIP": { @@ -180,8 +180,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" } }, "NATGateway": { @@ -208,14 +208,14 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" } }, "PublicSubnet2": { @@ -258,16 +258,16 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" } }, "Acl": { "id": "Acl", "path": "aws-sfn-tasks-ecs-fargate-integ/FargateCluster/Vpc/PublicSubnet2/Acl", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "RouteTable": { @@ -288,8 +288,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" } }, "RouteTableAssociation": { @@ -307,8 +307,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" } }, "DefaultRoute": { @@ -327,8 +327,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" } }, "EIP": { @@ -347,8 +347,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" } }, "NATGateway": { @@ -375,14 +375,14 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" } }, "PrivateSubnet1": { @@ -425,16 +425,16 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" } }, "Acl": { "id": "Acl", "path": "aws-sfn-tasks-ecs-fargate-integ/FargateCluster/Vpc/PrivateSubnet1/Acl", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "RouteTable": { @@ -455,8 +455,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" } }, "RouteTableAssociation": { @@ -474,8 +474,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" } }, "DefaultRoute": { @@ -494,14 +494,14 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" } }, "PrivateSubnet2": { @@ -544,16 +544,16 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" } }, "Acl": { "id": "Acl", "path": "aws-sfn-tasks-ecs-fargate-integ/FargateCluster/Vpc/PrivateSubnet2/Acl", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "RouteTable": { @@ -574,8 +574,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" } }, "RouteTableAssociation": { @@ -593,8 +593,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" } }, "DefaultRoute": { @@ -613,14 +613,14 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" } }, "IGW": { @@ -638,8 +638,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnInternetGateway", + "version": "0.0.0" } }, "VPCGW": { @@ -657,20 +657,20 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnVPCGatewayAttachment", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.Vpc", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.Cluster", + "version": "0.0.0" } }, "TaskDef": { @@ -685,8 +685,8 @@ "id": "ImportTaskRole", "path": "aws-sfn-tasks-ecs-fargate-integ/TaskDef/TaskRole/ImportTaskRole", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "Resource": { @@ -710,14 +710,14 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" } }, "Resource": { @@ -730,7 +730,7 @@ { "essential": true, "image": { - "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "memory": 256, "name": "TheContainer", @@ -770,8 +770,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.CfnTaskDefinition", + "version": "0.0.0" } }, "TheContainer": { @@ -786,22 +786,22 @@ "id": "Staging", "path": "aws-sfn-tasks-ecs-fargate-integ/TaskDef/TheContainer/AssetImage/Staging", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.AssetStaging", + "version": "0.0.0" } }, "Repository": { "id": "Repository", "path": "aws-sfn-tasks-ecs-fargate-integ/TaskDef/TheContainer/AssetImage/Repository", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecr.RepositoryBase", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecr_assets.DockerImageAsset", + "version": "0.0.0" } }, "LogGroup": { @@ -816,20 +816,20 @@ "aws:cdk:cloudformation:props": {} }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_logs.CfnLogGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_logs.LogGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.ContainerDefinition", + "version": "0.0.0" } }, "ExecutionRole": { @@ -840,8 +840,8 @@ "id": "ImportExecutionRole", "path": "aws-sfn-tasks-ecs-fargate-integ/TaskDef/ExecutionRole/ImportExecutionRole", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "Resource": { @@ -865,8 +865,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" } }, "DefaultPolicy": { @@ -942,34 +942,34 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnPolicy", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Policy", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.FargateTaskDefinition", + "version": "0.0.0" } }, "Start": { "id": "Start", "path": "aws-sfn-tasks-ecs-fargate-integ/Start", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions.Pass", + "version": "0.0.0" } }, "FargateTask": { @@ -1000,20 +1000,20 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions_tasks.EcsRunTask", + "version": "0.0.0" } }, "FargateTaskSetRevisionNumber": { @@ -1044,20 +1044,20 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions_tasks.EcsRunTask", + "version": "0.0.0" } }, "FargateTaskWithPropagatedTag": { @@ -1088,20 +1088,20 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions_tasks.EcsRunTask", + "version": "0.0.0" } }, "StateMachine": { @@ -1116,8 +1116,8 @@ "id": "ImportRole", "path": "aws-sfn-tasks-ecs-fargate-integ/StateMachine/Role/ImportRole", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "Resource": { @@ -1141,8 +1141,8 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" } }, "DefaultPolicy": { @@ -1160,231 +1160,117 @@ { "Action": "ecs:RunTask", "Effect": "Allow", - "Resource": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 2, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 0, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - "/", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - ":*" - ] - ] - }, - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 2, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 3, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 4, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - }, - ":", - { - "Fn::Select": [ - 0, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - }, - "/", - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - "/", - { - "Fn::Select": [ - 5, - { - "Fn::Split": [ - ":", - { - "Ref": "TaskDef54694570" - } - ] - } - ] - } - ] - } - ] - } - ] + "Resource": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Fn::Select": [ + 1, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 3, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 4, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + }, + ":", + { + "Fn::Select": [ + 0, + { + "Fn::Split": [ + "/", + { + "Fn::Select": [ + 5, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + } + ] + } + ] + }, + "/", + { + "Fn::Select": [ + 1, + { + "Fn::Split": [ + "/", + { + "Fn::Select": [ + 5, + { + "Fn::Split": [ + ":", + { + "Ref": "TaskDef54694570" + } + ] + } + ] + } + ] + } + ] + } ] - } - ] + ] + } }, { "Action": [ @@ -1452,20 +1338,20 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnPolicy", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Policy", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" } }, "Resource": { @@ -1569,86 +1455,86 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions.CfnStateMachine", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions.StateMachine", + "version": "0.0.0" } }, "stateMachineArn": { "id": "stateMachineArn", "path": "aws-sfn-tasks-ecs-fargate-integ/stateMachineArn", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.CfnOutput", + "version": "0.0.0" } }, "BootstrapVersion": { "id": "BootstrapVersion", "path": "aws-sfn-tasks-ecs-fargate-integ/BootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", "path": "aws-sfn-tasks-ecs-fargate-integ/CheckBootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" } }, - "EmrCreateClusterTest": { - "id": "EmrCreateClusterTest", - "path": "EmrCreateClusterTest", + "SfnTasksEcsFargateRunTaskTest": { + "id": "SfnTasksEcsFargateRunTaskTest", + "path": "SfnTasksEcsFargateRunTaskTest", "children": { "DefaultTest": { "id": "DefaultTest", - "path": "EmrCreateClusterTest/DefaultTest", + "path": "SfnTasksEcsFargateRunTaskTest/DefaultTest", "children": { "Default": { "id": "Default", - "path": "EmrCreateClusterTest/DefaultTest/Default", + "path": "SfnTasksEcsFargateRunTaskTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } }, "DeployAssert": { "id": "DeployAssert", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert", + "path": "SfnTasksEcsFargateRunTaskTest/DefaultTest/DeployAssert", "children": { "BootstrapVersion": { "id": "BootstrapVersion", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert/BootstrapVersion", + "path": "SfnTasksEcsFargateRunTaskTest/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion", + "path": "SfnTasksEcsFargateRunTaskTest/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" } } }, @@ -1668,13 +1554,13 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.assets.json similarity index 83% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.assets.json index 4b62986ef80b7..af300895c5ae7 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.ec2-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.assets.json @@ -1,9 +1,9 @@ { - "version": "34.0.0", + "version": "36.0.0", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { - "path": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json", + "path": "SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.template.json", "packaging": "file" }, "destinations": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.template.json similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.template.json diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile deleted file mode 100644 index c56a857762763..0000000000000 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM --platform=x86-64 public.ecr.aws/docker/library/python:3.12 -ADD index.py . -CMD [ "python3", "./index.py" ] diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile new file mode 100644 index 0000000000000..23cf9b3e22f5d --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/Dockerfile @@ -0,0 +1,3 @@ +FROM public.ecr.aws/docker/library/python:3.12 +ADD index.py . +CMD [ "python3", "./index.py" ] diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/index.py b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/index.py similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594/index.py rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534/index.py diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ2.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ-task.assets.json similarity index 59% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ2.assets.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ-task.assets.json index 7eed9c231aa54..6829a8c270902 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ2.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ-task.assets.json @@ -1,29 +1,29 @@ { - "version": "34.0.0", + "version": "36.0.0", "files": { - "f432fdf9903e7fb60e9e60200f7bf8e729f8643725057a1c949d29f53286b04f": { + "da8038fbe005d6050fcba566789cd6bb111aa6f1ad1f9f64a9d648fae2144f52": { "source": { - "path": "aws-sfn-tasks-ecs-fargate-integ2.template.json", + "path": "aws-sfn-tasks-ecs-fargate-integ-task.template.json", "packaging": "file" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "f432fdf9903e7fb60e9e60200f7bf8e729f8643725057a1c949d29f53286b04f.json", + "objectKey": "da8038fbe005d6050fcba566789cd6bb111aa6f1ad1f9f64a9d648fae2144f52.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } } }, "dockerImages": { - "2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594": { + "d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534": { "source": { - "directory": "asset.2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "directory": "asset.d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "destinations": { "current_account-current_region": { "repositoryName": "cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}", - "imageTag": "2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594", + "imageTag": "d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-image-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ2.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ-task.template.json similarity index 91% rename from packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ2.template.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ-task.template.json index 8b7d2cccc2edb..ff604c525724d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ2.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/aws-sfn-tasks-ecs-fargate-integ-task.template.json @@ -13,7 +13,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc" } ] } @@ -42,7 +42,7 @@ }, { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1" } ], "VpcId": { @@ -56,7 +56,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1" } ], "VpcId": { @@ -97,7 +97,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1" } ] } @@ -117,7 +117,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1" } ] }, @@ -150,7 +150,7 @@ }, { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2" } ], "VpcId": { @@ -164,7 +164,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2" } ], "VpcId": { @@ -205,7 +205,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2" } ] } @@ -225,7 +225,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2" } ] }, @@ -258,7 +258,7 @@ }, { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -272,7 +272,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1" } ], "VpcId": { @@ -327,7 +327,7 @@ }, { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -341,7 +341,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2" } ], "VpcId": { @@ -378,7 +378,7 @@ "Tags": [ { "Key": "Name", - "Value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc" + "Value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc" } ] } @@ -418,7 +418,7 @@ { "Essential": true, "Image": { - "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "LogConfiguration": { "LogDriver": "awslogs", @@ -443,7 +443,7 @@ "Arn" ] }, - "Family": "awssfntasksecsfargateinteg2TaskDef1C10F63E", + "Family": "awssfntasksecsfargateintegtaskTaskDef127A232E", "Memory": "512", "NetworkMode": "awsvpc", "RequiresCompatibilities": [ @@ -547,7 +547,7 @@ "FargateTaskSecurityGroup0BBB27CB": { "Type": "AWS::EC2::SecurityGroup", "Properties": { - "GroupDescription": "aws-sfn-tasks-ecs-fargate-integ2/FargateTask/SecurityGroup", + "GroupDescription": "aws-sfn-tasks-ecs-fargate-integ-task/FargateTask/SecurityGroup", "SecurityGroupEgress": [ { "CidrIp": "0.0.0.0/0", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/cdk.out index 2313ab5436501..1f0068d32659a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"34.0.0"} \ No newline at end of file +{"version":"36.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/integ.json index a7e9b01e4e9ed..bf122b21c66a5 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/integ.json @@ -1,12 +1,12 @@ { - "version": "34.0.0", + "version": "36.0.0", "testCases": { - "EmrCreateClusterTest/DefaultTest": { + "SfnTasksEcsFargateTaskTest/DefaultTest": { "stacks": [ - "aws-sfn-tasks-ecs-fargate-integ2" + "aws-sfn-tasks-ecs-fargate-integ-task" ], - "assertionStack": "EmrCreateClusterTest/DefaultTest/DeployAssert", - "assertionStackName": "EmrCreateClusterTestDefaultTestDeployAssert697DC891" + "assertionStack": "SfnTasksEcsFargateTaskTest/DefaultTest/DeployAssert", + "assertionStackName": "SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/manifest.json index c3a46f61fadc8..d201eb14a3c0b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/manifest.json @@ -1,28 +1,28 @@ { - "version": "34.0.0", + "version": "36.0.0", "artifacts": { - "aws-sfn-tasks-ecs-fargate-integ2.assets": { + "aws-sfn-tasks-ecs-fargate-integ-task.assets": { "type": "cdk:asset-manifest", "properties": { - "file": "aws-sfn-tasks-ecs-fargate-integ2.assets.json", + "file": "aws-sfn-tasks-ecs-fargate-integ-task.assets.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" } }, - "aws-sfn-tasks-ecs-fargate-integ2": { + "aws-sfn-tasks-ecs-fargate-integ-task": { "type": "aws:cloudformation:stack", "environment": "aws://unknown-account/unknown-region", "properties": { - "templateFile": "aws-sfn-tasks-ecs-fargate-integ2.template.json", + "templateFile": "aws-sfn-tasks-ecs-fargate-integ-task.template.json", "terminationProtection": false, "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}/f432fdf9903e7fb60e9e60200f7bf8e729f8643725057a1c949d29f53286b04f.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/da8038fbe005d6050fcba566789cd6bb111aa6f1ad1f9f64a9d648fae2144f52.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ - "aws-sfn-tasks-ecs-fargate-integ2.assets" + "aws-sfn-tasks-ecs-fargate-integ-task.assets" ], "lookupRole": { "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", @@ -31,235 +31,235 @@ } }, "dependencies": [ - "aws-sfn-tasks-ecs-fargate-integ2.assets" + "aws-sfn-tasks-ecs-fargate-integ-task.assets" ], "metadata": { - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Resource": [ { "type": "aws:cdk:logicalId", "data": "FargateCluster7CCD5F93" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/Resource": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpc377E8024" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/Subnet": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/Subnet": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet1SubnetB9C24BC7" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/RouteTable": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/RouteTable": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet1RouteTable1D7FA747" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/RouteTableAssociation": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet1RouteTableAssociation80F1442F" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/DefaultRoute": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/DefaultRoute": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet1DefaultRoute80086690" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/EIP": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/EIP": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet1EIPF91909D0" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/NATGateway": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/NATGateway": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet1NATGateway5202D86A" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/Subnet": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/Subnet": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet2Subnet24C0F9D8" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/RouteTable": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/RouteTable": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet2RouteTable1493C5D6" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/RouteTableAssociation": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet2RouteTableAssociation3EFA74DC" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/DefaultRoute": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/DefaultRoute": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet2DefaultRoute8E847CD2" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/EIP": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/EIP": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet2EIPBBB24774" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/NATGateway": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/NATGateway": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPublicSubnet2NATGatewayFFEC8ED2" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1/Subnet": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1/Subnet": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPrivateSubnet1Subnet9127625F" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1/RouteTable": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1/RouteTable": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPrivateSubnet1RouteTable21B3CEAE" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1/RouteTableAssociation": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPrivateSubnet1RouteTableAssociation78F6E213" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1/DefaultRoute": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1/DefaultRoute": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPrivateSubnet1DefaultRoute0438DCBA" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2/Subnet": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2/Subnet": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPrivateSubnet2Subnet307CEE57" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2/RouteTable": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2/RouteTable": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPrivateSubnet2RouteTable7B7F9678" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2/RouteTableAssociation": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPrivateSubnet2RouteTableAssociation3A46964C" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2/DefaultRoute": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2/DefaultRoute": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcPrivateSubnet2DefaultRoute35FDD29D" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/IGW": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/IGW": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcIGW827638CB" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/VPCGW": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/VPCGW": [ { "type": "aws:cdk:logicalId", "data": "FargateClusterVpcVPCGW38717255" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TaskRole/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TaskRole/Resource": [ { "type": "aws:cdk:logicalId", "data": "TaskDefTaskRole1EDB4A67" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/TaskDef/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/Resource": [ { "type": "aws:cdk:logicalId", "data": "TaskDef54694570" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TheContainer/LogGroup/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TheContainer/LogGroup/Resource": [ { "type": "aws:cdk:logicalId", "data": "TaskDefTheContainerLogGroupD94C8EF5" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/TaskDef/ExecutionRole/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/ExecutionRole/Resource": [ { "type": "aws:cdk:logicalId", "data": "TaskDefExecutionRoleB4775C97" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/TaskDef/ExecutionRole/DefaultPolicy/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/ExecutionRole/DefaultPolicy/Resource": [ { "type": "aws:cdk:logicalId", "data": "TaskDefExecutionRoleDefaultPolicy0DBB737A" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/FargateTask/SecurityGroup/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/FargateTask/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", "data": "FargateTaskSecurityGroup0BBB27CB" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/StateMachine/Role/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/StateMachine/Role/Resource": [ { "type": "aws:cdk:logicalId", "data": "StateMachineRoleB840431D" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/StateMachine/Role/DefaultPolicy/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/StateMachine/Role/DefaultPolicy/Resource": [ { "type": "aws:cdk:logicalId", "data": "StateMachineRoleDefaultPolicyDF1E6607" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/StateMachine/Resource": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/StateMachine/Resource": [ { "type": "aws:cdk:logicalId", "data": "StateMachine2E01A3A5" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/BootstrapVersion": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/BootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "BootstrapVersion" } ], - "/aws-sfn-tasks-ecs-fargate-integ2/CheckBootstrapVersion": [ + "/aws-sfn-tasks-ecs-fargate-integ-task/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } ] }, - "displayName": "aws-sfn-tasks-ecs-fargate-integ2" + "displayName": "aws-sfn-tasks-ecs-fargate-integ-task" }, - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets": { + "SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.assets": { "type": "cdk:asset-manifest", "properties": { - "file": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json", + "file": "SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.assets.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" } }, - "EmrCreateClusterTestDefaultTestDeployAssert697DC891": { + "SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074": { "type": "aws:cloudformation:stack", "environment": "aws://unknown-account/unknown-region", "properties": { - "templateFile": "EmrCreateClusterTestDefaultTestDeployAssert697DC891.template.json", + "templateFile": "SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.template.json", "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", @@ -268,7 +268,7 @@ "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets" + "SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.assets" ], "lookupRole": { "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", @@ -277,23 +277,23 @@ } }, "dependencies": [ - "EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets" + "SfnTasksEcsFargateTaskTestDefaultTestDeployAssert83C8E074.assets" ], "metadata": { - "/EmrCreateClusterTest/DefaultTest/DeployAssert/BootstrapVersion": [ + "/SfnTasksEcsFargateTaskTest/DefaultTest/DeployAssert/BootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "BootstrapVersion" } ], - "/EmrCreateClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + "/SfnTasksEcsFargateTaskTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } ] }, - "displayName": "EmrCreateClusterTest/DefaultTest/DeployAssert" + "displayName": "SfnTasksEcsFargateTaskTest/DefaultTest/DeployAssert" }, "Tree": { "type": "cdk:tree", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/tree.json index 837ddd2c22a38..6631b67516a02 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.js.snapshot/tree.json @@ -4,33 +4,33 @@ "id": "App", "path": "", "children": { - "aws-sfn-tasks-ecs-fargate-integ2": { - "id": "aws-sfn-tasks-ecs-fargate-integ2", - "path": "aws-sfn-tasks-ecs-fargate-integ2", + "aws-sfn-tasks-ecs-fargate-integ-task": { + "id": "aws-sfn-tasks-ecs-fargate-integ-task", + "path": "aws-sfn-tasks-ecs-fargate-integ-task", "children": { "FargateCluster": { "id": "FargateCluster", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster", "children": { "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::ECS::Cluster", "aws:cdk:cloudformation:props": {} }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.CfnCluster", + "version": "0.0.0" } }, "Vpc": { "id": "Vpc", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc", "children": { "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPC", "aws:cdk:cloudformation:props": { @@ -41,23 +41,23 @@ "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc" } ] } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", + "version": "0.0.0" } }, "PublicSubnet1": { "id": "PublicSubnet1", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1", "children": { "Subnet": { "id": "Subnet", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/Subnet", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -82,7 +82,7 @@ }, { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1" } ], "vpcId": { @@ -91,28 +91,28 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" } }, "Acl": { "id": "Acl", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/Acl", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/Acl", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "RouteTable": { "id": "RouteTable", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/RouteTable", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1" } ], "vpcId": { @@ -121,13 +121,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" } }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/RouteTableAssociation", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { @@ -140,13 +140,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" } }, "DefaultRoute": { "id": "DefaultRoute", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/DefaultRoute", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { @@ -160,13 +160,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" } }, "EIP": { "id": "EIP", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/EIP", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/EIP", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::EIP", "aws:cdk:cloudformation:props": { @@ -174,19 +174,19 @@ "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1" } ] } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" } }, "NATGateway": { "id": "NATGateway", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1/NATGateway", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1/NATGateway", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { @@ -202,29 +202,29 @@ "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet1" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet1" } ] } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" } }, "PublicSubnet2": { "id": "PublicSubnet2", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2", "children": { "Subnet": { "id": "Subnet", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/Subnet", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -249,7 +249,7 @@ }, { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2" } ], "vpcId": { @@ -258,28 +258,28 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" } }, "Acl": { "id": "Acl", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/Acl", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/Acl", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "RouteTable": { "id": "RouteTable", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/RouteTable", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2" } ], "vpcId": { @@ -288,13 +288,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" } }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/RouteTableAssociation", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { @@ -307,13 +307,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" } }, "DefaultRoute": { "id": "DefaultRoute", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/DefaultRoute", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { @@ -327,13 +327,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" } }, "EIP": { "id": "EIP", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/EIP", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/EIP", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::EIP", "aws:cdk:cloudformation:props": { @@ -341,19 +341,19 @@ "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2" } ] } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" } }, "NATGateway": { "id": "NATGateway", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2/NATGateway", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2/NATGateway", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { @@ -369,29 +369,29 @@ "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PublicSubnet2" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PublicSubnet2" } ] } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" } }, "PrivateSubnet1": { "id": "PrivateSubnet1", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1", "children": { "Subnet": { "id": "Subnet", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1/Subnet", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -416,7 +416,7 @@ }, { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1" } ], "vpcId": { @@ -425,28 +425,28 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" } }, "Acl": { "id": "Acl", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1/Acl", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1/Acl", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "RouteTable": { "id": "RouteTable", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1/RouteTable", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1" } ], "vpcId": { @@ -455,13 +455,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" } }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1/RouteTableAssociation", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { @@ -474,13 +474,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" } }, "DefaultRoute": { "id": "DefaultRoute", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet1/DefaultRoute", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet1/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { @@ -494,23 +494,23 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" } }, "PrivateSubnet2": { "id": "PrivateSubnet2", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2", "children": { "Subnet": { "id": "Subnet", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2/Subnet", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -535,7 +535,7 @@ }, { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2" } ], "vpcId": { @@ -544,28 +544,28 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" } }, "Acl": { "id": "Acl", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2/Acl", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2/Acl", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "RouteTable": { "id": "RouteTable", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2/RouteTable", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2" } ], "vpcId": { @@ -574,13 +574,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" } }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2/RouteTableAssociation", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { @@ -593,13 +593,13 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" } }, "DefaultRoute": { "id": "DefaultRoute", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/PrivateSubnet2/DefaultRoute", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/PrivateSubnet2/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { @@ -613,38 +613,38 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" } }, "IGW": { "id": "IGW", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/IGW", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/IGW", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc" + "value": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc" } ] } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnInternetGateway", + "version": "0.0.0" } }, "VPCGW": { "id": "VPCGW", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateCluster/Vpc/VPCGW", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateCluster/Vpc/VPCGW", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { @@ -657,41 +657,41 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnVPCGatewayAttachment", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.Vpc", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.Cluster", + "version": "0.0.0" } }, "TaskDef": { "id": "TaskDef", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef", "children": { "TaskRole": { "id": "TaskRole", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TaskRole", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TaskRole", "children": { "ImportTaskRole": { "id": "ImportTaskRole", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TaskRole/ImportTaskRole", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TaskRole/ImportTaskRole", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TaskRole/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TaskRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -710,19 +710,19 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" } }, "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::ECS::TaskDefinition", "aws:cdk:cloudformation:props": { @@ -730,7 +730,7 @@ { "essential": true, "image": { - "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:2fd4a6b04e9ebb0162037939c7caef60d007d2593ce4bfcfbe4bf8b3fca00594" + "Fn::Sub": "${AWS::AccountId}.dkr.ecr.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}:d87af9b5acc567118fa529d3d3b763098200a6446a5ca64aea987729efd52534" }, "memory": 256, "name": "TheContainer", @@ -755,7 +755,7 @@ "Arn" ] }, - "family": "awssfntasksecsfargateinteg2TaskDef1C10F63E", + "family": "awssfntasksecsfargateintegtaskTaskDef127A232E", "memory": "512", "networkMode": "awsvpc", "requiresCompatibilities": [ @@ -770,83 +770,83 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.CfnTaskDefinition", + "version": "0.0.0" } }, "TheContainer": { "id": "TheContainer", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TheContainer", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TheContainer", "children": { "AssetImage": { "id": "AssetImage", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TheContainer/AssetImage", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TheContainer/AssetImage", "children": { "Staging": { "id": "Staging", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TheContainer/AssetImage/Staging", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TheContainer/AssetImage/Staging", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.AssetStaging", + "version": "0.0.0" } }, "Repository": { "id": "Repository", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TheContainer/AssetImage/Repository", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TheContainer/AssetImage/Repository", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecr.RepositoryBase", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecr_assets.DockerImageAsset", + "version": "0.0.0" } }, "LogGroup": { "id": "LogGroup", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TheContainer/LogGroup", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TheContainer/LogGroup", "children": { "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/TheContainer/LogGroup/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/TheContainer/LogGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Logs::LogGroup", "aws:cdk:cloudformation:props": {} }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_logs.CfnLogGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_logs.LogGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.ContainerDefinition", + "version": "0.0.0" } }, "ExecutionRole": { "id": "ExecutionRole", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/ExecutionRole", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/ExecutionRole", "children": { "ImportExecutionRole": { "id": "ImportExecutionRole", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/ExecutionRole/ImportExecutionRole", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/ExecutionRole/ImportExecutionRole", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/ExecutionRole/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/ExecutionRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -865,17 +865,17 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" } }, "DefaultPolicy": { "id": "DefaultPolicy", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/ExecutionRole/DefaultPolicy", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/ExecutionRole/DefaultPolicy", "children": { "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/TaskDef/ExecutionRole/DefaultPolicy/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/TaskDef/ExecutionRole/DefaultPolicy/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Policy", "aws:cdk:cloudformation:props": { @@ -942,51 +942,51 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnPolicy", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Policy", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ecs.FargateTaskDefinition", + "version": "0.0.0" } }, "Start": { "id": "Start", - "path": "aws-sfn-tasks-ecs-fargate-integ2/Start", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/Start", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions.Pass", + "version": "0.0.0" } }, "FargateTask": { "id": "FargateTask", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateTask", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateTask", "children": { "SecurityGroup": { "id": "SecurityGroup", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateTask/SecurityGroup", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateTask/SecurityGroup", "children": { "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/FargateTask/SecurityGroup/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/FargateTask/SecurityGroup/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", "aws:cdk:cloudformation:props": { - "groupDescription": "aws-sfn-tasks-ecs-fargate-integ2/FargateTask/SecurityGroup", + "groupDescription": "aws-sfn-tasks-ecs-fargate-integ-task/FargateTask/SecurityGroup", "securityGroupEgress": [ { "cidrIp": "0.0.0.0/0", @@ -1000,41 +1000,41 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions.Task", + "version": "0.0.0" } }, "StateMachine": { "id": "StateMachine", - "path": "aws-sfn-tasks-ecs-fargate-integ2/StateMachine", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/StateMachine", "children": { "Role": { "id": "Role", - "path": "aws-sfn-tasks-ecs-fargate-integ2/StateMachine/Role", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/StateMachine/Role", "children": { "ImportRole": { "id": "ImportRole", - "path": "aws-sfn-tasks-ecs-fargate-integ2/StateMachine/Role/ImportRole", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/StateMachine/Role/ImportRole", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" } }, "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/StateMachine/Role/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/StateMachine/Role/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -1053,17 +1053,17 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" } }, "DefaultPolicy": { "id": "DefaultPolicy", - "path": "aws-sfn-tasks-ecs-fargate-integ2/StateMachine/Role/DefaultPolicy", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/StateMachine/Role/DefaultPolicy", "children": { "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/StateMachine/Role/DefaultPolicy/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/StateMachine/Role/DefaultPolicy/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Policy", "aws:cdk:cloudformation:props": { @@ -1142,25 +1142,25 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.CfnPolicy", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Policy", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" } }, "Resource": { "id": "Resource", - "path": "aws-sfn-tasks-ecs-fargate-integ2/StateMachine/Resource", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/StateMachine/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::StepFunctions::StateMachine", "aws:cdk:cloudformation:props": { @@ -1211,78 +1211,78 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions.CfnStateMachine", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.aws_stepfunctions.StateMachine", + "version": "0.0.0" } }, "BootstrapVersion": { "id": "BootstrapVersion", - "path": "aws-sfn-tasks-ecs-fargate-integ2/BootstrapVersion", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/BootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", - "path": "aws-sfn-tasks-ecs-fargate-integ2/CheckBootstrapVersion", + "path": "aws-sfn-tasks-ecs-fargate-integ-task/CheckBootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" } }, - "EmrCreateClusterTest": { - "id": "EmrCreateClusterTest", - "path": "EmrCreateClusterTest", + "SfnTasksEcsFargateTaskTest": { + "id": "SfnTasksEcsFargateTaskTest", + "path": "SfnTasksEcsFargateTaskTest", "children": { "DefaultTest": { "id": "DefaultTest", - "path": "EmrCreateClusterTest/DefaultTest", + "path": "SfnTasksEcsFargateTaskTest/DefaultTest", "children": { "Default": { "id": "Default", - "path": "EmrCreateClusterTest/DefaultTest/Default", + "path": "SfnTasksEcsFargateTaskTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } }, "DeployAssert": { "id": "DeployAssert", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert", + "path": "SfnTasksEcsFargateTaskTest/DefaultTest/DeployAssert", "children": { "BootstrapVersion": { "id": "BootstrapVersion", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert/BootstrapVersion", + "path": "SfnTasksEcsFargateTaskTest/DefaultTest/DeployAssert/BootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" } }, "CheckBootstrapVersion": { "id": "CheckBootstrapVersion", - "path": "EmrCreateClusterTest/DefaultTest/DeployAssert/CheckBootstrapVersion", + "path": "SfnTasksEcsFargateTaskTest/DefaultTest/DeployAssert/CheckBootstrapVersion", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" } } }, @@ -1302,13 +1302,13 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.2.70" + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.ts index ff9fad0b38b00..f0013b8c452da 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/ecs/integ.fargate-task.ts @@ -17,7 +17,7 @@ import { IntegTest } from '@aws-cdk/integ-tests-alpha'; * -- aws stepfunctions describe-execution --execution-arn returns a status of `Succeeded` */ const app = new cdk.App(); -const stack = new cdk.Stack(app, 'aws-sfn-tasks-ecs-fargate-integ2'); +const stack = new cdk.Stack(app, 'aws-sfn-tasks-ecs-fargate-integ-task'); stack.node.setContext(EC2_RESTRICT_DEFAULT_SECURITY_GROUP, false); const cluster = new ecs.Cluster(stack, 'FargateCluster'); diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/ecs/eventhandler-image/Dockerfile b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/ecs/eventhandler-image/Dockerfile index c56a857762763..23cf9b3e22f5d 100644 --- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/ecs/eventhandler-image/Dockerfile +++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/ecs/eventhandler-image/Dockerfile @@ -1,3 +1,3 @@ -FROM --platform=x86-64 public.ecr.aws/docker/library/python:3.12 +FROM public.ecr.aws/docker/library/python:3.12 ADD index.py . CMD [ "python3", "./index.py" ]