make tests pass (or skip) on darwin/arm64 (hashicorp#304)

* make tests pass on darwin/arm64 * address PR feedback (add extra v1 tests)
rstandt · Jun 21, 2022 · e617517 · e617517
1 parent 531dc1c
commit e617517
Show file tree

Hide file tree

Showing 24 changed files with 235 additions and 36 deletions.
diff --git a/tfexec/destroy_test.go b/tfexec/destroy_test.go
@@ -10,7 +10,7 @@ import (
 func TestDestroyCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/fmt_test.go b/tfexec/fmt_test.go
@@ -3,10 +3,15 @@ package tfexec
 import (
 	"context"
 	"errors"
+	"runtime"
 	"testing"
 )
 
 func TestFormat(t *testing.T) {
+	if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
+		t.Skip("Terraform for darwin/arm64 is not available until v1")
+	}
+
 	td := t.TempDir()
 
 	tf, err := NewTerraform(td, tfVersion(t, "0.7.6"))

diff --git a/tfexec/get_test.go b/tfexec/get_test.go
@@ -10,7 +10,7 @@ import (
 func TestGetCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/graph_test.go b/tfexec/graph_test.go
@@ -2,12 +2,17 @@ package tfexec
 
 import (
 	"context"
+	"runtime"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
-func TestGraphCmd(t *testing.T) {
+func TestGraphCmd_v013(t *testing.T) {
+	if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
+		t.Skip("Terraform for darwin/arm64 is not available until v1")
+	}
+
 	td := t.TempDir()
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest013))
@@ -41,10 +46,10 @@ func TestGraphCmd(t *testing.T) {
 	})
 }
 
-func TestGraphCmd15(t *testing.T) {
+func TestGraphCmd_v1(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest015))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/import_test.go b/tfexec/import_test.go
@@ -10,7 +10,7 @@ import (
 func TestImportCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/init_test.go b/tfexec/init_test.go
@@ -2,12 +2,17 @@ package tfexec
 
 import (
 	"context"
+	"runtime"
 	"testing"
 
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
 )
 
-func TestInitCmd(t *testing.T) {
+func TestInitCmd_v012(t *testing.T) {
+	if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
+		t.Skip("Terraform for darwin/arm64 is not available until v1")
+	}
+
 	td := t.TempDir()
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
@@ -68,3 +73,57 @@ func TestInitCmd(t *testing.T) {
 		}, nil, initCmd)
 	})
 }
+
+func TestInitCmd_v1(t *testing.T) {
+	td := t.TempDir()
+
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// empty env, to avoid environ mismatch in testing
+	tf.SetEnv(map[string]string{})
+
+	t.Run("defaults", func(t *testing.T) {
+		// defaults
+		initCmd, err := tf.initCmd(context.Background())
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		assertCmd(t, []string{
+			"init",
+			"-no-color",
+			"-force-copy",
+			"-input=false",
+			"-backend=true",
+			"-get=true",
+			"-upgrade=false",
+		}, nil, initCmd)
+	})
+
+	t.Run("override all defaults", func(t *testing.T) {
+		initCmd, err := tf.initCmd(context.Background(), Backend(false), BackendConfig("confpath1"), BackendConfig("confpath2"), FromModule("testsource"), Get(false), PluginDir("testdir1"), PluginDir("testdir2"), Reconfigure(true), Upgrade(true), Dir("initdir"))
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		assertCmd(t, []string{
+			"init",
+			"-no-color",
+			"-force-copy",
+			"-input=false",
+			"-from-module=testsource",
+			"-backend=false",
+			"-get=false",
+			"-upgrade=true",
+			"-reconfigure",
+			"-backend-config=confpath1",
+			"-backend-config=confpath2",
+			"-plugin-dir=testdir1",
+			"-plugin-dir=testdir2",
+			"initdir",
+		}, nil, initCmd)
+	})
+}
diff --git a/tfexec/internal/e2etest/testdata/bigint/main.tf b/tfexec/internal/e2etest/testdata/bigint/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     random = {
-      version = "3.0.1"
+      version = "3.1.3"
     }
   }
 }

diff --git a/tfexec/internal/e2etest/util_test.go b/tfexec/internal/e2etest/util_test.go
@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -50,6 +51,16 @@ func runTestVersions(t *testing.T, versions []string, fixtureName string, cb fun
 	alreadyRunVersions := map[string]bool{}
 	for _, tfv := range versions {
 		t.Run(fmt.Sprintf("%s-%s", fixtureName, tfv), func(t *testing.T) {
+			if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
+				v, err := version.NewVersion(tfv)
+				if err != nil {
+					t.Fatal(err)
+				}
+				if v.LessThan(version.Must(version.NewVersion("1.0.2"))) {
+					t.Skipf("Terraform not available for darwin/arm64 < 1.0.2 (%s)", v)
+				}
+			}
+
 			if alreadyRunVersions[tfv] {
 				t.Skipf("already run version %q", tfv)
 			}

diff --git a/tfexec/output_test.go b/tfexec/output_test.go
@@ -10,7 +10,7 @@ import (
 func TestOutputCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/providers_lock_test.go b/tfexec/providers_lock_test.go
@@ -10,7 +10,7 @@ import (
 func TestProvidersLockCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/providers_schema_test.go b/tfexec/providers_schema_test.go
@@ -10,7 +10,7 @@ import (
 func TestProvidersSchemaCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/refresh_test.go b/tfexec/refresh_test.go
@@ -10,7 +10,7 @@ import (
 func TestRefreshCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest013))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/show_test.go b/tfexec/show_test.go
@@ -10,7 +10,7 @@ import (
 func TestShowCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -31,7 +31,7 @@ func TestShowCmd(t *testing.T) {
 func TestShowStateFileCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -52,7 +52,7 @@ func TestShowStateFileCmd(t *testing.T) {
 func TestShowPlanFileCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -73,7 +73,7 @@ func TestShowPlanFileCmd(t *testing.T) {
 func TestShowPlanFileRawCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/state_mv_test.go b/tfexec/state_mv_test.go
@@ -10,7 +10,7 @@ import (
 func TestStateMvCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest013))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/state_rm_test.go b/tfexec/state_rm_test.go
@@ -10,7 +10,7 @@ import (
 func TestStateRmCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest013))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/taint_test.go b/tfexec/taint_test.go
@@ -10,7 +10,7 @@ import (
 func TestTaintCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest013))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tfexec/terraform_test.go b/tfexec/terraform_test.go
@@ -32,7 +32,7 @@ func TestMain(m *testing.M) {
 func TestSetEnv(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -272,7 +272,11 @@ func TestSetLogPath(t *testing.T) {
 	})
 }
 
-func TestCheckpointDisablePropagation(t *testing.T) {
+func TestCheckpointDisablePropagation_v012(t *testing.T) {
+	if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
+		t.Skip("Terraform for darwin/arm64 is not available until v1")
+	}
+
 	td := t.TempDir()
 
 	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest012))
@@ -351,6 +355,77 @@ func TestCheckpointDisablePropagation(t *testing.T) {
 	})
 }
 
+func TestCheckpointDisablePropagation_v1(t *testing.T) {
+	td := t.TempDir()
+
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = os.Setenv("CHECKPOINT_DISABLE", "1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.Unsetenv("CHECKPOINT_DISABLE")
+
+	t.Run("case 1: env var is set in environment and not overridden", func(t *testing.T) {
+
+		err = tf.SetEnv(map[string]string{
+			"FOOBAR": "1",
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		initCmd, err := tf.initCmd(context.Background())
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		assertCmd(t, []string{
+			"init",
+			"-no-color",
+			"-force-copy",
+			"-input=false",
+			"-backend=true",
+			"-get=true",
+			"-upgrade=false",
+		}, map[string]string{
+			"CHECKPOINT_DISABLE": "1",
+			"FOOBAR":             "1",
+		}, initCmd)
+	})
+
+	t.Run("case 2: env var is set in environment and overridden with SetEnv", func(t *testing.T) {
+		err = tf.SetEnv(map[string]string{
+			"CHECKPOINT_DISABLE": "",
+			"FOOBAR":             "2",
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		initCmd, err := tf.initCmd(context.Background())
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		assertCmd(t, []string{
+			"init",
+			"-no-color",
+			"-force-copy",
+			"-input=false",
+			"-backend=true",
+			"-get=true",
+			"-upgrade=false",
+		}, map[string]string{
+			"CHECKPOINT_DISABLE": "",
+			"FOOBAR":             "2",
+		}, initCmd)
+	})
+}
+
 // test that a suitable error is returned if NewTerraform is called without a valid
 // executable path
 func TestNoTerraformBinary(t *testing.T) {

diff --git a/tfexec/untaint_test.go b/tfexec/untaint_test.go
@@ -10,7 +10,7 @@ import (
 func TestUntaintCmd(t *testing.T) {
 	td := t.TempDir()
 
-	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest013))
+	tf, err := NewTerraform(td, tfVersion(t, testutil.Latest_v1))
 	if err != nil {
 		t.Fatal(err)
 	}