From 199e877a685b0c7f76d189e205c0199ed058aa1b Mon Sep 17 00:00:00 2001 From: wlodekj Date: Fri, 3 Jul 2020 14:36:30 +0200 Subject: [PATCH 1/3] Added new 0.1 version to WAF managed_rule_set to support Microsoft_BotManagerRuleSet creation in tf --- azurerm/helpers/validate/web_application_firewall_policy.go | 1 + website/docs/r/web_application_firewall_policy.html.markdown | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azurerm/helpers/validate/web_application_firewall_policy.go b/azurerm/helpers/validate/web_application_firewall_policy.go index da86db47f952..a7945b91dcdc 100644 --- a/azurerm/helpers/validate/web_application_firewall_policy.go +++ b/azurerm/helpers/validate/web_application_firewall_policy.go @@ -28,6 +28,7 @@ var ValidateWebApplicationFirewallPolicyRuleGroupName = validation.StringInSlice }, false) var ValidateWebApplicationFirewallPolicyRuleSetVersion = validation.StringInSlice([]string{ + "0.1", "1.0", "2.2.9", "3.0", diff --git a/website/docs/r/web_application_firewall_policy.html.markdown b/website/docs/r/web_application_firewall_policy.html.markdown index 4c5d17f2d59b..f3032d58aeb5 100644 --- a/website/docs/r/web_application_firewall_policy.html.markdown +++ b/website/docs/r/web_application_firewall_policy.html.markdown @@ -185,9 +185,9 @@ The `exclusion` block supports the following: The `managed_rule_set` block supports the following: -* `type` - (Optional) The rule set type. +* `type` - (Optional) The rule set type. Possible values: `OWASP`, `Microsoft_BotManagerRuleSet`. -* `version` - (Required) The rule set version. +* `version` - (Required) The rule set version. Possible values: `0.1`, `1.0`, `2.2.9`, `3.0`, `3.1`. * `rule_group_override` - (Optional) One or more `rule_group_override` block defined below. From 4f9ce99e472c9077dca04795d3a229fcec40028d Mon Sep 17 00:00:00 2001 From: wlodekj Date: Fri, 3 Jul 2020 14:54:49 +0200 Subject: [PATCH 2/3] Removed 1.0 version --- azurerm/helpers/validate/web_application_firewall_policy.go | 1 - website/docs/r/web_application_firewall_policy.html.markdown | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/azurerm/helpers/validate/web_application_firewall_policy.go b/azurerm/helpers/validate/web_application_firewall_policy.go index a7945b91dcdc..6e180b045cac 100644 --- a/azurerm/helpers/validate/web_application_firewall_policy.go +++ b/azurerm/helpers/validate/web_application_firewall_policy.go @@ -29,7 +29,6 @@ var ValidateWebApplicationFirewallPolicyRuleGroupName = validation.StringInSlice var ValidateWebApplicationFirewallPolicyRuleSetVersion = validation.StringInSlice([]string{ "0.1", - "1.0", "2.2.9", "3.0", "3.1", diff --git a/website/docs/r/web_application_firewall_policy.html.markdown b/website/docs/r/web_application_firewall_policy.html.markdown index f3032d58aeb5..a72cecebf80c 100644 --- a/website/docs/r/web_application_firewall_policy.html.markdown +++ b/website/docs/r/web_application_firewall_policy.html.markdown @@ -187,7 +187,7 @@ The `managed_rule_set` block supports the following: * `type` - (Optional) The rule set type. Possible values: `OWASP`, `Microsoft_BotManagerRuleSet`. -* `version` - (Required) The rule set version. Possible values: `0.1`, `1.0`, `2.2.9`, `3.0`, `3.1`. +* `version` - (Required) The rule set version. Possible values: `0.1`, `2.2.9`, `3.0`, `3.1`. * `rule_group_override` - (Optional) One or more `rule_group_override` block defined below. From 155da1dcd5575fa9e101cb2d168aa5d7426cf698 Mon Sep 17 00:00:00 2001 From: wlodekj Date: Mon, 6 Jul 2020 17:59:29 +0200 Subject: [PATCH 3/3] Reverted back 1.0 and updated docs --- azurerm/helpers/validate/web_application_firewall_policy.go | 1 + website/docs/r/web_application_firewall_policy.html.markdown | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azurerm/helpers/validate/web_application_firewall_policy.go b/azurerm/helpers/validate/web_application_firewall_policy.go index 6e180b045cac..a7945b91dcdc 100644 --- a/azurerm/helpers/validate/web_application_firewall_policy.go +++ b/azurerm/helpers/validate/web_application_firewall_policy.go @@ -29,6 +29,7 @@ var ValidateWebApplicationFirewallPolicyRuleGroupName = validation.StringInSlice var ValidateWebApplicationFirewallPolicyRuleSetVersion = validation.StringInSlice([]string{ "0.1", + "1.0", "2.2.9", "3.0", "3.1", diff --git a/website/docs/r/web_application_firewall_policy.html.markdown b/website/docs/r/web_application_firewall_policy.html.markdown index a72cecebf80c..b6232194ed34 100644 --- a/website/docs/r/web_application_firewall_policy.html.markdown +++ b/website/docs/r/web_application_firewall_policy.html.markdown @@ -185,9 +185,9 @@ The `exclusion` block supports the following: The `managed_rule_set` block supports the following: -* `type` - (Optional) The rule set type. Possible values: `OWASP`, `Microsoft_BotManagerRuleSet`. +* `type` - (Optional) The rule set type. Possible values: `Microsoft_BotManagerRuleSet` and `OWASP`. -* `version` - (Required) The rule set version. Possible values: `0.1`, `2.2.9`, `3.0`, `3.1`. +* `version` - (Required) The rule set version. Possible values: `0.1`, `1.0`, `2.2.9`, `3.0` and `3.1`. * `rule_group_override` - (Optional) One or more `rule_group_override` block defined below.