Import tidy/refactoring (#487)

* refactor: change signature so that the function is the last argument

* refactor: tidy

* refactor: extract functions

* refactor: extract function

* lint

Author: bbasata

helper/resource/plugin.go

@@ -120,7 +120,7 @@ func runProviderCommandApply(ctx context.Context, t testing.T, wd *plugintest.Wo
 	fn := func() error {
 		return wd.Apply(ctx)
 	}
-	return runProviderCommand(ctx, t, fn, wd, factories)
+	return runProviderCommand(ctx, t, wd, factories, fn)
 }
 
 func runProviderCommandCreatePlan(ctx context.Context, t testing.T, wd *plugintest.WorkingDir, factories *providerFactories) error {
@@ -129,7 +129,7 @@ func runProviderCommandCreatePlan(ctx context.Context, t testing.T, wd *pluginte
 	fn := func() error {
 		return wd.CreatePlan(ctx)
 	}
-	return runProviderCommand(ctx, t, fn, wd, factories)
+	return runProviderCommand(ctx, t, wd, factories, fn)
 }
 
 func runProviderCommandGetStateJSON(ctx context.Context, t testing.T, wd *plugintest.WorkingDir, factories *providerFactories) (*tfjson.State, error) {
@@ -141,7 +141,7 @@ func runProviderCommandGetStateJSON(ctx context.Context, t testing.T, wd *plugin
 		stateJSON, err = wd.State(ctx)
 		return err
 	}
-	err := runProviderCommand(ctx, t, fn, wd, factories)
+	err := runProviderCommand(ctx, t, wd, factories, fn)
 	if err != nil {
 		return nil, err
 	}
@@ -158,15 +158,15 @@ func runProviderCommandSavedPlan(ctx context.Context, t testing.T, wd *plugintes
 		plan, err = wd.SavedPlan(ctx)
 		return err
 	}
-	err := runProviderCommand(ctx, t, fn, wd, factories)
+	err := runProviderCommand(ctx, t, wd, factories, fn)
 	if err != nil {
 		return nil, err
 	}
 
 	return plan, nil
 }
 
-func runProviderCommand(ctx context.Context, t testing.T, f func() error, wd *plugintest.WorkingDir, factories *providerFactories) error {
+func runProviderCommand(ctx context.Context, t testing.T, wd *plugintest.WorkingDir, factories *providerFactories, f func() error) error {
 	// don't point to this as a test failure location
 	// point to whatever called it
 	t.Helper()

helper/resource/plugin_test.go

@@ -250,44 +250,38 @@ func TestRunProviderCommand(t *testing.T) {
 	funcCalled := false
 	helper := plugintest.AutoInitProviderHelper(ctx, currentDir)
 
-	err = runProviderCommand(
-		ctx,
-		t,
-		func() error {
-			funcCalled = true
-			return nil
-		},
-		helper.RequireNewWorkingDir(ctx, t, ""),
-		&providerFactories{
-			legacy: map[string]func() (*schema.Provider, error){
-				"examplecloud": func() (*schema.Provider, error) { //nolint:unparam // required signature
-					return &schema.Provider{
-						ResourcesMap: map[string]*schema.Resource{
-							"examplecloud_thing": {
-								CreateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics {
-									d.SetId("id")
-
-									return nil
-								},
-								DeleteContext: func(_ context.Context, _ *schema.ResourceData, _ interface{}) diag.Diagnostics {
-									return nil
-								},
-								ReadContext: func(_ context.Context, d *schema.ResourceData, _ interface{}) diag.Diagnostics {
-									return nil
-								},
-								Schema: map[string]*schema.Schema{
-									"id": {
-										Computed: true,
-										Type:     schema.TypeString,
-									},
+	err = runProviderCommand(ctx, t, helper.RequireNewWorkingDir(ctx, t, ""), &providerFactories{
+		legacy: map[string]func() (*schema.Provider, error){
+			"examplecloud": func() (*schema.Provider, error) { //nolint:unparam // required signature
+				return &schema.Provider{
+					ResourcesMap: map[string]*schema.Resource{
+						"examplecloud_thing": {
+							CreateContext: func(ctx context.Context, d *schema.ResourceData, i interface{}) diag.Diagnostics {
+								d.SetId("id")
+
+								return nil
+							},
+							DeleteContext: func(_ context.Context, _ *schema.ResourceData, _ interface{}) diag.Diagnostics {
+								return nil
+							},
+							ReadContext: func(_ context.Context, d *schema.ResourceData, _ interface{}) diag.Diagnostics {
+								return nil
+							},
+							Schema: map[string]*schema.Schema{
+								"id": {
+									Computed: true,
+									Type:     schema.TypeString,
 								},
 							},
 						},
-					}, nil
-				},
+					},
+				}, nil
 			},
 		},
-	)
+	}, func() error {
+		funcCalled = true
+		return nil
+	})
 
 	if err != nil {
 		t.Fatal(err)

helper/resource/testing_new.go

@@ -27,9 +27,9 @@ import (
 func runPostTestDestroy(ctx context.Context, t testing.T, c TestCase, wd *plugintest.WorkingDir, providers *providerFactories, statePreDestroy *terraform.State) error {
 	t.Helper()
 
-	err := runProviderCommand(ctx, t, func() error {
+	err := runProviderCommand(ctx, t, wd, providers, func() error {
 		return wd.Destroy(ctx)
-	}, wd, providers)
+	})
 	if err != nil {
 		return err
 	}
@@ -67,13 +67,13 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 
 		var statePreDestroy *terraform.State
 		var err error
-		err = runProviderCommand(ctx, t, func() error {
+		err = runProviderCommand(ctx, t, wd, providers, func() error {
 			_, statePreDestroy, err = getState(ctx, t, wd)
 			if err != nil {
 				return err
 			}
 			return nil
-		}, wd, providers)
+		})
 		if err != nil {
 			logging.HelperResourceError(ctx,
 				"Error retrieving state, there may be dangling resources",
@@ -116,9 +116,9 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 			t.Fatalf("TestCase error setting provider configuration: %s", err)
 		}
 
-		err = runProviderCommand(ctx, t, func() error {
+		err = runProviderCommand(ctx, t, wd, providers, func() error {
 			return wd.Init(ctx)
-		}, wd, providers)
+		})
 
 		if err != nil {
 			logging.HelperResourceError(ctx,
@@ -264,15 +264,9 @@ func runNewTest(ctx context.Context, t testing.T, c TestCase, helper *plugintest
 				t.Fatalf("TestStep %d/%d error setting test provider configuration: %s", stepNumber, len(c.Steps), err)
 			}
 
-			err = runProviderCommand(
-				ctx,
-				t,
-				func() error {
-					return wd.Init(ctx)
-				},
-				wd,
-				providers,
-			)
+			err = runProviderCommand(ctx, t, wd, providers, func() error {
+				return wd.Init(ctx)
+			})
 
 			if err != nil {
 				logging.HelperResourceError(ctx,
@@ -568,7 +562,7 @@ func testIDRefresh(ctx context.Context, t testing.T, c TestCase, wd *plugintest.
 	}()
 
 	// Refresh!
-	err = runProviderCommand(ctx, t, func() error {
+	err = runProviderCommand(ctx, t, wd, providers, func() error {
 		err = wd.Refresh(ctx)
 		if err != nil {
 			t.Fatalf("Error running terraform refresh: %s", err)
@@ -578,7 +572,7 @@ func testIDRefresh(ctx context.Context, t testing.T, c TestCase, wd *plugintest.
 			return err
 		}
 		return nil
-	}, wd, providers)
+	})
 	if err != nil {
 		return err
 	}