Skip to content

Commit

Permalink
Merge branch 'main' into automation/yarn-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Sep 29, 2023
2 parents e1025e4 + 0fbcfea commit 7ff9a49
Show file tree
Hide file tree
Showing 339 changed files with 145,523 additions and 6,613 deletions.
1 change: 1 addition & 0 deletions .gitallowed
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ account: '924023996002'
account: '919366029133' #cn-north-1
account: '919830735681' #cn-northwest-1
account: '909464085924' #ap-southeast-3
account: '564877687649' #il-central-1

# The account IDs of password rotation applications of Serverless Application Repository
# https://docs.aws.amazon.com/secretsmanager/latest/userguide/enable-rotation-rds.html
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"Action": [
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:List*"
"s3:List*",
"s3:PutBucketPolicy"
],
"Effect": "Allow",
"Principal": {
Expand Down Expand Up @@ -155,7 +156,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "3e6ea85c994cf2198f02e67a9e98e8f23456efa8bd72dd55b3a86454c4db9d5f.zip"
"S3Key": "2ec8ad9e91dcd6e7ad6a5c84ffc6c9c05c408aca3b26ceb2816d81043e6c4dc3.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down Expand Up @@ -187,10 +188,6 @@
"Trail022F0CF2": {
"Type": "AWS::CloudTrail::Trail",
"Properties": {
"IsLogging": true,
"S3BucketName": {
"Ref": "S3486F821D"
},
"EnableLogFileValidation": true,
"EventSelectors": [],
"IncludeGlobalServiceEvents": true,
Expand All @@ -202,7 +199,11 @@
"InsightType": "ApiErrorRateInsight"
}
],
"IsMultiRegionTrail": true
"IsLogging": true,
"IsMultiRegionTrail": true,
"S3BucketName": {
"Ref": "S3486F821D"
}
},
"DependsOn": [
"S3Policy2E4AA1D6"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7ff9a49

Please sign in to comment.