feat(connectivity): Add option to set allow_non_virtual_wan_traffic i…

…n express route gateway.
Azure · Mar 22, 2024 · 8b46c96 · 8b46c96
1 parent e6cb214
commit 8b46c96
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -450,6 +450,7 @@ object({
               enabled = optional(bool, false)
               config = optional(object({
                 scale_unit = optional(number, 1)
+                allow_non_virtual_wan_traffic = optional(bool, false)
               }), {})
             }), {})
             vpn_gateway = optional(object({

diff --git a/docs/wiki/[Examples]-Deploy-Virtual-WAN-Resources-With-Custom-Settings.md b/docs/wiki/[Examples]-Deploy-Virtual-WAN-Resources-With-Custom-Settings.md
@@ -180,6 +180,7 @@ locals {
               enabled = true
               config = {
                 scale_unit = 1
+                allow_non_virtual_wan_traffic = false
               }
             }
             vpn_gateway = {

diff --git a/modules/connectivity/locals.tf b/modules/connectivity/locals.tf
@@ -1343,6 +1343,7 @@ locals {
       location            = location
       virtual_hub_id      = local.virtual_hub_resource_id[location]
       scale_units         = virtual_hub.config.expressroute_gateway.config.scale_unit
+      allow_non_virtual_wan_traffic = virtual_hub.config.expressroute_gateway.config.allow_non_virtual_wan_traffic
       # Optional definition attributes
       tags = try(local.custom_settings.azurerm_express_route_gateway["virtual_wan"][location].tags, local.tags)
     }

diff --git a/modules/connectivity/variables.tf b/modules/connectivity/variables.tf
@@ -166,6 +166,7 @@ variable "settings" {
             enabled = optional(bool, false)
             config = optional(object({
               scale_unit = optional(number, 1)
+              allow_non_virtual_wan_traffic = optional(bool, false)
             }), {})
           }), {})
           vpn_gateway = optional(object({

diff --git a/resources.virtual_wan.tf b/resources.virtual_wan.tf
@@ -80,7 +80,7 @@ resource "azurerm_express_route_gateway" "virtual_wan" {
   location            = each.value.template.location
   virtual_hub_id      = each.value.template.virtual_hub_id
   scale_units         = each.value.template.scale_units
-
+  allow_non_virtual_wan_traffic = each.value.template.allow_non_virtual_wan_traffic
   # Optional resource attributes
   tags = each.value.template.tags
 

diff --git a/tests/modules/settings/settings.connectivity.tf b/tests/modules/settings/settings.connectivity.tf
@@ -143,6 +143,7 @@ locals {
               enabled = true
               config = {
                 scale_unit = 1
+                allow_non_virtual_wan_traffic = false
               }
             }
             vpn_gateway = {

diff --git a/variables.tf b/variables.tf
@@ -279,6 +279,7 @@ variable "configure_connectivity_resources" {
               enabled = optional(bool, false)
               config = optional(object({
                 scale_unit = optional(number, 1)
+                allow_non_virtual_wan_traffic = optional(bool, false)
               }), {})
             }), {})
             vpn_gateway = optional(object({