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: custom_rules.match_conditions support transforms #7545

Merged
merged 1 commit into from
Jul 7, 2020
Merged

azurerm_web_application_firewall_policy: custom_rules.match_conditions support transforms #7545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions azurerm/internal/services/network/tests/web_application_firewall_policy_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TestAccAzureRMWebApplicationFirewallPolicy_complete(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.operator", "Contains"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.negation_condition", "false"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.match_values.#", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.match_values.0", "Windows"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.match_values.0", "windows"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.action", "Block"),
resource.TestCheckResourceAttr(data.ResourceName, "managed_rules.#", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "managed_rules.0.exclusion.#", "2"),
Expand Down Expand Up @@ -146,7 +146,7 @@ func TestAccAzureRMWebApplicationFirewallPolicy_update(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.operator", "Contains"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.negation_condition", "false"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.match_values.#", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.match_values.0", "Windows"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.match_conditions.1.match_values.0", "windows"),
resource.TestCheckResourceAttr(data.ResourceName, "custom_rules.1.action", "Block"),
resource.TestCheckResourceAttr(data.ResourceName, "managed_rules.#", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "managed_rules.0.exclusion.#", "2"),
Expand Down Expand Up @@ -310,7 +310,8 @@ resource "azurerm_web_application_firewall_policy" "test" {

operator = "Contains"
negation_condition = false
match_values = ["Windows"]
match_values = ["windows"]
transforms = ["Lowercase"]
}

action = "Block"
Expand Down
28 changes: 28 additions & 0 deletions azurerm/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 @@ -122,6 +122,21 @@ func resourceArmWebApplicationFirewallPolicy() *schema.Resource {
Type: schema.TypeBool,
Optional: true,
},
"transforms": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(network.HTMLEntityDecode),
string(network.Lowercase),
string(network.RemoveNulls),
string(network.Trim),
string(network.URLDecode),
string(network.URLEncode),
}, false),
},
},
},
},
},
Expand Down Expand Up @@ -522,12 +537,18 @@ func expandArmWebApplicationFirewallPolicyMatchCondition(input []interface{}) *[
operator := v["operator"].(string)
negationCondition := v["negation_condition"].(bool)
matchValues := v["match_values"].([]interface{})
transformsRaw := v["transforms"].(*schema.Set).List()

var transforms []network.WebApplicationFirewallTransform
for _, trans := range transformsRaw {
transforms = append(transforms, network.WebApplicationFirewallTransform(trans.(string)))
}
result := network.MatchCondition{
MatchValues: utils.ExpandStringSlice(matchValues),
MatchVariables: expandArmWebApplicationFirewallPolicyMatchVariable(matchVariables),
NegationConditon: utils.Bool(negationCondition),
Operator: network.WebApplicationFirewallOperator(operator),
Transforms: &transforms,
}

results = append(results, result)
Expand Down Expand Up @@ -689,12 +710,19 @@ func flattenArmWebApplicationFirewallPolicyMatchCondition(input *[]network.Match
for _, item := range *input {
v := make(map[string]interface{})

var transforms []interface{}
if item.Transforms != nil {
for _, trans := range *item.Transforms {
transforms = append(transforms, string(trans))
}
}
v["match_values"] = utils.FlattenStringSlice(item.MatchValues)
v["match_variables"] = flattenArmWebApplicationFirewallPolicyMatchVariable(item.MatchVariables)
if negationCondition := item.NegationConditon; negationCondition != nil {
v["negation_condition"] = *negationCondition
}
v["operator"] = string(item.Operator)
v["transforms"] = transforms

results = append(results, v)
}
Expand Down
6 changes: 4 additions & 2 deletions website/docs/r/web_application_firewall_policy.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ The following arguments are supported:

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

* `managed_rules` - (Optional) A `managed_rules` blocks as defined below.
* `managed_rules` - (Required) A `managed_rules` blocks as defined below.

* `tags` - (Optional) A mapping of tags to assign to the Web Application Firewall Policy.

Expand All @@ -141,11 +141,13 @@ The `match_conditions` block supports the following:

* `match_variables` - (Required) One or more `match_variables` blocks as defined below.

* `match_values` - (Required) A list of match values.

* `operator` - (Required) Describes operator to be matched.

* `negation_condition` - (Optional) Describes if this is negate condition or not

* `match_values` - (Required) A list of match values.
* `transforms` - (Optional) A list of transformations to do before the match is attempted.

---

Expand Down