Skip to content
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.

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

azurerm_virtual_hub_connection - adding property static_vnet_propagate_static_routes #28560

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ func dataSourceVirtualHubConnection() *pluginsdk.Resource {
Computed: true,
},

"static_vnet_propagate_static_routes": {
Type: pluginsdk.TypeBool,
Computed: true,
},

// lintignore:XS003
"static_vnet_route": {
Type: pluginsdk.TypeList,
Expand Down
12 changes: 12 additions & 0 deletions internal/services/network/virtual_hub_connection_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@ func resourceVirtualHubConnection() *pluginsdk.Resource {
}, false),
},

"static_vnet_propagate_static_routes": {
Type: pluginsdk.TypeBool,
Optional: true,
},

// lintignore:XS003
"static_vnet_route": {
Type: pluginsdk.TypeList,
Expand Down Expand Up @@ -321,6 +326,7 @@ func expandVirtualHubConnectionRouting(input []interface{}) *virtualwans.Routing
VnetRoutes: &virtualwans.VnetRoute{
StaticRoutes: expandVirtualHubConnectionVnetStaticRoute(v["static_vnet_route"].([]interface{})),
StaticRoutesConfig: &virtualwans.StaticRoutesConfig{
PropagateStaticRoutes: pointer.To(v["static_vnet_propagate_static_routes"].(bool)),
VnetLocalRouteOverrideCriteria: pointer.To(virtualwans.VnetLocalRouteOverrideCriteria(v["static_vnet_local_route_override_criteria"].(string))),
},
},
Expand Down Expand Up @@ -442,6 +448,11 @@ func flattenVirtualHubConnectionRouting(input *virtualwans.RoutingConfiguration)
staticVnetLocalRouteOverrideCriteria = string(*input.VnetRoutes.StaticRoutesConfig.VnetLocalRouteOverrideCriteria)
}

staticVnetPropagateStaticRoutes := false
if input.VnetRoutes != nil && input.VnetRoutes.StaticRoutesConfig != nil && input.VnetRoutes.StaticRoutesConfig.PropagateStaticRoutes != nil {
staticVnetPropagateStaticRoutes = *input.VnetRoutes.StaticRoutesConfig.PropagateStaticRoutes
}

return []interface{}{
map[string]interface{}{
"associated_route_table_id": associatedRouteTableId,
Expand All @@ -450,6 +461,7 @@ func flattenVirtualHubConnectionRouting(input *virtualwans.RoutingConfiguration)
"propagated_route_table": flattenVirtualHubConnectionPropagatedRouteTable(input.PropagatedRouteTables),
"static_vnet_route": flattenVirtualHubConnectionVnetStaticRoute(input.VnetRoutes),
"static_vnet_local_route_override_criteria": staticVnetLocalRouteOverrideCriteria,
"static_vnet_propagate_static_routes": staticVnetPropagateStaticRoutes,
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,21 @@ func TestAccVirtualHubConnection_routeMapAndStaticVnetLocalRouteOverrideCriteria
})
}

func TestAccVirtualHubConnection_routeMapAndStaticVnetPropagateStaticRoutes(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_virtual_hub_connection", "test")
r := VirtualHubConnectionResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.routeMapAndStaticVnetPropagateStaticRoutes(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func (t VirtualHubConnectionResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := virtualwans.ParseHubVirtualNetworkConnectionID(state.ID)
if err != nil {
Expand Down Expand Up @@ -673,3 +688,19 @@ resource "azurerm_virtual_hub_connection" "test" {
}
`, r.template(data), nameSuffix, data.RandomInteger)
}

func (r VirtualHubConnectionResource) routeMapAndStaticVnetPropagateStaticRoutes(data acceptance.TestData) string {
return fmt.Sprintf(`
%[1]s

resource "azurerm_virtual_hub_connection" "test" {
name = "acctest-vhubconn-%[2]d"
virtual_hub_id = azurerm_virtual_hub.test.id
remote_virtual_network_id = azurerm_virtual_network.test.id

routing {
static_vnet_propagate_static_routes = true
}
}
`, r.template(data), data.RandomInteger)
}
2 changes: 2 additions & 0 deletions website/docs/d/virtual_hub_connection.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ An `routing` block exports the following:

* `static_vnet_local_route_override_criteria` - The static VNet local route override criteria that is used to determine whether NVA in spoke VNet is bypassed for traffic with destination in spoke VNet.

* `static_vnet_propagate_static_routes` - Whether the static routes should be propagated to the Virtual Hub or not.

* `static_vnet_route` - A `static_vnet_route` block as defined below.

---
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/virtual_hub_connection.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ A `routing` block supports the following:

* `static_vnet_local_route_override_criteria` - (Optional) The static VNet local route override criteria that is used to determine whether NVA in spoke VNet is bypassed for traffic with destination in spoke VNet. Possible values are `Contains` and `Equal`. Defaults to `Contains`. Changing this forces a new resource to be created.

* `static_vnet_propagate_static_routes` - (Optional) Set to true if the static routes should be propagated to the Virtual Hub.

* `static_vnet_route` - (Optional) A `static_vnet_route` block as defined below.

---
Expand Down
Loading