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

dependencies: migrate firewall to hashicorp/go-azure-sdk #22863

Merged
merged 8 commits into from
Sep 26, 2023
Merged

dependencies: migrate firewall to hashicorp/go-azure-sdk #22863

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7fb4894
Swap various azurerm_firewal_x resources to hashicorp/go-azure-sdk
mbfrahry Aug 7, 2023
d4ebf8e
move azurerm_firewall_policy to hashicorp/go-azure-sdk
mbfrahry Aug 8, 2023
17d793d
move azurerm_firewall_policy_rule_collection_group to hashicorp/go-az…
mbfrahry Aug 8, 2023
117ba3b
Hardcode Dnat for sdk inconsistencies
mbfrahry Aug 8, 2023
aaa4af9
Only set identity when type is not None
mbfrahry Aug 8, 2023
8e79eaa
Add deadline for disappears test
mbfrahry Aug 8, 2023
72508b0
move check for existing virtual hub
mbfrahry Aug 8, 2023
7c10ecf
Add deadline to test
mbfrahry Aug 9, 2023
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
9 changes: 8 additions & 1 deletion internal/services/firewall/firewall_policy_rule_collection_group_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"
"log"
"strconv"
"strings"
"time"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
Expand Down Expand Up @@ -757,7 +758,13 @@ func flattenFirewallPolicyRuleCollection(input *[]firewallpolicyrulecollectiongr

var action string
if rule.Action != nil {
action = string(pointer.From(rule.Action.Type))
// todo 4.0 change this from DNAT to Dnat
// doing this because we hardcode Dnat for https://github.com/Azure/azure-rest-api-specs/issues/9986
if strings.EqualFold(string(pointer.From(rule.Action.Type)), "Dnat") {
action = "Dnat"
} else {
action = string(pointer.From(rule.Action.Type))
}
Comment on lines +761 to +767
Copy link
Contributor

Choose a reason for hiding this comment

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

since Firewall is using the new base layer, this shouldn't be needed - the base layer should be updating Action to be DNAT as defined in the Swagger - what's the issue this is fixing?

Copy link
Member Author

Choose a reason for hiding this comment

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

The issue is that we're specifying Dnat in the config files which should mean our users are too

image

}

rules, err := flattenFirewallPolicyRuleNat(rule.Rules)
Expand Down