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.

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

Jump to bottom

Add EnablePrivateLinkFastPath to the Express Route Connection resource #25596

Merged
merged 11 commits into from
Apr 16, 2024
Merged

Add EnablePrivateLinkFastPath to the Express Route Connection resource #25596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c30624e
Add Boolean option for `EnablePrivateLinkFastPath`
fjaeckel Apr 12, 2024
b03eca8
add `enable_private_link_fast_path` to tests
fjaeckel Apr 12, 2024
f388e81
Add documentation for `enable_private_link_fast_path`
fjaeckel Apr 12, 2024
fc10726
Rename `enable_private_link_fast_path` to `private_link_fast_path_ena…
fjaeckel Apr 15, 2024
3e0b033
Refactor by suggestion
fjaeckel Apr 15, 2024
a68eaec
use `pointer` helper
fjaeckel Apr 15, 2024
333ec83
update documentation
fjaeckel Apr 15, 2024
51d2153
Guard `private_link_fast_path_enabled` being set
fjaeckel Apr 15, 2024
6a39f25
Add `PrivateLinkFastPath` to Update function
fjaeckel Apr 15, 2024
6ce4de4
Update attribute name to match Specs
fjaeckel Apr 15, 2024
fd3657e
Add dependency to test `express_route_gateway_bypass_enabled`
fjaeckel Apr 15, 2024
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
17 changes: 17 additions & 0 deletions internal/services/network/express_route_connection_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"time"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/network/parse"
Expand Down Expand Up @@ -71,6 +72,12 @@ func resourceExpressRouteConnection() *pluginsdk.Resource {
Optional: true,
},

"private_link_fast_path_enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Default: false,
},

"express_route_gateway_bypass_enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Expand Down Expand Up @@ -173,6 +180,10 @@ func resourceExpressRouteConnectionCreate(d *pluginsdk.ResourceData, meta interf
return tf.ImportAsExistsError("azurerm_express_route_connection", id.ID())
}

if d.Get("private_link_fast_path_enabled").(bool) && !d.Get("express_route_gateway_bypass_enabled").(bool) {
return fmt.Errorf("`express_route_gateway_bypass_enabled` must be enabled when `private_link_fast_path_enabled` is set to `true`")
}

parameters := network.ExpressRouteConnection{
Name: utils.String(id.Name),
ExpressRouteConnectionProperties: &network.ExpressRouteConnectionProperties{
Expand All @@ -183,6 +194,7 @@ func resourceExpressRouteConnectionCreate(d *pluginsdk.ResourceData, meta interf
RoutingConfiguration: expandExpressRouteConnectionRouting(d.Get("routing").([]interface{})),
RoutingWeight: utils.Int32(int32(d.Get("routing_weight").(int))),
ExpressRouteGatewayBypass: utils.Bool(d.Get("express_route_gateway_bypass_enabled").(bool)),
EnablePrivateLinkFastPath: utils.Bool(d.Get("private_link_fast_path_enabled").(bool)),
},
}

Expand Down Expand Up @@ -230,6 +242,7 @@ func resourceExpressRouteConnectionRead(d *pluginsdk.ResourceData, meta interfac
d.Set("routing_weight", props.RoutingWeight)
d.Set("authorization_key", props.AuthorizationKey)
d.Set("enable_internet_security", props.EnableInternetSecurity)
d.Set("private_link_fast_path_enabled", pointer.From(props.EnablePrivateLinkFastPath))

if props.ExpressRouteGatewayBypass != nil {
d.Set("express_route_gateway_bypass_enabled", props.ExpressRouteGatewayBypass)
Expand Down Expand Up @@ -267,6 +280,9 @@ func resourceExpressRouteConnectionUpdate(d *pluginsdk.ResourceData, meta interf
return err
}

if d.Get("private_link_fast_path_enabled").(bool) && !d.Get("express_route_gateway_bypass_enabled").(bool) {
return fmt.Errorf("`express_route_gateway_bypass_enabled` must be enabled when `private_link_fast_path_enabled` is set to `true`")
}
parameters := network.ExpressRouteConnection{
Name: utils.String(id.Name),
ExpressRouteConnectionProperties: &network.ExpressRouteConnectionProperties{
Expand All @@ -277,6 +293,7 @@ func resourceExpressRouteConnectionUpdate(d *pluginsdk.ResourceData, meta interf
RoutingConfiguration: expandExpressRouteConnectionRouting(d.Get("routing").([]interface{})),
RoutingWeight: utils.Int32(int32(d.Get("routing_weight").(int))),
ExpressRouteGatewayBypass: utils.Bool(d.Get("express_route_gateway_bypass_enabled").(bool)),
EnablePrivateLinkFastPath: utils.Bool(d.Get("private_link_fast_path_enabled").(bool)),
},
}

Expand Down
15 changes: 9 additions & 6 deletions internal/services/network/express_route_connection_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,14 @@ func (r ExpressRouteConnectionResource) complete(data acceptance.TestData) strin
%s

resource "azurerm_express_route_connection" "test" {
name = "acctest-ExpressRouteConnection-%d"
express_route_gateway_id = azurerm_express_route_gateway.test.id
express_route_circuit_peering_id = azurerm_express_route_circuit_peering.test.id
routing_weight = 2
authorization_key = "90f8db47-e25b-4b65-a68b-7743ced2a16b"
enable_internet_security = true
name = "acctest-ExpressRouteConnection-%d"
express_route_gateway_id = azurerm_express_route_gateway.test.id
express_route_circuit_peering_id = azurerm_express_route_circuit_peering.test.id
routing_weight = 2
authorization_key = "90f8db47-e25b-4b65-a68b-7743ced2a16b"
enable_internet_security = true
private_link_fast_path_enabled = true
express_route_gateway_bypass_enabled = true

routing {
associated_route_table_id = azurerm_virtual_hub.test.default_route_table_id
Expand Down Expand Up @@ -223,6 +225,7 @@ resource "azurerm_express_route_connection" "test" {
routing_weight = 2
authorization_key = "90f8db47-e25b-4b65-a68b-7743ced2a16b"
enable_internet_security = true
private_link_fast_path_enabled = true
express_route_gateway_bypass_enabled = true

routing {
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/express_route_connection.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ The following arguments are supported:

* `express_route_gateway_bypass_enabled` - (Optional) Specified whether Fast Path is enabled for Virtual Wan Firewall Hub. Defaults to `false`.

* `private_link_fast_path_enabled` - (Optional) Bypass the Express Route gateway when accessing private-links. When enabled `express_route_gateway_bypass_enabled` must be set to `true`. Defaults to `false`.

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

* `routing_weight` - (Optional) The routing weight associated to the Express Route Connection. Possible value is between `0` and `32000`. Defaults to `0`.
Expand Down
Loading