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_function_app/azurerm_linux_function_app - Add support for PowerShell 7.2 #16718

Merged
merged 3 commits into from
May 18, 2022
Merged

azurerm_windows_function_app/azurerm_linux_function_app - Add support for PowerShell 7.2 #16718

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
9bc1df0
Add support for PowerShell 7.2
Francisco-Gamino May 10, 2022
329ae7a
Update docs to include PowerShell 7.2
Francisco-Gamino May 17, 2022
875b7a5
Update function_app_schema.go
mbfrahry May 17, 2022
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
10 changes: 6 additions & 4 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 @@ -976,7 +976,7 @@ type ApplicationStackLinuxFunctionApp struct {
DotNetIsolated bool `tfschema:"use_dotnet_isolated_runtime"` // Supported values `true` for `dotnet-isolated`, `false` otherwise
NodeVersion string `tfschema:"node_version"` // Supported values `12LTS`, `14LTS`
PythonVersion string `tfschema:"python_version"` // Supported values `3.9`, `3.8`, `3.7`
PowerShellCoreVersion string `tfschema:"powershell_core_version"` // Supported values are `7.0`
PowerShellCoreVersion string `tfschema:"powershell_core_version"` // Supported values are `7.0`, `7.2`
JavaVersion string `tfschema:"java_version"` // Supported values `8`, `11`
CustomHandler bool `tfschema:"use_custom_runtime"` // Supported values `true`
Docker []ApplicationStackDocker `tfschema:"docker"` // Needs ElasticPremium or Basic (B1) Standard (S 1-3) or Premium(PxV2 or PxV3) LINUX Service Plan
Expand All @@ -987,7 +987,7 @@ type ApplicationStackWindowsFunctionApp struct {
DotNetIsolated bool `tfschema:"use_dotnet_isolated_runtime"` // Supported values `true` for `dotnet-isolated`, `false` otherwise
NodeVersion string `tfschema:"node_version"` // Supported values `12LTS`, `14LTS`
JavaVersion string `tfschema:"java_version"` // Supported values `8`, `11`
PowerShellCoreVersion string `tfschema:"powershell_core_version"` // Supported values are `7.0`
PowerShellCoreVersion string `tfschema:"powershell_core_version"` // Supported values are `7.0`, `7.2`
CustomHandler bool `tfschema:"use_custom_runtime"` // Supported values `true`
}

Expand Down Expand Up @@ -1085,6 +1085,7 @@ func linuxFunctionAppStackSchema() *pluginsdk.Schema {
Optional: true,
ValidateFunc: validation.StringInSlice([]string{
"7",
"7.2", // preview LTS Support
}, false),
ExactlyOneOf: []string{
"site_config.0.application_stack.0.dotnet_version",
Expand All @@ -1095,7 +1096,7 @@ func linuxFunctionAppStackSchema() *pluginsdk.Schema {
"site_config.0.application_stack.0.docker",
"site_config.0.application_stack.0.use_custom_runtime",
},
Description: "The version of PowerShell Core to use. Possibles values are `7`.",
Description: "The version of PowerShell Core to use. Possibles values are `7`, and `7.2`",
},

"java_version": {
Expand Down Expand Up @@ -1344,6 +1345,7 @@ func windowsFunctionAppStackSchema() *pluginsdk.Schema {
Optional: true,
ValidateFunc: validation.StringInSlice([]string{
"7",
"7.2", // preview LTS Support
}, false),
ExactlyOneOf: []string{
"site_config.0.application_stack.0.dotnet_version",
Expand All @@ -1352,7 +1354,7 @@ func windowsFunctionAppStackSchema() *pluginsdk.Schema {
"site_config.0.application_stack.0.powershell_core_version",
"site_config.0.application_stack.0.use_custom_runtime",
},
Description: "The PowerShell Core version to use. Possible values are `7`.",
Description: "The PowerShell Core version to use. Possible values are `7`, and `7.2`",
},

"use_custom_runtime": {
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 @@ -142,7 +142,7 @@ A `application_stack` block supports the following:

* `python_version` - (Optional) The version of Python to run. Possible values include `3.6`, `3.7`, `3.8`, and `3.9`.

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

* `use_custom_runtime` - (Optional) Should the Linux Function App use a custom runtime?

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

* `node_version` - (Optional) The version of Node to use. Possible values include `12`, and `14`

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

* `python_version` - (Optional) The version of Python to use. Possible values include `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 @@ -138,7 +138,7 @@ A `application_stack` block supports the following:

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

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

* `use_custom_runtime` - (Optional) Should the Windows Function App use a custom runtime?

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

* `node_version` - (Optional) The version of Node to use. Possible values include `12`, and `14`

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

* `use_custom_runtime` - (Optional) Does the Function App use a custom Application Stack?

Expand Down