`azurerm_web_application_firewall_policy`: support `rate_limit_` and `request_body_` properties #23239

wuxu92 · 2023-09-12T00:57:18Z

should fixes: #23145

--- PASS: TestAccWebApplicationFirewallPolicy_basic (217.49s)
--- PASS: TestAccWebApplicationFirewallPolicy_complete (283.57s)
--- PASS: TestAccWebApplicationFirewallPolicy_update (289.15s)
--- PASS: TestAccWebApplicationFirewallPolicy_knownCVEs (219.64s)
--- PASS: TestAccWebApplicationFirewallPolicy_OperatorAny (282.21s)
--- PASS: TestAccWebApplicationFirewallPolicy_excludedRules (241.73s)
--- PASS: TestAccWebApplicationFirewallPolicy_updateDisabledRules (243.31s)
--- PASS: TestAccWebApplicationFirewallPolicy_LogScrubbing (280.74s)
--- PASS: TestAccWebApplicationFirewallPolicy_updateOverrideRules (339.01s)
PASS

UppyAU · 2023-09-12T02:29:39Z

This related to #23145 ?

wuxu92 · 2023-09-12T08:02:53Z

@UppyAU Yes, I think it is. this PR add support for rate limit properties.

stephybun

Thanks for this @wuxu92.

In addition to the comments left in-line, can you please resolve the merge conflict as well as add a test that updates these values?

internal/services/network/web_application_firewall_policy_resource.go

stephybun · 2023-09-18T06:33:58Z

internal/services/network/web_application_firewall_policy_resource.go

+			result.RateLimitThreshold = pointer.To(int64(rateLimitThreshHold))
+		}
+
+		if groupBy := v["group_rate_limit_by"].(string); len(groupBy) > 0 {


Why are we length checking a string instead of just checking if it's empty like on line 639?

stephybun · 2023-09-18T06:36:24Z

internal/services/network/web_application_firewall_policy_resource.go

+		if rateLimitDuration := v["rate_limit_duration"].(string); rateLimitDuration != "" {
+			result.RateLimitDuration = pointer.To(webapplicationfirewallpolicies.ApplicationGatewayFirewallRateLimitDuration(rateLimitDuration))
+		}
+
+		if rateLimitThreshHold := v["rate_limit_threshold"].(int); rateLimitThreshHold > 0 {
+			result.RateLimitThreshold = pointer.To(int64(rateLimitThreshHold))
+		}
+
+		if groupBy := v["group_rate_limit_by"].(string); len(groupBy) > 0 {


We should be doing an ok check on these

Suggested change

if rateLimitDuration := v["rate_limit_duration"].(string); rateLimitDuration != "" {

result.RateLimitDuration = pointer.To(webapplicationfirewallpolicies.ApplicationGatewayFirewallRateLimitDuration(rateLimitDuration))

}

if rateLimitThreshHold := v["rate_limit_threshold"].(int); rateLimitThreshHold > 0 {

result.RateLimitThreshold = pointer.To(int64(rateLimitThreshHold))

}

if groupBy := v["group_rate_limit_by"].(string); len(groupBy) > 0 {

if rateLimitDuration, ok := v["rate_limit_duration"]; ok && rateLimitDuration.(string) != "" {

result.RateLimitDuration = pointer.To(webapplicationfirewallpolicies.ApplicationGatewayFirewallRateLimitDuration(rateLimitDuration))

}

if rateLimitThreshHold, ok := v["rate_limit_threshold"]; ok && rateLimitThreshHold.(int) > 0 {

result.RateLimitThreshold = pointer.To(int64(rateLimitThreshHold))

}

if groupBy, ok := v["group_rate_limit_by"].(string); ok && groupBy.(string) != "" {

stephybun · 2023-09-18T06:40:40Z

website/docs/r/web_application_firewall_policy.html.markdown


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

 * `action` - (Required) Type of action. Possible values are `Allow`, `Block` and `Log`.

+* `rate_limit_duration` - (Optional) Specifies the duration the rate limit policy will be applied. Should be used with `RateLimitRule` rule type. Possible values are `FiveMins` and `OneMin`.


Suggested change

* `rate_limit_duration` - (Optional) Specifies the duration the rate limit policy will be applied. Should be used with `RateLimitRule` rule type. Possible values are `FiveMins` and `OneMin`.

* `rate_limit_duration` - (Optional) Specifies the duration at which the rate limit policy will be applied. Should be used with `RateLimitRule` rule type. Possible values are `FiveMins` and `OneMin`.

stephybun · 2023-09-18T06:43:01Z

website/docs/r/web_application_firewall_policy.html.markdown

@@ -182,6 +188,8 @@ The `policy_settings` block supports the following:

 * `log_scrubbing` - (Optional) One `log_scrubbing` block as defined below.

+* `request_body_inspect_limit_in_kb` - (Optional) Specifies the max inspection limit in KB for request body inspection for the WAF.


Suggested change

* `request_body_inspect_limit_in_kb` - (Optional) Specifies the max inspection limit in KB for request body inspection for the WAF.

* `request_body_inspect_limit_in_kb` - (Optional) Specifies the maximum request body inspection limit in KB for the Web Application Firewall. Defaults to `128`.

stephybun

Thanks @wuxu92 LGTM 👍

<Actions> <action id="4a39167e811ac038e4a588362092472c27cfbe9e4929ae61d035f708a093a669"> <h3>Bump Terraform `azurerm` provider version</h3> <details id="1d9343c012f5434ac9fe8a98135bae3667b399259be16d9b14302ea3bd424a24"> <summary>Update Terraform lock file</summary> <p>"hashicorp/azurerm" updated from "3.73.0" to "3.74.0" in file ".terraform.lock.hcl"</p> <details> <summary>3.74.0</summary> <pre>Changelog retrieved from:
	https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.74.0
NOTES:

* `azurerm_synapse_sql_pool` - users that have imported `azurerm_synapse_sql_pool` resources that were created outside of Terraform using an `LRS` storage account type will need to use `ignore_changes` to avoid the resource from being destroyed and recreated.

FEATURES:

* **New Resource**: `azurerm_arc_resource_bridge_appliance` ([#23108](hashicorp/terraform-provider-azurerm#23108 **New Resource**: `azurerm_data_factory_dataset_azure_sql_table` ([#23264](hashicorp/terraform-provider-azurerm#23264 **New Resource**: `azurerm_function_app_connection` ([#23127](https://github.com/hashicorp/terraform-provider-azurerm/issues/23127))

ENHANCEMENTS:

* dependencies: updating to `v0.20230918.1115907` of `github.com/hashicorp/go-azure-sdk` ([#23337](hashicorp/terraform-provider-azurerm#23337 dependencies: downgrading to `v1.12.5` of `github.com/rickb777/date` ([#23296](hashicorp/terraform-provider-azurerm#23296 `mysql`: updating to use API Version `2022-01-01` ([#23320](hashicorp/terraform-provider-azurerm#23320 `azurerm_app_configuration` - support for the `replica` block ([#22452](hashicorp/terraform-provider-azurerm#22452 `azurerm_bot_channel_directline` - support for `user_upload_enabled`, `endpoint_parameters_enabled`, and `storage_enabled` ([#23149](hashicorp/terraform-provider-azurerm#23149 `azurerm_container_app` - support for scale rules ([#23294](hashicorp/terraform-provider-azurerm#23294 `azurerm_container_app_environment` - support for zone redundancy ([#23313](hashicorp/terraform-provider-azurerm#23313 `azurerm_container_group` - support for the `key_vault_user_identity_id` property for Customer Managed Keys ([#23332](hashicorp/terraform-provider-azurerm#23332 `azurerm_cosmosdb_account` - support for MongoDB connection strings ([#23331](hashicorp/terraform-provider-azurerm#23331 `azurerm_data_factory_dataset_delimited_text` - support for the `dynamic_file_system_enabled`, `dynamic_path_enabled`, and `dynamic_filename_enabled` properties ([#23261](hashicorp/terraform-provider-azurerm#23261 `azurerm_data_factory_dataset_parquet` - support for the `azure_blob_fs_location` block ([#23261](hashicorp/terraform-provider-azurerm#23261 `azurerm_monitor_diagnostic_setting` - validation to ensure either `category` or `category_group` are supplied in `enabled_log` and `log` blocks ([#23308](hashicorp/terraform-provider-azurerm#23308 `azurerm_network_interface` - support for the `auxiliary_mode` and `auxiliary_sku` properties ([#22979](hashicorp/terraform-provider-azurerm#22979 `azurerm_postgresql_flexible_server` - increased the maximum supported value for `storage_mb` ([#23277](hashicorp/terraform-provider-azurerm#23277 `azurerm_shared_image_version` - support for the `replicated_region_deletion_enabled` and `target_region.exclude_from_latest_enabled` properties ([#23147](hashicorp/terraform-provider-azurerm#23147 `azurerm_storage_account` - support for setting `domain_name` and `domain_guid` for `AADKERB` ([#22833](hashicorp/terraform-provider-azurerm#22833 `azurerm_storage_account_customer_managed_key` - support for cross-tenant customer-managed keys with the `federated_identity_client_id`, and `key_vault_uri` properties ([#20356](hashicorp/terraform-provider-azurerm#20356 `azurerm_web_application_firewall_policy` - support for the `rate_limit_duration`, `rate_limit_threshold`, `group_rate_limit_by`, and `request_body_inspect_limit_in_kb` properties ([#23239](https://github.com/hashicorp/terraform-provider-azurerm/issues/23239))

BUG FIXES:

* Data Source: `azurerm_container_app_environment`: fix `log_analytics_workspace_name` output to correct value ([#23298](hashicorp/terraform-provider-azurerm#23298 `azurerm_api_management_api` - set the `service_url` property when importing the resource ([#23011](hashicorp/terraform-provider-azurerm#23011 `azurerm_app_configuration` - prevent crash by nil checking the encryption configuration ([#23302](hashicorp/terraform-provider-azurerm#23302 `azurerm_app_configuration_feature` - update `percentage_filter_value` to accept correct type of float ([#23263](hashicorp/terraform-provider-azurerm#23263 `azurerm_container_app` - fix an issue with `commands` and `args` being overwritten when using multiple containers ([#23338](hashicorp/terraform-provider-azurerm#23338 `azurerm_key_vault_certificate` - fix issue where certificates couldn't be recovered anymore ([#23204](hashicorp/terraform-provider-azurerm#23204 `azurerm_key_vault_key` - the ForceNew when `expiration_date` is removed from the config file ([#23327](hashicorp/terraform-provider-azurerm#23327 `azurerm_linux_function_app` - fix a bug in setting the storage settings when using Elastic Premium plans ([#21212](hashicorp/terraform-provider-azurerm#21212 `azurerm_linux_web_app` - fix docker app stack update ([#23303](hashicorp/terraform-provider-azurerm#23303 `azurerm_linux_web_app` - fix crash in auto heal expansion ([#21328](hashicorp/terraform-provider-azurerm#21328 `azurerm_linux_web_app_slot` - fix docker app stack update ([#23303](hashicorp/terraform-provider-azurerm#23303 `azurerm_linux_web_app_slot` - fix crash in auto heal expansion ([#21328](hashicorp/terraform-provider-azurerm#21328 `azurerm_log_analytics_solution` - fix bug where the resource wasn't handling successful creation on subsequent applies ([#23312](hashicorp/terraform-provider-azurerm#23312 `azurerm_management_group_subscription_association` - fix bug to correctly mark resource as gone if not found during read ([#23335](hashicorp/terraform-provider-azurerm#23335 `azurerm_mssql_elasticpool` - remove check that prevents `license_type` from being set for certain skus ([#23262](hashicorp/terraform-provider-azurerm#23262 `azurerm_servicebus_queue` - fixing an issue where `auto_delete_on_idle` couldn't be set to `P10675199DT2H48M5.4775807S` ([#23296](hashicorp/terraform-provider-azurerm#23296 `azurerm_servicebus_topic` - fixing an issue where `auto_delete_on_idle` couldn't be set to `P10675199DT2H48M5.4775807S` ([#23296](hashicorp/terraform-provider-azurerm#23296 `azurerm_storage_account` - prevent sending unsupported blob properties in payload for `Storage` account kind ([#23288](hashicorp/terraform-provider-azurerm#23288 `azurerm_synapse_sql_pool` - expose `storage_account_type` ([#23217](hashicorp/terraform-provider-azurerm#23217 `azurerm_windows_function_app` - fix a bug in setting the storage settings when using Elastic Premium plans ([#21212](hashicorp/terraform-provider-azurerm#21212 `azurerm_windows_web_app` - fix docker app stack update ([#23303](hashicorp/terraform-provider-azurerm#23303 `azurerm_windows_web_app_slot` - fix docker app stack update ([#23303](https://github.com/hashicorp/terraform-provider-azurerm/issues/23303))

DEPRECATIONS:

* `azurerm_application_gateway` - deprecate `Standard` and `WAF` skus ([#23310](hashicorp/terraform-provider-azurerm#23310 `azurerm_bot_channel_web_chat` - deprecate `site_names` in favour of `site` block ([#23161](hashicorp/terraform-provider-azurerm#23161 `azurerm_monitor_diagnostic_setting` - deprecate `retention_policy` in favour of `azurerm_storage_management_policy` ([#23260](https://github.com/hashicorp/terraform-provider-azurerm/issues/23260))


</pre> </details> </details> </action> </Actions> --- <table> <tr> <td width="77"> <img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli logo" width="50" height="50"> </td> <td> <p> Created automatically by <a href="https://www.updatecli.io/">Updatecli</a> </p> <details><summary>Options:</summary> <br /> <p>Most of Updatecli configuration is done via <a href="https://www.updatecli.io/docs/prologue/quick-start/">its manifest(s)</a>.</p> <ul> <li>If you close this pull request, Updatecli will automatically reopen it, the next time it runs.</li> <li>If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.</li> </ul> <p> Feel free to report any issues at <a href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br /> If you find this tool useful, do not hesitate to star <a href="https://github.com/updatecli/updatecli/stargazers">our GitHub repository</a> as a sign of appreciation, and/or to tell us directly on our <a href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>! </p> </details> </td> </tr> </table> Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com>

github-actions · 2024-05-11T02:05:59Z

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

github-actions bot added documentation service/network size/M labels Sep 12, 2023

wuxu92 marked this pull request as ready for review September 12, 2023 08:12

rcskosir mentioned this pull request Sep 13, 2023

Support for rate limiting in azurerm_web_application_firewall_policy #23145

Closed

1 task

stephybun requested changes Sep 18, 2023

View reviewed changes

stephybun added the enhancement label Sep 18, 2023

add missing properties in webapplication firewall policy

2b1910b

wuxu92 force-pushed the vanguard/fwpol branch from 302d161 to 2b1910b Compare September 19, 2023 02:59

github-actions bot added size/L and removed size/M labels Sep 19, 2023

stephybun approved these changes Sep 20, 2023

View reviewed changes

stephybun merged commit 40364bf into hashicorp:main Sep 20, 2023
23 checks passed

github-actions bot added this to the v3.74.0 milestone Sep 20, 2023

stephybun added a commit that referenced this pull request Sep 20, 2023

Update for #23239 #23261 #23331 #22452 #23264

b21ae25

wuxu92 deleted the vanguard/fwpol branch October 16, 2023 06:11

github-actions bot locked as resolved and limited conversation to collaborators May 11, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`azurerm_web_application_firewall_policy`: support `rate_limit_` and `request_body_` properties #23239

`azurerm_web_application_firewall_policy`: support `rate_limit_` and `request_body_` properties #23239

wuxu92 commented Sep 12, 2023 •

edited

Loading

UppyAU commented Sep 12, 2023

wuxu92 commented Sep 12, 2023

stephybun left a comment

stephybun Sep 18, 2023

stephybun Sep 18, 2023

stephybun Sep 18, 2023

stephybun Sep 18, 2023

stephybun left a comment

github-actions bot commented May 11, 2024

	* `rate_limit_duration` - (Optional) Specifies the duration the rate limit policy will be applied. Should be used with `RateLimitRule` rule type. Possible values are `FiveMins` and `OneMin`.
	* `rate_limit_duration` - (Optional) Specifies the duration at which the rate limit policy will be applied. Should be used with `RateLimitRule` rule type. Possible values are `FiveMins` and `OneMin`.

		@@ -182,6 +188,8 @@ The `policy_settings` block supports the following:

		* `log_scrubbing` - (Optional) One `log_scrubbing` block as defined below.

		* `request_body_inspect_limit_in_kb` - (Optional) Specifies the max inspection limit in KB for request body inspection for the WAF.

azurerm_web_application_firewall_policy: support rate_limit_* and request_body_* properties #23239

azurerm_web_application_firewall_policy: support rate_limit_* and request_body_* properties #23239

Conversation

wuxu92 commented Sep 12, 2023 • edited Loading

UppyAU commented Sep 12, 2023

wuxu92 commented Sep 12, 2023

stephybun left a comment

Choose a reason for hiding this comment

stephybun Sep 18, 2023

Choose a reason for hiding this comment

stephybun Sep 18, 2023

Choose a reason for hiding this comment

stephybun Sep 18, 2023

Choose a reason for hiding this comment

stephybun Sep 18, 2023

Choose a reason for hiding this comment

stephybun left a comment

Choose a reason for hiding this comment

github-actions bot commented May 11, 2024

`azurerm_web_application_firewall_policy`: support `rate_limit_` and `request_body_` properties #23239

`azurerm_web_application_firewall_policy`: support `rate_limit_` and `request_body_` properties #23239

wuxu92 commented Sep 12, 2023 •

edited

Loading