`azurerm_windows_web_app`, `azurerm_windows_web_app_slot`, `azurerm_linux_web_app`, `azurerm_linux _web_app_slot` - fix auto heal slow request with path issue #20049

xiaxyi · 2023-01-17T06:52:42Z

In current provider, we only allow user to set the slow request rule with one path, but slow request rule with multiple paths is also supported by api, checking the property - slowRequestsWithPath:

The previous PR #18227 was closed but the issue was not fixed.

fix #19256
fix #22492

Local Acc test:

--- PASS: TestAccLinuxWebAppSlot_withAutoHealSlowRequestWithPath (428.62s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice    429.724s
--- PASS: TestAccWindowsWebAppSlot_withAutoHealSlowRequestWithPath (420.55s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice    421.585s
--- PASS: TestAccLinuxWebApp_withAutoHealRulesSlowRequestWithPath (399.84s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice    400.520s
--- PASS: TestAccWindowsWebApp_withAutoHealRulesSlowRequestWithPath (403.73s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice    404.528s

pietersap · 2023-01-18T09:57:39Z

I can confirm that the linked issue 17862 is not fixed yet, even though the previous PR was closed because it was supposedly superseded by another one.

Tried today in Azure provider 3.39.1, the autoheal settings (sub_status and win32_status) are not set, and behaviour is still the same as described in the original issue.

jackofallops

Hi @xiaxyi - Thanks for this and apologies again for the delayed review.

I think we have a design issue here. The two properties are present in the swagger, and as far as I can tell, both should be maintained / supported? Which means we should be able to simply add this as a new property? possibly as ConflictsWith on slow_requests if appropriate to only have one? WDYT?

xiaxyi · 2023-04-07T08:48:57Z

Thanks @jackofallops for the suggestion, I didn't remove the slow_request property and I did added the slow_request_with_path as a new property. Not sure what do you mean by "add it as a new property"?

pietersap · 2023-04-20T21:46:09Z

Looking forward to this merge

jackofallops

Hi @xiaxyi - Thanks for this. I've left some comments below if you can take a look?

Thanks!

internal/services/appservice/helpers/auto_heal.go

internal/services/appservice/windows_web_app_slot_resource_test.go

internal/services/appservice/windows_web_app_resource_test.go

jackofallops · 2023-04-28T08:11:40Z

internal/services/appservice/linux_web_app_slot_resource_test.go

+          count      = "10"
+          interval   = "00:10:00"
+          time_taken = "00:00:10"
+          path       = null


This is an Optional field, so should be omitted. It will also cause the test to fail when the 4.0 flag is set to true.

internal/services/appservice/linux_web_app_resource_test.go

website/docs/r/windows_web_app.html.markdown

…_withpath

xiaxyi · 2023-05-15T06:30:05Z

Thanks @jackofallops for the review, I updated the code, added the validation and deprecation message.

Regarding the documentation, shall we still remove the path field even though I added the deprecation message right below the property?

jackofallops · 2023-09-06T06:35:40Z

Hi @xiaxyi - Apologies for the delay in re-review. I have found there's a crash behind the feature flag here, which I don't believe can be addressed in this PR as the schema and the underlying go structs will no longer be compatible when the feature flag is set to true, so I'm going to mark this as blocked for now whilst the team investigates how to mitigate this.

xiaxyi · 2024-01-15T08:38:02Z

@jackofallops I don't see any crash when running the tests, what about from your side? I see Tom removed the Block tag, would you like to share some updates with me? Thanks!

katbyte · 2024-02-06T16:55:05Z

Now that the API has been updated and resources migrated can you please resolve the conflicts here?

jackofallops

Hi @xiaxyi - Thanks for this PR, and sorry it fell between the cracks for so long. There's some changes to take a look at below, but if you can get those sorted, I think this will be good to go.

Thanks!

jackofallops · 2024-03-22T06:46:32Z

internal/services/appservice/helpers/auto_heal.go

+type AutoHealSlowRequestWithPath struct {
+	TimeTaken string `tfschema:"time_taken"`
+	Interval  string `tfschema:"interval"`
+	Count     int    `tfschema:"count"`


Suggested change

Count int `tfschema:"count"`

Count int64 `tfschema:"count"`

jackofallops · 2024-03-22T06:49:14Z

internal/services/appservice/helpers/auto_heal.go

@@ -47,6 +49,13 @@ type AutoHealSlowRequest struct {
 	Path      string `tfschema:"path"`


To be able to remove this from the schema below, the struct needs to be tagged as below or we'll get a error in decoding.

Suggested change

Path string `tfschema:"path"`

Path string `tfschema:"path,removedInNextMajorVersion"`

jackofallops · 2024-03-22T08:43:31Z

internal/services/appservice/helpers/auto_heal.go

+			trigger := webapps.SlowRequestsBasedTrigger{
+				TimeTaken:    pointer.To(sr.TimeTaken),
+				TimeInterval: pointer.To(sr.Interval),
+				Count:        pointer.To(int64(sr.Count)),


Suggested change

Count: pointer.To(int64(sr.Count)),

Count: pointer.To(sr.Count),

jackofallops · 2024-03-22T08:44:23Z

internal/services/appservice/helpers/auto_heal.go

+				sr := AutoHealSlowRequestWithPath{
+					TimeTaken: pointer.From(v.TimeTaken),
+					Interval:  pointer.From(v.TimeInterval),
+					Count:     int(pointer.From(v.Count)),


Suggested change

Count: int(pointer.From(v.Count)),

Count: pointer.From(v.Count),

jackofallops · 2024-03-22T08:46:10Z

internal/services/appservice/helpers/linux_web_app_schema.go

+			trigger := webapps.SlowRequestsBasedTrigger{
+				TimeTaken:    pointer.To(sr.TimeTaken),
+				TimeInterval: pointer.To(sr.Interval),
+				Count:        pointer.To(int64(sr.Count)),


Suggested change

Count: pointer.To(int64(sr.Count)),

Count: pointer.To(sr.Count),

jackofallops · 2024-03-22T09:00:13Z

website/docs/r/linux_web_app_slot.html.markdown

@@ -790,7 +804,9 @@ A `trigger` block supports the following:

 * `requests` - (Optional) A `requests` block as defined above.

-* `slow_request` - (Optional) One or more `slow_request` blocks as defined above.
+* `slow_request` - (Optional) A `slow_request` blocks as defined above.


Suggested change

* `slow_request` - (Optional) A `slow_request` blocks as defined above.

* `slow_request` - (Optional) A `slow_request` block as defined above.

jackofallops · 2024-03-22T09:00:49Z

website/docs/r/windows_web_app.html.markdown

@@ -773,6 +773,20 @@ A `slow_request` block supports the following:

 * `path` - (Optional) The path for which this slow request rule applies.

+~> **NOTE:** `path` in `slow_request` block will be deprecated in 4.0 provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.


Suggested change

~> **NOTE:** `path` in `slow_request` block will be deprecated in 4.0 provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.

~> **NOTE:** The `path` property in the `slow_request` block is deprecated and will be removed in 4.0 of provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.

jackofallops · 2024-03-22T09:01:00Z

website/docs/r/windows_web_app.html.markdown

@@ -821,7 +835,9 @@ A `trigger` block supports the following:

 * `requests` - (Optional) A `requests` block as defined above.

-* `slow_request` - (Optional) One or more `slow_request` blocks as defined above.
+* `slow_request` - (Optional) A `slow_request` blocks as defined above.


Suggested change

* `slow_request` - (Optional) A `slow_request` blocks as defined above.

* `slow_request` - (Optional) A `slow_request` block as defined above.

jackofallops · 2024-03-22T09:01:13Z

website/docs/r/windows_web_app_slot.html.markdown

@@ -770,6 +770,20 @@ A `slow_request` block supports the following:

 * `path` - (Optional) The path for which this slow request rule applies.

+~> **NOTE:** `path` in `slow_request` block will be deprecated in 4.0 provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.


Suggested change

~> **NOTE:** `path` in `slow_request` block will be deprecated in 4.0 provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.

~> **NOTE:** The `path` property in the `slow_request` block is deprecated and will be removed in 4.0 of provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.

jackofallops · 2024-03-22T09:01:28Z

website/docs/r/windows_web_app_slot.html.markdown

@@ -810,7 +824,9 @@ A `trigger` block supports the following:

 * `requests` - (Optional) A `requests` block as defined above.

-* `slow_request` - (Optional) One or more `slow_request` blocks as defined above.
+* `slow_request` - (Optional) A `slow_request` blocks as defined above.


Suggested change

* `slow_request` - (Optional) A `slow_request` blocks as defined above.

* `slow_request` - (Optional) A `slow_request` block as defined above.

…_withpath

xiaxyi · 2024-03-29T07:25:43Z

@jackofallops Thanks for the review, I updated the code as comments. Let me know if you have any other feedbacks.

jackofallops

Thanks @xiaxyi - Apologies for the very long tail on this one. LGTM now 👍

jackofallops · 2024-05-07T06:15:52Z

Tests looking fine, failures are transient errors:

github-actions · 2024-06-08T02:06:37Z

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.

fix auto heal issue for web apps

d8fbfe9

github-actions bot added documentation service/app-service size/XL labels Jan 17, 2023

fix format

94427b8

katbyte assigned jackofallops Jan 19, 2023

jackofallops requested changes Apr 3, 2023

View reviewed changes

github-actions bot added the waiting-response label Apr 3, 2023

github-actions bot removed the waiting-response label Apr 7, 2023

jackofallops requested changes Apr 28, 2023

View reviewed changes

github-actions bot added the waiting-response label Apr 28, 2023

Merge remote-tracking branch 'upstream/main' into appservice/autoheal…

1038cee

…_withpath

github-actions bot removed the waiting-response label May 15, 2023

add validation and deprecate message

141a8fe

update upstream

3a75b1d

github-actions bot added the waiting-response label Jul 13, 2023

update

6be0d88

github-actions bot added waiting-response and removed waiting-response labels Jul 13, 2023

update

0cd95a1

github-actions bot removed the waiting-response label Jul 13, 2023

xiaxyi mentioned this pull request Jul 13, 2023

auto_heal_setting => slow_request only allows 1 block #22492

Closed

1 task

jackofallops added this to the Blocked milestone Sep 6, 2023

tombuildsstuff removed this from the Blocked milestone Dec 7, 2023

katbyte added the waiting-response label Feb 6, 2024

xiaxyi added 2 commits February 7, 2024 11:14

merging upstream

a7d83a3

resolving conflict

8cb97b5

github-actions bot added waiting-response and removed waiting-response labels Feb 7, 2024

update

71b3427

github-actions bot added waiting-response and removed waiting-response labels Feb 7, 2024

update

1bf08dd

github-actions bot removed the waiting-response label Feb 7, 2024

jackofallops requested changes Mar 22, 2024

View reviewed changes

github-actions bot added the waiting-response label Mar 22, 2024

xiaxyi added 2 commits March 29, 2024 11:24

Merge remote-tracking branch 'upstream/main' into appservice/autoheal…

b8a4bbf

…_withpath

update code as review comments

0dc08fe

github-actions bot removed the waiting-response label Mar 29, 2024

jackofallops approved these changes May 7, 2024

View reviewed changes

jackofallops merged commit c3e020f into hashicorp:main May 7, 2024
33 checks passed

github-actions bot added this to the v3.103.0 milestone May 7, 2024

jackofallops added a commit that referenced this pull request May 7, 2024

Update CHANGELOG.md for #20049

68b15eb

github-actions bot locked as resolved and limited conversation to collaborators Jun 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`azurerm_windows_web_app`, `azurerm_windows_web_app_slot`, `azurerm_linux_web_app`, `azurerm_linux _web_app_slot` - fix auto heal slow request with path issue #20049

`azurerm_windows_web_app`, `azurerm_windows_web_app_slot`, `azurerm_linux_web_app`, `azurerm_linux _web_app_slot` - fix auto heal slow request with path issue #20049

xiaxyi commented Jan 17, 2023 •

edited

Loading

pietersap commented Jan 18, 2023

jackofallops left a comment

xiaxyi commented Apr 7, 2023

pietersap commented Apr 20, 2023

jackofallops left a comment

jackofallops Apr 28, 2023

xiaxyi May 15, 2023

xiaxyi commented May 15, 2023

jackofallops commented Sep 6, 2023

xiaxyi commented Jan 15, 2024

katbyte commented Feb 6, 2024

jackofallops left a comment

jackofallops Mar 22, 2024

jackofallops Mar 22, 2024

jackofallops Mar 22, 2024

jackofallops Mar 22, 2024

jackofallops Mar 22, 2024

jackofallops Mar 22, 2024

jackofallops Mar 22, 2024

jackofallops Mar 22, 2024

jackofallops Mar 22, 2024

jackofallops Mar 22, 2024

xiaxyi commented Mar 29, 2024

jackofallops left a comment

jackofallops commented May 7, 2024

github-actions bot commented Jun 8, 2024

		@@ -47,6 +49,13 @@ type AutoHealSlowRequest struct {
		Path string `tfschema:"path"`

	Path string `tfschema:"path"`
	Path string `tfschema:"path,removedInNextMajorVersion"`

	Count: pointer.To(int64(sr.Count)),
	Count: pointer.To(sr.Count),

	Count: int(pointer.From(v.Count)),
	Count: pointer.From(v.Count),

	* `slow_request` - (Optional) A `slow_request` blocks as defined above.
	* `slow_request` - (Optional) A `slow_request` block as defined above.

		@@ -773,6 +773,20 @@ A `slow_request` block supports the following:

		* `path` - (Optional) The path for which this slow request rule applies.

		~> NOTE: `path` in `slow_request` block will be deprecated in 4.0 provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.

	~> NOTE: `path` in `slow_request` block will be deprecated in 4.0 provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.
	~> NOTE: The `path` property in the `slow_request` block is deprecated and will be removed in 4.0 of provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.

		@@ -770,6 +770,20 @@ A `slow_request` block supports the following:

		* `path` - (Optional) The path for which this slow request rule applies.

		~> NOTE: `path` in `slow_request` block will be deprecated in 4.0 provider. Please use `slow_request_with_path` to set a slow request trigger with path specified.

azurerm_windows_web_app, azurerm_windows_web_app_slot, azurerm_linux_web_app, azurerm_linux _web_app_slot - fix auto heal slow request with path issue #20049

azurerm_windows_web_app, azurerm_windows_web_app_slot, azurerm_linux_web_app, azurerm_linux _web_app_slot - fix auto heal slow request with path issue #20049

Conversation

xiaxyi commented Jan 17, 2023 • edited Loading

pietersap commented Jan 18, 2023

jackofallops left a comment

Choose a reason for hiding this comment

xiaxyi commented Apr 7, 2023

pietersap commented Apr 20, 2023

jackofallops left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xiaxyi commented May 15, 2023

jackofallops commented Sep 6, 2023

xiaxyi commented Jan 15, 2024

katbyte commented Feb 6, 2024

jackofallops left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xiaxyi commented Mar 29, 2024

jackofallops left a comment

Choose a reason for hiding this comment

jackofallops commented May 7, 2024

github-actions bot commented Jun 8, 2024

`azurerm_windows_web_app`, `azurerm_windows_web_app_slot`, `azurerm_linux_web_app`, `azurerm_linux _web_app_slot` - fix auto heal slow request with path issue #20049

`azurerm_windows_web_app`, `azurerm_windows_web_app_slot`, `azurerm_linux_web_app`, `azurerm_linux _web_app_slot` - fix auto heal slow request with path issue #20049

xiaxyi commented Jan 17, 2023 •

edited

Loading