Adding validations

Author: LAVEEN

modules/compute/vm-instance/variables.tf

@@ -233,15 +233,15 @@ variable "network_interfaces" {
   }
   validation {
     condition = alltrue([
-      for ni in var.network_interfaces : ni.nic_type == "GVNIC" || ni.nic_type == "VIRTIO_NET" || ni.nic_type == "MRDMA" || ni.nic_type == "IRDMA" || ni.nic_type == "IDPF" || ni.nic_type == null
+      for ni in var.network_interfaces : ni.nic_type == null || contains(["GVNIC", "VIRTIO_NET", "MRDMA", "IRDMA", "IDPF"], ni.nic_type)
     ])
-    error_message = "In the variable network_interfaces, field \"nic_type\" must be \"GVNIC\", \"VIRTIO_NET\", \"MRDMA\", \"IRDMA\",\"IDPF\"  or null."
+    error_message = "In the variable network_interfaces, field \"nic_type\" must be \"GVNIC\", \"VIRTIO_NET\", \"MRDMA\", \"IRDMA\", \"IDPF\" or null."
   }
   validation {
     condition = alltrue([
-      for ni in var.network_interfaces : ni.stack_type == "IPV4_ONLY" || ni.stack_type == "IPV4_IPV6" || ni.stack_type == "IPV6_ONLY" || ni.stack_type == null
+      for ni in var.network_interfaces : ni.stack_type == null || contains(["IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY"], ni.stack_type)
     ])
-    error_message = "In the variable network_interfaces, field \"stack_type\" must be either \"IPV4_ONLY\", \"IPV4_IPV6\" , \"IPV6_ONLY\" or null."
+    error_message = "In the variable network_interfaces, field \"stack_type\" must be either \"IPV4_ONLY\", \"IPV4_IPV6\", \"IPV6_ONLY\" or null."
   }
 }
 

modules/network/gpu-rdma-vpc/main.tf

@@ -17,7 +17,7 @@
 locals {
   autoname      = replace(var.deployment_name, "_", "-")
   network_name  = var.network_name == null ? "${local.autoname}-net" : var.network_name
-  subnet_prefix = try(var.subnetworks_template.name_prefix, null) == null ? "${local.autoname}-subnet" : var.subnetworks_template.name_prefix
+  subnet_prefix = var.subnetworks_template==null ||  var.subnetworks_template.name_prefix == null ? "${local.autoname}-subnet" : var.subnetworks_template.name_prefix
   is_roce_metal = var.network_profile != null ? can(regex("vpc-roce-metal", var.network_profile)) : false
 
   new_bits = local.is_roce_metal ? 0 : ceil(log(var.subnetworks_template.count, 2))

modules/network/gpu-rdma-vpc/outputs.tf

@@ -55,5 +55,6 @@ output "subnetwork_interfaces_gke" {
 
 output "subnetwork_name_prefix" {
   description = "Prefix of the RDMA subnetwork names"
-  value       = var.subnetworks_template.name_prefix
+  # This uses a conditional: if the variable is null, return null; otherwise, return the prefix.
+  value       = var.subnetworks_template != null ? var.subnetworks_template.name_prefix : null
 }

modules/network/gpu-rdma-vpc/variables.tf

@@ -81,7 +81,9 @@ variable "subnetworks_template" {
   }
 
   validation {
-    condition     = can(cidrhost(var.subnetworks_template.ip_range, 0))
+    # If the template is null, return true (pass). 
+    # Otherwise, check if the CIDR format is valid.
+    condition     = var.subnetworks_template == null ? true : can(cidrhost(var.subnetworks_template.ip_range, 0))
     error_message = "IP address range must be in CIDR format."
   }
 }