Skip to content

Commit fb267b3

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into bergjaak/ResourceDiffRefactor
2 parents d74a4ab + f54a945 commit fb267b3

16 files changed

Lines changed: 1884 additions & 8 deletions

File tree

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/aws-ecs-integ-ecs.assets.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/aws-ecs-integ-ecs.template.json‎

Lines changed: 239 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,245 @@
955955
}
956956
]
957957
}
958+
},
959+
"ScheduledEc2Task2ScheduledEventRule904C0930": {
960+
"Type": "AWS::Events::Rule",
961+
"Properties": {
962+
"ScheduleExpression": "rate(1 minute)",
963+
"State": "ENABLED",
964+
"Targets": [
965+
{
966+
"Arn": {
967+
"Fn::GetAtt": [
968+
"EcsCluster97242B84",
969+
"Arn"
970+
]
971+
},
972+
"EcsParameters": {
973+
"PropagateTags": "TASK_DEFINITION",
974+
"TagList": [
975+
{
976+
"Key": "my-tag",
977+
"Value": "my-tag-value"
978+
}
979+
],
980+
"TaskCount": 2,
981+
"TaskDefinitionArn": {
982+
"Ref": "ScheduledEc2Task2ScheduledTaskDef5A1A589E"
983+
}
984+
},
985+
"Id": "Target0",
986+
"Input": "{}",
987+
"RoleArn": {
988+
"Fn::GetAtt": [
989+
"ScheduledEc2Task2ScheduledTaskDefEventsRoleE4A47A7F",
990+
"Arn"
991+
]
992+
}
993+
}
994+
]
995+
}
996+
},
997+
"ScheduledEc2Task2ScheduledTaskDefTaskRoleF24CD72E": {
998+
"Type": "AWS::IAM::Role",
999+
"Properties": {
1000+
"AssumeRolePolicyDocument": {
1001+
"Statement": [
1002+
{
1003+
"Action": "sts:AssumeRole",
1004+
"Effect": "Allow",
1005+
"Principal": {
1006+
"Service": "ecs-tasks.amazonaws.com"
1007+
}
1008+
}
1009+
],
1010+
"Version": "2012-10-17"
1011+
}
1012+
}
1013+
},
1014+
"ScheduledEc2Task2ScheduledTaskDef5A1A589E": {
1015+
"Type": "AWS::ECS::TaskDefinition",
1016+
"Properties": {
1017+
"ContainerDefinitions": [
1018+
{
1019+
"Cpu": 1,
1020+
"Environment": [
1021+
{
1022+
"Name": "TRIGGER",
1023+
"Value": "CloudWatch Events"
1024+
}
1025+
],
1026+
"Essential": true,
1027+
"Image": "amazon/amazon-ecs-sample",
1028+
"LogConfiguration": {
1029+
"LogDriver": "awslogs",
1030+
"Options": {
1031+
"awslogs-group": {
1032+
"Ref": "ScheduledEc2Task2ScheduledTaskDefdifferentNameLogGroup576E34BD"
1033+
},
1034+
"awslogs-stream-prefix": "ScheduledEc2Task2",
1035+
"awslogs-region": {
1036+
"Ref": "AWS::Region"
1037+
}
1038+
}
1039+
},
1040+
"Memory": 512,
1041+
"Name": "differentName"
1042+
}
1043+
],
1044+
"ExecutionRoleArn": {
1045+
"Fn::GetAtt": [
1046+
"ScheduledEc2Task2ScheduledTaskDefExecutionRoleC4A2CB80",
1047+
"Arn"
1048+
]
1049+
},
1050+
"Family": "awsecsintegecsScheduledEc2Task2ScheduledTaskDef4390684D",
1051+
"NetworkMode": "bridge",
1052+
"RequiresCompatibilities": [
1053+
"EC2"
1054+
],
1055+
"TaskRoleArn": {
1056+
"Fn::GetAtt": [
1057+
"ScheduledEc2Task2ScheduledTaskDefTaskRoleF24CD72E",
1058+
"Arn"
1059+
]
1060+
}
1061+
}
1062+
},
1063+
"ScheduledEc2Task2ScheduledTaskDefdifferentNameLogGroup576E34BD": {
1064+
"Type": "AWS::Logs::LogGroup",
1065+
"UpdateReplacePolicy": "Retain",
1066+
"DeletionPolicy": "Retain"
1067+
},
1068+
"ScheduledEc2Task2ScheduledTaskDefExecutionRoleC4A2CB80": {
1069+
"Type": "AWS::IAM::Role",
1070+
"Properties": {
1071+
"AssumeRolePolicyDocument": {
1072+
"Statement": [
1073+
{
1074+
"Action": "sts:AssumeRole",
1075+
"Effect": "Allow",
1076+
"Principal": {
1077+
"Service": "ecs-tasks.amazonaws.com"
1078+
}
1079+
}
1080+
],
1081+
"Version": "2012-10-17"
1082+
}
1083+
}
1084+
},
1085+
"ScheduledEc2Task2ScheduledTaskDefExecutionRoleDefaultPolicy70781945": {
1086+
"Type": "AWS::IAM::Policy",
1087+
"Properties": {
1088+
"PolicyDocument": {
1089+
"Statement": [
1090+
{
1091+
"Action": [
1092+
"logs:CreateLogStream",
1093+
"logs:PutLogEvents"
1094+
],
1095+
"Effect": "Allow",
1096+
"Resource": {
1097+
"Fn::GetAtt": [
1098+
"ScheduledEc2Task2ScheduledTaskDefdifferentNameLogGroup576E34BD",
1099+
"Arn"
1100+
]
1101+
}
1102+
}
1103+
],
1104+
"Version": "2012-10-17"
1105+
},
1106+
"PolicyName": "ScheduledEc2Task2ScheduledTaskDefExecutionRoleDefaultPolicy70781945",
1107+
"Roles": [
1108+
{
1109+
"Ref": "ScheduledEc2Task2ScheduledTaskDefExecutionRoleC4A2CB80"
1110+
}
1111+
]
1112+
}
1113+
},
1114+
"ScheduledEc2Task2ScheduledTaskDefEventsRoleE4A47A7F": {
1115+
"Type": "AWS::IAM::Role",
1116+
"Properties": {
1117+
"AssumeRolePolicyDocument": {
1118+
"Statement": [
1119+
{
1120+
"Action": "sts:AssumeRole",
1121+
"Effect": "Allow",
1122+
"Principal": {
1123+
"Service": "events.amazonaws.com"
1124+
}
1125+
}
1126+
],
1127+
"Version": "2012-10-17"
1128+
}
1129+
}
1130+
},
1131+
"ScheduledEc2Task2ScheduledTaskDefEventsRoleDefaultPolicyF5EB7640": {
1132+
"Type": "AWS::IAM::Policy",
1133+
"Properties": {
1134+
"PolicyDocument": {
1135+
"Statement": [
1136+
{
1137+
"Action": "ecs:RunTask",
1138+
"Condition": {
1139+
"ArnEquals": {
1140+
"ecs:cluster": {
1141+
"Fn::GetAtt": [
1142+
"EcsCluster97242B84",
1143+
"Arn"
1144+
]
1145+
}
1146+
}
1147+
},
1148+
"Effect": "Allow",
1149+
"Resource": {
1150+
"Ref": "ScheduledEc2Task2ScheduledTaskDef5A1A589E"
1151+
}
1152+
},
1153+
{
1154+
"Action": "ecs:TagResource",
1155+
"Effect": "Allow",
1156+
"Resource": {
1157+
"Fn::Join": [
1158+
"",
1159+
[
1160+
"arn:",
1161+
{
1162+
"Ref": "AWS::Partition"
1163+
},
1164+
":ecs:",
1165+
{
1166+
"Ref": "AWS::Region"
1167+
},
1168+
":*:task/",
1169+
{
1170+
"Ref": "EcsCluster97242B84"
1171+
},
1172+
"/*"
1173+
]
1174+
]
1175+
}
1176+
},
1177+
{
1178+
"Action": "iam:PassRole",
1179+
"Effect": "Allow",
1180+
"Resource": {
1181+
"Fn::GetAtt": [
1182+
"ScheduledEc2Task2ScheduledTaskDefExecutionRoleC4A2CB80",
1183+
"Arn"
1184+
]
1185+
}
1186+
}
1187+
],
1188+
"Version": "2012-10-17"
1189+
},
1190+
"PolicyName": "ScheduledEc2Task2ScheduledTaskDefEventsRoleDefaultPolicyF5EB7640",
1191+
"Roles": [
1192+
{
1193+
"Ref": "ScheduledEc2Task2ScheduledTaskDefEventsRoleE4A47A7F"
1194+
}
1195+
]
1196+
}
9581197
}
9591198
},
9601199
"Parameters": {

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/manifest.json‎

Lines changed: 49 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)