Skip to content

Commit 920f12f

Browse files
jogoldmergify[bot]
authored andcommitted
fix(events): remove custom resource for fargate event target (#3952)
* chore(events): remove custom resource for fargate event target The latest CloudFormation specification adds `LaunchType` and `NetworkConfiguration` properties to the `EcsParameters` property. A custom resource to set those values is no longer needed. Closes #3930 * fix comma in package.json after fixing merge conflict
1 parent 73a1de1 commit 920f12f

File tree

6 files changed

+150
-765
lines changed

6 files changed

+150
-765
lines changed

packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.scheduled-fargate-task.lit.expected.json

Lines changed: 19 additions & 301 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,25 @@
207207
]
208208
},
209209
"EcsParameters": {
210+
"LaunchType": "FARGATE",
211+
"NetworkConfiguration": {
212+
"AwsVpcConfiguration": {
213+
"AssignPublicIp": "DISABLED",
214+
"SecurityGroups": [
215+
{
216+
"Fn::GetAtt": [
217+
"ScheduledFargateTaskScheduledTaskDefSecurityGroupE075BC19",
218+
"GroupId"
219+
]
220+
}
221+
],
222+
"Subnets": [
223+
{
224+
"Ref": "VpcPrivateSubnet1Subnet536B997A"
225+
}
226+
]
227+
}
228+
},
210229
"TaskCount": 2,
211230
"TaskDefinitionArn": {
212231
"Ref": "ScheduledFargateTaskScheduledTaskDef521FA675"
@@ -600,173 +619,6 @@
600619
]
601620
}
602621
},
603-
"ScheduledFargateTaskScheduledTaskDefScheduledEventRuleTarget0PutTargets4F6BAABA": {
604-
"Type": "Custom::AWS",
605-
"Properties": {
606-
"ServiceToken": {
607-
"Fn::GetAtt": [
608-
"AWS679f53fac002430cb0da5b7982bd22872D164C4C",
609-
"Arn"
610-
]
611-
},
612-
"Create": {
613-
"service": "CloudWatchEvents",
614-
"apiVersion": "2015-10-07",
615-
"action": "putTargets",
616-
"parameters": {
617-
"Rule": {
618-
"Fn::Select": [
619-
1,
620-
{
621-
"Fn::Split": [
622-
"/",
623-
{
624-
"Fn::Select": [
625-
5,
626-
{
627-
"Fn::Split": [
628-
":",
629-
{
630-
"Fn::GetAtt": [
631-
"ScheduledFargateTaskScheduledEventRule2B79E34F",
632-
"Arn"
633-
]
634-
}
635-
]
636-
}
637-
]
638-
}
639-
]
640-
}
641-
]
642-
},
643-
"Targets": [
644-
{
645-
"Arn": {
646-
"Fn::GetAtt": [
647-
"FargateCluster7CCD5F93",
648-
"Arn"
649-
]
650-
},
651-
"Id": "Target0",
652-
"EcsParameters": {
653-
"TaskDefinitionArn": {
654-
"Ref": "ScheduledFargateTaskScheduledTaskDef521FA675"
655-
},
656-
"LaunchType": "FARGATE",
657-
"NetworkConfiguration": {
658-
"awsvpcConfiguration": {
659-
"Subnets": [
660-
{
661-
"Ref": "VpcPrivateSubnet1Subnet536B997A"
662-
}
663-
],
664-
"AssignPublicIp": "DISABLED",
665-
"SecurityGroups": [
666-
{
667-
"Fn::GetAtt": [
668-
"ScheduledFargateTaskScheduledTaskDefSecurityGroupE075BC19",
669-
"GroupId"
670-
]
671-
}
672-
]
673-
}
674-
},
675-
"TaskCount": 2
676-
},
677-
"Input": "{}",
678-
"RoleArn": {
679-
"Fn::GetAtt": [
680-
"ScheduledFargateTaskScheduledTaskDefEventsRole6CE19522",
681-
"Arn"
682-
]
683-
}
684-
}
685-
]
686-
},
687-
"physicalResourceId": "awsfargateintegScheduledFargateTaskScheduledTaskDefB0AD4F70"
688-
},
689-
"Update": {
690-
"service": "CloudWatchEvents",
691-
"apiVersion": "2015-10-07",
692-
"action": "putTargets",
693-
"parameters": {
694-
"Rule": {
695-
"Fn::Select": [
696-
1,
697-
{
698-
"Fn::Split": [
699-
"/",
700-
{
701-
"Fn::Select": [
702-
5,
703-
{
704-
"Fn::Split": [
705-
":",
706-
{
707-
"Fn::GetAtt": [
708-
"ScheduledFargateTaskScheduledEventRule2B79E34F",
709-
"Arn"
710-
]
711-
}
712-
]
713-
}
714-
]
715-
}
716-
]
717-
}
718-
]
719-
},
720-
"Targets": [
721-
{
722-
"Arn": {
723-
"Fn::GetAtt": [
724-
"FargateCluster7CCD5F93",
725-
"Arn"
726-
]
727-
},
728-
"Id": "Target0",
729-
"EcsParameters": {
730-
"TaskDefinitionArn": {
731-
"Ref": "ScheduledFargateTaskScheduledTaskDef521FA675"
732-
},
733-
"LaunchType": "FARGATE",
734-
"NetworkConfiguration": {
735-
"awsvpcConfiguration": {
736-
"Subnets": [
737-
{
738-
"Ref": "VpcPrivateSubnet1Subnet536B997A"
739-
}
740-
],
741-
"AssignPublicIp": "DISABLED",
742-
"SecurityGroups": [
743-
{
744-
"Fn::GetAtt": [
745-
"ScheduledFargateTaskScheduledTaskDefSecurityGroupE075BC19",
746-
"GroupId"
747-
]
748-
}
749-
]
750-
}
751-
},
752-
"TaskCount": 2
753-
},
754-
"Input": "{}",
755-
"RoleArn": {
756-
"Fn::GetAtt": [
757-
"ScheduledFargateTaskScheduledTaskDefEventsRole6CE19522",
758-
"Arn"
759-
]
760-
}
761-
}
762-
]
763-
},
764-
"physicalResourceId": "awsfargateintegScheduledFargateTaskScheduledTaskDefB0AD4F70"
765-
}
766-
},
767-
"UpdateReplacePolicy": "Delete",
768-
"DeletionPolicy": "Delete"
769-
},
770622
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleD788AA17": {
771623
"Type": "AWS::IAM::Role",
772624
"Properties": {
@@ -912,128 +764,6 @@
912764
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleDefaultPolicy6BC8737C",
913765
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleD788AA17"
914766
]
915-
},
916-
"AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2": {
917-
"Type": "AWS::IAM::Role",
918-
"Properties": {
919-
"AssumeRolePolicyDocument": {
920-
"Statement": [
921-
{
922-
"Action": "sts:AssumeRole",
923-
"Effect": "Allow",
924-
"Principal": {
925-
"Service": "lambda.amazonaws.com"
926-
}
927-
}
928-
],
929-
"Version": "2012-10-17"
930-
},
931-
"ManagedPolicyArns": [
932-
{
933-
"Fn::Join": [
934-
"",
935-
[
936-
"arn:",
937-
{
938-
"Ref": "AWS::Partition"
939-
},
940-
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
941-
]
942-
]
943-
}
944-
]
945-
}
946-
},
947-
"AWS679f53fac002430cb0da5b7982bd2287ServiceRoleDefaultPolicyD28E1A5E": {
948-
"Type": "AWS::IAM::Policy",
949-
"Properties": {
950-
"PolicyDocument": {
951-
"Statement": [
952-
{
953-
"Action": "events:PutTargets",
954-
"Effect": "Allow",
955-
"Resource": {
956-
"Fn::GetAtt": [
957-
"ScheduledFargateTaskScheduledEventRule2B79E34F",
958-
"Arn"
959-
]
960-
}
961-
},
962-
{
963-
"Action": "iam:PassRole",
964-
"Effect": "Allow",
965-
"Resource": {
966-
"Fn::GetAtt": [
967-
"ScheduledFargateTaskScheduledTaskDefEventsRole6CE19522",
968-
"Arn"
969-
]
970-
}
971-
}
972-
],
973-
"Version": "2012-10-17"
974-
},
975-
"PolicyName": "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleDefaultPolicyD28E1A5E",
976-
"Roles": [
977-
{
978-
"Ref": "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2"
979-
}
980-
]
981-
}
982-
},
983-
"AWS679f53fac002430cb0da5b7982bd22872D164C4C": {
984-
"Type": "AWS::Lambda::Function",
985-
"Properties": {
986-
"Code": {
987-
"S3Bucket": {
988-
"Ref": "AWS679f53fac002430cb0da5b7982bd2287CodeS3BucketF55839B6"
989-
},
990-
"S3Key": {
991-
"Fn::Join": [
992-
"",
993-
[
994-
{
995-
"Fn::Select": [
996-
0,
997-
{
998-
"Fn::Split": [
999-
"||",
1000-
{
1001-
"Ref": "AWS679f53fac002430cb0da5b7982bd2287CodeS3VersionKey3C45B02F"
1002-
}
1003-
]
1004-
}
1005-
]
1006-
},
1007-
{
1008-
"Fn::Select": [
1009-
1,
1010-
{
1011-
"Fn::Split": [
1012-
"||",
1013-
{
1014-
"Ref": "AWS679f53fac002430cb0da5b7982bd2287CodeS3VersionKey3C45B02F"
1015-
}
1016-
]
1017-
}
1018-
]
1019-
}
1020-
]
1021-
]
1022-
}
1023-
},
1024-
"Handler": "index.handler",
1025-
"Role": {
1026-
"Fn::GetAtt": [
1027-
"AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",
1028-
"Arn"
1029-
]
1030-
},
1031-
"Runtime": "nodejs10.x"
1032-
},
1033-
"DependsOn": [
1034-
"AWS679f53fac002430cb0da5b7982bd2287ServiceRoleDefaultPolicyD28E1A5E",
1035-
"AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2"
1036-
]
1037767
}
1038768
},
1039769
"Parameters": {
@@ -1052,18 +782,6 @@
1052782
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cCodeArtifactHash8BCBAA49": {
1053783
"Type": "String",
1054784
"Description": "Artifact hash for asset \"aws-fargate-integ/AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62c/Code\""
1055-
},
1056-
"AWS679f53fac002430cb0da5b7982bd2287CodeS3BucketF55839B6": {
1057-
"Type": "String",
1058-
"Description": "S3 bucket for asset \"aws-fargate-integ/AWS679f53fac002430cb0da5b7982bd2287/Code\""
1059-
},
1060-
"AWS679f53fac002430cb0da5b7982bd2287CodeS3VersionKey3C45B02F": {
1061-
"Type": "String",
1062-
"Description": "S3 key for asset version \"aws-fargate-integ/AWS679f53fac002430cb0da5b7982bd2287/Code\""
1063-
},
1064-
"AWS679f53fac002430cb0da5b7982bd2287CodeArtifactHash49FACC2E": {
1065-
"Type": "String",
1066-
"Description": "Artifact hash for asset \"aws-fargate-integ/AWS679f53fac002430cb0da5b7982bd2287/Code\""
1067785
}
1068786
}
1069787
}

0 commit comments

Comments
 (0)