NDR-213 Refactor conditional into locals

megan-bower4 · megan-bower4 · commit ee462b9766b3 · 2025-09-12T10:04:49.000+01:00
diff --git a/infrastructure/api_mtls.tf b/infrastructure/api_mtls.tf
@@ -18,7 +18,7 @@ resource "aws_api_gateway_domain_name" "custom_api_domain_mtls" {
   }
 
   mutual_tls_authentication {
-    truststore_uri     = local.is_sandbox ? "s3://ndr-dev-${var.truststore_bucket_name}/${var.ca_pem_filename}" : "s3://${module.ndr-truststore[0].bucket_id}/${var.ca_pem_filename}"
+    truststore_uri     = local.truststore_uri
     truststore_version = data.aws_s3_object.truststore_ext_cert.version_id
   }
 }
diff --git a/infrastructure/buckets.tf b/infrastructure/buckets.tf
@@ -129,7 +129,7 @@ module "ndr-truststore" {
 }
 
 data "aws_s3_object" "truststore_ext_cert" {
-  bucket = local.is_sandbox ? "ndr-dev-${var.truststore_bucket_name}" : module.ndr-truststore[0].bucket_id
+  bucket = local.truststore_bucket_id
   key    = var.ca_pem_filename
 }
 
diff --git a/infrastructure/variable.tf b/infrastructure/variable.tf
@@ -238,6 +238,9 @@ locals {
   current_account_id = data.aws_caller_identity.current.account_id
 
   apim_api_url = "https://${var.apim_environment}api.service.nhs.uk/national-document-repository"
+
+  truststore_bucket_id = local.is_sandbox ? "ndr-dev-${var.truststore_bucket_name}" : module.ndr-truststore[0].bucket_id
+  truststore_uri       = "s3://${local.truststore_bucket_id}/${var.ca_pem_filename}"
 }
 
 variable "nrl_api_endpoint_suffix" {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ resource "aws_api_gateway_domain_name" "custom_api_domain_mtls" {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`mutual_tls_authentication {`
`21`		`- truststore_uri = local.is_sandbox ? "s3://ndr-dev-${var.truststore_bucket_name}/${var.ca_pem_filename}" : "s3://${module.ndr-truststore[0].bucket_id}/${var.ca_pem_filename}"`
	`21`	`+ truststore_uri = local.truststore_uri`
`22`	`22`	`truststore_version = data.aws_s3_object.truststore_ext_cert.version_id`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ module "ndr-truststore" {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`data "aws_s3_object" "truststore_ext_cert" {`
`132`		`- bucket = local.is_sandbox ? "ndr-dev-${var.truststore_bucket_name}" : module.ndr-truststore[0].bucket_id`
	`132`	`+ bucket = local.truststore_bucket_id`
`133`	`133`	`key = var.ca_pem_filename`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,9 @@ locals {`
`238`	`238`	`current_account_id = data.aws_caller_identity.current.account_id`
`239`	`239`
`240`	`240`	`apim_api_url = "https://${var.apim_environment}api.service.nhs.uk/national-document-repository"`
	`241`	`+`
	`242`	`+ truststore_bucket_id = local.is_sandbox ? "ndr-dev-${var.truststore_bucket_name}" : module.ndr-truststore[0].bucket_id`
	`243`	`+ truststore_uri = "s3://${local.truststore_bucket_id}/${var.ca_pem_filename}"`
`241`	`244`	`}`
`242`	`245`
`243`	`246`	`variable "nrl_api_endpoint_suffix" {`