Skip to content

Commit

Permalink
Merge branch 'master' into jerry-shao/logs-query-definition
Browse files Browse the repository at this point in the history
  • Loading branch information
@jerry-shao
jerry-shao authored Apr 19, 2022
2 parents 071c452 + ca3920d commit 0aba264
Show file tree
Hide file tree
Showing 1,182 changed files with 18,171 additions and 82,784 deletions.
258 changes: 93 additions & 165 deletions ...ecs-service-extensions/test/all-service-addons.integ.snapshot/aws-ecs-integ.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,8 @@
{
"Action": [
"ecr:BatchCheckLayerAvailability",
"ecr:GetDownloadUrlForLayer",
"ecr:BatchGetImage"
"ecr:BatchGetImage",
"ecr:GetDownloadUrlForLayer"
],
"Effect": "Allow",
"Resource": {
Expand Down Expand Up @@ -841,30 +841,12 @@
]
}
},
{
"Action": "ecr:GetAuthorizationToken",
"Effect": "Allow",
"Resource": "*"
},
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"nametaskdefinitionenvoyLogGroup258B673B",
"Arn"
]
}
},
{
"Action": [
"ecr:GetAuthorizationToken",
"ecr:BatchCheckLayerAvailability",
"ecr:GetDownloadUrlForLayer",
"ecr:BatchGetImage"
"ecr:BatchGetImage",
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer"
],
"Effect": "Allow",
"Resource": "*"
Expand All @@ -875,38 +857,32 @@
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"nametaskdefinitionfirelensLogGroup80DDA60F",
"Arn"
]
}
},
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"nametaskdefinitionxrayLogGroup4AF4CA37",
"Arn"
]
}
},
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"nametaskdefinitioncloudwatchagentLogGroup78DDC685",
"Arn"
]
}
"Resource": [
{
"Fn::GetAtt": [
"nametaskdefinitioncloudwatchagentLogGroup78DDC685",
"Arn"
]
},
{
"Fn::GetAtt": [
"nametaskdefinitionenvoyLogGroup258B673B",
"Arn"
]
},
{
"Fn::GetAtt": [
"nametaskdefinitionfirelensLogGroup80DDA60F",
"Arn"
]
},
{
"Fn::GetAtt": [
"nametaskdefinitionxrayLogGroup4AF4CA37",
"Arn"
]
}
]
}
],
"Version": "2012-10-17"
Expand Down Expand Up @@ -1680,8 +1656,8 @@
{
"Action": [
"ecr:BatchCheckLayerAvailability",
"ecr:GetDownloadUrlForLayer",
"ecr:BatchGetImage"
"ecr:BatchGetImage",
"ecr:GetDownloadUrlForLayer"
],
"Effect": "Allow",
"Resource": {
Expand Down Expand Up @@ -1711,30 +1687,12 @@
]
}
},
{
"Action": "ecr:GetAuthorizationToken",
"Effect": "Allow",
"Resource": "*"
},
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"greetingtaskdefinitionenvoyLogGroup6556AC35",
"Arn"
]
}
},
{
"Action": [
"ecr:GetAuthorizationToken",
"ecr:BatchCheckLayerAvailability",
"ecr:GetDownloadUrlForLayer",
"ecr:BatchGetImage"
"ecr:BatchGetImage",
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer"
],
"Effect": "Allow",
"Resource": "*"
Expand All @@ -1745,38 +1703,32 @@
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"greetingtaskdefinitionfirelensLogGroupD7A398A7",
"Arn"
]
}
},
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"greetingtaskdefinitionxrayLogGroupD25C072D",
"Arn"
]
}
},
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"greetingtaskdefinitioncloudwatchagentLogGroupCEF72742",
"Arn"
]
}
"Resource": [
{
"Fn::GetAtt": [
"greetingtaskdefinitioncloudwatchagentLogGroupCEF72742",
"Arn"
]
},
{
"Fn::GetAtt": [
"greetingtaskdefinitionenvoyLogGroup6556AC35",
"Arn"
]
},
{
"Fn::GetAtt": [
"greetingtaskdefinitionfirelensLogGroupD7A398A7",
"Arn"
]
},
{
"Fn::GetAtt": [
"greetingtaskdefinitionxrayLogGroupD25C072D",
"Arn"
]
}
]
}
],
"Version": "2012-10-17"
Expand Down Expand Up @@ -2669,8 +2621,8 @@
{
"Action": [
"ecr:BatchCheckLayerAvailability",
"ecr:GetDownloadUrlForLayer",
"ecr:BatchGetImage"
"ecr:BatchGetImage",
"ecr:GetDownloadUrlForLayer"
],
"Effect": "Allow",
"Resource": {
Expand Down Expand Up @@ -2700,30 +2652,12 @@
]
}
},
{
"Action": "ecr:GetAuthorizationToken",
"Effect": "Allow",
"Resource": "*"
},
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"greetertaskdefinitionenvoyLogGroup6E10B93E",
"Arn"
]
}
},
{
"Action": [
"ecr:GetAuthorizationToken",
"ecr:BatchCheckLayerAvailability",
"ecr:GetDownloadUrlForLayer",
"ecr:BatchGetImage"
"ecr:BatchGetImage",
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer"
],
"Effect": "Allow",
"Resource": "*"
Expand All @@ -2734,38 +2668,32 @@
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"greetertaskdefinitionfirelensLogGroupD5BAAC35",
"Arn"
]
}
},
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"greetertaskdefinitionxrayLogGroupBC1558B6",
"Arn"
]
}
},
{
"Action": [
"logs:CreateLogStream",
"logs:PutLogEvents"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"greetertaskdefinitioncloudwatchagentLogGroupE7EAF327",
"Arn"
]
}
"Resource": [
{
"Fn::GetAtt": [
"greetertaskdefinitioncloudwatchagentLogGroupE7EAF327",
"Arn"
]
},
{
"Fn::GetAtt": [
"greetertaskdefinitionenvoyLogGroup6E10B93E",
"Arn"
]
},
{
"Fn::GetAtt": [
"greetertaskdefinitionfirelensLogGroupD5BAAC35",
"Arn"
]
},
{
"Fn::GetAtt": [
"greetertaskdefinitionxrayLogGroupBC1558B6",
"Arn"
]
}
]
}
],
"Version": "2012-10-17"
Expand Down
7 changes: 3 additions & 4 deletions ...dk-containers/ecs-service-extensions/test/all-service-addons.integ.snapshot/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"type": "cdk:tree",
"properties": {
"file": "tree.json"
},
"metadata": {}
}
},
"aws-ecs-integ": {
"type": "aws:cloudformation:stack",
Expand Down Expand Up @@ -583,11 +582,11 @@
"/aws-ecs-integ/greeter-service/SecurityGroup": [
{
"type": "aws:cdk:warning",
"data": "Ignoring Egress rule since 'allowAllOutbound' is set to true; To add customize rules, set allowAllOutbound=false on the SecurityGroup"
"data": "Ignoring Egress rule since 'allowAllOutbound' is set to true; To add customized rules, set allowAllOutbound=false on the SecurityGroup"
},
{
"type": "aws:cdk:warning",
"data": "Ignoring Egress rule since 'allowAllOutbound' is set to true; To add customize rules, set allowAllOutbound=false on the SecurityGroup"
"data": "Ignoring Egress rule since 'allowAllOutbound' is set to true; To add customized rules, set allowAllOutbound=false on the SecurityGroup"
}
],
"/aws-ecs-integ/greeter-service/SecurityGroup/Resource": [
Expand Down
Loading

0 comments on commit 0aba264

Please sign in to comment.