fix: FTRS-386 change the data resource

ri-nhs · ri-nhs · commit 4e51408e0da7 · 2026-02-05T19:53:51.000Z
diff --git a/infrastructure/stacks/read_only_viewer/data.tf b/infrastructure/stacks/read_only_viewer/data.tf
@@ -89,7 +89,6 @@ data "aws_acm_certificate" "domain_cert" {
   most_recent = true
 }
 
-data "aws_prefix_list" "cloudfront_prefix_list" {
-  name     = "com.amazonaws.global.cloudfront.origin-facing"
-  provider = aws.us-east-1
+data "aws_ec2_managed_prefix_list" "cloudfront_prefix_list" {
+  name = "com.amazonaws.global.cloudfront.origin-facing"
 }
diff --git a/infrastructure/stacks/read_only_viewer/security_group.tf b/infrastructure/stacks/read_only_viewer/security_group.tf
@@ -17,7 +17,7 @@ resource "aws_vpc_security_group_ingress_rule" "frontend_lambda_allow_cloudfront
   from_port         = var.https_port
   to_port           = var.https_port
   ip_protocol       = "tcp"
-  prefix_list_id    = data.aws_prefix_list.cloudfront_prefix_list.id
+  prefix_list_id    = data.aws_ec2_managed_prefix_list.cloudfront_prefix_list.id
 }
 
 # trivy:ignore:aws-vpc-no-public-egress-sgr : TODO https://nhsd-jira.digital.nhs.uk/browse/FTRS-386
diff --git a/infrastructure/stacks/ui/data.tf b/infrastructure/stacks/ui/data.tf
@@ -169,7 +169,6 @@ data "aws_cloudfront_origin_request_policy" "all_viewer_headers" {
   name  = "Managed-AllViewerExceptHostHeader"
 }
 
-data "aws_prefix_list" "cloudfront_prefix_list" {
-  name     = "com.amazonaws.global.cloudfront.origin-facing"
-  provider = aws.us-east-1
+data "aws_ec2_managed_prefix_list" "cloudfront_prefix_list" {
+  name = "com.amazonaws.global.cloudfront.origin-facing"
 }
diff --git a/infrastructure/stacks/ui/security_group.tf b/infrastructure/stacks/ui/security_group.tf
@@ -17,7 +17,7 @@ resource "aws_vpc_security_group_ingress_rule" "ui_lambda_allow_cloudfront" {
   from_port         = var.https_port
   to_port           = var.https_port
   ip_protocol       = "tcp"
-  prefix_list_id    = data.aws_prefix_list.cloudfront_prefix_list.id
+  prefix_list_id    = data.aws_ec2_managed_prefix_list.cloudfront_prefix_list.id
 }
 
 # trivy:ignore:aws-vpc-no-public-egress-sgr : TODO https://nhsd-jira.digital.nhs.uk/browse/FTRS-386

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ data "aws_acm_certificate" "domain_cert" {`
`89`	`89`	`most_recent = true`
`90`	`90`	`}`
`91`	`91`
`92`		`-data "aws_prefix_list" "cloudfront_prefix_list" {`
`93`		`- name = "com.amazonaws.global.cloudfront.origin-facing"`
`94`		`- provider = aws.us-east-1`
	`92`	`+data "aws_ec2_managed_prefix_list" "cloudfront_prefix_list" {`
	`93`	`+ name = "com.amazonaws.global.cloudfront.origin-facing"`
`95`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ resource "aws_vpc_security_group_ingress_rule" "frontend_lambda_allow_cloudfront`
`17`	`17`	`from_port = var.https_port`
`18`	`18`	`to_port = var.https_port`
`19`	`19`	`ip_protocol = "tcp"`
`20`		`- prefix_list_id = data.aws_prefix_list.cloudfront_prefix_list.id`
	`20`	`+ prefix_list_id = data.aws_ec2_managed_prefix_list.cloudfront_prefix_list.id`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`# trivy:ignore:aws-vpc-no-public-egress-sgr : TODO https://nhsd-jira.digital.nhs.uk/browse/FTRS-386`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,6 @@ data "aws_cloudfront_origin_request_policy" "all_viewer_headers" {`
`169`	`169`	`name = "Managed-AllViewerExceptHostHeader"`
`170`	`170`	`}`
`171`	`171`
`172`		`-data "aws_prefix_list" "cloudfront_prefix_list" {`
`173`		`- name = "com.amazonaws.global.cloudfront.origin-facing"`
`174`		`- provider = aws.us-east-1`
	`172`	`+data "aws_ec2_managed_prefix_list" "cloudfront_prefix_list" {`
	`173`	`+ name = "com.amazonaws.global.cloudfront.origin-facing"`
`175`	`174`	`}`