Skip to content

azurerm_nginx_deployment - support NGINX App Protect WAF#27454

Merged
WodansSon merged 9 commits intohashicorp:mainfrom
arpith-f5:nginxaas_nap
Apr 25, 2025
Merged

azurerm_nginx_deployment - support NGINX App Protect WAF#27454
WodansSon merged 9 commits intohashicorp:mainfrom
arpith-f5:nginxaas_nap

Conversation

@arpith-f5
Copy link
Contributor

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

NGINXaaS now supports NGINX App Protect WAF. In order to use WAF, customers need to explicitly enable it while creating/update their NGINXaaS deployment. This commit includes changes to support a new block nginx_app_protect in azurerm_nginx_deployment resource to enable/disable WAF while creation or updating an NGINXaaS deployment.

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 relevent 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)

Manually tested create and update of a NGINXaaS deployment with WAF enabled/disabled

Change Log

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

  • azurerm_nginx_deployment - support NGINX App Protect WAF

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

Related Issue(s)

Note

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

NGINXaaS now supports NGINX App Protect WAF. This commit includes changes to enable/disable WAF while creation or updating an NGINXaaS deployment.
@arpith-f5 arpith-f5 changed the title NGINXaaS App Protect azurerm_nginx_deployment - support NGINX App Protect WAF Sep 20, 2024
@puneetsarna
Copy link
Contributor

Looks like some vendor checks are failing?

@puneetsarna
Copy link
Contributor

I like the newly flattened structure (less nested) to invoke this new feature as well 👍

@arpith-f5
Copy link
Contributor Author

Hi @katbyte @stephybun, when you get time would you be able to take a look at this PR. Thanks in advance!

@arpith-f5
Copy link
Contributor Author

@katbyte would appreciate another look at this PR when convenient. Thanks in advance!

@russokj
Copy link

russokj commented Feb 14, 2025

@katbyte - Anything left before this can be approved?

WodansSon
WodansSon previously approved these changes Feb 16, 2025
Copy link
Collaborator

@WodansSon WodansSon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arpith-f5, thanks for pushing those changes, if the tests pass TLGTM! 🚀

@WodansSon
Copy link
Collaborator

Looks like we still have test failures, if you can get that fixed up we can give this another go... 🙂

------- Stdout: -------
=== RUN   TestAccNginxDeploymentDataSource_nginxappprotect
=== PAUSE TestAccNginxDeploymentDataSource_nginxappprotect
=== CONT  TestAccNginxDeploymentDataSource_nginxappprotect
    testcase.go:173: Step 1/1 error: Check failed: Check 1/1 error: data.azurerm_nginx_deployment.test: Attribute 'web_application_firewall.0.activation_state' not found
--- FAIL: TestAccNginxDeploymentDataSource_nginxappprotect (426.85s)
FAIL

@arpith-f5
Copy link
Contributor Author

@WodansSon Thank you for the review. I missed to fix the test after my last change. I have fixed it now and it passed locally. Could you review again

TF_ACC=1 go test -v ./internal/services/nginx -run=TestAccNginxDeploymentDataSource_nginxappprotect -timeout 60m -ldflags="-X=github.com/hashicorp/terraform-provider-azurerm/version.ProviderVersion=acc"
=== RUN   TestAccNginxDeploymentDataSource_nginxappprotect
=== PAUSE TestAccNginxDeploymentDataSource_nginxappprotect
=== CONT  TestAccNginxDeploymentDataSource_nginxappprotect
--- PASS: TestAccNginxDeploymentDataSource_nginxappprotect (401.70s)
PASS
ok  	github.com/hashicorp/terraform-provider-azurerm/internal/services/nginx	405.335s

@arpith-f5 arpith-f5 requested a review from WodansSon February 25, 2025 17:51
@russokj
Copy link

russokj commented Feb 25, 2025

@WodansSon Are there any other changes which are needed before approving this MR?

@arpith-f5
Copy link
Contributor Author

@WodansSon just a gentle reminder for a re-review when you get a chance. Thanks in advance!

@WodansSon
Copy link
Collaborator

WodansSon commented Apr 25, 2025

@arpith-f5, I have kicked off a test run... there were some minor issues I noticed while looking over the PR, but nothing that would prevent it from being merged. If the tests pass I believe this PR is good to go! 🚀

image

@WodansSon WodansSon dismissed katbyte’s stale review April 25, 2025 19:54

Comments have been addressed

Copy link
Collaborator

@WodansSon WodansSon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arpith-f5, thanks for pushing the changes. This LGTM now! 🚀

@WodansSon WodansSon merged commit 3b3128e into hashicorp:main Apr 25, 2025
33 checks passed
@github-actions github-actions bot added this to the v4.28.0 milestone Apr 25, 2025
WodansSon added a commit that referenced this pull request Apr 25, 2025
teowa pushed a commit to teowa/terraform-provider-azurerm that referenced this pull request May 8, 2025
* NGINXaaS App Protect
NGINXaaS now supports NGINX App Protect WAF. This commit includes changes to enable/disable WAF while creation or updating an NGINXaaS deployment.

* fix comments

* update docs

* fix test

* fix comments

* nest status within web_application_firewall

* Fix test
jackofallops added a commit that referenced this pull request May 9, 2025
* changelog for 4.28 release

* Update CHANGELOG.md #29410

* Update CHANGELOG.md #29397

* Update CHANGELOG.md #27454

* Update CHANGELOG.md #28919

* Update CHANGELOG.md #29443

* Update CHANGELOG.md #29443

* Update CHANGELOG.md #29456

* Update CHANGELOG.md for #29424

* Update CHANGELOG.md for #29150

* Update CHANGELOG.md #29435

* Update CHANGELOG.md #29431

* Update CHANGELOG.md #29396

* Update CHANGELOG.md #29197

* Update CHANGELOG.md for #28705

* Update CHANGELOG.md #28954

* Update CHANGELOG.md for #29363

* prep for release

---------

Co-authored-by: catriona-m <86247157+catriona-m@users.noreply.github.com>
Co-authored-by: Wodans Son <20408400+WodansSon@users.noreply.github.com>
Co-authored-by: sreallymatt <106555974+sreallymatt@users.noreply.github.com>
Co-authored-by: Matthew Frahry <mbfrahry@gmail.com>
Co-authored-by: jackofallops <ste@hashicorp.com>
@github-actions
Copy link
Contributor

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 github-actions bot locked as resolved and limited conversation to collaborators May 26, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants