Skip to content

Commit

Permalink
updates for #227 and #230
Browse files Browse the repository at this point in the history
  • Loading branch information
@morjoan
morjoan committed Dec 14, 2021
1 parent f43c814 commit d7d23e9
Show file tree
Hide file tree
Showing 5 changed files with 106 additions and 1 deletion.
16 changes: 16 additions & 0 deletions source/events/msam-events-release.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
}]
}
}
Expand Down Expand Up @@ -138,6 +146,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
}]
}
}
Expand Down
8 changes: 8 additions & 0 deletions source/msam/build/msam-dynamodb-release.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
}]
}
}
Expand Down
3 changes: 2 additions & 1 deletion source/msam/chalicelib/connections.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,8 @@ def s3_bucket_medialive_input_ddb_items():
re.compile(r"http.?\:\/\/s3\-\S+\.amazonaws\.com\/([^\/]+)\/.+"),
re.compile(r"http.?\:\/\/(\S+)\.s3\.amazonaws\.com\/.+"),
re.compile(r"http.?\:\/\/(\S+)\.s3\-(\S+)\.amazonaws\.com"),
re.compile(r"s3\:\/\/([^\/]+)")
re.compile(r"s3\:\/\/([^\/]+)"),
re.compile(r"s3ssl\:\/\/([^\/]+)")
]
try:
# get S3 buckets
Expand Down
64 changes: 64 additions & 0 deletions source/msam/merge_template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
}]
}
}
Expand Down Expand Up @@ -112,6 +120,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
}]
}
}
Expand Down Expand Up @@ -170,6 +186,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
}]
}
}
Expand Down Expand Up @@ -228,6 +252,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
}]
}
}
Expand Down Expand Up @@ -286,6 +318,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
}]
}
}
Expand Down Expand Up @@ -344,6 +384,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
}]
}
}
Expand Down Expand Up @@ -402,6 +450,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
}]
}
}
Expand Down Expand Up @@ -460,6 +516,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with CloudWatch Logs permissions defined in different template."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
}]
}
}
Expand Down
16 changes: 16 additions & 0 deletions source/web-cloudformation/msam-browser-app-release.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with AWSLambdaBasicExecutionRole defined in different template."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
}]
}
}
Expand Down Expand Up @@ -323,6 +331,14 @@
"rules_to_suppress": [{
"id": "W58",
"reason": "Role with AWSLambdaBasicExecutionRole defined in different template."
},
{
"id": "W89",
"reason": "Lambda does not need to be in a VPC."
},
{
"id": "W92",
"reason": "Lambda does not need ReservedConcurrentExecutions."
}]
}
}
Expand Down

0 comments on commit d7d23e9

Please sign in to comment.