diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bf4e652e794c..af74d69ba444c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ ENHANCEMENTS: * `azurerm_eventhub_namespace` - support for setting `retention_count` to `90` when using a Dedicated Cluster [GH-7548] * `azurerm_kusto_cluster` - support for the `language_extensions` [GH-7421] * `azurerm_mssql_database` - the `sku_name` property now only forces a new resource for the `HS` (HyperScale) family [GH-7559] +* `azurerm_web_application_firewall_policy` - allow setting `version` to `0.1` (for when `type` is set to `Microsoft_BotManagerRuleSet`) [GH-7579] BUG FIXES: diff --git a/azurerm/helpers/validate/web_application_firewall_policy.go b/azurerm/helpers/validate/web_application_firewall_policy.go index da86db47f9523..a7945b91dcdc7 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/container_registry.html.markdown b/website/docs/r/container_registry.html.markdown index 2f1a7435a45e8..f09466cc5abe1 100644 --- a/website/docs/r/container_registry.html.markdown +++ b/website/docs/r/container_registry.html.markdown @@ -68,6 +68,8 @@ The following arguments are supported: ~> **NOTE:** `network_rule_set ` is only supported with the `Premium` SKU at this time. +~> **NOTE:** Azure automatically configures Network Rules - to remove these you'll need to specify an `network_rule_set` block with `default_action` set to `Deny`. + `ip_rule` supports the following: * `action` - (Required) The behaviour for requests matching this rule. At this time the only supported value is `Allow` diff --git a/website/docs/r/linux_virtual_machine_scale_set.html.markdown b/website/docs/r/linux_virtual_machine_scale_set.html.markdown index d023fb101e479..792ce1f6f76bb 100644 --- a/website/docs/r/linux_virtual_machine_scale_set.html.markdown +++ b/website/docs/r/linux_virtual_machine_scale_set.html.markdown @@ -156,7 +156,7 @@ The following arguments are supported: -> **NOTE:** This can only be configured when `priority` is set to `Spot`. -* `overprovision` - (Optional) Should Azure over-provision Virtual Machines in this Scale Set? This means that multiple Virtual Machines will be provisioned and Azure will keep the instances which become available first - which improves provisioning success rates and improves deployment time. You're not billed for these over-provisioned VM's and they don't count towards the Subscription Quota. Defaults to `false`. +* `overprovision` - (Optional) Should Azure over-provision Virtual Machines in this Scale Set? This means that multiple Virtual Machines will be provisioned and Azure will keep the instances which become available first - which improves provisioning success rates and improves deployment time. You're not billed for these over-provisioned VM's and they don't count towards the Subscription Quota. Defaults to `true`. * `priority` - (Optional) The Priority of this Virtual Machine Scale Set. Possible values are `Regular` and `Spot`. Defaults to `Regular`. Changing this value forces a new resource. diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index 21fd40e3c6736..02aabb48c0254 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -303,7 +303,7 @@ The following arguments are supported: * `os_profile_secrets` - (Optional) A collection of Secret blocks as documented below. -* `overprovision` - (Optional) Specifies whether the virtual machine scale set should be overprovisioned. +* `overprovision` - (Optional) Specifies whether the virtual machine scale set should be overprovisioned. Defaults to `true`. * `plan` - (Optional) A plan block as documented below. diff --git a/website/docs/r/web_application_firewall_policy.html.markdown b/website/docs/r/web_application_firewall_policy.html.markdown index 4c5d17f2d59b2..b6232194ed34b 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: `Microsoft_BotManagerRuleSet` and `OWASP`. -* `version` - (Required) The rule set version. +* `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. diff --git a/website/docs/r/windows_virtual_machine_scale_set.html.markdown b/website/docs/r/windows_virtual_machine_scale_set.html.markdown index 8a1e0cf949f65..982e028ef5d47 100644 --- a/website/docs/r/windows_virtual_machine_scale_set.html.markdown +++ b/website/docs/r/windows_virtual_machine_scale_set.html.markdown @@ -144,7 +144,7 @@ The following arguments are supported: -> **NOTE:** This can only be configured when `priority` is set to `Spot`. -* `overprovision` - (Optional) Should Azure over-provision Virtual Machines in this Scale Set? This means that multiple Virtual Machines will be provisioned and Azure will keep the instances which become available first - which improves provisioning success rates and improves deployment time. You're not billed for these over-provisioned VM's and they don't count towards the Subscription Quota. Defaults to `false`. +* `overprovision` - (Optional) Should Azure over-provision Virtual Machines in this Scale Set? This means that multiple Virtual Machines will be provisioned and Azure will keep the instances which become available first - which improves provisioning success rates and improves deployment time. You're not billed for these over-provisioned VM's and they don't count towards the Subscription Quota. Defaults to `true`. * `priority` - (Optional) The Priority of this Virtual Machine Scale Set. Possible values are `Regular` and `Spot`. Defaults to `Regular`. Changing this value forces a new resource.