From 76d6813e6d003dccd584b1f3127df4b108199b6d Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Tue, 26 Mar 2024 00:21:47 +0100
Subject: [PATCH] chore(tests): use `t.TempDir` (#1677)

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
---
 internal/controller/promotion/git_test.go  | 24 ++++++++--------------
 internal/controller/promotion/helm_test.go |  6 ++----
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/internal/controller/promotion/git_test.go b/internal/controller/promotion/git_test.go
index 928f17175..ba2b8439d 100644
--- a/internal/controller/promotion/git_test.go
+++ b/internal/controller/promotion/git_test.go
@@ -466,17 +466,14 @@ func TestMoveRepoContents(t *testing.T) {
 	const subdirCount = 50
 	const fileCount = 50
 	// Create dummy repo dir
-	srcDir, err := createDummyRepoDir(subdirCount, fileCount)
-	defer os.RemoveAll(srcDir)
+	srcDir, err := createDummyRepoDir(t, subdirCount, fileCount)
 	require.NoError(t, err)
 	// Double-check the setup
 	dirEntries, err := os.ReadDir(srcDir)
 	require.NoError(t, err)
 	require.Len(t, dirEntries, subdirCount+fileCount+1)
 	// Create destination dir
-	destDir, err := os.MkdirTemp("", "")
-	defer os.RemoveAll(destDir)
-	require.NoError(t, err)
+	destDir := t.TempDir()
 	// Move
 	err = moveRepoContents(srcDir, destDir)
 	require.NoError(t, err)
@@ -499,8 +496,7 @@ func TestDeleteRepoContents(t *testing.T) {
 	const subdirCount = 50
 	const fileCount = 50
 	// Create dummy repo dir
-	dir, err := createDummyRepoDir(subdirCount, fileCount)
-	defer os.RemoveAll(dir)
+	dir, err := createDummyRepoDir(t, subdirCount, fileCount)
 	require.NoError(t, err)
 	// Double-check the setup
 	dirEntries, err := os.ReadDir(dir)
@@ -580,19 +576,17 @@ func TestBuildCommitMessage(t *testing.T) {
 	}
 }
 
-func createDummyRepoDir(dirCount, fileCount int) (string, error) {
-	// Create a directory
-	dir, err := os.MkdirTemp("", "")
-	if err != nil {
-		return dir, err
-	}
+func createDummyRepoDir(t *testing.T, dirCount, fileCount int) (string, error) {
+	t.Helper()
+	// Create a temporary directory
+	dir := t.TempDir()
 	// Add a dummy .git/ subdir
-	if err = os.Mkdir(filepath.Join(dir, ".git"), 0755); err != nil {
+	if err := os.Mkdir(filepath.Join(dir, ".git"), 0755); err != nil {
 		return dir, err
 	}
 	// Add some dummy dirs
 	for i := 0; i < dirCount; i++ {
-		if err = os.Mkdir(
+		if err := os.Mkdir(
 			filepath.Join(dir, fmt.Sprintf("dir-%d", i)),
 			0755,
 		); err != nil {
diff --git a/internal/controller/promotion/helm_test.go b/internal/controller/promotion/helm_test.go
index c68702275..faf483eff 100644
--- a/internal/controller/promotion/helm_test.go
+++ b/internal/controller/promotion/helm_test.go
@@ -344,12 +344,10 @@ func TestBuildValuesFilesChanges(t *testing.T) {
 
 func TestBuildChartDependencyChanges(t *testing.T) {
 	// Set up a couple of fake Chart.yaml files
-	testDir, err := os.MkdirTemp("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(testDir)
+	testDir := t.TempDir()
 
 	testChartsDir := filepath.Join(testDir, "charts")
-	err = os.Mkdir(testChartsDir, 0755)
+	err := os.Mkdir(testChartsDir, 0755)
 	require.NoError(t, err)
 
 	testFooChartDir := filepath.Join(testChartsDir, "foo")