From f27eeee0cb350bfebab83f35efcf9c3d1c137f6c Mon Sep 17 00:00:00 2001
From: Tristan Morgan <tristan.morgan@hashicorp.com>
Date: Tue, 30 Apr 2024 13:49:41 +1000
Subject: [PATCH] Use T.TempDir() in tests.

---
 decompress_tar_test.go | 14 ++++----------
 decompress_zip_test.go |  7 ++-----
 get_file_unix_test.go  |  7 ++-----
 get_git_test.go        | 12 +++---------
 get_http_test.go       |  7 ++-----
 source_test.go         |  5 +----
 6 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/decompress_tar_test.go b/decompress_tar_test.go
index f744547e..b092f2d0 100644
--- a/decompress_tar_test.go
+++ b/decompress_tar_test.go
@@ -78,14 +78,11 @@ func TestTarLimits(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	td, err := os.MkdirTemp("", "getter")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
+	td := t.TempDir()
 
 	tarFilePath := filepath.Join(td, "input.tar")
 
-	err = os.WriteFile(tarFilePath, b.Bytes(), 0666)
+	err := os.WriteFile(tarFilePath, b.Bytes(), 0666)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -129,15 +126,12 @@ func TestTarLimits(t *testing.T) {
 
 // testDecompressPermissions decompresses a directory and checks the permissions of the expanded files
 func testDecompressorPermissions(t *testing.T, d Decompressor, input string, expected map[string]int, umask os.FileMode) {
-	td, err := os.MkdirTemp("", "getter")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
+	td := t.TempDir()
 
 	// Destination is always joining result so that we have a new path
 	dst := filepath.Join(td, "subdir", "result")
 
-	err = d.Decompress(dst, input, true, umask)
+	err := d.Decompress(dst, input, true, umask)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
diff --git a/decompress_zip_test.go b/decompress_zip_test.go
index f788577f..3bb7fa04 100644
--- a/decompress_zip_test.go
+++ b/decompress_zip_test.go
@@ -165,14 +165,11 @@ func TestDecompressZipBomb(t *testing.T) {
 		}
 	}
 
-	td, err := os.MkdirTemp("", "go-getter-zip")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
+	td := t.TempDir()
 
 	zipFilePath := filepath.Join(td, "input.zip")
 
-	err = os.WriteFile(zipFilePath, buf.Bytes(), 0666)
+	err := os.WriteFile(zipFilePath, buf.Bytes(), 0666)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
diff --git a/get_file_unix_test.go b/get_file_unix_test.go
index a84312d9..ec999d21 100644
--- a/get_file_unix_test.go
+++ b/get_file_unix_test.go
@@ -12,16 +12,13 @@ import (
 // If a relative symlink is passed in as the pwd to Detect, the resulting URL
 // can have an invalid path.
 func TestFileDetector_relativeSymlink(t *testing.T) {
-	tmpDir, err := os.MkdirTemp("", "go-getter")
-	if err != nil {
-		t.Fatal(err)
-	}
+	tmpDir := t.TempDir()
 
 	defer os.RemoveAll(tmpDir)
 
 	// We may have a symlinked tmp dir,
 	// e.g. OSX uses /var -> /private/var
-	tmpDir, err = filepath.EvalSymlinks(tmpDir)
+	tmpDir, err := filepath.EvalSymlinks(tmpDir)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/get_git_test.go b/get_git_test.go
index 454c261e..d4a588e0 100644
--- a/get_git_test.go
+++ b/get_git_test.go
@@ -321,14 +321,11 @@ func TestGitGetter_gitVersion(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		t.Skip("skipping on windows since the test requires sh")
 	}
-	dir, err := os.MkdirTemp("", "go-getter")
-	if err != nil {
-		t.Fatal(err)
-	}
+	dir := t.TempDir()
 	defer os.RemoveAll(dir)
 
 	script := filepath.Join(dir, "git")
-	err = os.WriteFile(
+	err := os.WriteFile(
 		script,
 		[]byte("#!/bin/sh\necho \"git version 2.0 (Some Metadata Here)\n\""),
 		0700)
@@ -849,10 +846,7 @@ type gitRepo struct {
 
 // testGitRepo creates a new test git repository.
 func testGitRepo(t *testing.T, name string) *gitRepo {
-	dir, err := os.MkdirTemp("", "go-getter")
-	if err != nil {
-		t.Fatal(err)
-	}
+	dir := t.TempDir()
 	dir = filepath.Join(dir, name)
 	if err := os.Mkdir(dir, 0700); err != nil {
 		t.Fatal(err)
diff --git a/get_http_test.go b/get_http_test.go
index f98f97fb..b5e689e0 100644
--- a/get_http_test.go
+++ b/get_http_test.go
@@ -803,10 +803,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
 	ln := testHttpServerSubDir(t)
 	defer ln.Close()
 
-	dst, err := os.MkdirTemp("", "tf")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
+	dst := t.TempDir()
 
 	t.Logf("dst: %q", dst)
 
@@ -828,7 +825,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
 		GetMode: ModeAny,
 	}
 
-	_, err = client.Get(ctx, &req)
+	_, err := client.Get(ctx, &req)
 	if err != nil {
 		t.Fatalf("get err: %v", err)
 	}
diff --git a/source_test.go b/source_test.go
index 02c02a9b..0d154594 100644
--- a/source_test.go
+++ b/source_test.go
@@ -53,10 +53,7 @@ func TestSourceDirSubdir(t *testing.T) {
 }
 
 func TestSourceSubdirGlob(t *testing.T) {
-	td, err := os.MkdirTemp("", "subdir-glob")
-	if err != nil {
-		t.Fatal(err)
-	}
+	td := t.TempDir()
 	defer os.RemoveAll(td)
 
 	if err := os.Mkdir(filepath.Join(td, "subdir"), 0755); err != nil {