Add/reformat private endpoint variable validation

NHSDigital · Feb 10, 2025 · 6ba531a · 6ba531a
1 parent dbdf861
commit 6ba531a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/infrastructure/modules/sql-server/variables.tf b/infrastructure/modules/sql-server/variables.tf
@@ -64,11 +64,11 @@ variable "private_endpoint_properties" {
       can(var.private_endpoint_properties == null) ||
       (can(var.private_endpoint_properties.private_endpoint_enabled) && var.private_endpoint_properties.private_endpoint_enabled == false) ||
       (can(var.private_endpoint_properties.private_endpoint_enabled) && var.private_endpoint_properties.private_endpoint_enabled == true &&
-        can(length(var.private_endpoint_properties.private_dns_zone_ids)) &&
-        length(var.private_endpoint_properties.private_dns_zone_ids) > 0 &&
+        can(length(var.private_endpoint_properties.private_dns_zone_ids_sql)) &&
+        length(var.private_endpoint_properties.private_dns_zone_ids_sql) > 0 &&
         can(length(var.private_endpoint_properties.private_endpoint_subnet_id)) &&
     length(var.private_endpoint_properties.private_endpoint_subnet_id) > 0))
-    error_message = "Both private_dns_zone_ids and private_endpoint_subnet_id must be provided if private_endpoint_enabled is true."
+    error_message = "Both private_dns_zone_ids_sql and private_endpoint_subnet_id must be provided if private_endpoint_enabled is true."
   }
 }
 

diff --git a/infrastructure/modules/storage/variables.tf b/infrastructure/modules/storage/variables.tf
@@ -83,8 +83,10 @@ variable "private_endpoint_properties" {
       can(var.private_endpoint_properties == null) ||
       (can(var.private_endpoint_properties.private_endpoint_enabled) && var.private_endpoint_properties.private_endpoint_enabled == false) ||
       (can(var.private_endpoint_properties.private_endpoint_enabled) && var.private_endpoint_properties.private_endpoint_enabled == true &&
-        can(length(var.private_endpoint_properties.private_dns_zone_ids)) &&
-        length(var.private_endpoint_properties.private_dns_zone_ids) > 0 &&
+        can(length(var.private_endpoint_properties.private_dns_zone_ids_blob)) &&
+        length(var.private_endpoint_properties.private_dns_zone_ids_blob) > 0 &&
+        can(length(var.private_endpoint_properties.private_dns_zone_ids_queue)) &&
+        length(var.private_endpoint_properties.private_dns_zone_ids_queue) > 0 &&
         can(length(var.private_endpoint_properties.private_endpoint_subnet_id)) &&
     length(var.private_endpoint_properties.private_endpoint_subnet_id) > 0))
     error_message = "Both private_dns_zone_ids and private_endpoint_subnet_id must be provided if private_endpoint_enabled is true."