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

azurerm_web_application_firewall_policy add enabled / disabled state for Custom Rules #23163

Merged
merged 6 commits into from
Sep 12, 2023
Merged

azurerm_web_application_firewall_policy add enabled / disabled state for Custom Rules #23163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2bb1485
Added the Enable Field for State on Custom Rules
UppyAU Sep 4, 2023
af9848f
TestAccWebApplicationFirewallPolicy_complete Updated
UppyAU Sep 5, 2023
5d33e8f
Fix linting on Enable in test
UppyAU Sep 5, 2023
322eb3b
Created a Test involving Custom Rules Enable State
UppyAU Sep 8, 2023
77c763f
Corrected Go Path in ENV Vars and Ran terrafmt
UppyAU Sep 11, 2023
ae48442
Merge branch 'hashicorp:main' into WebApplicationFirewallCustomRule-E…
UppyAU Sep 11, 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
12 changes: 12 additions & 0 deletions internal/services/network/web_application_firewall_policy_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ func resourceWebApplicationFirewallPolicy() *pluginsdk.Resource {
string(webapplicationfirewallpolicies.WebApplicationFirewallActionLog),
}, false),
},
"enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Default: true,
},
"match_conditions": {
Type: pluginsdk.TypeList,
Required: true,
Expand Down Expand Up @@ -599,7 +604,13 @@ func expandWebApplicationFirewallPolicyWebApplicationFirewallCustomRule(input []
matchConditions := v["match_conditions"].([]interface{})
action := v["action"].(string)

enabled := webapplicationfirewallpolicies.WebApplicationFirewallStateEnabled
if value, ok := v["enabled"].(bool); ok && !value {
enabled = webapplicationfirewallpolicies.WebApplicationFirewallStateDisabled
}

result := webapplicationfirewallpolicies.WebApplicationFirewallCustomRule{
State: pointer.To(enabled),
Action: webapplicationfirewallpolicies.WebApplicationFirewallAction(action),
MatchConditions: expandWebApplicationFirewallPolicyMatchCondition(matchConditions),
Name: pointer.To(name),
Expand Down Expand Up @@ -946,6 +957,7 @@ func flattenWebApplicationFirewallPolicyWebApplicationFirewallCustomRule(input *
v["name"] = *name
}
v["action"] = string(item.Action)
v["enabled"] = pointer.From(item.State) == webapplicationfirewallpolicies.WebApplicationFirewallStateEnabled
v["match_conditions"] = flattenWebApplicationFirewallPolicyMatchCondition(item.MatchConditions)
v["priority"] = int(item.Priority)
v["rule_type"] = string(item.RuleType)
Expand Down
Loading