From 1354593cc47356da33dc0c5f1fd50bdff33996ae Mon Sep 17 00:00:00 2001 From: jackofallops Date: Mon, 1 Jun 2020 13:40:43 +0100 Subject: [PATCH] fix scope of name availability check in ASE hosted app services --- .../services/web/resource_arm_app_service.go | 15 +++- .../tests/resource_arm_app_service_test.go | 78 +++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/web/resource_arm_app_service.go b/azurerm/internal/services/web/resource_arm_app_service.go index 6cc4c00455c3..9f9a2e175819 100644 --- a/azurerm/internal/services/web/resource_arm_app_service.go +++ b/azurerm/internal/services/web/resource_arm_app_service.go @@ -192,6 +192,7 @@ func resourceArmAppService() *schema.Resource { func resourceArmAppServiceCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.Client).Web.AppServicesClient + aspClient := meta.(*clients.Client).Web.AppServicePlansClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -217,6 +218,19 @@ func resourceArmAppServiceCreate(d *schema.ResourceData, meta interface{}) error Name: utils.String(name), Type: web.CheckNameResourceTypesMicrosoftWebsites, } + + appServicePlanId := d.Get("app_service_plan_id").(string) + aspID, err := ParseAppServicePlanID(appServicePlanId) + if err != nil { + return err + } + // Check if App Service Plan is part of ASE + // If so, the name needs updating to ..appserviceenvironment.net and FQDN setting true for name availability check + aspDetails, _ := aspClient.Get(ctx, aspID.ResourceGroup, aspID.Name) + if aspDetails.HostingEnvironmentProfile != nil { + availabilityRequest.Name = utils.String(fmt.Sprintf("%s.%s.appserviceenvironment.net", name, aspID.Name)) + availabilityRequest.IsFqdn = utils.Bool(true) + } available, err := client.CheckNameAvailability(ctx, availabilityRequest) if err != nil { return fmt.Errorf("Error checking if the name %q was available: %+v", name, err) @@ -227,7 +241,6 @@ func resourceArmAppServiceCreate(d *schema.ResourceData, meta interface{}) error } location := azure.NormalizeLocation(d.Get("location").(string)) - appServicePlanId := d.Get("app_service_plan_id").(string) enabled := d.Get("enabled").(bool) httpsOnly := d.Get("https_only").(bool) t := d.Get("tags").(map[string]interface{}) diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_test.go index 5314d7bf719c..53eb51bb01a8 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_test.go @@ -1670,6 +1670,24 @@ func TestAccAzureRMAppService_basicWindowsContainer(t *testing.T) { }) } +func TestAccAzureRMAppService_aseScopeNameCheck(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_app_service", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMAppServiceDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMAppService_inAppServiceEnvironment(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMAppServiceExists(data.ResourceName), + ), + }, + data.ImportStep(), + }, + }) +} + func testCheckAzureRMAppServiceDestroy(s *terraform.State) error { client := acceptance.AzureProvider.Meta().(*clients.Client).Web.AppServicesClient ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext @@ -4371,3 +4389,63 @@ resource "azurerm_app_service" "test" { } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger) } + +func testAccAzureRMAppService_inAppServiceEnvironment(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_virtual_network" "test" { + name = "acctest-vnet-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + address_space = ["10.0.0.0/16"] +} + +resource "azurerm_subnet" "ase" { + name = "asesubnet" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.1.0/24" +} + +resource "azurerm_subnet" "gateway" { + name = "gatewaysubnet" + resource_group_name = azurerm_resource_group.test.name + virtual_network_name = azurerm_virtual_network.test.name + address_prefix = "10.0.2.0/24" +} + +resource "azurerm_app_service_environment" "test" { + name = "acctest-ase-%d" + subnet_id = azurerm_subnet.ase.id +} + +resource "azurerm_app_service_plan" "test" { + name = "acctest-ASP-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + app_service_environment_id = azurerm_app_service_environment.test.id + + sku { + tier = "Isolated" + size = "I1" + capacity = 1 + } +} + +resource "azurerm_app_service" "test" { + name = "acctestAS-%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + app_service_plan_id = azurerm_app_service_plan.test.id +} + +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +}