Add support to customize subnet name

robo-cap · Feb 18, 2025 · 7ed7407 · 7ed7407
1 parent 9bd7d26
commit 7ed7407
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/modules/network/subnets.tf b/modules/network/subnets.tf
@@ -126,7 +126,7 @@ resource "oci_core_subnet" "oke" {
   compartment_id             = var.compartment_id
   vcn_id                     = var.vcn_id
   cidr_block                 = lookup(local.subnet_cidrs_all, each.key)
-  display_name               = format("%v-%v", each.key, var.state_id)
+  display_name               = lookup(var.subnets, each.key, null) != null ? lookup(var.subnets[each.key], "display_name", format("%v-%v", each.key, var.state_id)) : format("%v-%v", each.key, var.state_id)
   dns_label                  = lookup(local.subnet_dns_labels, each.key, null)
   prohibit_public_ip_on_vnic = !tobool(lookup(each.value, "is_public", false))
   route_table_id             = !tobool(lookup(each.value, "is_public", false)) ? var.nat_route_table_id : var.ig_route_table_id
@@ -136,7 +136,7 @@ resource "oci_core_subnet" "oke" {
 
   lifecycle {
     ignore_changes = [
-      freeform_tags, defined_tags, display_name,
+      freeform_tags, defined_tags,
       cidr_block, dns_label, security_list_ids, vcn_id, route_table_id,
     ]
   }

diff --git a/modules/network/variables.tf b/modules/network/variables.tf
@@ -40,12 +40,13 @@ variable "worker_is_public" { type = bool }
 
 variable "subnets" {
   type = map(object({
-    create    = optional(string)
-    id        = optional(string)
-    newbits   = optional(string)
-    netnum    = optional(string)
-    cidr      = optional(string)
-    dns_label = optional(string)
+    create       = optional(string)
+    id           = optional(string)
+    newbits      = optional(string)
+    netnum       = optional(string)
+    cidr         = optional(string)
+    display_name = optional(string)
+    dns_label    = optional(string)
   }))
 }
 

diff --git a/variables-network.tf b/variables-network.tf
@@ -139,12 +139,13 @@ variable "subnets" {
   }
   description = "Configuration for standard subnets. The 'create' parameter of each entry defaults to 'auto', creating subnets when other enabled components are expected to utilize them, and may be configured with 'never' or 'always' to force disabled/enabled."
   type = map(object({
-    create    = optional(string)
-    id        = optional(string)
-    newbits   = optional(string)
-    netnum    = optional(string)
-    cidr      = optional(string)
-    dns_label = optional(string)
+    create       = optional(string)
+    id           = optional(string)
+    newbits      = optional(string)
+    netnum       = optional(string)
+    cidr         = optional(string)
+    display_name = optional(string)
+    dns_label    = optional(string)
   }))
   validation {
     condition = alltrue([
@@ -154,10 +155,10 @@ variable "subnets" {
   }
   validation {
     condition = alltrue([
-      for v in flatten([for k, v in var.subnets : keys(v)]) : contains(["create", "id", "cidr", "netnum", "newbits", "dns_label"], v)
+      for v in flatten([for k, v in var.subnets : keys(v)]) : contains(["create", "id", "cidr", "netnum", "newbits", "display_name", "dns_label"], v)
     ])
     error_message = format("Invalid subnet configuration keys: %s", jsonencode(distinct([
-      for v in flatten([for k, v in var.subnets : keys(v)]) : v if !contains(["create", "id", "cidr", "netnum", "newbits", "dns_label"], v)
+      for v in flatten([for k, v in var.subnets : keys(v)]) : v if !contains(["create", "id", "cidr", "netnum", "newbits", "display_name", "dns_label"], v)
     ])))
   }
 }