From a779c4d435c4ceece3b17ad53dca6f1325319280 Mon Sep 17 00:00:00 2001 From: Pierre-Rudolf Gerlach Date: Wed, 21 Dec 2022 12:51:16 +0100 Subject: [PATCH] feat: add node_version 18-lts to appservice app stack --- examples/app-service/linux-nodejs/main.tf | 2 +- internal/services/appservice/helpers/web_app_schema.go | 2 ++ .../services/appservice/linux_web_app_slot_resource_test.go | 2 +- .../services/appservice/windows_web_app_slot_resource_test.go | 2 +- website/docs/r/linux_web_app.html.markdown | 2 +- website/docs/r/linux_web_app_slot.html.markdown | 2 +- website/docs/r/windows_web_app.html.markdown | 2 +- website/docs/r/windows_web_app_slot.html.markdown | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/app-service/linux-nodejs/main.tf b/examples/app-service/linux-nodejs/main.tf index 09a334bddde4..edc75e870ab1 100644 --- a/examples/app-service/linux-nodejs/main.tf +++ b/examples/app-service/linux-nodejs/main.tf @@ -23,7 +23,7 @@ resource "azurerm_linux_web_app" "example" { site_config { application_stack { - node_version = "16-lts" + node_version = "18-lts" } } } \ No newline at end of file diff --git a/internal/services/appservice/helpers/web_app_schema.go b/internal/services/appservice/helpers/web_app_schema.go index 35be8676b97c..5bebaa2b94bc 100644 --- a/internal/services/appservice/helpers/web_app_schema.go +++ b/internal/services/appservice/helpers/web_app_schema.go @@ -949,6 +949,7 @@ func windowsApplicationStackSchema() *pluginsdk.Schema { "12-LTS", "14-LTS", "16-LTS", + "18-LTS", }, false), AtLeastOneOf: []string{ "site_config.0.application_stack.0.docker_container_name", @@ -1225,6 +1226,7 @@ func linuxApplicationStackSchema() *pluginsdk.Schema { "12-lts", "14-lts", "16-lts", + "18-lts", }, false), AtLeastOneOf: []string{ "site_config.0.application_stack.0.docker_image", diff --git a/internal/services/appservice/linux_web_app_slot_resource_test.go b/internal/services/appservice/linux_web_app_slot_resource_test.go index 0f307633ee05..541e23bd9f75 100644 --- a/internal/services/appservice/linux_web_app_slot_resource_test.go +++ b/internal/services/appservice/linux_web_app_slot_resource_test.go @@ -782,7 +782,7 @@ func TestAccLinuxWebAppSlot_withNode16LTS(t *testing.T) { data.ResourceTest(t, r, []acceptance.TestStep{ { - Config: r.node(data, "16-lts"), + Config: r.node(data, "18-lts"), Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), diff --git a/internal/services/appservice/windows_web_app_slot_resource_test.go b/internal/services/appservice/windows_web_app_slot_resource_test.go index 138cf453f82d..d87e3c5126c9 100644 --- a/internal/services/appservice/windows_web_app_slot_resource_test.go +++ b/internal/services/appservice/windows_web_app_slot_resource_test.go @@ -654,7 +654,7 @@ func TestAccWindowsWebAppSlot_withNode16LTS(t *testing.T) { data.ResourceTest(t, r, []acceptance.TestStep{ { - Config: r.node(data, "16-LTS"), + Config: r.node(data, "18-LTS"), Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), diff --git a/website/docs/r/linux_web_app.html.markdown b/website/docs/r/linux_web_app.html.markdown index 193ea7475c2d..6b4e3f05553d 100644 --- a/website/docs/r/linux_web_app.html.markdown +++ b/website/docs/r/linux_web_app.html.markdown @@ -151,7 +151,7 @@ An `application_stack` block supports the following: ~> **NOTE:** The valid version combinations for `java_version`, `java_server` and `java_server_version` can be checked from the command line via `az webapp list-runtimes --linux`. -* `node_version` - (Optional) The version of Node to run. Possible values include `12-lts`, `14-lts`, and `16-lts`. This property conflicts with `java_version`. +* `node_version` - (Optional) The version of Node to run. Possible values include `12-lts`, `14-lts`, `16-lts`, and `18-lts`. This property conflicts with `java_version`. ~> **NOTE:** 10.x versions have been/are being deprecated so may cease to work for new resources in the future and may be removed from the provider. diff --git a/website/docs/r/linux_web_app_slot.html.markdown b/website/docs/r/linux_web_app_slot.html.markdown index 76ba316abbd5..11f2066dea6f 100644 --- a/website/docs/r/linux_web_app_slot.html.markdown +++ b/website/docs/r/linux_web_app_slot.html.markdown @@ -152,7 +152,7 @@ An `application_stack` block supports the following: ~> **NOTE:** The valid version combinations for `java_version`, `java_server` and `java_server_version` can be checked from the command line via `az webapp list-runtimes --linux`. -* `node_version` - (Optional) The version of Node to run. Possible values include `12-lts`, `14-lts`, and `16-lts`. This property conflicts with `java_version`. +* `node_version` - (Optional) The version of Node to run. Possible values include `12-lts`, `14-lts`, `16-lts`, and `18-lts`. This property conflicts with `java_version`. ~> **NOTE:** 10.x versions have been/are being deprecated so may cease to work for new resources in the future and may be removed from the provider. diff --git a/website/docs/r/windows_web_app.html.markdown b/website/docs/r/windows_web_app.html.markdown index 9de34ee2b708..0f7adef4c3b9 100644 --- a/website/docs/r/windows_web_app.html.markdown +++ b/website/docs/r/windows_web_app.html.markdown @@ -156,7 +156,7 @@ An `application_stack` block supports the following: ~> **NOTE:** For compatible combinations of `java_version`, `java_container` and `java_container_version` users can use `az webapp list-runtimes` from command line. -* `node_version` - (Optional) The version of node to use when `current_stack` is set to `node`. Possible values include `12-LTS`, `14-LTS`, and `16-LTS`. +* `node_version` - (Optional) The version of node to use when `current_stack` is set to `node`. Possible values include `12-LTS`, `14-LTS`, `16-LTS` and `18-LTS`. ~> **NOTE:** This property conflicts with `java_version`. diff --git a/website/docs/r/windows_web_app_slot.html.markdown b/website/docs/r/windows_web_app_slot.html.markdown index 45c9d0cd3dab..24214369618f 100644 --- a/website/docs/r/windows_web_app_slot.html.markdown +++ b/website/docs/r/windows_web_app_slot.html.markdown @@ -160,7 +160,7 @@ A `application_stack` block supports the following: ~> **NOTE:** For compatible combinations of `java_version`, `java_container` and `java_container_version` users can use `az webapp list-runtimes` from command line. -* `node_version` - (Optional) The version of node to use when `current_stack` is set to `node`. Possible values include `12-LTS`, `14-LTS`, and `16-LTS`. +* `node_version` - (Optional) The version of node to use when `current_stack` is set to `node`. Possible values include `12-LTS`, `14-LTS`, `16-LTS` and `18-LTS`. ~> **NOTE:** This property conflicts with `java_version`.