From 3e6ca364f9383845ec8cb52d8a42a8ce8f5ae1c4 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 14 Nov 2018 10:39:43 +0000 Subject: [PATCH 1/2] app service: support for php 7.2 Fixes #2307 --- azurerm/helpers/azure/app_service.go | 1 + azurerm/resource_arm_app_service_slot_test.go | 4 ++-- azurerm/resource_arm_app_service_test.go | 4 ++-- website/docs/r/app_service.html.markdown | 2 +- website/docs/r/app_service_slot.html.markdown | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go index b676c671c440..e6100981925c 100644 --- a/azurerm/helpers/azure/app_service.go +++ b/azurerm/helpers/azure/app_service.go @@ -117,6 +117,7 @@ func SchemaAppServiceSiteConfig() *schema.Schema { "5.6", "7.0", "7.1", + "7.2", }, false), }, diff --git a/azurerm/resource_arm_app_service_slot_test.go b/azurerm/resource_arm_app_service_slot_test.go index d4f02a5a8d88..8e4df15aaa4b 100644 --- a/azurerm/resource_arm_app_service_slot_test.go +++ b/azurerm/resource_arm_app_service_slot_test.go @@ -682,7 +682,7 @@ func TestAccAzureRMAppServiceSlot_windowsPHP7(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceSlotExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "site_config.0.php_version", "7.1"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.php_version", "7.2"), ), }, }, @@ -1755,7 +1755,7 @@ resource "azurerm_app_service_slot" "test" { app_service_name = "${azurerm_app_service.test.name}" site_config { - php_version = "7.1" + php_version = "7.2" } } `, rInt, location, rInt, rInt, rInt) diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go index 2f073241c06c..8d435622ea72 100644 --- a/azurerm/resource_arm_app_service_test.go +++ b/azurerm/resource_arm_app_service_test.go @@ -900,7 +900,7 @@ func TestAccAzureRMAppService_windowsPHP7(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "site_config.0.php_version", "7.1"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.php_version", "7.2"), ), }, { @@ -1968,7 +1968,7 @@ resource "azurerm_app_service" "test" { app_service_plan_id = "${azurerm_app_service_plan.test.id}" site_config { - php_version = "7.1" + php_version = "7.2" } } `, rInt, location, rInt, rInt) diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index ffe7f4fcbe5a..561f1c0f137e 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -170,7 +170,7 @@ The following arguments are supported: * `linux_fx_version` - (Optional) Linux App Framework and version for the AppService, e.g. `DOCKER|(golang:latest)`. * `managed_pipeline_mode` - (Optional) The Managed Pipeline Mode. Possible values are `Integrated` and `Classic`. Defaults to `Integrated`. * `min_tls_version` - (Optional) The minimum supported TLS version for the app service. Possible values are `1.0`, `1.1`, and `1.2`. Defaults to `1.2` for new app services. -* `php_version` - (Optional) The version of PHP to use in this App Service. Possible values are `5.5`, `5.6`, `7.0` and `7.1`. +* `php_version` - (Optional) The version of PHP to use in this App Service. Possible values are `5.5`, `5.6`, `7.0`, `7.1` and `7.2`. * `python_version` - (Optional) The version of Python to use in this App Service. Possible values are `2.7` and `3.4`. * `remote_debugging_enabled` - (Optional) Is Remote Debugging Enabled? Defaults to `false`. * `remote_debugging_version` - (Optional) Which version of Visual Studio should the Remote Debugger be compatible with? Possible values are `VS2012`, `VS2013`, `VS2015` and `VS2017`. diff --git a/website/docs/r/app_service_slot.html.markdown b/website/docs/r/app_service_slot.html.markdown index 4f547faf90bc..57d03f3f1951 100644 --- a/website/docs/r/app_service_slot.html.markdown +++ b/website/docs/r/app_service_slot.html.markdown @@ -197,7 +197,7 @@ The following arguments are supported: * `managed_pipeline_mode` - (Optional) The Managed Pipeline Mode. Possible values are `Integrated` and `Classic`. Defaults to `Integrated`. * `min_tls_version` - (Optional) The minimum supported TLS version for the app service. Possible values are `1.0`, `1.1`, and `1.2`. Defaults to `1.2` for new app services. -* `php_version` - (Optional) The version of PHP to use in this App Service Slot. Possible values are `5.5`, `5.6`, `7.0` and `7.1`. +* `php_version` - (Optional) The version of PHP to use in this App Service. Possible values are `5.5`, `5.6`, `7.0`, `7.1` and `7.2`. * `python_version` - (Optional) The version of Python to use in this App Service Slot. Possible values are `2.7` and `3.4`. * `remote_debugging_enabled` - (Optional) Is Remote Debugging Enabled? Defaults to `false`. * `remote_debugging_version` - (Optional) Which version of Visual Studio should the Remote Debugger be compatible with? Possible values are `VS2012`, `VS2013`, `VS2015` and `VS2017`. From a4d0c59421712fcf3e51e7ece8c5636297951402 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Wed, 14 Nov 2018 15:38:51 +0000 Subject: [PATCH 2/2] adding back in the missing slot --- website/docs/r/app_service_slot.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/app_service_slot.html.markdown b/website/docs/r/app_service_slot.html.markdown index 57d03f3f1951..ee6997d492ce 100644 --- a/website/docs/r/app_service_slot.html.markdown +++ b/website/docs/r/app_service_slot.html.markdown @@ -197,7 +197,7 @@ The following arguments are supported: * `managed_pipeline_mode` - (Optional) The Managed Pipeline Mode. Possible values are `Integrated` and `Classic`. Defaults to `Integrated`. * `min_tls_version` - (Optional) The minimum supported TLS version for the app service. Possible values are `1.0`, `1.1`, and `1.2`. Defaults to `1.2` for new app services. -* `php_version` - (Optional) The version of PHP to use in this App Service. Possible values are `5.5`, `5.6`, `7.0`, `7.1` and `7.2`. +* `php_version` - (Optional) The version of PHP to use in this App Service Slot. Possible values are `5.5`, `5.6`, `7.0`, `7.1` and `7.2`. * `python_version` - (Optional) The version of Python to use in this App Service Slot. Possible values are `2.7` and `3.4`. * `remote_debugging_enabled` - (Optional) Is Remote Debugging Enabled? Defaults to `false`. * `remote_debugging_version` - (Optional) Which version of Visual Studio should the Remote Debugger be compatible with? Possible values are `VS2012`, `VS2013`, `VS2015` and `VS2017`.