fix: Include user-configured defined tags with cluster

Signed-off-by: Devon Crouse <[email protected]>

Author: devoncrouse

module-cluster.tf

@@ -69,43 +69,43 @@ module "cluster" {
 
   # Standard tags as defined if enabled for use, or freeform
   # User-provided tags are merged last and take precedence
-  cluster_defined_tags = var.use_defined_tags ? merge(
-    {
+  cluster_defined_tags = merge(
+    var.use_defined_tags ? {
       "${var.tag_namespace}.state_id" = local.state_id,
       "${var.tag_namespace}.role"     = "cluster",
-    },
+    } : {},
     local.cluster_defined_tags,
-  ) : {}
-  cluster_freeform_tags = var.use_defined_tags ? {} : merge(
-    {
+  )
+  cluster_freeform_tags = merge(
+    var.use_defined_tags ? {} : {
       "state_id" = local.state_id,
       "role"     = "cluster",
     },
     local.cluster_freeform_tags,
   )
-  persistent_volume_defined_tags = var.use_defined_tags ? merge(
-    {
+  persistent_volume_defined_tags = merge(
+    var.use_defined_tags ? {
       "${var.tag_namespace}.state_id" = local.state_id,
       "${var.tag_namespace}.role"     = "persistent_volume",
-    },
+    } : {},
     local.persistent_volume_defined_tags,
-  ) : {}
-  persistent_volume_freeform_tags = var.use_defined_tags ? {} : merge(
-    {
+  )
+  persistent_volume_freeform_tags = merge(
+    var.use_defined_tags ? {} : {
       "state_id" = local.state_id,
       "role"     = "persistent_volume",
     },
     local.persistent_volume_freeform_tags,
   )
-  service_lb_defined_tags = var.use_defined_tags ? merge(
-    {
+  service_lb_defined_tags = merge(
+    var.use_defined_tags ? {
       "${var.tag_namespace}.state_id" = local.state_id,
       "${var.tag_namespace}.role"     = "service_lb"
-    },
+    } : {},
     local.service_lb_defined_tags,
-  ) : {}
-  service_lb_freeform_tags = var.use_defined_tags ? {} : merge(
-    {
+  )
+  service_lb_freeform_tags = merge(
+    var.use_defined_tags ? {} : {
       "state_id" = local.state_id,
       "role"     = "service_lb"
     },

modules/network/rules.tf

@@ -134,8 +134,8 @@ resource "oci_core_network_security_group_security_rule" "oke" {
           contains(var.control_plane_allowed_cidrs, local.anywhere),
         ]),
 
-        # TCP ingress to internal load balancer from anywhere has been configured explicitly        
-        contains(keys(var.allow_rules_internal_lb), each.key),        
+        # TCP ingress to internal load balancer from anywhere has been configured explicitly
+        contains(keys(var.allow_rules_internal_lb), each.key),
 
         # TCP ingress to public load balancer from anywhere has been configured explicitly
         contains(keys(var.allow_rules_public_lb), each.key),