Use ... to keep testcase codes

minamijoyo · Jul 5, 2022 · 1ab353b · 1ab353b
1 parent 2bfdbe2
commit 1ab353b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/tfexec/terraform_test.go b/tfexec/terraform_test.go
@@ -100,7 +100,7 @@ resource "aws_security_group" "foo" {}
 resource "aws_security_group" "bar" {}
 `
 	workspace := "work1"
-	terraformCLI := SetupTestAccWithApply(t, workspace, backend+source, nil)
+	terraformCLI := SetupTestAccWithApply(t, workspace, backend+source)
 
 	updatedSource := `
 resource "aws_security_group" "foo2" {}
@@ -216,7 +216,7 @@ resource "aws_security_group" "bar" {}
 `
 	workspace := "work1"
 	backendConfig := []string{"bucket=tfstate-test"}
-	terraformCLI := SetupTestAccWithApply(t, workspace, backend+source, backendConfig)
+	terraformCLI := SetupTestAccWithApply(t, workspace, backend+source, backendConfig...)
 
 	updatedSource := `
 resource "aws_security_group" "foo2" {}

diff --git a/tfexec/test_helper.go b/tfexec/test_helper.go
@@ -283,15 +283,17 @@ provider "aws" {
 
 // SetupTestAccWithApply is an acceptance test helper for initializing a
 // temporary work directory and applying a given source.
-func SetupTestAccWithApply(t *testing.T, workspace string, source string, backendConfig []string) TerraformCLI {
+func SetupTestAccWithApply(t *testing.T, workspace string, source string, backendConfig ...string) TerraformCLI {
 	t.Helper()
 
 	e := SetupTestAcc(t, source)
 	tf := NewTerraformCLI(e)
 	ctx := context.Background()
 
 	var args = []string{"-input=false", "-no-color"}
-	args = append(args, backendConfig...)
+	for _, b := range backendConfig {
+		args = append(args, fmt.Sprintf("-backend-config=%s", b))
+	}
 	err := tf.Init(ctx, args...)
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)

diff --git a/tfmigrate/multi_state_migrator_test.go b/tfmigrate/multi_state_migrator_test.go
@@ -243,9 +243,9 @@ func TestAccMultiStateMigratorApply(t *testing.T) {
 
 			//setup the initial files and states
 			fromBackend := tfexec.GetTestAccBackendS3Config(t.Name() + "/fromDir")
-			fromTf := tfexec.SetupTestAccWithApply(t, tc.fromWorkspace, fromBackend+tc.fromSource, nil)
+			fromTf := tfexec.SetupTestAccWithApply(t, tc.fromWorkspace, fromBackend+tc.fromSource)
 			toBackend := tfexec.GetTestAccBackendS3Config(t.Name() + "/toDir")
-			toTf := tfexec.SetupTestAccWithApply(t, tc.toWorkspace, toBackend+tc.toSource, nil)
+			toTf := tfexec.SetupTestAccWithApply(t, tc.toWorkspace, toBackend+tc.toSource)
 
 			//update terraform resource files for migration
 			tfexec.UpdateTestAccSource(t, fromTf, fromBackend+tc.fromUpdatedSource)

diff --git a/tfmigrate/state_import_action_test.go b/tfmigrate/state_import_action_test.go
@@ -23,7 +23,7 @@ resource "aws_iam_user" "baz" {
 	name = "baz"
 }
 `
-	tf := tfexec.SetupTestAccWithApply(t, "default", backend+source, nil)
+	tf := tfexec.SetupTestAccWithApply(t, "default", backend+source)
 	ctx := context.Background()
 
 	_, err := tf.StateRm(ctx, nil, []string{"aws_iam_user.foo", "aws_iam_user.baz"})

diff --git a/tfmigrate/state_migrator_test.go b/tfmigrate/state_migrator_test.go
@@ -149,7 +149,7 @@ resource "aws_iam_user" "qux" {
 	name = "qux"
 }
 `
-			tf := tfexec.SetupTestAccWithApply(t, tc.workspace, backend+source, nil)
+			tf := tfexec.SetupTestAccWithApply(t, tc.workspace, backend+source)
 			ctx := context.Background()
 
 			updatedSource := `
@@ -228,7 +228,7 @@ func TestAccStateMigratorApplyForce(t *testing.T) {
 resource "aws_security_group" "foo" {}
 resource "aws_security_group" "bar" {}
 `
-	tf := tfexec.SetupTestAccWithApply(t, "default", backend+source, nil)
+	tf := tfexec.SetupTestAccWithApply(t, "default", backend+source)
 	ctx := context.Background()
 
 	updatedSource := `

diff --git a/tfmigrate/state_mv_action_test.go b/tfmigrate/state_mv_action_test.go
@@ -17,7 +17,7 @@ resource "aws_security_group" "foo" {}
 resource "aws_security_group" "bar" {}
 resource "aws_security_group" "baz" {}
 `
-	tf := tfexec.SetupTestAccWithApply(t, "default", backend+source, nil)
+	tf := tfexec.SetupTestAccWithApply(t, "default", backend+source)
 	ctx := context.Background()
 
 	updatedSource := `

diff --git a/tfmigrate/state_rm_action_test.go b/tfmigrate/state_rm_action_test.go
@@ -18,7 +18,7 @@ resource "aws_security_group" "bar" {}
 resource "aws_security_group" "baz" {}
 resource "aws_security_group" "qux" {}
 `
-	tf := tfexec.SetupTestAccWithApply(t, "default", backend+source, nil)
+	tf := tfexec.SetupTestAccWithApply(t, "default", backend+source)
 	ctx := context.Background()
 
 	updatedSource := `