fix: Remove experimental features and ensure compatibility

Author: blackapple805

main.tf

@@ -309,18 +309,17 @@ resource "aws_route" "private_route_table_routes" {
   route_table_id = each.value.route_table_id
 
   # Route attributes
-  destination_cidr_block        = lookup(each.value.route, "destination_cidr_block", null)
-  destination_ipv6_cidr_block   = lookup(each.value.route, "destination_ipv6_cidr_block", null)
-  egress_only_gateway_id        = lookup(each.value.route, "egress_only_gateway_id", null)
-  gateway_id                    = lookup(each.value.route, "gateway_id", null)
-  nat_gateway_id                = lookup(each.value.route, "nat_gateway_id", null)
-  transit_gateway_id            = lookup(each.value.route, "transit_gateway_id", null)
-  vpc_peering_connection_id     = lookup(each.value.route, "vpc_peering_connection_id", null)
-  local_gateway_id              = lookup(each.value.route, "local_gateway_id", null)
-  carrier_gateway_id            = lookup(each.value.route, "carrier_gateway_id", null)
-  destination_prefix_list_id    = lookup(each.value.route, "destination_prefix_list_id", null)
+  destination_cidr_block        = each.value.route.destination_cidr_block != "" ? each.value.route.destination_cidr_block : null
+  destination_ipv6_cidr_block   = each.value.route.destination_ipv6_cidr_block != "" ? each.value.route.destination_ipv6_cidr_block : null
+  egress_only_gateway_id        = each.value.route.egress_only_gateway_id != "" ? each.value.route.egress_only_gateway_id : null
+  gateway_id                    = each.value.route.gateway_id != "" ? each.value.route.gateway_id : null
+  nat_gateway_id                = each.value.route.nat_gateway_id != "" ? each.value.route.nat_gateway_id : null
+  transit_gateway_id            = each.value.route.transit_gateway_id != "" ? each.value.route.transit_gateway_id : null
+  vpc_peering_connection_id     = each.value.route.vpc_peering_connection_id != "" ? each.value.route.vpc_peering_connection_id : null
+  local_gateway_id              = each.value.route.local_gateway_id != "" ? each.value.route.local_gateway_id : null
+  carrier_gateway_id            = each.value.route.carrier_gateway_id != "" ? each.value.route.carrier_gateway_id : null
+  destination_prefix_list_id    = each.value.route.destination_prefix_list_id != "" ? each.value.route.destination_prefix_list_id : null
 }
-
 ################################################################################
 # Private Network ACLs
 ################################################################################

variables.tf

@@ -399,16 +399,16 @@ variable "private_route_table_tags" {
 variable "private_route_table_routes" {
   description = "A map of private route table IDs to a list of route objects."
   type = map(list(object({
-    destination_cidr_block       = optional(string)
-    destination_ipv6_cidr_block  = optional(string)
-    egress_only_gateway_id       = optional(string)
-    gateway_id                   = optional(string)
-    nat_gateway_id               = optional(string)
-    transit_gateway_id           = optional(string)
-    vpc_peering_connection_id    = optional(string)
-    local_gateway_id             = optional(string)
-    carrier_gateway_id           = optional(string)
-    destination_prefix_list_id   = optional(string)
+    destination_cidr_block       = string
+    destination_ipv6_cidr_block  = string
+    egress_only_gateway_id       = string
+    gateway_id                   = string
+    nat_gateway_id               = string
+    transit_gateway_id           = string
+    vpc_peering_connection_id    = string
+    local_gateway_id             = string
+    carrier_gateway_id           = string
+    destination_prefix_list_id   = string
   })))
   default = {}
 }