Skip to content

feat(connectivity): Add option to set allow_non_virtual_wan_traffic in express route gateway. #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaredfholgate merged 1 commit into from
Apr 5, 2024
Merged

feat(connectivity): Add option to set allow_non_virtual_wan_traffic in express route gateway. #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
1 change: 1 addition & 0 deletions docs/wiki/[Examples]-Deploy-Virtual-WAN-Resources-With-Custom-Settings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ locals {
enabled = true
config = {
scale_unit = 1
allow_non_virtual_wan_traffic = false
}
}
vpn_gateway = {
Expand Down
11 changes: 6 additions & 5 deletions modules/connectivity/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1338,11 +1338,12 @@ locals {
resource_id = local.virtual_hub_express_route_gateway_resource_id[location]
managed_by_module = local.deploy_virtual_hub_express_route_gateway[location]
# Resource definition attributes
name = local.virtual_hub_express_route_gateway_name[location]
resource_group_name = local.virtual_hub_resource_group_name[location]
location = location
virtual_hub_id = local.virtual_hub_resource_id[location]
scale_units = virtual_hub.config.expressroute_gateway.config.scale_unit
name = local.virtual_hub_express_route_gateway_name[location]
resource_group_name = local.virtual_hub_resource_group_name[location]
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)
}
Expand Down
3 changes: 2 additions & 1 deletion modules/connectivity/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ variable "settings" {
expressroute_gateway = optional(object({
enabled = optional(bool, false)
config = optional(object({
scale_unit = optional(number, 1)
scale_unit = optional(number, 1)
allow_non_virtual_wan_traffic = optional(bool, false)
}), {})
}), {})
vpn_gateway = optional(object({
Expand Down
12 changes: 6 additions & 6 deletions resources.virtual_wan.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ resource "azurerm_express_route_gateway" "virtual_wan" {
provider = azurerm.connectivity

# Mandatory resource attributes
name = each.value.template.name
resource_group_name = each.value.template.resource_group_name
location = each.value.template.location
virtual_hub_id = each.value.template.virtual_hub_id
scale_units = each.value.template.scale_units

name = each.value.template.name
resource_group_name = each.value.template.resource_group_name
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
Copy link
Member

@jaredfholgate jaredfholgate Apr 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please run terraform fmt. Thanks!

# Optional resource attributes
tags = each.value.template.tags

Expand Down
3 changes: 2 additions & 1 deletion tests/modules/settings/settings.connectivity.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ locals {
expressroute_gateway = {
enabled = true
config = {
scale_unit = 1
scale_unit = 1
allow_non_virtual_wan_traffic = false
}
}
vpn_gateway = {
Expand Down
3 changes: 2 additions & 1 deletion variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ variable "configure_connectivity_resources" {
expressroute_gateway = optional(object({
enabled = optional(bool, false)
config = optional(object({
scale_unit = optional(number, 1)
scale_unit = optional(number, 1)
allow_non_virtual_wan_traffic = optional(bool, false)
}), {})
}), {})
vpn_gateway = optional(object({
Expand Down