Skip to content

[PRMP-1318] Refactor CloudFront policies and more #569

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

Open
NogaNHS wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[PRMP-1318] Refactor CloudFront policies and more #569

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d66f968
[PRMP-1318] Refactor CloudFront policies to use local variables for s…
NogaNHS Jan 21, 2026
5de924a
[PRMP-1318] Rename CloudFront policies to use environment variables
NogaNHS Jan 21, 2026
1e59af8
[PRMP-1318] WIP
NogaNHS Jan 21, 2026
f10c135
[PRMP-1318] Rename CloudFront policies for development environment
NogaNHS Jan 21, 2026
f3b8cda
[PRMP-1318] add moved block for CloudFront policies
NogaNHS Jan 21, 2026
fae4e6d
[PRMP-1318] rename moved-resources to version 1.6.11
NogaNHS Jan 21, 2026
ca2a3cd
[PRMP-1318] replace aws_iam_policy references with local variables fo…
NogaNHS Jan 21, 2026
79698cf
[PRMP-1318] update SSM access policy references to use local variables
NogaNHS Jan 21, 2026
adcee05
[PRMP-1318] update SSM access policy references to use local variables 2
NogaNHS Jan 21, 2026
9a695ae
[PRMP-1318] IAM policies in im-alerting-lambda
NogaNHS Jan 21, 2026
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
49 changes: 41 additions & 8 deletions infrastructure/cloudfront.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ resource "aws_cloudfront_distribution" "s3_presign_mask" {
cached_methods = ["HEAD", "GET", "OPTIONS"]
target_origin_id = module.ndr-lloyd-george-store.bucket_id
viewer_protocol_policy = "redirect-to-https"
cache_policy_id = aws_cloudfront_cache_policy.nocache.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.viewer.id
cache_policy_id = local.cache_policy_id
origin_request_policy_id = local.viewer_policy_id

lambda_function_association {
event_type = "origin-request"
Expand All @@ -58,8 +58,8 @@ resource "aws_cloudfront_distribution" "s3_presign_mask" {
path_pattern = "/review/*"
target_origin_id = module.ndr-document-pending-review-store.bucket_id
viewer_protocol_policy = "redirect-to-https"
cache_policy_id = aws_cloudfront_cache_policy.nocache.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.viewer.id
cache_policy_id = local.cache_policy_id
origin_request_policy_id = local.viewer_policy_id

lambda_function_association {
event_type = "origin-request"
Expand All @@ -79,8 +79,8 @@ resource "aws_cloudfront_distribution" "s3_presign_mask" {
path_pattern = "/upload/*"
target_origin_id = module.ndr-bulk-staging-store.bucket_id
viewer_protocol_policy = "redirect-to-https"
cache_policy_id = aws_cloudfront_cache_policy.nocache.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.uploader.id
cache_policy_id = local.cache_policy_id
origin_request_policy_id = local.uploader_policy_id

lambda_function_association {
event_type = "origin-request"
Expand All @@ -103,7 +103,8 @@ resource "aws_cloudfront_distribution" "s3_presign_mask" {
}

resource "aws_cloudfront_origin_request_policy" "viewer" {
name = "${terraform.workspace}_BlockQueriesAndAllowViewer"
count = local.is_sandbox ? 0 : 1
name = "${terraform.workspace}_BlockQueriesAndAllowViewer"

query_strings_config {
query_string_behavior = "whitelist"
Expand Down Expand Up @@ -136,7 +137,8 @@ resource "aws_cloudfront_origin_request_policy" "viewer" {
}

resource "aws_cloudfront_origin_request_policy" "uploader" {
name = "${terraform.workspace}_BlockQueriesAndAllowUploader"
count = local.is_sandbox ? 0 : 1
name = "${terraform.workspace}_BlockQueriesAndAllowUploader"

query_strings_config {
query_string_behavior = "whitelist"
Expand Down Expand Up @@ -172,6 +174,7 @@ resource "aws_cloudfront_origin_request_policy" "uploader" {
}

resource "aws_cloudfront_cache_policy" "nocache" {
count = local.is_sandbox ? 0 : 1
name = "${terraform.workspace}_nocache_policy"
default_ttl = 0
max_ttl = 0
Expand All @@ -189,3 +192,33 @@ resource "aws_cloudfront_cache_policy" "nocache" {
}
}
}

data "aws_cloudfront_origin_request_policy" "dev_environment_viewer" {
count = local.is_sandbox ? 1 : 0
name = "${var.shared_infra_workspace}_BlockQueriesAndAllowViewer"
}

data "aws_cloudfront_origin_request_policy" "dev_environment_uploader" {
count = local.is_sandbox ? 1 : 0
name = "${var.shared_infra_workspace}_BlockQueriesAndAllowUploader"
}

data "aws_cloudfront_cache_policy" "dev_environment_nocache" {
count = local.is_sandbox ? 1 : 0
name = "${var.shared_infra_workspace}_nocache_policy"
}

locals {
viewer_policy_id = local.is_sandbox ? (
data.aws_cloudfront_origin_request_policy.dev_environment_viewer[0].id
) : aws_cloudfront_origin_request_policy.viewer[0].id

uploader_policy_id = local.is_sandbox ? (
data.aws_cloudfront_origin_request_policy.dev_environment_uploader[0].id
) : aws_cloudfront_origin_request_policy.uploader[0].id

cache_policy_id = local.is_sandbox ? (
data.aws_cloudfront_cache_policy.dev_environment_nocache[0].id
) : aws_cloudfront_cache_policy.nocache[0].id
}

14 changes: 14 additions & 0 deletions infrastructure/moved-resources-v1.6.11.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
moved {
from = aws_cloudfront_origin_request_policy.viewer
to = aws_cloudfront_origin_request_policy.viewer[0]
}

moved {
from = aws_cloudfront_origin_request_policy.uploader
to = aws_cloudfront_origin_request_policy.uploader[0]
}

moved {
from = aws_cloudfront_cache_policy.nocache
to = aws_cloudfront_cache_policy.nocache[0]
}