From dc2db73575aed7fae73e80973a10b08edfddf39a Mon Sep 17 00:00:00 2001 From: Joakim Hansson Date: Thu, 14 Feb 2019 13:54:48 +0100 Subject: [PATCH] Add support_credentials --- azurerm/helpers/azure/app_service.go | 13 +++++++++++++ azurerm/resource_arm_app_service_test.go | 4 +++- website/docs/r/app_service.html.markdown | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/azurerm/helpers/azure/app_service.go b/azurerm/helpers/azure/app_service.go index ced6f34f5b276..87e76f8056516 100644 --- a/azurerm/helpers/azure/app_service.go +++ b/azurerm/helpers/azure/app_service.go @@ -26,6 +26,11 @@ func SchemaAppServiceCorsSettings() *schema.Schema { Required: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "support_credentials": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, }, }, } @@ -254,6 +259,10 @@ func ExpandAppServiceCorsSettings(input interface{}) web.CorsSettings { corsSettings.AllowedOrigins = &allowedOrigins } + if v, ok := setting["support_credentials"]; ok { + corsSettings.SupportCredentials = utils.Bool(v.(bool)) + } + return corsSettings } @@ -272,6 +281,10 @@ func FlattenAppServiceCorsSettings(input *web.CorsSettings) []interface{} { } result["allowed_origins"] = allowedOrigins + if input.SupportCredentials != nil { + result["support_credentials"] = *input.SupportCredentials + } + return append(results, result) } diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go index 5d174cf541cc7..e07d2c5d62f6f 100644 --- a/azurerm/resource_arm_app_service_test.go +++ b/azurerm/resource_arm_app_service_test.go @@ -1197,6 +1197,7 @@ func TestAccAzureRMAppService_corsSettings(t *testing.T) { Check: resource.ComposeTestCheckFunc( testCheckAzureRMAppServiceExists(resourceName), resource.TestCheckResourceAttr(resourceName, "site_config.0.cors.#", "1"), + resource.TestCheckResourceAttr(resourceName, "site_config.0.cors.0.support_credentials", "true"), resource.TestCheckResourceAttr(resourceName, "site_config.0.cors.0.allowed_origins.#", "3"), resource.TestCheckResourceAttr(resourceName, "site_config.0.cors.0.allowed_origins.0", "http://www.contoso.com"), resource.TestCheckResourceAttr(resourceName, "site_config.0.cors.0.allowed_origins.1", "www.contoso.com"), @@ -2472,7 +2473,8 @@ resource "azurerm_app_service" "test" { "http://www.contoso.com", "www.contoso.com", "contoso.com" - ] + ] + support_credentials = true } } } diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown index cde0613a608ec..8c33284eddbd0 100644 --- a/website/docs/r/app_service.html.markdown +++ b/website/docs/r/app_service.html.markdown @@ -249,6 +249,8 @@ The following attributes are exported: * `allowed_origins` - (Required) List of allowed origins +* `support_credentials` - (Optional) Should credential headers be allowed? Defaults to `false`. + ## Import App Services can be imported using the `resource id`, e.g.