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.

Sign up for GitHub

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
Merged

azurerm_windows_web_app - fix change detection for tomcat_version #28842

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4437ffe
test container version for changes
wyattfry Feb 21, 2025
6070576
remove comment
wyattfry Feb 21, 2025
49fe911
combine tests
wyattfry Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/services/appservice/helpers/windows_web_app_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ func (s *SiteConfigWindows) ExpandForUpdate(metadata sdk.ResourceMetaData, exist
if winAppStack.PythonVersion != "" || winAppStack.Python {
expanded.PythonVersion = pointer.To(winAppStack.PythonVersion)
}
if metadata.ResourceData.HasChange("site_config.0.application_stack.0.java_version") {
if metadata.ResourceData.HasChanges("site_config.0.application_stack.0.java_version", "site_config.0.application_stack.0.tomcat_version") {
if winAppStack.JavaVersion != "" {
expanded.JavaVersion = pointer.To(winAppStack.JavaVersion)
switch {
Expand Down
44 changes: 44 additions & 0 deletions internal/services/appservice/windows_web_app_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

data := acceptance.BuildTestData(t, "azurerm_windows_web_app", "test")
r := WindowsWebAppResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.java(data, "17.0.2"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("site_credential.0.password"),
{
Config: r.java(data, "21"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("site_credential.0.password"),
})
}

func TestAccWindowsWebApp_withJava17Tomcat10(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_windows_web_app", "test")
r := WindowsWebAppResource{}
Expand Down Expand Up @@ -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

data := acceptance.BuildTestData(t, "azurerm_windows_web_app", "test")
r := WindowsWebAppResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.javaTomcat(data, "11.0.14", "10.0"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("site_credential.0.password"),
{
Config: r.javaTomcat(data, "11.0.14", "10.0.20"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("site_credential.0.password"),
})
}

func TestAccWindowsWebApp_withDockerImageMCR(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_windows_web_app", "test")
r := WindowsWebAppResource{}
Expand Down
Loading