add validation to prevent new import kinds to be used with config files or directories

Author: stephybun

helper/resource/testing_new_import_block_id_test.go

@@ -214,7 +214,7 @@ func TestTest_TestStep_ImportBlockId_SkipDataSourceState(t *testing.T) {
 func TestTest_TestStep_ImportBlockId_ImportStateVerifyIgnore_Real_Example(t *testing.T) {
 	/*
 		This test tries to imitate a real world example of behaviour we often see in the AzureRM provider which requires
-		the use of `ImportStateVerifyIgnore` when testing the import of a resource.
+		the use of `ImportStateVerifyIgnore` when testing the import of a resource using the import command.
 
 		A sensitive field e.g. a password can be supplied on create but isn't returned in the API response on a subsequent
 		read, resulting in a different value for password in the two states.
@@ -297,7 +297,7 @@ func TestTest_TestStep_ImportBlockId_ImportStateVerifyIgnore_Real_Example(t *tes
 								        state.
 
 								Modifying the plan to set the id to a known value appears to be the only way to
-								circumvent this behaviour, the cause of which I don't fully understand
+								circumvent this behaviour, the cause of which I don't fully understand.
 
 								This doesn't seem great, because this gets applied to all Plans that happen in this
 								test - so we're modifying plans in steps that we might not want to.
@@ -351,18 +351,13 @@ func TestTest_TestStep_ImportBlockId_ImportStateVerifyIgnore_Real_Example(t *tes
   					required_providers {
     					examplecloud = {
       						source = "registry.terraform.io/hashicorp/examplecloud"
-    					}
+						}
 					}
 				}
 
 				resource "examplecloud_container" "test" {
 					name = "somename"
-				}
-
-				import {
-					to = examplecloud_container.test
-					id = "sometestid"
-   				}`,
+				}`,
 				ResourceName:            "examplecloud_container.test",
 				ImportState:             true,
 				ImportStateKind:         ImportBlockWithId,

helper/resource/testing_new_import_state.go

@@ -23,6 +23,14 @@ import (
 func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest.Helper, wd *plugintest.WorkingDir, step TestStep, cfgRaw string, providers *providerFactories, stepNumber int) error {
 	t.Helper()
 
+	// Currently import modes `ImportBlockWithId` and `ImportBlockWithResourceIdentity` cannot support config file or directory
+	// since these modes append the import block to the configuration automatically
+	if step.ImportStateKind != ImportCommandWithId {
+		if step.ConfigFile != nil || step.ConfigDirectory != nil {
+			t.Fatalf("ImportStateKind %q is not supported for config file or directory", step.ImportStateKind)
+		}
+	}
+
 	configRequest := teststep.PrepareConfigurationRequest{
 		Directory: step.ConfigDirectory,
 		File:      step.ConfigFile,
@@ -93,15 +101,19 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 
 	logging.HelperResourceTrace(ctx, fmt.Sprintf("Using import identifier: %s", importId))
 
-	// Prepare the test config dependent on the kind of import test being performed
-	if testStepConfig == nil {
-		logging.HelperResourceTrace(ctx, "Using prior TestStep Config for import")
+	if testStepConfig == nil || step.Config != "" {
+		importConfig := step.Config
+		if importConfig == "" {
+			logging.HelperResourceTrace(ctx, "Using prior TestStep Config for import")
+			importConfig = cfgRaw
+		}
 
+		// Update the test config dependent on the kind of import test being performed
 		switch step.ImportStateKind {
 		case ImportBlockWithResourceIdentity:
 			t.Fatalf("TODO implement me")
 		case ImportBlockWithId:
-			cfgRaw += fmt.Sprintf(`
+			importConfig += fmt.Sprintf(`
 			import {
 				to = %s
 				id = %q