Skip to content

Commit 9f2dead

Browse files
mergify[bot]mergify[bot]
authored
chore: forward merge 'master' into 'v2-main' (#19957)
Automated action from aws/cdk-ops
2 parents da4b93e + 7979f7c commit 9f2dead

File tree

581 files changed

+4159
-31838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

581 files changed

+4159
-31838
lines changed

‎packages/@aws-cdk-containers/ecs-service-extensions/test/all-service-addons.integ.snapshot/aws-ecs-integ.assets.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"version": "17.0.0",
33
"files": {
4-
"822f1eb0e14bdeebc9941ec50e004627e84a8c5240d15432a31a4b3f76e8d9cf": {
4+
"9220951fe280727c8695ca9cd06f929712e6c44319ad69591a87f7ce6a931b6b": {
55
"source": {
66
"path": "aws-ecs-integ.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "822f1eb0e14bdeebc9941ec50e004627e84a8c5240d15432a31a4b3f76e8d9cf.json",
12+
"objectKey": "9220951fe280727c8695ca9cd06f929712e6c44319ad69591a87f7ce6a931b6b.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}
1616
}
1717
},
1818
"dockerImages": {}
19-
}
19+
}

‎packages/@aws-cdk-containers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/tree.json

+107
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,113 @@
627627
"version": "0.0.0"
628628
}
629629
},
630+
"name-logs": {
631+
"id": "name-logs",
632+
"path": "aws-ecs-integ/name-logs",
633+
"children": {
634+
"Resource": {
635+
"id": "Resource",
636+
"path": "aws-ecs-integ/name-logs/Resource",
637+
"attributes": {
638+
"aws:cdk:cloudformation:type": "AWS::Logs::LogGroup",
639+
"aws:cdk:cloudformation:props": {
640+
"logGroupName": "name-logs",
641+
"retentionInDays": 30
642+
}
643+
},
644+
"constructInfo": {
645+
"fqn": "@aws-cdk/core.CfnResource",
646+
"version": "0.0.0"
647+
}
648+
},
649+
"ExecutionRole": {
650+
"id": "ExecutionRole",
651+
"path": "aws-ecs-integ/name-task-definition/ExecutionRole",
652+
"children": {
653+
"Resource": {
654+
"id": "Resource",
655+
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/Resource",
656+
"attributes": {
657+
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
658+
"aws:cdk:cloudformation:props": {
659+
"assumeRolePolicyDocument": {
660+
"Statement": [
661+
{
662+
"Action": "sts:AssumeRole",
663+
"Effect": "Allow",
664+
"Principal": {
665+
"Service": "ecs-tasks.amazonaws.com"
666+
}
667+
}
668+
],
669+
"Version": "2012-10-17"
670+
}
671+
}
672+
},
673+
"constructInfo": {
674+
"fqn": "@aws-cdk/core.CfnResource",
675+
"version": "0.0.0"
676+
}
677+
},
678+
"DefaultPolicy": {
679+
"id": "DefaultPolicy",
680+
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/DefaultPolicy",
681+
"children": {
682+
"Resource": {
683+
"id": "Resource",
684+
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/DefaultPolicy/Resource",
685+
"attributes": {
686+
"aws:cdk:cloudformation:type": "AWS::IAM::Policy",
687+
"aws:cdk:cloudformation:props": {
688+
"policyDocument": {
689+
"Statement": [
690+
{
691+
"Action": [
692+
"logs:CreateLogStream",
693+
"logs:PutLogEvents"
694+
],
695+
"Effect": "Allow",
696+
"Resource": {
697+
"Fn::GetAtt": [
698+
"namelogsF4B17D31",
699+
"Arn"
700+
]
701+
}
702+
}
703+
],
704+
"Version": "2012-10-17"
705+
},
706+
"policyName": "nametaskdefinitionExecutionRoleDefaultPolicyF7942D20",
707+
"roles": [
708+
{
709+
"Ref": "nametaskdefinitionExecutionRole45AC5C9A"
710+
}
711+
]
712+
}
713+
},
714+
"constructInfo": {
715+
"fqn": "@aws-cdk/core.CfnResource",
716+
"version": "0.0.0"
717+
}
718+
}
719+
},
720+
"constructInfo": {
721+
"fqn": "@aws-cdk/core.Resource",
722+
"version": "0.0.0"
723+
}
724+
}
725+
},
726+
"constructInfo": {
727+
"fqn": "@aws-cdk/core.Resource",
728+
"version": "0.0.0"
729+
}
730+
}
731+
},
732+
"constructInfo": {
733+
"fqn": "@aws-cdk/core.Resource",
734+
"version": "0.0.0"
735+
}
736+
},
630737
"name-logs": {
631738
"id": "name-logs",
632739
"path": "aws-ecs-integ/name-logs",

‎packages/@aws-cdk-containers/ecs-service-extensions/test/custom-service-extension.integ.snapshot/tree.json

+107
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,113 @@
905905
"version": "0.0.0"
906906
}
907907
},
908+
"name-logs": {
909+
"id": "name-logs",
910+
"path": "aws-ecs-integ/name-logs",
911+
"children": {
912+
"Resource": {
913+
"id": "Resource",
914+
"path": "aws-ecs-integ/name-logs/Resource",
915+
"attributes": {
916+
"aws:cdk:cloudformation:type": "AWS::Logs::LogGroup",
917+
"aws:cdk:cloudformation:props": {
918+
"logGroupName": "name-logs",
919+
"retentionInDays": 30
920+
}
921+
},
922+
"constructInfo": {
923+
"fqn": "@aws-cdk/core.CfnResource",
924+
"version": "0.0.0"
925+
}
926+
},
927+
"ExecutionRole": {
928+
"id": "ExecutionRole",
929+
"path": "aws-ecs-integ/name-task-definition/ExecutionRole",
930+
"children": {
931+
"Resource": {
932+
"id": "Resource",
933+
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/Resource",
934+
"attributes": {
935+
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
936+
"aws:cdk:cloudformation:props": {
937+
"assumeRolePolicyDocument": {
938+
"Statement": [
939+
{
940+
"Action": "sts:AssumeRole",
941+
"Effect": "Allow",
942+
"Principal": {
943+
"Service": "ecs-tasks.amazonaws.com"
944+
}
945+
}
946+
],
947+
"Version": "2012-10-17"
948+
}
949+
}
950+
},
951+
"constructInfo": {
952+
"fqn": "@aws-cdk/core.CfnResource",
953+
"version": "0.0.0"
954+
}
955+
},
956+
"DefaultPolicy": {
957+
"id": "DefaultPolicy",
958+
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/DefaultPolicy",
959+
"children": {
960+
"Resource": {
961+
"id": "Resource",
962+
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/DefaultPolicy/Resource",
963+
"attributes": {
964+
"aws:cdk:cloudformation:type": "AWS::IAM::Policy",
965+
"aws:cdk:cloudformation:props": {
966+
"policyDocument": {
967+
"Statement": [
968+
{
969+
"Action": [
970+
"logs:CreateLogStream",
971+
"logs:PutLogEvents"
972+
],
973+
"Effect": "Allow",
974+
"Resource": {
975+
"Fn::GetAtt": [
976+
"namelogsF4B17D31",
977+
"Arn"
978+
]
979+
}
980+
}
981+
],
982+
"Version": "2012-10-17"
983+
},
984+
"policyName": "nametaskdefinitionExecutionRoleDefaultPolicyF7942D20",
985+
"roles": [
986+
{
987+
"Ref": "nametaskdefinitionExecutionRole45AC5C9A"
988+
}
989+
]
990+
}
991+
},
992+
"constructInfo": {
993+
"fqn": "@aws-cdk/core.CfnResource",
994+
"version": "0.0.0"
995+
}
996+
}
997+
},
998+
"constructInfo": {
999+
"fqn": "@aws-cdk/core.Resource",
1000+
"version": "0.0.0"
1001+
}
1002+
}
1003+
},
1004+
"constructInfo": {
1005+
"fqn": "@aws-cdk/core.Resource",
1006+
"version": "0.0.0"
1007+
}
1008+
}
1009+
},
1010+
"constructInfo": {
1011+
"fqn": "@aws-cdk/core.Resource",
1012+
"version": "0.0.0"
1013+
}
1014+
},
9081015
"name-logs": {
9091016
"id": "name-logs",
9101017
"path": "aws-ecs-integ/name-logs",

‎packages/@aws-cdk-containers/ecs-service-extensions/test/imported-environment.integ.snapshot/tree.json

+107
Original file line numberDiff line numberDiff line change
@@ -1297,6 +1297,113 @@
12971297
"version": "0.0.0"
12981298
}
12991299
},
1300+
"Service-logs": {
1301+
"id": "Service-logs",
1302+
"path": "imported-environment-integ/Service-logs",
1303+
"children": {
1304+
"Resource": {
1305+
"id": "Resource",
1306+
"path": "imported-environment-integ/Service-logs/Resource",
1307+
"attributes": {
1308+
"aws:cdk:cloudformation:type": "AWS::Logs::LogGroup",
1309+
"aws:cdk:cloudformation:props": {
1310+
"logGroupName": "Service-logs",
1311+
"retentionInDays": 30
1312+
}
1313+
},
1314+
"constructInfo": {
1315+
"fqn": "@aws-cdk/core.CfnResource",
1316+
"version": "0.0.0"
1317+
}
1318+
},
1319+
"ExecutionRole": {
1320+
"id": "ExecutionRole",
1321+
"path": "imported-environment-integ/Service-task-definition/ExecutionRole",
1322+
"children": {
1323+
"Resource": {
1324+
"id": "Resource",
1325+
"path": "imported-environment-integ/Service-task-definition/ExecutionRole/Resource",
1326+
"attributes": {
1327+
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
1328+
"aws:cdk:cloudformation:props": {
1329+
"assumeRolePolicyDocument": {
1330+
"Statement": [
1331+
{
1332+
"Action": "sts:AssumeRole",
1333+
"Effect": "Allow",
1334+
"Principal": {
1335+
"Service": "ecs-tasks.amazonaws.com"
1336+
}
1337+
}
1338+
],
1339+
"Version": "2012-10-17"
1340+
}
1341+
}
1342+
},
1343+
"constructInfo": {
1344+
"fqn": "@aws-cdk/core.CfnResource",
1345+
"version": "0.0.0"
1346+
}
1347+
},
1348+
"DefaultPolicy": {
1349+
"id": "DefaultPolicy",
1350+
"path": "imported-environment-integ/Service-task-definition/ExecutionRole/DefaultPolicy",
1351+
"children": {
1352+
"Resource": {
1353+
"id": "Resource",
1354+
"path": "imported-environment-integ/Service-task-definition/ExecutionRole/DefaultPolicy/Resource",
1355+
"attributes": {
1356+
"aws:cdk:cloudformation:type": "AWS::IAM::Policy",
1357+
"aws:cdk:cloudformation:props": {
1358+
"policyDocument": {
1359+
"Statement": [
1360+
{
1361+
"Action": [
1362+
"logs:CreateLogStream",
1363+
"logs:PutLogEvents"
1364+
],
1365+
"Effect": "Allow",
1366+
"Resource": {
1367+
"Fn::GetAtt": [
1368+
"Servicelogs9F4E1F70",
1369+
"Arn"
1370+
]
1371+
}
1372+
}
1373+
],
1374+
"Version": "2012-10-17"
1375+
},
1376+
"policyName": "ServicetaskdefinitionExecutionRoleDefaultPolicy25CEAFC5",
1377+
"roles": [
1378+
{
1379+
"Ref": "ServicetaskdefinitionExecutionRoleD09F4578"
1380+
}
1381+
]
1382+
}
1383+
},
1384+
"constructInfo": {
1385+
"fqn": "@aws-cdk/core.CfnResource",
1386+
"version": "0.0.0"
1387+
}
1388+
}
1389+
},
1390+
"constructInfo": {
1391+
"fqn": "@aws-cdk/core.Resource",
1392+
"version": "0.0.0"
1393+
}
1394+
}
1395+
},
1396+
"constructInfo": {
1397+
"fqn": "@aws-cdk/core.Resource",
1398+
"version": "0.0.0"
1399+
}
1400+
}
1401+
},
1402+
"constructInfo": {
1403+
"fqn": "@aws-cdk/core.Resource",
1404+
"version": "0.0.0"
1405+
}
1406+
},
13001407
"Service-logs": {
13011408
"id": "Service-logs",
13021409
"path": "imported-environment-integ/Service-logs",

0 commit comments

Comments
 (0)