fix: for breaking change introduced in #101 and causes destruction (#119)

* fix: for breaking change introduced in #101 and causes destruction

and recreation of existing infrastructure

Signed-off-by: Ali Mukadam <[email protected]>

* fix: reverted to 3.5.3 position

Signed-off-by: Ali Mukadam <[email protected]>

* fix: removed redundant variables

Signed-off-by: Ali Mukadam <[email protected]>

* fix: removed commented line

Signed-off-by: Ali Mukadam <[email protected]>

---------

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

examples/custom_route_rules/main.tf

@@ -16,7 +16,7 @@ terraform {
 # Resources
 
 module "vcn" {
-  
+
   source = "github.com/oracle-terraform-modules/terraform-oci-vcn"
   # to use the terraform registry version comment the previous line and uncomment the 2 lines below
   # source  = "oracle-terraform-modules/vcn/oci"
@@ -26,7 +26,7 @@ module "vcn" {
   compartment_id = var.compartment_id
   label_prefix   = var.label_prefix
   freeform_tags  = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags   = var.defined_tags
 
   # vcn parameters
   create_internet_gateway  = var.create_internet_gateway  # boolean: true or false

examples/custom_route_rules/variables.tf

@@ -117,8 +117,8 @@ variable "vcn_name" {
 
 variable "attached_drg_id" {
   description = "the ID of DRG attached to the VCN"
-  type = string
-  default = null
+  type        = string
+  default     = null
 }
 
 variable "internet_gateway_display_name" {

examples/drg/main.tf

@@ -8,7 +8,7 @@
 # Resources
 
 module "drg_hub" {
-  
+
   source = "github.com/oracle-terraform-modules/terraform-oci-drg"
   # to use the terraform registry version comment the previous line and uncomment the 2 lines below
   # source  = "oracle-terraform-modules/drg/oci"
@@ -33,7 +33,7 @@ module "drg_hub" {
 }
 
 module "vcn_spokes" {
-  
+
   source = "github.com/oracle-terraform-modules/terraform-oci-vcn"
   # to use the terraform registry version comment the previous line and uncomment the 2 lines below
   # source  = "oracle-terraform-modules/vcn/oci"

examples/hub-spoke/main.tf

@@ -16,7 +16,7 @@ module "vcn_hub" {
   compartment_id = var.compartment_id
   label_prefix   = var.label_prefix
   freeform_tags  = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags   = var.defined_tags
 
   # vcn parameters
   create_internet_gateway  = var.create_internet_gateway  # boolean: true or false
@@ -59,7 +59,7 @@ resource "oci_core_route_table" "VTR_spokes" {
 
 module "vcn_spoke1" {
   # this module use the generic vcn module and configure it to act as a spoke in a hub-and-spoke topology
-  
+
   source = "github.com/oracle-terraform-modules/terraform-oci-vcn"
   # to use the terraform registry version comment the previous line and uncomment the 2 lines below
   # source  = "oracle-terraform-modules/vcn/oci"
@@ -91,7 +91,7 @@ module "vcn_spoke1" {
 
 module "vcn_spoke2" {
   # this module use the generic vcn module and configure it to act as a spoke in a hub-and-spoke topology
-  
+
   source = "github.com/oracle-terraform-modules/terraform-oci-vcn"
   # to use the terraform registry version comment the previous line and uncomment the 2 lines below
   # source  = "oracle-terraform-modules/vcn/oci"
@@ -121,7 +121,7 @@ module "vcn_spoke2" {
 
 module "vcn_spoke3" {
   # this module use the generic vcn module and configure it to act as a spoke in a hub-and-spoke topology
-  
+
   source = "github.com/oracle-terraform-modules/terraform-oci-vcn"
   # to use the terraform registry version comment the previous line and uncomment the 2 lines below
   # source  = "oracle-terraform-modules/vcn/oci"

examples/hub-spoke/variables.tf

@@ -116,8 +116,8 @@ variable "vcn_name" {
 
 variable "attached_drg_id" {
   description = "the ID of DRG attached to the VCN"
-  type = string
-  default = null
+  type        = string
+  default     = null
 }
 
 

examples/module_composition/main.tf

@@ -5,7 +5,7 @@
 # Resources
 
 module "vcn" {
-  
+
   source = "github.com/oracle-terraform-modules/terraform-oci-vcn"
   # to use the terraform registry version comment the previous line and uncomment the 2 lines below
   # source  = "oracle-terraform-modules/vcn/oci"
@@ -15,7 +15,7 @@ module "vcn" {
   compartment_id = var.compartment_id
   label_prefix   = var.label_prefix
   freeform_tags  = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags   = var.defined_tags
 
   # vcn parameters
   create_internet_gateway  = var.create_internet_gateway  # boolean: true or false

examples/module_composition/variables.tf

@@ -116,8 +116,8 @@ variable "vcn_name" {
 
 variable "attached_drg_id" {
   description = "the ID of DRG attached to the VCN"
-  type = string
-  default = null
+  type        = string
+  default     = null
 }
 
 

variables.tf

@@ -157,13 +157,13 @@ variable "nat_gateway_route_rules" {
 
 variable "attached_drg_id" {
   description = "the ID of DRG attached to the VCN"
-  type = string
-  default = null
+  type        = string
+  default     = null
 }
 
 #subnets
 variable "subnets" {
   description = "Private or Public subnets in a VCN"
   type        = any
   default     = {}
-}
+}

vcn_defaultresources.tf

@@ -62,6 +62,6 @@ resource "oci_core_default_security_list" "restore_default" {
   lifecycle {
     ignore_changes = [egress_security_rules, ingress_security_rules, defined_tags]
   }
-  
+
   count = var.lockdown_default_seclist == false ? 1 : 0
 }

vcn_gateways.tf

@@ -10,7 +10,7 @@ resource "oci_core_internet_gateway" "ig" {
   display_name   = var.label_prefix == "none" ? var.internet_gateway_display_name : "${var.label_prefix}-${var.internet_gateway_display_name}"
 
   freeform_tags = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags  = var.defined_tags
 
   vcn_id = oci_core_vcn.vcn.id
 
@@ -26,7 +26,7 @@ resource "oci_core_route_table" "ig" {
   display_name   = var.label_prefix == "none" ? "internet-route" : "${var.label_prefix}-internet-route"
 
   freeform_tags = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags  = var.defined_tags
 
   route_rules {
     # * With this route table, Internet Gateway is always declared as the default gateway
@@ -50,12 +50,12 @@ resource "oci_core_route_table" "ig" {
     # * filter var.internet_gateway_route_rules for routes with "drg" as destination
     # * and steer traffic to the attached DRG if available
     for_each = var.internet_gateway_route_rules != null ? { for k, v in var.internet_gateway_route_rules : k => v
-    if v.network_entity_id == "drg" && var.attached_drg_id != null} : {}
+    if v.network_entity_id == "drg" && var.attached_drg_id != null } : {}
 
     content {
       destination       = route_rules.value.destination
       destination_type  = route_rules.value.destination_type
-      network_entity_id =  var.attached_drg_id
+      network_entity_id = var.attached_drg_id
       description       = route_rules.value.description
     }
   }
@@ -115,7 +115,7 @@ resource "oci_core_service_gateway" "service_gateway" {
   display_name   = var.label_prefix == "none" ? var.service_gateway_display_name : "${var.label_prefix}-${var.service_gateway_display_name}"
 
   freeform_tags = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags  = var.defined_tags
   services {
     service_id = lookup(data.oci_core_services.all_oci_services[0].services[0], "id")
   }
@@ -134,7 +134,7 @@ resource "oci_core_route_table" "service_gw" {
   display_name   = var.label_prefix == "none" ? "service-gw-route" : "${var.label_prefix}-service-gw-route"
 
   freeform_tags = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags  = var.defined_tags
 
   dynamic "route_rules" {
     # * If Service Gateway is created with the module, automatically creates a rule to handle traffic for "all services" through Service Gateway
@@ -165,7 +165,7 @@ resource "oci_core_nat_gateway" "nat_gateway" {
   display_name   = var.label_prefix == "none" ? var.nat_gateway_display_name : "${var.label_prefix}-${var.nat_gateway_display_name}"
 
   freeform_tags = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags  = var.defined_tags
 
   public_ip_id = var.nat_gateway_public_ip_id != "none" ? var.nat_gateway_public_ip_id : null
 
@@ -178,12 +178,15 @@ resource "oci_core_nat_gateway" "nat_gateway" {
   count = var.create_nat_gateway == true ? 1 : 0
 }
 
+# special fix due to bug introduced in #101 which causes destruction and recreation of subnets
+# for existing users
+
 resource "oci_core_route_table" "nat" {
   compartment_id = var.compartment_id
   display_name   = var.label_prefix == "none" ? "nat-route" : "${var.label_prefix}-nat-route"
 
   freeform_tags = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags  = var.defined_tags
 
   route_rules {
     # * With this route table, NAT Gateway is always declared as the default gateway
@@ -193,11 +196,24 @@ resource "oci_core_route_table" "nat" {
     description       = "Terraformed - Auto-generated at NAT Gateway creation: NAT Gateway as default gateway"
   }
 
+  # bring this block back to fix #101
+  dynamic "route_rules" {
+    # * If Service Gateway is created with the module, automatically creates a rule to handle traffic for "all services" through Service Gateway
+    for_each = var.create_service_gateway == true ? [1] : []
+
+    content {
+      destination       = lookup(data.oci_core_services.all_oci_services[0].services[0], "cidr_block")
+      destination_type  = "SERVICE_CIDR_BLOCK"
+      network_entity_id = oci_core_service_gateway.service_gateway[0].id
+      description       = "Terraformed - Auto-generated at Service Gateway creation: All Services in region to Service Gateway"
+    }
+  }
+
   dynamic "route_rules" {
     # * filter var.nat_gateway_route_rules for routes with "drg" as destination
     # * and steer traffic to the attached DRG if available
     for_each = var.nat_gateway_route_rules != null ? { for k, v in var.nat_gateway_route_rules : k => v
-    if v.network_entity_id == "drg" && var.attached_drg_id != null} : {}
+    if v.network_entity_id == "drg" && var.attached_drg_id != null } : {}
 
     content {
       destination       = route_rules.value.destination
@@ -238,11 +254,14 @@ resource "oci_core_route_table" "nat" {
 
   vcn_id = oci_core_vcn.vcn.id
 
+  # ignore changes to route rules to avoid recreation issues due to #101.
+  # A fix may still be needed for when new custom route rules are added.
+
   lifecycle {
-    ignore_changes = [defined_tags, freeform_tags]
+    ignore_changes = [defined_tags, freeform_tags, route_rules]
   }
 
-  count = var.create_nat_gateway == true ? 1 : 0
+  count = var.create_nat_gateway ? 1 : 0
 }
 
 
@@ -257,7 +276,7 @@ resource "oci_core_local_peering_gateway" "lpg" {
   display_name   = var.label_prefix == "none" ? each.key : "${var.label_prefix}-${each.key}"
 
   freeform_tags = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags  = var.defined_tags
 
   vcn_id = oci_core_vcn.vcn.id