Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_windows_web_app - fix change detection for tomcat_version #28842

Merged
merged 3 commits into from
Feb 26, 2025

Conversation

wyattfry
Copy link
Collaborator

@wyattfry wyattfry commented Feb 21, 2025

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

This fixes the bug that prevented the azurerm_windows_web_app property site_config.application_stack.tomcat_version from updating.

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. N/A
  • 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)

Test Running...

Change Log

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

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)

Fixes #28471

Note

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

@wyattfry wyattfry marked this pull request as ready for review February 24, 2025 16:11
@wyattfry wyattfry requested a review from a team as a code owner February 24, 2025 16:11
@@ -1005,6 +1005,28 @@ func TestAccWindowsWebApp_withJava1702Embedded(t *testing.T) {
})
}

func TestAccWindowsWebApp_withJava1702EmbeddedUpdate(t *testing.T) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I wonder if TestAccWindowsWebApp_withJava1702EmbeddedUpdate should be merged into the existing TestAccWindowsWebApp_withJava1702Embedded test, that way we don't have to provision extra resources. Though the other tests within this file are also very granular, so maybe this is okay?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Combined

@@ -1035,6 +1057,28 @@ func TestAccWindowsWebApp_withJava110414Tomcat10020(t *testing.T) {
})
}

func TestAccWindowsWebApp_withJava110414TomcatUpdate(t *testing.T) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same comment as the one on TestAccWindowsWebApp_withJava1702EmbeddedUpdate

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Combined

@wyattfry
Copy link
Collaborator Author

@sreallymatt thanks for the idea, if nothing else it means fewer lines added and faster tests which is great.

@wyattfry wyattfry requested a review from sreallymatt February 24, 2025 18:28
Copy link
Collaborator

@sreallymatt sreallymatt left a comment

Choose a reason for hiding this comment

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

Thanks @wyattfry, LGTM! 🔥

@wyattfry wyattfry merged commit 0b3e6a9 into main Feb 26, 2025
33 checks passed
@wyattfry wyattfry deleted the wyatt/windowswebapptomcatversion branch February 26, 2025 17:11
@github-actions github-actions bot added this to the v4.21.0 milestone Feb 26, 2025
@wyattfry wyattfry mentioned this pull request Feb 26, 2025
wyattfry added a commit that referenced this pull request Feb 26, 2025
jackofallops added a commit that referenced this pull request Feb 27, 2025
* Update CHANGELOG.md for #28840

* Update CHANGELOG.md #28808

* Update CHANGELOG.md #27962

* Update CHANGELOG.md for #28859

* Update for #28825

* Update CHANGELOG.md for #28864

* Update CHANGELOG.md #28539

* Update CHANGELOG.md #28685

* Update CHANGELOG.md for #28818

* Update for #28857 #28799 #28856

* Update for #28122

* Update for #28248 #27805

* Update for #28853

* Update for #28316 #28494 #28696

* Update for #28754

* Update CHANGELOG.md #28771

* Update CHANGELOG.md #28842

* Update for #28879

* Update for #28199

* Update CHANGELOG.md #28862

* prep for release v4.21.0

---------

Co-authored-by: sreallymatt <[email protected]>
Co-authored-by: Wodans Son <[email protected]>
Co-authored-by: stephybun <[email protected]>
Co-authored-by: catriona-m <[email protected]>
Co-authored-by: Matthew Frahry <[email protected]>
Co-authored-by: Wyatt Fry <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

azurerm_windows_web_app - Tomcat version returned is different 10.0 -> 10.0.2
2 participants