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

Slapper · 2024-03-21T10:33:31Z

Overview/Summary

Add option to set allow_non_virtual_wan_traffic value to true or false in express route gateway.

This PR fixes/adds/changes/removes

Give the option to set allow_non_virtual_wan_traffic to true in azurerm_express_route_gateway resource

Breaking Changes

None

Testing Evidence

On the latest azurerm versions ( v3.48.0 and higher ) azurerm_express_route_gateway resource has the option to set this value to true. At the time of writing CAF module has no option available .

We saw this issue in our Dev environment during terraform plan : the value was true so using a newer azurerm version the value goes to false, which is the default.

  # module.vWAN.module.alz_connectivity.azurerm_express_route_gateway.virtual_wan["/subscriptions/xxxxx-xxxx-xxxx-xxxxx-xxxxxxxxxx/resourceGroups/dev-connectivity/providers/Microsoft.Network/expressRouteGateways/dev-ergw-northeurope"] will be updated in-place
  ~ resource "azurerm_express_route_gateway" "virtual_wan" {
      ~ allow_non_virtual_wan_traffic = true -> false
        id                            = "/subscriptions/xxxxx-xxxx-xxxx-xxxxx-xxxxxxxxxx/resourceGroups/dev-connectivity/providers/Microsoft.Network/expressRouteGateways/dev-ergw-northeurope"
        name                          = "dev-ergw-northeurope"
        tags                          = {
            "deployedBy"  = "terraform/azure/caf-enterprise-scale"
            "deployedFor" = "Dev"
        }

More info about this option can be found here : hashicorp/terraform-provider-azurerm#20667

As part of this Pull Request I have

Checked for duplicate Pull Requests
Associated it with relevant issues, for tracking and closure.
Ensured my code/branch is up-to-date with the latest changes in the main branch
Performed testing and provided evidence.
Updated relevant and associated documentation.

Slapper · 2024-03-21T11:43:36Z

@microsoft-github-policy-service agree

matt-FFFFFF · 2024-04-02T10:53:34Z

LGTM - @luke-taylor @jaredfholgate

Please could you have a look and merge/release if you're happy?

Thanks!

birdnathan · 2024-04-03T12:29:00Z

+1 - Hit by this issue today

jaredfholgate · 2024-04-03T17:13:26Z

/azp run unit

azure-pipelines · 2024-04-03T17:13:37Z

Azure Pipelines successfully started running 1 pipeline(s).

jaredfholgate

Need to run terraform fmt -recursive to fix the tests.

jaredfholgate · 2024-04-03T17:15:08Z

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


Please run terraform fmt. Thanks!

jaredfholgate · 2024-04-04T08:30:58Z

/azp run unit

azure-pipelines · 2024-04-04T08:31:09Z

Azure Pipelines successfully started running 1 pipeline(s).

jaredfholgate · 2024-04-04T09:18:38Z

@Slapper For some reason I am still seeing formatting errors in the unit tests. Two options:

Give me access to your repo and I'll fix it there.
I can move your branch over to the Azure org and fix it there.

Let me know which you prefer.

Thanks

Slapper · 2024-04-04T09:33:30Z

Hi @jaredfholgate ,

Feel free to move my branch to Azure project.

( i forgot to run the fmt with the recursive flag so maybe thats was the case )
Thanks!

…n express route gateway.

jaredfholgate · 2024-04-04T10:56:33Z

/azp run unit

azure-pipelines · 2024-04-04T10:56:44Z

Azure Pipelines successfully started running 1 pipeline(s).

jaredfholgate · 2024-04-04T10:59:35Z

Hi @jaredfholgate ,

Feel free to move my branch to Azure project.

( i forgot to run the fmt with the recursive flag so maybe thats was the case ) Thanks!

That has fixed the linting issues, thanks. I will run and update the tests as nessecary now.

jaredfholgate

LGTM

jaredfholgate · 2024-04-05T07:54:07Z

This was released in 5.2.0.

birdnathan · 2024-04-05T10:45:21Z

@Slapper @jaredfholgate - something not quite right with that release

birdnathan · 2024-04-05T11:01:59Z

@Slapper @jaredfholgate - something not quite right with that release

Apologies, sorted. Nothing to do with your change. #907 introduced a breaking change. Had to tweak settings.connectivity to also change threat_intelligence_allowlist = [] to threat_intelligence_allowlist = {}

* feat(connectivity): Add option to set allow_non_virtual_wan_traffic in express route gateway. (Azure#914) Co-authored-by: Miltos Tsatsakis <m.tsatsakis@kaizengaming.com> * updates to resolve issue Azure#794 (Azure#919) Co-authored-by: github-actions <action@github.com> * docs: update docs for threat_intelligence_allowlist (Azure#928) * Update wiki-sync.yml * chore(deps): bump github/super-linter from 5 to 6 (Azure#931) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * add link to Upgrade guide from v4.2.0 to v5.0.0 (Azure#934) Co-authored-by: Matt White <16320656+matt-FFFFFF@users.noreply.github.com> * Added hub_routing_preference to connectivity advanced configuration (Azure#930) * Policy sync updates (Azure#959) * Update Library Templates (automated) (Azure#966) Co-authored-by: github-actions <action@github.com> * Add remote branch option (Azure#970) * Update Library Templates (automated) (Azure#973) Co-authored-by: github-actions <action@github.com> * Update Library Templates (automated) (Azure#976) Co-authored-by: github-actions <action@github.com> * Remove redundant assignment file (Azure#977) * updating threat intelligence allowlist dynamic block (Azure#953) Co-authored-by: Matt White <16320656+matt-FFFFFF@users.noreply.github.com> * chore(deps): bump azure/powershell from 1 to 2 (Azure#917) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add OpenSFF Scorecard (Azure#987) * chore(deps): bump github/codeql-action from 3.24.9 to 3.25.8 (Azure#990) * chore(deps): bump github.com/hashicorp/go-getter from 1.7.3 to 1.7.4 in /tests/terratest (Azure#986) * feat!: ama (Azure#968) * Fix example uami issue (Azure#1000) * Update Library Templates (automated) (Azure#1001) Co-authored-by: github-actions <action@github.com> * docs: additional v6 upgrade detail (Azure#1002) * Update Library Templates (automated) (Azure#1006) Co-authored-by: github-actions <action@github.com> * docs: update docs with FAQ on roadmap and banner for upcoming breaking changes (Azure#1008) * naming fixed in module --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Mtsa <miltsatsakis@gmail.com> Co-authored-by: Miltos Tsatsakis <m.tsatsakis@kaizengaming.com> Co-authored-by: Adam Tuckwell <106317528+ATuckwell@users.noreply.github.com> Co-authored-by: github-actions <action@github.com> Co-authored-by: Jared Holgate <jaredholgate@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tobias <tobias-m99@gmx.de> Co-authored-by: Matt White <16320656+matt-FFFFFF@users.noreply.github.com> Co-authored-by: QBY-MarkusMaring <106068259+QBY-MarkusMaring@users.noreply.github.com> Co-authored-by: cae-pr-creator[bot] <126156663+cae-pr-creator[bot]@users.noreply.github.com> Co-authored-by: Daan Toes <112694691+cndaan@users.noreply.github.com>

Slapper force-pushed the add_allow_non_virtual_wan_traffic_option branch from f8906c7 to 8b46c96 Compare March 22, 2024 12:23

jaredfholgate requested changes Apr 3, 2024

View reviewed changes

Slapper force-pushed the add_allow_non_virtual_wan_traffic_option branch from 8b46c96 to 34fef99 Compare April 4, 2024 06:07

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

69f2d2a

…n express route gateway.

Slapper force-pushed the add_allow_non_virtual_wan_traffic_option branch from 34fef99 to 69f2d2a Compare April 4, 2024 09:34

jaredfholgate approved these changes Apr 5, 2024

View reviewed changes

jaredfholgate merged commit fc666d1 into Azure:main Apr 5, 2024
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

Slapper commented Mar 21, 2024

Slapper commented Mar 21, 2024

matt-FFFFFF commented Apr 2, 2024

birdnathan commented Apr 3, 2024

jaredfholgate commented Apr 3, 2024

azure-pipelines bot commented Apr 3, 2024

jaredfholgate left a comment

jaredfholgate Apr 3, 2024

jaredfholgate commented Apr 4, 2024

azure-pipelines bot commented Apr 4, 2024

jaredfholgate commented Apr 4, 2024

Slapper commented Apr 4, 2024 •

edited

Loading

jaredfholgate commented Apr 4, 2024

azure-pipelines bot commented Apr 4, 2024

jaredfholgate commented Apr 4, 2024

jaredfholgate left a comment

jaredfholgate commented Apr 5, 2024

birdnathan commented Apr 5, 2024

birdnathan commented Apr 5, 2024 •

edited

Loading

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

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

Conversation

Slapper commented Mar 21, 2024

Overview/Summary

This PR fixes/adds/changes/removes

Breaking Changes

Testing Evidence

As part of this Pull Request I have

Slapper commented Mar 21, 2024

matt-FFFFFF commented Apr 2, 2024

birdnathan commented Apr 3, 2024

jaredfholgate commented Apr 3, 2024

azure-pipelines bot commented Apr 3, 2024

jaredfholgate left a comment

Choose a reason for hiding this comment

jaredfholgate Apr 3, 2024

Choose a reason for hiding this comment

jaredfholgate commented Apr 4, 2024

azure-pipelines bot commented Apr 4, 2024

jaredfholgate commented Apr 4, 2024

Slapper commented Apr 4, 2024 • edited Loading

jaredfholgate commented Apr 4, 2024

azure-pipelines bot commented Apr 4, 2024

jaredfholgate commented Apr 4, 2024

jaredfholgate left a comment

Choose a reason for hiding this comment

jaredfholgate commented Apr 5, 2024

birdnathan commented Apr 5, 2024

birdnathan commented Apr 5, 2024 • edited Loading

Slapper commented Apr 4, 2024 •

edited

Loading

birdnathan commented Apr 5, 2024 •

edited

Loading