importstate: fix reading configuration from previous step when previous step use file or directory

Fix #516

Author: jeremmfr

helper/resource/testing_new.go

@@ -132,6 +132,8 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 	// use this to track last step successfully applied
 	// acts as default for import tests
 	var appliedCfg string
+	var appliedDirCfg string
+	var appliedFileCfg string
 	var stepNumber int
 
 	for stepIndex, step := range c.Steps {
@@ -141,14 +143,16 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 
 		stepNumber = stepIndex + 1 // 1-based indexing for humans
 
+		currentTestStepConfigRequest := config.TestStepConfigRequest{
+			StepNumber: stepNumber,
+			TestName:   t.Name(),
+		}
+
 		configRequest := teststep.PrepareConfigurationRequest{
-			Directory: step.ConfigDirectory,
-			File:      step.ConfigFile,
-			Raw:       step.Config,
-			TestStepConfigRequest: config.TestStepConfigRequest{
-				StepNumber: stepNumber,
-				TestName:   t.Name(),
-			},
+			Directory:             step.ConfigDirectory,
+			File:                  step.ConfigFile,
+			Raw:                   step.Config,
+			TestStepConfigRequest: currentTestStepConfigRequest,
 		}.Exec()
 
 		cfg := teststep.Configuration(configRequest)
@@ -281,7 +285,7 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 		if step.ImportState {
 			logging.HelperResourceTrace(ctx, "TestStep is ImportState mode")
 
-			err := testStepNewImportState(ctx, t, helper, wd, step, appliedCfg, providers, stepNumber)
+			err := testStepNewImportState(ctx, t, helper, wd, step, appliedCfg, appliedDirCfg, appliedFileCfg, providers, stepNumber)
 			if step.ExpectError != nil {
 				logging.HelperResourceDebug(ctx, "Checking TestStep ExpectError")
 				if err == nil {
@@ -430,6 +434,11 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 
 			logging.HelperResourceDebug(ctx, "Finished TestStep")
 
+			// Store the ConfigDirectory and ConfigFile from the current step
+			// so they can be used by subsequent ImportState steps if not explicitly set.
+			appliedDirCfg = step.ConfigDirectory.Exec(currentTestStepConfigRequest)
+			appliedFileCfg = step.ConfigFile.Exec(currentTestStepConfigRequest)
+
 			continue
 		}
 

helper/resource/testing_new_import_state.go

@@ -25,7 +25,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
-func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest.Helper, testCaseWorkingDir *plugintest.WorkingDir, step TestStep, cfgRaw string, providers *providerFactories, stepNumber int) error {
+func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest.Helper, testCaseWorkingDir *plugintest.WorkingDir, step TestStep, cfgRaw string, cfgDir string, cfgFile string, providers *providerFactories, stepNumber int) error {
 	t.Helper()
 
 	// step.ImportStateKind implicitly defaults to the zero-value (ImportCommandWithID) for backward compatibility
@@ -106,18 +106,35 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 	}
 
 	var inlineConfig string
+	var configDirectory string
+	var configFile string
+
+	testStepConfigRequest := config.TestStepConfigRequest{
+		StepNumber: stepNumber,
+		TestName:   t.Name(),
+	}
+
 	if step.Config != "" {
 		inlineConfig = step.Config
 	} else {
 		inlineConfig = cfgRaw
 	}
-	testStepConfigRequest := config.TestStepConfigRequest{
-		StepNumber: stepNumber,
-		TestName:   t.Name(),
+
+	if step.ConfigDirectory != nil {
+		configDirectory = step.ConfigDirectory.Exec(testStepConfigRequest)
+	} else {
+		configDirectory = cfgDir
 	}
+
+	if step.ConfigFile != nil {
+		configFile = step.ConfigFile.Exec(testStepConfigRequest)
+	} else {
+		configFile = cfgFile
+	}
+
 	testStepConfig := teststep.Configuration(teststep.PrepareConfigurationRequest{
-		Directory:             step.ConfigDirectory,
-		File:                  step.ConfigFile,
+		Directory:             config.TestStepConfigFunc(func(_ config.TestStepConfigRequest) string { return configDirectory }),
+		File:                  config.TestStepConfigFunc(func(_ config.TestStepConfigRequest) string { return configFile }),
 		Raw:                   inlineConfig,
 		TestStepConfigRequest: testStepConfigRequest,
 	}.Exec())