diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go index e774fff5dfb8..5751ad9acb6b 100644 --- a/azurerm/helpers/azure/app_service.go +++ b/azurerm/helpers/azure/app_service.go @@ -159,8 +159,23 @@ func SchemaAppServiceSiteConfig() *schema.Schema { Optional: true, Default: string(web.ScmTypeNone), ValidateFunc: validation.StringInSlice([]string{ - string(web.ScmTypeNone), + string(web.ScmTypeBitbucketGit), + string(web.ScmTypeBitbucketHg), + string(web.ScmTypeCodePlexGit), + string(web.ScmTypeCodePlexHg), + string(web.ScmTypeDropbox), + string(web.ScmTypeExternalGit), + string(web.ScmTypeExternalHg), + string(web.ScmTypeGitHub), string(web.ScmTypeLocalGit), + string(web.ScmTypeNone), + string(web.ScmTypeOneDrive), + string(web.ScmTypeTfs), + string(web.ScmTypeVSO), + // Not in the specs, but is set by Azure Pipelines + // https://github.com/Microsoft/azure-pipelines-tasks/blob/master/Tasks/AzureRmWebAppDeploymentV4/operations/AzureAppServiceUtility.ts#L19 + // upstream issue: https://github.com/Azure/azure-rest-api-specs/issues/5345 + "VSTSRM", }, false), }, diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index dc672ce51f5e..da949006fd47 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -149,9 +149,7 @@ Additional examples of how to run Containers via the `azurerm_app_service` resou * `remote_debugging_version` - (Optional) Which version of Visual Studio should the Remote Debugger be compatible with? Possible values are `VS2012`, `VS2013`, `VS2015` and `VS2017`. -* `scm_type` - (Optional) The type of Source Control enabled for this App Service. Possible values include `None` and `LocalGit`. Defaults to `None`. - -~> **NOTE:** Additional Source Control types will be added in the future, once support for them has been added in the Azure SDK for Go. +* `scm_type` - (Optional) The type of Source Control enabled for this App Service. Defaults to `None`. Possible values are: `BitbucketGit`, `BitbucketHg`, `CodePlexGit`, `CodePlexHg`, `Dropbox`, `ExternalGit`, `ExternalHg`, `GitHub`, `LocalGit`, `None`, `OneDrive`, `Tfs`, `VSO` and `VSTSRM` * `use_32_bit_worker_process` - (Optional) Should the App Service run in 32 bit mode, rather than 64 bit mode? diff --git a/website/docs/r/app_service_slot.html.markdown b/website/docs/r/app_service_slot.html.markdown index 232e7a9b1007..bb629cc8e74c 100644 --- a/website/docs/r/app_service_slot.html.markdown +++ b/website/docs/r/app_service_slot.html.markdown @@ -182,26 +182,42 @@ The following arguments are supported: `site_config` supports the following: -* `always_on` - (Optional) Should the app be loaded at all times? Defaults to `false`. * `app_command_line` - (Optional) App command line to launch, e.g. `/sbin/myserver -b 0.0.0.0`. + +* `always_on` - (Optional) Should the app be loaded at all times? Defaults to `false`. + * `default_documents` - (Optional) The ordering of default documents to load, if an address isn't specified. + * `dotnet_framework_version` - (Optional) The version of the .net framework's CLR used in this App Service Slot. Possible values are `v2.0` (which will use the latest version of the .net framework for the .net CLR v2 - currently `.net 3.5`) and `v4.0` (which corresponds to the latest version of the .net CLR v4 - which at the time of writing is `.net 4.7.1`). [For more information on which .net CLR version to use based on the .net framework you're targeting - please see this table](https://en.wikipedia.org/wiki/.NET_Framework_version_history#Overview). Defaults to `v4.0`. + * `http2_enabled` - (Optional) Is HTTP2 Enabled on this App Service? Defaults to `false`. + * `ip_restriction` - (Optional) One or more `ip_restriction` blocks as defined below. -* `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7` and `1.8`. + * `java_container` - (Optional) The Java Container to use. If specified `java_version` and `java_container_version` must also be specified. Possible values are `JETTY` and `TOMCAT`. + * `java_container_version` - (Optional) The version of the Java Container to use. If specified `java_version` and `java_container` must also be specified. +* `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7` and `1.8`. + * `local_mysql_enabled` - (Optional) Is "MySQL In App" Enabled? This runs a local MySQL instance with your app and shares resources from the App Service plan. ~> **NOTE:** MySQL In App is not intended for production environments and will not scale beyond a single instance. Instead you may wish [to use Azure Database for MySQL](/docs/providers/azurerm/r/mysql_database.html). * `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`, `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`. + +* `scm_type` - (Optional) The type of Source Control enabled for this App Service Slot. Defaults to `None`. Possible values are: `BitbucketGit`, `BitbucketHg`, `CodePlexGit`, `CodePlexHg`, `Dropbox`, `ExternalGit`, `ExternalHg`, `GitHub`, `LocalGit`, `None`, `OneDrive`, `Tfs`, `VSO` and `VSTSRM` + * `use_32_bit_worker_process` - (Optional) Should the App Service Slot run in 32 bit mode, rather than 64 bit mode? ~> **Note:** Deployment Slots are not supported in the `Free`, `Shared`, or `Basic` App Service Plans.