Skip to content

Commit

Permalink
chore: forward merge 'master' into 'v2-main' (#19957)
Browse files Browse the repository at this point in the history 
Automated action from aws/cdk-ops
  • Loading branch information
@mergify
mergify[bot] authored Apr 18, 2022
2 parents da4b93e + 7979f7c commit 9f2dead
Show file tree
Hide file tree
Showing 581 changed files with 4,159 additions and 31,838 deletions.
6 changes: 3 additions & 3 deletions ...s/ecs-service-extensions/test/all-service-addons.integ.snapshot/aws-ecs-integ.assets.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"version": "17.0.0",
"files": {
"822f1eb0e14bdeebc9941ec50e004627e84a8c5240d15432a31a4b3f76e8d9cf": {
"9220951fe280727c8695ca9cd06f929712e6c44319ad69591a87f7ce6a931b6b": {
"source": {
"path": "aws-ecs-integ.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "822f1eb0e14bdeebc9941ec50e004627e84a8c5240d15432a31a4b3f76e8d9cf.json",
"objectKey": "9220951fe280727c8695ca9cd06f929712e6c44319ad69591a87f7ce6a931b6b.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
}
107 changes: 107 additions & 0 deletions ...@aws-cdk-containers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/tree.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,113 @@
"version": "0.0.0"
}
},
"name-logs": {
"id": "name-logs",
"path": "aws-ecs-integ/name-logs",
"children": {
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ/name-logs/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Logs::LogGroup",
"aws:cdk:cloudformation:props": {
"logGroupName": "name-logs",
"retentionInDays": 30
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
},
"ExecutionRole": {
"id": "ExecutionRole",
"path": "aws-ecs-integ/name-task-definition/ExecutionRole",
"children": {
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
"assumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ecs-tasks.amazonaws.com"
}
}
],
"Version": "2012-10-17"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
},
"DefaultPolicy": {
"id": "DefaultPolicy",
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/DefaultPolicy",
"children": {
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/DefaultPolicy/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Policy",
"aws:cdk:cloudformation:props": {
"policyDocument": {
"Statement": [
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"namelogsF4B17D31",
"Arn"
]
}
}
],
"Version": "2012-10-17"
},
"policyName": "nametaskdefinitionExecutionRoleDefaultPolicyF7942D20",
"roles": [
{
"Ref": "nametaskdefinitionExecutionRole45AC5C9A"
}
]
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"name-logs": {
"id": "name-logs",
"path": "aws-ecs-integ/name-logs",
Expand Down
107 changes: 107 additions & 0 deletions ...-containers/ecs-service-extensions/test/custom-service-extension.integ.snapshot/tree.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,113 @@
"version": "0.0.0"
}
},
"name-logs": {
"id": "name-logs",
"path": "aws-ecs-integ/name-logs",
"children": {
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ/name-logs/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Logs::LogGroup",
"aws:cdk:cloudformation:props": {
"logGroupName": "name-logs",
"retentionInDays": 30
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
},
"ExecutionRole": {
"id": "ExecutionRole",
"path": "aws-ecs-integ/name-task-definition/ExecutionRole",
"children": {
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
"assumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ecs-tasks.amazonaws.com"
}
}
],
"Version": "2012-10-17"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
},
"DefaultPolicy": {
"id": "DefaultPolicy",
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/DefaultPolicy",
"children": {
"Resource": {
"id": "Resource",
"path": "aws-ecs-integ/name-task-definition/ExecutionRole/DefaultPolicy/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Policy",
"aws:cdk:cloudformation:props": {
"policyDocument": {
"Statement": [
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"namelogsF4B17D31",
"Arn"
]
}
}
],
"Version": "2012-10-17"
},
"policyName": "nametaskdefinitionExecutionRoleDefaultPolicyF7942D20",
"roles": [
{
"Ref": "nametaskdefinitionExecutionRole45AC5C9A"
}
]
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"name-logs": {
"id": "name-logs",
"path": "aws-ecs-integ/name-logs",
Expand Down
107 changes: 107 additions & 0 deletions ...-cdk-containers/ecs-service-extensions/test/imported-environment.integ.snapshot/tree.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1297,6 +1297,113 @@
"version": "0.0.0"
}
},
"Service-logs": {
"id": "Service-logs",
"path": "imported-environment-integ/Service-logs",
"children": {
"Resource": {
"id": "Resource",
"path": "imported-environment-integ/Service-logs/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Logs::LogGroup",
"aws:cdk:cloudformation:props": {
"logGroupName": "Service-logs",
"retentionInDays": 30
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
},
"ExecutionRole": {
"id": "ExecutionRole",
"path": "imported-environment-integ/Service-task-definition/ExecutionRole",
"children": {
"Resource": {
"id": "Resource",
"path": "imported-environment-integ/Service-task-definition/ExecutionRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
"assumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ecs-tasks.amazonaws.com"
}
}
],
"Version": "2012-10-17"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
},
"DefaultPolicy": {
"id": "DefaultPolicy",
"path": "imported-environment-integ/Service-task-definition/ExecutionRole/DefaultPolicy",
"children": {
"Resource": {
"id": "Resource",
"path": "imported-environment-integ/Service-task-definition/ExecutionRole/DefaultPolicy/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Policy",
"aws:cdk:cloudformation:props": {
"policyDocument": {
"Statement": [
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"Servicelogs9F4E1F70",
"Arn"
]
}
}
],
"Version": "2012-10-17"
},
"policyName": "ServicetaskdefinitionExecutionRoleDefaultPolicy25CEAFC5",
"roles": [
{
"Ref": "ServicetaskdefinitionExecutionRoleD09F4578"
}
]
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Service-logs": {
"id": "Service-logs",
"path": "imported-environment-integ/Service-logs",
Expand Down
Loading

0 comments on commit 9f2dead

Please sign in to comment.