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_*function_app, azurerm_linux_web_app - add node 22 and java 17 support for JBOSSEAP #28472

Merged
merged 3 commits into from
Jan 15, 2025
Merged

azurerm_*function_app, azurerm_linux_web_app - add node 22 and java 17 support for JBOSSEAP #28472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
918d96c
add node 22 and java 17 support for JBOSSEAP
xiaxyi Jan 10, 2025
be3a270
update docs
xiaxyi Jan 10, 2025
c1653fa
fix typo
xiaxyi Jan 13, 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
1 change: 1 addition & 0 deletions internal/services/appservice/helpers/function_app_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,7 @@ func linuxFunctionAppStackSchema() *pluginsdk.Schema {
"16",
"18",
"20",
"22",
}, false),
ExactlyOneOf: []string{
"site_config.0.application_stack.0.dotnet_version",
Expand Down
2 changes: 1 addition & 1 deletion internal/services/appservice/helpers/fx_strings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ func JavaLinuxFxStringBuilder(javaMajorVersion, javaServer, javaServerVersion st
case LinuxJavaServerTomcat:
return pointer.To(fmt.Sprintf("%s|%s-java17", LinuxJavaServerTomcat, javaServerVersion)), nil // e,g, TOMCAT|10.0-java17 / TOMCAT|10.0.20-java17
case LinuxJavaServerJboss:
return nil, fmt.Errorf("java 17 is not supported on %s", LinuxJavaServerJboss)
return pointer.To(fmt.Sprintf("%s|%s-java17", LinuxJavaServerJboss, javaServerVersion)), nil // e.g. TOMCAT|10.0-java17 and TOMCAT|10.0.20-java17// e.g. JBOSSEAP|7-java17 / JBOSSEAP|7.4.2-java17
default:
return pointer.To(fmt.Sprintf("%s|%s-java17", javaServer, javaServerVersion)), nil
}
Expand Down
9 changes: 9 additions & 0 deletions internal/services/appservice/linux_function_app_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,15 @@ func TestAccLinuxFunctionApp_appStackNodeUpdate(t *testing.T) {
),
},
data.ImportStep(),
{
Config: r.appStackNode(data, SkuBasicPlan, "22"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("kind").HasValue("functionapp,linux"),
check.That(data.ResourceName).Key("site_config.0.linux_fx_version").HasValue("NODE|22"),
),
},
data.ImportStep(),
{
Config: r.appStackNode(data, SkuBasicPlan, "14"),
Check: acceptance.ComposeTestCheckFunc(
Expand Down
8 changes: 8 additions & 0 deletions internal/services/appservice/windows_function_app_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,14 @@ func TestAccWindowsFunctionApp_appStackNodeUpdate(t *testing.T) {
),
},
data.ImportStep("site_credential.0.password"),
{
Config: r.appStackNode(data, SkuBasicPlan, "~22"),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("kind").HasValue("functionapp"),
),
},
data.ImportStep("site_credential.0.password"),
})
}

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/linux_function_app.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ A `application_stack` block supports the following:

~> **NOTE:** The value `21` is currently in Preview for `java_version`.

* `node_version` - (Optional) The version of Node to run. Possible values include `12`, `14`, `16`, `18` and `20`.
* `node_version` - (Optional) The version of Node to run. Possible values include `12`, `14`, `16`, `18` `20` and `22`.

* `python_version` - (Optional) The version of Python to run. Possible values are `3.12`, `3.11`, `3.10`, `3.9`, `3.8` and `3.7`.

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/windows_function_app.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ A `application_stack` block supports the following:

* `java_version` - (Optional) The Version of Java to use. Supported versions include `1.8`, `11`, `17`, `21` (In-Preview).

* `node_version` - (Optional) The version of Node to run. Possible values include `~12`, `~14`, `~16`, `~18` and `~20`.
* `node_version` - (Optional) The version of Node to run. Possible values include `~12`, `~14`, `~16`, `~18` `~20` and `~22`.

* `powershell_core_version` - (Optional) The version of PowerShell Core to run. Possible values are `7`, `7.2`, and `7.4`.

Expand Down
Loading