Requiring Import (PR 1 of ...)

azurerm/feature_flags.go

@@ -0,0 +1,9 @@
+package azurerm
+
+import (
+	"os"
+	"strings"
+)
+
+// This file contains feature flags for functionality which will prove more challenging to implement en-mass
+var requireResourcesToBeImported = strings.EqualFold(os.Getenv("ARM_PROVIDER_STRICT"), "true")

azurerm/helpers/tf/errors.go

@@ -0,0 +1,8 @@
+package tf
+
+import "fmt"
+
+func ImportAsExistsError(resourceName, id string) error {
+	msg := "A resource with the ID %q already exists - to be managed via Terraform this resource needs to be imported into the State. Please see the resource documentation for %q for more information."
+	return fmt.Errorf(msg, id, resourceName)
+}

azurerm/provider_test.go

@@ -3,6 +3,7 @@ package azurerm
 import (
 	"fmt"
 	"os"
+	"regexp"
 	"testing"
 
 	"github.com/Azure/go-autorest/autorest/azure"
@@ -98,3 +99,8 @@ func testGetAzureConfig(t *testing.T) *authentication.Config {
 
 	return config
 }
+
+func testRequiresImportError(resourceName string) *regexp.Regexp {
+	message := "to be managed via Terraform this resource needs to be imported into the State. Please see the resource documentation for %q for more information."
+	return regexp.MustCompile(fmt.Sprintf(message, resourceName))
+}

azurerm/resource_arm_api_management.go

@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
@@ -297,6 +298,20 @@ func resourceArmApiManagementServiceCreateUpdate(d *schema.ResourceData, meta in
 
 	name := d.Get("name").(string)
 	resourceGroup := d.Get("resource_group_name").(string)
+
+	if requireResourcesToBeImported && d.IsNewResource() {
+		existing, err := client.Get(ctx, resourceGroup, name)
+		if err != nil {
+			if !utils.ResponseWasNotFound(existing.Response) {
+				return fmt.Errorf("Error checking for presence of existing API Management Service %q (Resource Group %q): %s", name, resourceGroup, err)
+			}
+		}
+
+		if existing.ID != nil && *existing.ID != "" {
+			return tf.ImportAsExistsError("azurerm_api_management", *existing.ID)
+		}
+	}
+
 	location := azureRMNormalizeLocation(d.Get("location").(string))
 	tags := d.Get("tags").(map[string]interface{})
 

azurerm/resource_arm_api_management_test.go

@@ -35,6 +35,35 @@ func TestAccAzureRMApiManagement_basic(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMApiManagement_requiresImport(t *testing.T) {
+	if !requireResourcesToBeImported {
+		t.Skip("Skipping since resources aren't required to be imported")
+		return
+	}
+
+	resourceName := "azurerm_api_management.test"
+	ri := acctest.RandInt()
+	location := testLocation()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMApiManagementDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAzureRMApiManagement_basic(ri, location),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMApiManagementExists(resourceName),
+				),
+			},
+			{
+				Config:      testAccAzureRMApiManagement_requiresImport(ri, location),
+				ExpectError: testRequiresImportError("azurerm_api_management"),
+			},
+		},
+	})
+}
+
 func TestAccAzureRMApiManagement_customProps(t *testing.T) {
 	resourceName := "azurerm_api_management.test"
 	ri := acctest.RandInt()
@@ -83,7 +112,7 @@ func TestAccAzureRMApiManagement_complete(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
-					"certificate", // not returned from API, sensitive
+					"certificate",                                            // not returned from API, sensitive
 					"hostname_configuration.0.portal.0.certificate",          // not returned from API, sensitive
 					"hostname_configuration.0.portal.0.certificate_password", // not returned from API, sensitive
 					"hostname_configuration.0.proxy.0.certificate",           // not returned from API, sensitive
@@ -174,6 +203,26 @@ resource "azurerm_api_management" "test" {
 `, rInt, location, rInt)
 }
 
+func testAccAzureRMApiManagement_requiresImport(rInt int, location string) string {
+	template := testAccAzureRMApiManagement_basic(rInt, location)
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_api_management" "import" {
+  name                = "${azurerm_api_management.test.name}"
+  location            = "${azurerm_api_management.test.location}"
+  resource_group_name = "${azurerm_api_management.test.resource_group_name}"
+  publisher_name      = "${azurerm_api_management.test.publisher_name}"
+  publisher_email     = "${azurerm_api_management.test.publisher_email}"
+
+  sku {
+    name     = "Developer"
+    capacity = 1
+  }
+}
+`, template)
+}
+
 func testAccAzureRMApiManagement_customProps(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {

azurerm/resource_arm_app_service.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
@@ -188,6 +189,21 @@ func resourceArmAppServiceCreate(d *schema.ResourceData, meta interface{}) error
 	log.Printf("[INFO] preparing arguments for AzureRM App Service creation.")
 
 	name := d.Get("name").(string)
+	resGroup := d.Get("resource_group_name").(string)
+
+	if requireResourcesToBeImported && d.IsNewResource() {
+		existing, err := client.Get(ctx, resGroup, name)
+		if err != nil {
+			if !utils.ResponseWasNotFound(existing.Response) {
+				return fmt.Errorf("Error checking for presence of existing App Service %q (Resource Group %q): %s", name, resGroup, err)
+			}
+		}
+
+		if existing.ID != nil && *existing.ID != "" {
+			return tf.ImportAsExistsError("azurerm_app_service", *existing.ID)
+		}
+	}
+
 	availabilityRequest := web.ResourceNameAvailabilityRequest{
 		Name: utils.String(name),
 		Type: web.CheckNameResourceTypesMicrosoftWebsites,
@@ -201,7 +217,6 @@ func resourceArmAppServiceCreate(d *schema.ResourceData, meta interface{}) error
 		return fmt.Errorf("The name %q used for the App Service needs to be globally unique and isn't available: %s", name, *available.Message)
 	}
 
-	resGroup := d.Get("resource_group_name").(string)
 	location := azureRMNormalizeLocation(d.Get("location").(string))
 	appServicePlanId := d.Get("app_service_plan_id").(string)
 	enabled := d.Get("enabled").(bool)

azurerm/resource_arm_app_service_custom_hostname_binding.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
@@ -51,6 +52,19 @@ func resourceArmAppServiceCustomHostnameBindingCreate(d *schema.ResourceData, me
 	azureRMLockByName(appServiceName, appServiceCustomHostnameBindingResourceName)
 	defer azureRMUnlockByName(appServiceName, appServiceCustomHostnameBindingResourceName)
 
+	if requireResourcesToBeImported && d.IsNewResource() {
+		existing, err := client.GetHostNameBinding(ctx, resourceGroup, appServiceName, hostname)
+		if err != nil {
+			if !utils.ResponseWasNotFound(existing.Response) {
+				return fmt.Errorf("Error checking for presence of existing Custom Hostname Binding %q (App Service %q / Resource Group %q): %s", hostname, appServiceName, resourceGroup, err)
+			}
+		}
+
+		if existing.ID != nil && *existing.ID != "" {
+			return tf.ImportAsExistsError("azurerm_app_service_custom_hostname_binding", *existing.ID)
+		}
+	}
+
 	properties := web.HostNameBinding{
 		HostNameBindingProperties: &web.HostNameBindingProperties{
 			SiteName: utils.String(appServiceName),

azurerm/resource_arm_app_service_custom_hostname_binding_test.go

@@ -13,12 +13,25 @@ import (
 )
 
 func TestAccAzureRMAppServiceCustomHostnameBinding(t *testing.T) {
+	appServiceEnvVariable := "ARM_TEST_APP_SERVICE"
+	appServiceEnv := os.Getenv(appServiceEnvVariable)
+	if appServiceEnv == "" {
+		t.Skipf("Skipping as %q is not specified", appServiceEnvVariable)
+	}
+
+	domainEnvVariable := "ARM_TEST_DOMAIN"
+	domainEnv := os.Getenv(domainEnvVariable)
+	if domainEnv == "" {
+		t.Skipf("Skipping as %q is not specified", domainEnvVariable)
+	}
+
 	// NOTE: this is a combined test rather than separate split out tests due to
 	// the app service name being shared (so the tests don't conflict with each other)
-	testCases := map[string]map[string]func(t *testing.T){
+	testCases := map[string]map[string]func(t *testing.T, appServiceEnv, domainEnv string){
 		"basic": {
-			"basic":    testAccAzureRMAppServiceCustomHostnameBinding_basic,
-			"multiple": testAccAzureRMAppServiceCustomHostnameBinding_multiple,
+			"basic":          testAccAzureRMAppServiceCustomHostnameBinding_basic,
+			"multiple":       testAccAzureRMAppServiceCustomHostnameBinding_multiple,
+			"requiresImport": testAccAzureRMAppServiceCustomHostnameBinding_requiresImport,
 		},
 	}
 
@@ -28,26 +41,14 @@ func TestAccAzureRMAppServiceCustomHostnameBinding(t *testing.T) {
 			for name, tc := range m {
 				tc := tc
 				t.Run(name, func(t *testing.T) {
-					tc(t)
+					tc(t, appServiceEnv, domainEnv)
 				})
 			}
 		})
 	}
 }
 
-func testAccAzureRMAppServiceCustomHostnameBinding_basic(t *testing.T) {
-	appServiceEnvVariable := "ARM_TEST_APP_SERVICE"
-	appServiceEnv := os.Getenv(appServiceEnvVariable)
-	if appServiceEnv == "" {
-		t.Skipf("Skipping as %q is not specified", appServiceEnvVariable)
-	}
-
-	domainEnvVariable := "ARM_TEST_DOMAIN"
-	domainEnv := os.Getenv(domainEnvVariable)
-	if domainEnv == "" {
-		t.Skipf("Skipping as %q is not specified", domainEnvVariable)
-	}
-
+func testAccAzureRMAppServiceCustomHostnameBinding_basic(t *testing.T, appServiceEnv, domainEnv string) {
 	resourceName := "azurerm_app_service_custom_hostname_binding.test"
 	ri := acctest.RandInt()
 	location := testLocation()
@@ -73,23 +74,40 @@ func testAccAzureRMAppServiceCustomHostnameBinding_basic(t *testing.T) {
 	})
 }
 
-func testAccAzureRMAppServiceCustomHostnameBinding_multiple(t *testing.T) {
-	appServiceEnvVariable := "ARM_TEST_APP_SERVICE"
-	appServiceEnv := os.Getenv(appServiceEnvVariable)
-	if appServiceEnv == "" {
-		t.Skipf("Skipping as %q is not specified", appServiceEnvVariable)
+func testAccAzureRMAppServiceCustomHostnameBinding_requiresImport(t *testing.T, appServiceEnv, domainEnv string) {
+	if !requireResourcesToBeImported {
+		t.Skip("Skipping since resources aren't required to be imported")
+		return
 	}
 
-	domainEnvVariable := "ARM_TEST_DOMAIN"
-	domainEnv := os.Getenv(domainEnvVariable)
-	if domainEnv == "" {
-		t.Skipf("Skipping as %q is not specified", domainEnvVariable)
-	}
+	resourceName := "azurerm_app_service_custom_hostname_binding.test"
+	ri := acctest.RandInt()
+	location := testLocation()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMAppServiceCustomHostnameBindingDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAzureRMAppServiceCustomHostnameBinding_basicConfig(ri, location, appServiceEnv, domainEnv),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMAppServiceCustomHostnameBindingExists(resourceName),
+				),
+			},
+			{
+				Config:      testAccAzureRMAppServiceCustomHostnameBinding_requiresImportConfig(ri, location, appServiceEnv, domainEnv),
+				ExpectError: testRequiresImportError("azurerm_app_service_custom_hostname_binding"),
+			},
+		},
+	})
+}
 
+func testAccAzureRMAppServiceCustomHostnameBinding_multiple(t *testing.T, appServiceEnv, domainEnv string) {
 	altDomainEnvVariable := "ARM_ALT_TEST_DOMAIN"
 	altDomainEnv := os.Getenv(altDomainEnvVariable)
-	if domainEnv == "" {
-		t.Skipf("Skipping as %q is not specified", domainEnvVariable)
+	if altDomainEnv == "" {
+		t.Skipf("Skipping as %q is not specified", altDomainEnvVariable)
 	}
 
 	resourceName := "azurerm_app_service_custom_hostname_binding.test"
@@ -200,6 +218,19 @@ resource "azurerm_app_service_custom_hostname_binding" "test" {
 `, rInt, location, rInt, appServiceName, domain)
 }
 
+func testAccAzureRMAppServiceCustomHostnameBinding_requiresImportConfig(rInt int, location string, appServiceName string, domain string) string {
+	template := testAccAzureRMAppServiceCustomHostnameBinding_basicConfig(rInt, location, appServiceName, domain)
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_app_service_custom_hostname_binding" "import" {
+  hostname            = "${azurerm_app_service_custom_hostname_binding.test.name}"
+  app_service_name    = "${azurerm_app_service_custom_hostname_binding.test.app_service_name}"
+  resource_group_name = "${azurerm_app_service_custom_hostname_binding.test.resource_group_name}"
+}
+`, template)
+}
+
 func testAccAzureRMAppServiceCustomHostnameBinding_multipleConfig(rInt int, location, appServiceName, domain, altDomain string) string {
 	template := testAccAzureRMAppServiceCustomHostnameBinding_basicConfig(rInt, location, appServiceName, domain)
 	return fmt.Sprintf(`

azurerm/resource_arm_app_service_plan.go

@@ -6,6 +6,7 @@ import (
 	"regexp"
 
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 
 	"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -151,6 +152,20 @@ func resourceArmAppServicePlanCreateUpdate(d *schema.ResourceData, meta interfac
 
 	resGroup := d.Get("resource_group_name").(string)
 	name := d.Get("name").(string)
+
+	if requireResourcesToBeImported && d.IsNewResource() {
+		existing, err := client.Get(ctx, resGroup, name)
+		if err != nil {
+			if !utils.ResponseWasNotFound(existing.Response) {
+				return fmt.Errorf("Error checking for presence of existing App Service Plan %q (Resource Group %q): %s", name, resGroup, err)
+			}
+		}
+
+		if existing.ID != nil && *existing.ID != "" {
+			return tf.ImportAsExistsError("azurerm_app_service_plan", *existing.ID)
+		}
+	}
+
 	location := azureRMNormalizeLocation(d.Get("location").(string))
 	kind := d.Get("kind").(string)
 	tags := d.Get("tags").(map[string]interface{})