[Dependencies:] `azurerm_cdn_frontdoor_rule`, `azurerm_cdn_frontdoor_ruleset` and `cdn_frontdoor_rule_actions` - upgrade resources to `2024-02-01` API to enable support for the JS Challenge field by WodansSon · Pull Request #28308 · hashicorp/terraform-provider-azurerm

WodansSon · 2024-12-17T07:46:10Z

Community Note

Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

cdn_frontdoor_rule_actions - upgrade resource to 2024-09-01/rules and 2024-02-01/origins API's
azurerm_cdn_frontdoor_rule - upgrade resource to 2024-09-01/rules and 2024-02-01/rulesets API's
azurerm_cdn_frontdoor_ruleset - upgrade resource to 2024-02-01/rulesets API
front_door_validation_helpers - update dependencies to use 2024-09-01/rules API
front_door_route_https_redirect - update dependencies to use 2024-02-01/endpoints API
azurerm_cdn_frontdoor_firewall_policy - update dependencies to use 2024-02-01/webapplicationfirewallpolicies API
azurerm_cdn_frontdoor_firewall_policy - expose JSChallenge as an action type for the managed_rule.override.rule block

PR Checklist

I have followed the guidelines in our Contributing Documentation.
I have checked to ensure there aren't other open Pull Requests for the same update/change.
I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
For example: “resource_name_here - description of change e.g. adding property new_property_name_here”

Changes to existing Resource / Data Source

I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
I have written new tests for my resource or datasource changes & updated any relevant documentation.
I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
(For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

ENHANCEMENTS:

dependencies - cdn_frontdoor_rule_actions - upgrade resource to 2024-09-01/rules and 2024-02-01/origins API's
dependencies - front_door_validation_helpers update to use 2024-09-01/rules API
dependencies - front_door_route_https_redirect update to use 2024-02-01/endpoints API
dependencies - azurerm_cdn_frontdoor_rule update to use 2024-09-01/rules and 2024-02-01/rulesets API's
dependencies - azurerm_cdn_frontdoor_ruleset update to use 2024-02-01/rulesets API
dependencies - azurerm_cdn_frontdoor_firewall_policy update to use 2024-02-01/webapplicationfirewallpolicies API
azurerm_cdn_frontdoor_firewall_policy - expose JSChallenge as an action type for the managed_rule.override.rule block

This is a (please select all that apply):

Related Issue(s)

Second part of the fix for #27325 (see Related PRs)

Related PRs

#28284

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

…package...

…r-azurerm into deps/e_frontdoor_rules

jackofallops

Thanks @WodansSon - Handful of fairly minor stuff to check if you could. Also, I can see you rant the CI tests, and it looks like there are some failures introduced if you can check those over?

Thanks!

internal/services/cdn/cdn_frontdoor_firewall_policy_resource.go

internal/services/cdn/cdn_frontdoor_firewall_policy_resource_test.go

internal/services/cdn/cdn_frontdoor_rule_resource.go

internal/services/cdn/cdn_frontdoor_rule_set_resource.go

internal/services/cdn/cdn_frontdoor_rule_set_resource_test.go

internal/services/cdn/cdn_frontdoor_shared_schema.go

jackofallops · 2025-01-31T11:28:17Z

internal/services/cdn/frontdoorruleconditions/cdn_frontdoor_rule_conditions.go

 	}

-	if operator == string(cdn.OperatorAny) && len(*matchValues) > 0 {
+	// NOTE: There are now 14 different "Any" operators in the new API, however they are all the same so I am just hardcoding this here now...


Can you open an issue detailing this so it's tracked somewhere along with what we're planning to change it to if this is just for now?

I don't believe an issue is required here, these fields were added due to the swagger issue opened by HashiCorp to allow the Pandora SDK to build the API correctly. Every condition now has it's own Any field (e.g., ClientPortOperatorAny, CookiesOperatorAny, HostNameOperatorAny, etc.) So I believe hardcoding this value is acceptable here as this function is a general function that will be called by all conditions. That said I added more context in the code comment to give historical reasons why the decision was made to hardcode this value.

internal/services/cdn/frontdoorruleactions/cdn_frontdoor_rule_actions.go

Co-authored-by: jackofallops <11830746+jackofallops@users.noreply.github.com>

…est.go Co-authored-by: jackofallops <11830746+jackofallops@users.noreply.github.com>

jackofallops

Thanks @WodansSon for the updates, this LGTM now 👍
And the tests are looking good too

Co-authored-by: Wodans Son <20408400+WodansSon@users.noreply.github.com>

* CHANGELOG.md for v4.18.0 * Update CHANGELOG.md for #28308 * Update for #28447 * Update for #28532 * Update for #28537 * Update CHANGELOG.md for #28674 * Update for #28363 * Update for #28536 * Update for #28416 * Update CHANGELOG.md #28700 * Update for #28673 * Update for #28308 Co-authored-by: Wodans Son <20408400+WodansSon@users.noreply.github.com> * Update for #27533 * prep for release --------- Co-authored-by: stephybun <steph@hashicorp.com> Co-authored-by: sreallymatt <106555974+sreallymatt@users.noreply.github.com> Co-authored-by: Wodans Son <20408400+WodansSon@users.noreply.github.com>

…ruleset` and `cdn_frontdoor_rule_actions` - upgrade resources to `2024-02-01` API to enable support for the JS Challenge field (hashicorp#28308) * Check-in progress... * Fixing delivery rule conditions adding a polymorphisim discriminator package... * Progress... * Think I have the new polymorphisim figured out here... * go mod vendor * Fix lint errors... * Fix RuleSet Client... * Add JSChallenge functionality for the override action type... * go mod vendor to remove legacy API dependency... * Fix lint error... from if else to switch case... * Update internal/services/cdn/cdn_frontdoor_firewall_policy_resource.go Co-authored-by: jackofallops <11830746+jackofallops@users.noreply.github.com> * Update internal/services/cdn/cdn_frontdoor_firewall_policy_resource_test.go Co-authored-by: jackofallops <11830746+jackofallops@users.noreply.github.com> * Address PR comments... * Fix test case due to new returned error value... * Set Behavior and Order in Read... * Fix lint error add example of override for jschallenge... * Add legal note for JSChallenge value for action field... --------- Co-authored-by: jackofallops <11830746+jackofallops@users.noreply.github.com>

* CHANGELOG.md for v4.18.0 * Update CHANGELOG.md for hashicorp#28308 * Update for hashicorp#28447 * Update for hashicorp#28532 * Update for hashicorp#28537 * Update CHANGELOG.md for hashicorp#28674 * Update for hashicorp#28363 * Update for hashicorp#28536 * Update for hashicorp#28416 * Update CHANGELOG.md hashicorp#28700 * Update for hashicorp#28673 * Update for hashicorp#28308 Co-authored-by: Wodans Son <20408400+WodansSon@users.noreply.github.com> * Update for hashicorp#27533 * prep for release --------- Co-authored-by: stephybun <steph@hashicorp.com> Co-authored-by: sreallymatt <106555974+sreallymatt@users.noreply.github.com> Co-authored-by: Wodans Son <20408400+WodansSon@users.noreply.github.com>

github-actions · 2025-03-06T02:15:12Z

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.

Check-in progress...

c0f135b

WodansSon requested a review from a team as a code owner December 17, 2024 07:46

github-actions bot added dependencies service/cdn size/XL labels Dec 17, 2024

WodansSon mentioned this pull request Dec 17, 2024

[Enhancement:] cdn_frontdoor_firewall_policy* - add support for js_challenge_cookie_expiration_in_minutes policy #28284

Merged

14 tasks

github-actions bot added the waiting-response label Dec 17, 2024

WodansSon marked this pull request as draft December 17, 2024 07:48

Fixing delivery rule conditions adding a polymorphisim discriminator …

7fe9e5d

…package...

github-actions bot removed the waiting-response label Dec 18, 2024

github-actions bot added the waiting-response label Dec 18, 2024

Progress...

5c36ca9

github-actions bot added waiting-response and removed waiting-response labels Dec 29, 2024

Think I have the new polymorphisim figured out here...

d12bc09

github-actions bot added waiting-response and removed waiting-response labels Jan 30, 2025

Merge branch 'main' of https://github.com/hashicorp/terraform-provide…

b8ed54d

…r-azurerm into deps/e_frontdoor_rules

github-actions bot added waiting-response and removed waiting-response labels Jan 30, 2025

go mod vendor

e28e399

github-actions bot added waiting-response and removed waiting-response labels Jan 30, 2025

Fix lint errors...

4aeb972

github-actions bot removed the waiting-response label Jan 31, 2025

WodansSon added 2 commits January 30, 2025 20:37

Fix RuleSet Client...

ab385a0

Add JSChallenge functionality for the override action type...

5c42bba

github-actions bot added documentation waiting-response labels Jan 31, 2025

github-actions bot added the enhancement label Jan 31, 2025

go mod vendor to remove legacy API dependency...

225d716

github-actions bot added waiting-response and removed waiting-response labels Jan 31, 2025

Fix lint error... from if else to switch case...

ae6d1e8

github-actions bot removed the waiting-response label Jan 31, 2025

WodansSon marked this pull request as ready for review January 31, 2025 09:03

jackofallops requested changes Jan 31, 2025

View reviewed changes

WodansSon and others added 6 commits January 31, 2025 22:34

Merge branch 'main' into deps/e_frontdoor_rules

33e9f4f

Update internal/services/cdn/cdn_frontdoor_firewall_policy_resource.go

35fd986

Co-authored-by: jackofallops <11830746+jackofallops@users.noreply.github.com>

Update internal/services/cdn/cdn_frontdoor_firewall_policy_resource_t…

b978c74

…est.go Co-authored-by: jackofallops <11830746+jackofallops@users.noreply.github.com>

Address PR comments...

b5ac63d

Fix test case due to new returned error value...

5311de0

Set Behavior and Order in Read...

b157772

github-actions bot added the waiting-response label Feb 2, 2025

Fix lint error add example of override for jschallenge...

c3936ae

github-actions bot removed the waiting-response label Feb 3, 2025

WodansSon added this to the v4.18.0 milestone Feb 3, 2025

WodansSon assigned jackofallops Feb 3, 2025

Add legal note for JSChallenge value for action field...

2ed8d90

jackofallops approved these changes Feb 3, 2025

View reviewed changes

jackofallops merged commit c5af06c into main Feb 3, 2025
33 checks passed

jackofallops deleted the deps/e_frontdoor_rules branch February 3, 2025 13:15

jackofallops added a commit that referenced this pull request Feb 3, 2025

Update CHANGELOG.md for #28308

77b5806

stephybun added a commit that referenced this pull request Feb 7, 2025

Update for #28308

85cd007

Co-authored-by: Wodans Son <20408400+WodansSon@users.noreply.github.com>

github-actions bot locked as resolved and limited conversation to collaborators Mar 6, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Dependencies:] `azurerm_cdn_frontdoor_rule`, `azurerm_cdn_frontdoor_ruleset` and `cdn_frontdoor_rule_actions` - upgrade resources to `2024-02-01` API to enable support for the JS Challenge field#28308

[Dependencies:] `azurerm_cdn_frontdoor_rule`, `azurerm_cdn_frontdoor_ruleset` and `cdn_frontdoor_rule_actions` - upgrade resources to `2024-02-01` API to enable support for the JS Challenge field#28308
jackofallops merged 19 commits intomainfrom
deps/e_frontdoor_rules

WodansSon commented Dec 17, 2024 •

edited

Loading

Uh oh!

jackofallops left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jackofallops Jan 31, 2025

Uh oh!

WodansSon Feb 1, 2025 •

edited

Loading

Uh oh!

Uh oh!

jackofallops left a comment

Uh oh!

Uh oh!

github-actions bot commented Mar 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

WodansSon commented Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

ENHANCEMENTS:

Related Issue(s)

Related PRs

Uh oh!

jackofallops left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jackofallops Jan 31, 2025

Choose a reason for hiding this comment

Uh oh!

WodansSon Feb 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jackofallops left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

WodansSon commented Dec 17, 2024 •

edited

Loading

WodansSon Feb 1, 2025 •

edited

Loading