replace instances of stepIndex + 1 with stepNumber

Author: stephybun

helper/resource/testing_new.go

@@ -249,7 +249,7 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 				File:      step.ConfigFile,
 				Raw:       rawCfg,
 				TestStepConfigRequest: config.TestStepConfigRequest{
-					StepNumber: stepIndex + 1,
+					StepNumber: stepNumber,
 					TestName:   t.Name(),
 				},
 			}.Exec()
@@ -289,7 +289,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, stepIndex)
+			err := testStepNewImportState(ctx, t, helper, wd, step, appliedCfg, providers, stepNumber)
 			if step.ExpectError != nil {
 				logging.HelperResourceDebug(ctx, "Checking TestStep ExpectError")
 				if err == nil {

helper/resource/testing_new_import_state.go

@@ -20,15 +20,15 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 )
 
-func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest.Helper, wd *plugintest.WorkingDir, step TestStep, cfgRaw string, providers *providerFactories, stepIndex int) error {
+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()
 
 	configRequest := teststep.PrepareConfigurationRequest{
 		Directory: step.ConfigDirectory,
 		File:      step.ConfigFile,
 		Raw:       step.Config,
 		TestStepConfigRequest: config.TestStepConfigRequest{
-			StepNumber: stepIndex + 1,
+			StepNumber: stepNumber,
 			TestName:   t.Name(),
 		},
 	}.Exec()
@@ -116,7 +116,7 @@ func testStepNewImportState(ctx context.Context, t testing.T, helper *plugintest
 			File:      step.ConfigFile,
 			Raw:       cfgRaw,
 			TestStepConfigRequest: config.TestStepConfigRequest{
-				StepNumber: stepIndex + 1,
+				StepNumber: stepNumber,
 				TestName:   t.Name(),
 			},
 		}.Exec()