Removing any configuration or variables files from previous test step…

…s prior to copy configuration and variables for current test step (#150)

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_StepNotHardcoded/1/provider_1.tf

@@ -0,0 +1,4 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+provider "random" {}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_StepNotHardcoded/1/random_1.tf

@@ -0,0 +1,8 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+resource "random_password" "test" {
+  length = 8
+
+  numeric = false
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_StepNotHardcoded/1/terraform_1.tf

@@ -0,0 +1,11 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+terraform {
+  required_providers {
+    random = {
+      source = "registry.terraform.io/hashicorp/random"
+      version = "3.2.0"
+    }
+  }
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_StepNotHardcoded/2/provider_2.tf

@@ -0,0 +1,4 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+provider "random" {}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_StepNotHardcoded/2/random_2.tf

@@ -0,0 +1,8 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+resource "random_password" "test" {
+  length = 9
+
+  numeric = false
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_StepNotHardcoded/2/terraform_2.tf

@@ -0,0 +1,11 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+terraform {
+  required_providers {
+    random = {
+      source = "registry.terraform.io/hashicorp/random"
+      version = "3.5.1"
+    }
+  }
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded/1/provider_1.tf

@@ -0,0 +1,4 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+provider "random" {}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded/1/random_1.tf

@@ -0,0 +1,8 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+resource "random_password" "test" {
+  length = var.length
+
+  numeric = var.numeric
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded/1/terraform_1.tf

@@ -0,0 +1,11 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+terraform {
+  required_providers {
+    random = {
+      source = "registry.terraform.io/hashicorp/random"
+      version = "3.2.0"
+    }
+  }
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded/1/vars_1.tf

@@ -0,0 +1,10 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+variable "length" {
+  type = number
+}
+
+variable "numeric" {
+  type = bool
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded/2/provider_2.tf

@@ -0,0 +1,4 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+provider "random" {}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded/2/random2.tf

@@ -0,0 +1,8 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+resource "random_password" "test" {
+  length = var.length
+
+  numeric = var.numeric
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded/2/terraform_2.tf

@@ -0,0 +1,11 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+terraform {
+  required_providers {
+    random = {
+      source = "registry.terraform.io/hashicorp/random"
+      version = "3.5.1"
+    }
+  }
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded/2/vars_2.tf

@@ -0,0 +1,10 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+variable "length" {
+  type = number
+}
+
+variable "numeric" {
+  type = bool
+}

helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_StepNotHardcoded/1/random.tf → helper/resource/testdata/TestTest_ConfigDirectory_TestStepDirectory_StepNotHardcoded/1/random_1.tf

@@ -5,7 +5,7 @@ terraform {
   required_providers {
     random = {
       source = "registry.terraform.io/hashicorp/random"
-      version = "3.5.1"
+      version = "3.2.0"
     }
   }
 }

helper/resource/teststep_providers_test.go

@@ -2335,15 +2335,17 @@ func TestTest_ConfigDirectory_TestStepDirectory(t *testing.T) {
 }
 
 // TestTest_ConfigDirectory_TestStepDirectory_StepNotHardcoded uses a multistep test
-// to prove that the test step number is not hardcoded
+// to prove that the test step number is not hardcoded and to show that the
+// configuration files that are copied from the test step directory in test step 1
+// are removed prior to running test step 2.
 func TestTest_ConfigDirectory_TestStepDirectory_StepNotHardcoded(t *testing.T) {
 	t.Parallel()
 
 	Test(t, TestCase{
 		Steps: []TestStep{
 			{
 				ConfigDirectory: config.TestStepDirectory(),
-				Check:           TestCheckResourceAttrPtr("random_password.test", "length", teststep.Pointer("8")),
+				ExpectError:     regexp.MustCompile(`.*An argument named "numeric" is not expected here.`),
 			},
 			{
 				ConfigDirectory: config.TestStepDirectory(),
@@ -2443,6 +2445,27 @@ func TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles(t *testing.T) {
 	})
 }
 
+// TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_StepNotHardcoded uses a
+// multistep test to prove that the test step number is not hardcoded, and to show
+// that the configuration files that are copied from the test step directory in test
+// step 1 are removed prior to running test step 2.
+func TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_StepNotHardcoded(t *testing.T) {
+	t.Parallel()
+
+	Test(t, TestCase{
+		Steps: []TestStep{
+			{
+				ConfigDirectory: config.TestStepDirectory(),
+				ExpectError:     regexp.MustCompile(`.*An argument named "numeric" is not expected here.`),
+			},
+			{
+				ConfigDirectory: config.TestStepDirectory(),
+				Check:           TestCheckResourceAttrPtr("random_password.test", "length", teststep.Pointer("9")),
+			},
+		},
+	})
+}
+
 func TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars(t *testing.T) {
 	t.Parallel()
 
@@ -2460,6 +2483,35 @@ func TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars(t *testing.T)
 	})
 }
 
+// TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded uses a
+// multistep test to prove that the test step number is not hardcoded, and to show
+// that the configuration files that are copied from the test step directory in test
+// step 1 are removed prior to running test step 2.
+func TestTest_ConfigDirectory_TestStepDirectory_MultipleFiles_Vars_StepNotHardcoded(t *testing.T) {
+	t.Parallel()
+
+	Test(t, TestCase{
+		Steps: []TestStep{
+			{
+				ConfigDirectory: config.TestStepDirectory(),
+				ConfigVariables: config.Variables{
+					"length":  config.IntegerVariable(8),
+					"numeric": config.BoolVariable(false),
+				},
+				ExpectError: regexp.MustCompile(`.*An argument named "numeric" is not expected here.`),
+			},
+			{
+				ConfigDirectory: config.TestStepDirectory(),
+				ConfigVariables: config.Variables{
+					"length":  config.IntegerVariable(9),
+					"numeric": config.BoolVariable(false),
+				},
+				Check: TestCheckResourceAttrPtr("random_password.test", "length", teststep.Pointer("9")),
+			},
+		},
+	})
+}
+
 // TestTest_ConfigDirectory_StaticDirectory_AttributeDoesNotExist uses Terraform
 // configuration specifying a "numeric" attribute that was introduced in v3.3.0 of the
 // random provider password  This test confirms that the TestCase ExternalProviders

internal/plugintest/working_dir.go

@@ -83,12 +83,39 @@ func (wd *WorkingDir) GetHelper() *Helper {
 // Destroy to establish the configuration. Any previously-set configuration is
 // discarded and any saved plan is cleared.
 func (wd *WorkingDir) SetConfig(ctx context.Context, cfg teststep.Config, vars config.Variables) error {
+	// Remove old config and variables files first
+	d, err := os.Open(wd.baseDir)
+
+	if err != nil {
+		return err
+	}
+
+	defer d.Close()
+
+	fi, err := d.Readdir(-1)
+
+	if err != nil {
+		return err
+	}
+
+	for _, file := range fi {
+		if file.Mode().IsRegular() {
+			if filepath.Ext(file.Name()) == ".tf" || filepath.Ext(file.Name()) == ".json" {
+				err = os.Remove(filepath.Join(d.Name(), file.Name()))
+
+				if err != nil && !os.IsNotExist(err) {
+					return err
+				}
+			}
+		}
+	}
+
 	logging.HelperResourceTrace(ctx, "Setting Terraform configuration", map[string]any{logging.KeyTestTerraformConfiguration: cfg})
 
 	outFilename := filepath.Join(wd.baseDir, ConfigFileName)
 
 	// This file has to be written otherwise wd.Init() will return an error.
-	err := os.WriteFile(outFilename, nil, 0700)
+	err = os.WriteFile(outFilename, nil, 0700)
 
 	if err != nil {
 		return err