Remove a positional dir parameter from TerraformCLI.Init()

The positional `dir` parameter is no longer available in Terraform v0.15.0.
https://github.com/hashicorp/terraform/blob/v0.15/CHANGELOG.md#0150-april-14-2021

It was replaced by `-chdir` flag, but the current implementation actually
doesn't seem to use it. So we can remove it.

tfexec/terraform.go

@@ -61,8 +61,8 @@ type TerraformCLI interface {
 	// Verison returns a version number of Terraform.
 	Version(ctx context.Context) (string, error)
 
-	// Init initializes a given work directory.
-	Init(ctx context.Context, dir string, opts ...string) error
+	// Init initializes the current work directory.
+	Init(ctx context.Context, opts ...string) error
 
 	// Plan computes expected changes.
 	// If a state is given, use it for the input state.
@@ -221,7 +221,7 @@ terraform {
 	}
 
 	log.Printf("[INFO] [executor@%s] switch backend to local\n", c.Dir())
-	err := c.Init(ctx, "", "-input=false", "-no-color", "-reconfigure")
+	err := c.Init(ctx, "-input=false", "-no-color", "-reconfigure")
 	if err != nil {
 		// remove the override file before return an error.
 		os.Remove(path)
@@ -253,7 +253,7 @@ terraform {
 			log.Printf("[ERROR] [executor@%s] please remove the local workspace directory(%s) and re-run terraform init -reconfigure\n", c.Dir(), workspacePath)
 		}
 		log.Printf("[INFO] [executor@%s] switch back to remote\n", c.Dir())
-		err = c.Init(ctx, "", "-input=false", "-no-color", "-reconfigure")
+		err = c.Init(ctx, "-input=false", "-no-color", "-reconfigure")
 		if err != nil {
 			// we cannot return error here.
 			log.Printf("[ERROR] [executor@%s] failed to switch back to remote: %s\n", c.Dir(), err)

tfexec/terraform_apply_test.go

@@ -123,7 +123,7 @@ func TestAccTerraformCLIApply(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_destroy_test.go

@@ -91,7 +91,7 @@ func TestAccTerraformCLIDestroy(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_import_test.go

@@ -163,7 +163,7 @@ func TestAccTerraformCLIImport(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_init.go

@@ -2,13 +2,10 @@ package tfexec
 
 import "context"
 
-// Init initializes a given work directory.
-func (c *terraformCLI) Init(ctx context.Context, dir string, opts ...string) error {
+// Init initializes the current work directory.
+func (c *terraformCLI) Init(ctx context.Context, opts ...string) error {
 	args := []string{"init"}
 	args = append(args, opts...)
-	if len(dir) > 0 {
-		args = append(args, dir)
-	}
 	_, _, err := c.Run(ctx, args...)
 	return err
 }

tfexec/terraform_init_test.go

@@ -11,12 +11,11 @@ func TestTerraformCLIInit(t *testing.T) {
 	cases := []struct {
 		desc         string
 		mockCommands []*mockCommand
-		dir          string
 		opts         []string
 		ok           bool
 	}{
 		{
-			desc: "no dir and no opts",
+			desc: "no opts",
 			mockCommands: []*mockCommand{
 				{
 					args:     []string{"terraform", "init"},
@@ -35,17 +34,6 @@ func TestTerraformCLIInit(t *testing.T) {
 			},
 			ok: false,
 		},
-		{
-			desc: "with dir",
-			mockCommands: []*mockCommand{
-				{
-					args:     []string{"terraform", "init", "foo"},
-					exitCode: 0,
-				},
-			},
-			dir: "foo",
-			ok:  true,
-		},
 		{
 			desc: "with opts",
 			mockCommands: []*mockCommand{
@@ -57,25 +45,13 @@ func TestTerraformCLIInit(t *testing.T) {
 			opts: []string{"-input=false", "-no-color"},
 			ok:   true,
 		},
-		{
-			desc: "with dir and opts",
-			mockCommands: []*mockCommand{
-				{
-					args:     []string{"terraform", "init", "-input=false", "-no-color", "foo"},
-					exitCode: 0,
-				},
-			},
-			dir:  "foo",
-			opts: []string{"-input=false", "-no-color"},
-			ok:   true,
-		},
 	}
 
 	for _, tc := range cases {
 		t.Run(tc.desc, func(t *testing.T) {
 			e := NewMockExecutor(tc.mockCommands)
 			terraformCLI := NewTerraformCLI(e)
-			err := terraformCLI.Init(context.Background(), tc.dir, tc.opts...)
+			err := terraformCLI.Init(context.Background(), tc.opts...)
 			if tc.ok && err != nil {
 				t.Fatalf("unexpected err: %s", err)
 			}
@@ -93,7 +69,7 @@ func TestAccTerraformCLIInit(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_plan_test.go

@@ -168,7 +168,7 @@ func TestAccTerraformCLIPlan(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}
@@ -190,7 +190,7 @@ func TestAccTerraformCLIPlanWithOut(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_state_list_test.go

@@ -165,7 +165,7 @@ resource "null_resource" "bar" {}
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_state_mv_test.go

@@ -240,7 +240,7 @@ resource "null_resource" "bar" {}
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}
@@ -283,7 +283,7 @@ resource "null_resource" "bar" {}
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_state_pull_test.go

@@ -78,7 +78,7 @@ func TestAccTerraformCLIStatePull(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_state_push_test.go

@@ -79,7 +79,7 @@ func TestAccTerraformCLIStatePush(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_state_rm_test.go

@@ -152,7 +152,7 @@ resource "null_resource" "bar" {}
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_test.go

@@ -169,7 +169,7 @@ func TestAccTerraformCLIPlanHasChange(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_workspace_new_test.go

@@ -69,7 +69,7 @@ func TestAccTerraformCLIWorkspaceNew(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/terraform_workspace_select_test.go

@@ -67,7 +67,7 @@ func TestAccTerraformCLIWorkspaceSelect(t *testing.T) {
 	e := SetupTestAcc(t, source)
 	terraformCLI := NewTerraformCLI(e)
 
-	err := terraformCLI.Init(context.Background(), "", "-input=false", "-no-color")
+	err := terraformCLI.Init(context.Background(), "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfexec/test_helper.go

@@ -291,7 +291,7 @@ func SetupTestAccWithApply(t *testing.T, workspace string, source string) Terraf
 	tf := NewTerraformCLI(e)
 	ctx := context.Background()
 
-	err := tf.Init(ctx, "", "-input=false", "-no-color")
+	err := tf.Init(ctx, "-input=false", "-no-color")
 	if err != nil {
 		t.Fatalf("failed to run terraform init: %s", err)
 	}

tfmigrate/migrator.go

@@ -32,7 +32,7 @@ func setupWorkDir(ctx context.Context, tf tfexec.TerraformCLI, workspace string)
 
 	// init folder
 	log.Printf("[INFO] [migrator@%s] initialize work dir\n", tf.Dir())
-	err = tf.Init(ctx, "", "-input=false", "-no-color")
+	err = tf.Init(ctx, "-input=false", "-no-color")
 	if err != nil {
 		return nil, nil, err
 	}