Use t.Setenv function to set env in unit tests (#76)

Signed-off-by: Lam Tran <[email protected]>

Author: tranngoclam

cmd/istioctl_test.go

@@ -60,10 +60,7 @@ func TestIstioctl_istioctlArgChecks(t *testing.T) {
 	_, err = f.Write(raw)
 	require.NoError(t, err)
 
-	require.NoError(t, os.Setenv("GETMESH_TEST_MANIFEST_PATH", f.Name()))
-	defer func() {
-		require.NoError(t, os.Setenv("GETMESH_TEST_MANIFEST_PATH", ""))
-	}()
+	t.Setenv("GETMESH_TEST_MANIFEST_PATH", f.Name())
 
 	t.Run("ok", func(t *testing.T) {
 		out, err := istioctlArgChecks([]string{"analyze"}, nil, "")

cmd/switch_test.go

@@ -61,10 +61,7 @@ func Test_switchParse(t *testing.T) {
 	_, err = f.Write(raw)
 	require.NoError(t, err)
 
-	require.NoError(t, os.Setenv("GETMESH_TEST_MANIFEST_PATH", f.Name()))
-	defer func() {
-		require.NoError(t, os.Setenv("GETMESH_TEST_MANIFEST_PATH", ""))
-	}()
+	t.Setenv("GETMESH_TEST_MANIFEST_PATH", f.Name())
 
 	// set up active distro
 	d := &manifest.IstioDistribution{

e2e/e2e_test.go

@@ -74,8 +74,7 @@ func TestFetch(t *testing.T) {
 	home, err := ioutil.TempDir("", "")
 	require.NoError(t, err)
 	defer os.RemoveAll(home)
-	require.NoError(t, os.Setenv("GETMESH_HOME", home))
-	defer os.Setenv("GETMESH_HOME", "")
+	t.Setenv("GETMESH_HOME", home)
 
 	cmd := exec.Command("./getmesh", "fetch", "--version=1.8.6", "--flavor=tetrate", "--flavor-version=0")
 	buf := new(bytes.Buffer)
@@ -134,8 +133,7 @@ func TestPrune(t *testing.T) {
 	home, err := ioutil.TempDir("", "")
 	require.NoError(t, err)
 	defer os.RemoveAll(home)
-	require.NoError(t, os.Setenv("GETMESH_HOME", home))
-	defer os.Setenv("GETMESH_HOME", "")
+	t.Setenv("GETMESH_HOME", home)
 
 	t.Run("specific", func(t *testing.T) {
 		var version = "1.7.8"
@@ -205,8 +203,7 @@ func TestShow(t *testing.T) {
 	home, err := ioutil.TempDir("", "")
 	require.NoError(t, err)
 	defer os.RemoveAll(home)
-	require.NoError(t, os.Setenv("GETMESH_HOME", home))
-	defer os.Setenv("GETMESH_HOME", "")
+	t.Setenv("GETMESH_HOME", home)
 
 	distros := []struct{ version, flavor, flavorVersion string }{
 		{
@@ -245,8 +242,7 @@ func TestSwitch(t *testing.T) {
 	home, err := ioutil.TempDir("", "")
 	require.NoError(t, err)
 	defer os.RemoveAll(home)
-	require.NoError(t, os.Setenv("GETMESH_HOME", home))
-	defer os.Setenv("GETMESH_HOME", "")
+	t.Setenv("GETMESH_HOME", home)
 
 	distros := []struct{ version, flavor, flavorVersion string }{
 		{

internal/manifestchecker/endoflife_test.go

@@ -58,7 +58,7 @@ func Test_endOfLifeChecker(t *testing.T) {
 
 	_, err = f.Write(raw)
 	require.NoError(t, err)
-	require.NoError(t, os.Setenv("GETMESH_TEST_MANIFEST_PATH", f.Name()))
+	t.Setenv("GETMESH_TEST_MANIFEST_PATH", f.Name())
 
 	t.Run("ok version", func(t *testing.T) {
 		require.NoError(t, getmesh.SetIstioVersion(home, &manifest.IstioDistribution{Version: "1.8.1"}))

internal/util/kube_test.go

@@ -15,7 +15,6 @@
 package util
 
 import (
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -24,28 +23,22 @@ import (
 
 func TestGetKubeConfigLocation(t *testing.T) {
 	t.Run("default", func(t *testing.T) {
-		original := os.Getenv("KUBECONFIG")
-		os.Setenv("KUBECONFIG", "")
-		defer os.Setenv("KUBECONFIG", original)
+		t.Setenv("KUBECONFIG", "")
 
 		config := GetKubeConfigLocation()
 		require.Equal(t, config, clientcmd.RecommendedHomeFile)
 	})
 
 	t.Run("KUBECONFIG", func(t *testing.T) {
 		actual := "./testconfig"
-		original := os.Getenv("KUBECONFIG")
-		os.Setenv("KUBECONFIG", actual)
-		defer os.Setenv("KUBECONFIG", original)
+		t.Setenv("KUBECONFIG", actual)
 
 		config := GetKubeConfigLocation()
 		require.Equal(t, config, actual)
 	})
 	t.Run("local", func(t *testing.T) {
 		actual := "./testconfig"
-		original := os.Getenv("KUBECONFIG")
-		os.Setenv("KUBECONFIG", "")
-		defer os.Setenv("KUBECONFIG", original)
+		t.Setenv("KUBECONFIG", "")
 
 		KubeConfig = actual
 		config := GetKubeConfigLocation()