Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cdn): restrict CDN region check lookup #798

Merged
merged 3 commits into from
Feb 7, 2024
Merged

fix(cdn): restrict CDN region check lookup #798

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5199a02
fix(cdn): restrict CDN region check lookup
roleyfoley Feb 7, 2024
02d747e
Merge branch 'master' into fix/cdn-region-lookup
roleyfoley Feb 7, 2024
aad376d
Merge branch 'master' into fix/cdn-region-lookup
roleyfoley Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions aws/components/cdn/setup.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,15 +791,19 @@
[#if wafPresent ]
[#if solution.WAF.Logging.Enabled]

[#if getRegion() != "us-east-1" ]
[@fatal
message="To enable firehose based logging for WAF on CDN the deployment must be run from us-east-1"
context={
"CDNId" : occurrence.Core.Id,
"Region" : getRegion()
}
/]
[/#if]
[#if deploymentSubsetRequired(CDN_COMPONENT_TYPE, true)]

[#if getRegion() != "us-east-1" ]
[@fatal
message="To enable firehose based logging for WAF on CDN the deployment must be run from us-east-1"
context={
"CDNId" : occurrence.Core.Id,
"Region" : getRegion()
}
/]
[/#if]

[/#if ]

[#local wafFirehoseStreamId =
formatResourceId(AWS_KINESIS_FIREHOSE_STREAM_RESOURCE_TYPE, wafAclId)]
Expand Down
Loading