feat: Full naming support for route tables rather than just the prefix (

#137) Resolves #137 103
oracle-terraform-modules · Feb 19, 2024 · 95ae16a · 95ae16a
1 parent 3175360
commit 95ae16a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/locals.tf b/locals.tf
@@ -4,4 +4,22 @@
 locals {
   anywhere      = "0.0.0.0/0"
   anywhere_ipv6 = "::/0"
+  internet_gateway_display_name = coalesce(
+    var.label_prefix == "none" && var.internet_gateway_display_name == "none" ? "internet-route" : null,
+    var.label_prefix == "none" && var.internet_gateway_display_name != "none" ? var.internet_gateway_display_name : null,
+    var.label_prefix != "none" && var.internet_gateway_display_name == "none" ? "${var.label_prefix}-internet-route" : null,
+    var.label_prefix != "none" && var.internet_gateway_display_name != "none" ? "${var.label_prefix}-${var.internet_gateway_display_name}" : null
+  )
+  service_gateway_display_name = coalesce(
+    var.label_prefix == "none" && var.service_gateway_display_name == "none" ? "service-gw-route" : null,
+    var.label_prefix == "none" && var.service_gateway_display_name != "none" ? var.service_gateway_display_name : null,
+    var.label_prefix != "none" && var.service_gateway_display_name == "none" ? "${var.label_prefix}-service-gw-route" : null,
+    var.label_prefix != "none" && var.service_gateway_display_name != "none" ? "${var.label_prefix}-${var.service_gateway_display_name}" : null
+  )
+  nat_gateway_display_name = coalesce(
+    var.label_prefix == "none" && var.nat_gateway_display_name == "none" ? "nat-route" : null,
+    var.label_prefix == "none" && var.nat_gateway_display_name != "none" ? var.nat_gateway_display_name : null,
+    var.label_prefix != "none" && var.nat_gateway_display_name == "none" ? "${var.label_prefix}-nat-route" : null,
+    var.label_prefix != "none" && var.nat_gateway_display_name != "none" ? "${var.label_prefix}-${var.nat_gateway_display_name}" : null
+  )
 }
diff --git a/terraform.tfvars.example b/terraform.tfvars.example
@@ -18,14 +18,20 @@ label_prefix = "none"
 # vcn parameters
 create_internet_gateway = false
 
+internet_gateway_display_name = "none"
+
 create_nat_gateway = false
 
+nat_gateway_display_name = "none"
+
 enable_ipv6 = false
 
 nat_gateway_public_ip_id = "none"
 
 create_service_gateway = false
 
+service_gateway_display_name = "none"
+
 vcn_cidrs = ["10.0.0.0/16"]
 
 vcn_dns_label = "vcn"

diff --git a/vcn_gateways.tf b/vcn_gateways.tf
@@ -23,7 +23,7 @@ resource "oci_core_internet_gateway" "ig" {
 
 resource "oci_core_route_table" "ig" {
   compartment_id = var.compartment_id
-  display_name   = var.label_prefix == "none" ? "internet-route" : "${var.label_prefix}-internet-route"
+  display_name   = local.internet_gateway_display_name
 
   freeform_tags = var.freeform_tags
   defined_tags  = var.defined_tags
@@ -145,7 +145,7 @@ resource "oci_core_service_gateway" "service_gateway" {
 
 resource "oci_core_route_table" "service_gw" {
   compartment_id = var.compartment_id
-  display_name   = var.label_prefix == "none" ? "service-gw-route" : "${var.label_prefix}-service-gw-route"
+  display_name   = local.service_gateway_display_name
 
   freeform_tags = var.freeform_tags
   defined_tags  = var.defined_tags
@@ -206,7 +206,7 @@ resource "oci_core_nat_gateway" "nat_gateway" {
 
 resource "oci_core_route_table" "nat" {
   compartment_id = var.compartment_id
-  display_name   = var.label_prefix == "none" ? "nat-route" : "${var.label_prefix}-nat-route"
+  display_name   = local.nat_gateway_display_name
 
   freeform_tags = var.freeform_tags
   defined_tags  = var.defined_tags