Merge #11524 #11586

11524: test: use T.TempDir to create temporary test directory r=Frassle a=Juneezee

# Description

A testing cleanup. 

This pull request replaces `ioutil.TempDir` with `t.TempDir`. We can use the `T.TempDir` function from the `testing` package to create temporary directory. The directory created by `T.TempDir` is automatically removed when the test and all its subtests complete. 

Reference: https://pkg.go.dev/testing#T.TempDir

```go
func TestFoo(t *testing.T) {
	// before
	tmpDir, err := ioutil.TempDir("", "")
	assert.NoError(t, err)
	defer os.RemoveAll(tmpDir)

	// now
	tmpDir := t.TempDir()
}
```

## Checklist

- [ ] ~~I have added tests that prove my fix is effective or that my feature works~~: Tests refactoring only, no new features added.
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [ ] ~~I have updated the [CHANGELOG-PENDING](https://github.com/pulumi/pulumi/blob/master/CHANGELOG_PENDING.md) file with my change~~: This PR is a non user-facing change.
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Service,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] ~~Yes, there are changes in this PR that warrants bumping the Pulumi Service API version~~: N/A
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


11586: ci: Fix extraneous alpha draft releases r=AaronFriel a=AaronFriel

The [PR workflow to update Pulumi YAML to 1.0.4](https://github.com/pulumi/pulumi/actions/runs/3642973677) shows that it created a draft release, and this has been the case for all contributors' PRs.

This fixes the extra alpha releases created as a result of pull requests. The job "prepare-release" shouldn't run unless the ci/test label is set, indicating an intent to evaluate the full CI pipeline.


Co-authored-by: Eng Zer Jun <engzerjun@gmail.com>
Co-authored-by: Aaron Friel <mayreply@aaronfriel.com>

.github/workflows/on-pr.yml

@@ -71,7 +71,7 @@ jobs:
 
   prepare-release:
     name: prepare
-    if: |
+    if: >- # No newlines or trailing newline.
       ${{
         github.event.pull_request.head.repo.full_name == github.repository
         && contains(github.event.pull_request.labels.*.name, 'ci/test')

pkg/backend/filestate/backend_test.go

@@ -3,7 +3,6 @@ package filestate
 import (
 	"context"
 	"encoding/json"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -143,8 +142,7 @@ func makeUntypedDeployment(name tokens.QName, phrase, state string) (*apitype.Un
 //nolint:paralleltest // mutates environment variables
 func TestListStacksWithMultiplePassphrases(t *testing.T) {
 	// Login to a temp dir filestate backend
-	tmpDir, err := ioutil.TempDir("", "filestatebackend")
-	assert.NoError(t, err)
+	tmpDir := t.TempDir()
 	b, err := New(cmdutil.Diag(), "file://"+filepath.ToSlash(tmpDir))
 	assert.NoError(t, err)
 	ctx := context.Background()
@@ -205,8 +203,7 @@ func TestDrillError(t *testing.T) {
 	t.Parallel()
 
 	// Login to a temp dir filestate backend
-	tmpDir, err := ioutil.TempDir("", "filestatebackend")
-	assert.NoError(t, err)
+	tmpDir := t.TempDir()
 	b, err := New(cmdutil.Diag(), "file://"+filepath.ToSlash(tmpDir))
 	assert.NoError(t, err)
 	ctx := context.Background()
@@ -224,8 +221,7 @@ func TestCancel(t *testing.T) {
 	t.Parallel()
 
 	// Login to a temp dir filestate backend
-	tmpDir, err := ioutil.TempDir("", "filestatebackend")
-	assert.NoError(t, err)
+	tmpDir := t.TempDir()
 	b, err := New(cmdutil.Diag(), "file://"+filepath.ToSlash(tmpDir))
 	assert.NoError(t, err)
 	ctx := context.Background()
@@ -286,8 +282,7 @@ func TestRemoveMakesBackups(t *testing.T) {
 	t.Parallel()
 
 	// Login to a temp dir filestate backend
-	tmpDir, err := ioutil.TempDir("", "filestatebackend")
-	assert.NoError(t, err)
+	tmpDir := t.TempDir()
 	b, err := New(cmdutil.Diag(), "file://"+filepath.ToSlash(tmpDir))
 	assert.NoError(t, err)
 	ctx := context.Background()
@@ -330,8 +325,7 @@ func TestRenameWorks(t *testing.T) {
 	t.Parallel()
 
 	// Login to a temp dir filestate backend
-	tmpDir, err := ioutil.TempDir("", "filestatebackend")
-	assert.NoError(t, err)
+	tmpDir := t.TempDir()
 	b, err := New(cmdutil.Diag(), "file://"+filepath.ToSlash(tmpDir))
 	assert.NoError(t, err)
 	ctx := context.Background()
@@ -445,8 +439,7 @@ func TestHtmlEscaping(t *testing.T) {
 	}
 
 	// Login to a temp dir filestate backend
-	tmpDir, err := ioutil.TempDir("", "filestatebackend")
-	assert.NoError(t, err)
+	tmpDir := t.TempDir()
 	b, err := New(cmdutil.Diag(), "file://"+filepath.ToSlash(tmpDir))
 	assert.NoError(t, err)
 	ctx := context.Background()

pkg/cmd/pulumi/convert_test.go

@@ -41,8 +41,7 @@ func TestPclConvert(t *testing.T) {
 	t.Setenv("PULUMI_DEV", "TRUE")
 
 	// Check that we can run convert from PCL to PCL
-	tmp, err := os.MkdirTemp("", "pulumi-convert-test")
-	assert.NoError(t, err)
+	tmp := t.TempDir()
 
 	result := runConvert("pcl_convert_testdata", []string{}, "pcl", "pcl", tmp, true)
 	assert.Nil(t, result)

pkg/cmd/pulumi/policy_new_smoke_test.go

@@ -16,8 +16,6 @@ package main
 
 import (
 	"context"
-	"io/ioutil"
-	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -29,8 +27,7 @@ import (
 func TestCreatingPolicyPackWithArgsSpecifiedName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir, _ := ioutil.TempDir("", "test-env")
-	defer os.RemoveAll(tempdir)
+	tempdir := t.TempDir()
 	chdir(t, tempdir)
 
 	var args = newPolicyArgs{

pkg/cmd/pulumi/policy_new_test.go

@@ -18,8 +18,6 @@ package main
 
 import (
 	"context"
-	"io/ioutil"
-	"os"
 	"path/filepath"
 	"testing"
 
@@ -30,8 +28,7 @@ import (
 func TestCreatingPolicyPackWithPromptedName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir, _ := ioutil.TempDir("", "test-env")
-	defer os.RemoveAll(tempdir)
+	tempdir := t.TempDir()
 	chdir(t, tempdir)
 
 	var args = newPolicyArgs{
@@ -54,9 +51,7 @@ func TestInvalidPolicyPackTemplateName(t *testing.T) {
 	const nonExistantTemplate = "this-is-not-the-template-youre-looking-for"
 
 	t.Run("RemoteTemplateNotFound", func(t *testing.T) {
-		tempdir, _ := ioutil.TempDir("", "test-env")
-		defer os.RemoveAll(tempdir)
-		assert.DirExists(t, tempdir)
+		tempdir := t.TempDir()
 		chdir(t, tempdir)
 
 		var args = newPolicyArgs{
@@ -71,8 +66,7 @@ func TestInvalidPolicyPackTemplateName(t *testing.T) {
 	})
 
 	t.Run("LocalTemplateNotFound", func(t *testing.T) {
-		tempdir, _ := ioutil.TempDir("", "test-env")
-		defer os.RemoveAll(tempdir)
+		tempdir := t.TempDir()
 		chdir(t, tempdir)
 
 		var args = newPolicyArgs{

pkg/testing/integration/program.go

@@ -844,11 +844,7 @@ func newProgramTester(t *testing.T, opts *ProgramTestOptions) *ProgramTester {
 
 // MakeTempBackend creates a temporary backend directory which will clean up on test exit.
 func MakeTempBackend(t *testing.T) string {
-	tempDir, err := os.MkdirTemp("", "")
-	if err != nil {
-		t.Fatalf("Failed to create temporary directory: %v", err)
-	}
-	t.Cleanup(func() { os.RemoveAll(tempDir) })
+	tempDir := t.TempDir()
 	return fmt.Sprintf("file://%s", filepath.ToSlash(tempDir))
 }
 

pkg/testing/integration/program_test.go

@@ -22,8 +22,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
-	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 )
 
 // Test that RunCommand writes the command's output to a log file.
@@ -42,9 +40,7 @@ func TestRunCommandLog(t *testing.T) {
 		Stderr: os.Stderr,
 	}
 
-	tempdir, err := ioutil.TempDir("", "test")
-	contract.AssertNoError(err)
-	defer os.RemoveAll(tempdir)
+	tempdir := t.TempDir()
 
 	args := []string{node, "-e", "console.log('output from node');"}
 	err = RunCommand(t, "node", args, tempdir, opts)

sdk/go/auto/git_test.go

@@ -21,10 +21,7 @@ func TestGitClone(t *testing.T) {
 
 	// This makes a git repo to clone from, so to avoid relying on something at GitHub that could
 	// change or be inaccessible.
-	tmpDir, err := os.MkdirTemp("", "pulumi-git-test")
-	assert.NoError(t, err)
-	assert.True(t, len(tmpDir) > 1)
-	t.Cleanup(func() { os.RemoveAll(tmpDir) })
+	tmpDir := t.TempDir()
 	originDir := filepath.Join(tmpDir, "origin")
 
 	origin, err := git.PlainInit(originDir, false)

sdk/go/common/resource/asset_test.go

@@ -444,8 +444,7 @@ func TestNestedArchive(t *testing.T) {
 	t.Parallel()
 
 	// Create temp dir and place some files.
-	dirName, err := os.MkdirTemp("", "")
-	assert.Nil(t, err)
+	dirName := t.TempDir()
 	assert.NoError(t, os.MkdirAll(filepath.Join(dirName, "foo", "bar"), 0777))
 	assert.NoError(t, os.WriteFile(filepath.Join(dirName, "foo", "a.txt"), []byte("a"), 0777))
 	assert.NoError(t, os.WriteFile(filepath.Join(dirName, "foo", "bar", "b.txt"), []byte("b"), 0777))
@@ -487,8 +486,7 @@ func TestFileReferencedThroughMultiplePaths(t *testing.T) {
 	t.Parallel()
 
 	// Create temp dir and place some files.
-	dirName, err := os.MkdirTemp("", "")
-	assert.Nil(t, err)
+	dirName := t.TempDir()
 	assert.NoError(t, os.MkdirAll(filepath.Join(dirName, "foo", "bar"), 0777))
 	assert.NoError(t, os.WriteFile(filepath.Join(dirName, "foo", "bar", "b.txt"), []byte("b"), 0777))
 

sdk/go/common/util/archive/archive_test.go

@@ -28,8 +28,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
-
 	"github.com/stretchr/testify/assert"
 )
 
@@ -122,7 +120,7 @@ func TestIgnoreNestedGitignore(t *testing.T) {
 
 func doArchiveTest(t *testing.T, path string, files ...fileContents) {
 	doTest := func(prefixPathInsideTar, path string) {
-		tarball, err := archiveContents(prefixPathInsideTar, path, files...)
+		tarball, err := archiveContents(t, prefixPathInsideTar, path, files...)
 		assert.NoError(t, err)
 
 		tarReader := bytes.NewReader(tarball)
@@ -137,15 +135,8 @@ func doArchiveTest(t *testing.T, path string, files ...fileContents) {
 	}
 }
 
-func archiveContents(prefixPathInsideTar, path string, files ...fileContents) ([]byte, error) {
-	dir, err := os.MkdirTemp("", "archive-test")
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		contract.IgnoreError(os.RemoveAll(dir))
-	}()
+func archiveContents(t *testing.T, prefixPathInsideTar, path string, files ...fileContents) ([]byte, error) {
+	dir := t.TempDir()
 
 	for _, file := range files {
 		name := file.name

sdk/go/common/workspace/paths_test.go

@@ -15,7 +15,6 @@
 package workspace
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -28,17 +27,16 @@ import (
 // that directory. However DetectProjectAndPath will do symlink resolution, while ioutil.TempDir normally does
 // not. This can lead to asserts especially on macos where TmpDir will have returned /var/folders/XX, but
 // after sym link resolution that is /private/var/folders/XX.
-func mkTempDir(t *testing.T, pattern string) string {
-	tmpDir, err := ioutil.TempDir("", pattern)
-	assert.NoError(t, err)
+func mkTempDir(t *testing.T) string {
+	tmpDir := t.TempDir()
 	result, err := filepath.EvalSymlinks(tmpDir)
 	assert.NoError(t, err)
 	return result
 }
 
 //nolint:paralleltest // Theses test use and change the current working directory
 func TestDetectProjectAndPath(t *testing.T) {
-	tmpDir := mkTempDir(t, "TestDetectProjectAndPath")
+	tmpDir := mkTempDir(t)
 	cwd, err := os.Getwd()
 	assert.NoError(t, err)
 	defer func() { err := os.Chdir(cwd); assert.NoError(t, err) }()
@@ -99,7 +97,7 @@ func TestProjectStackPath(t *testing.T) {
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			tmpDir := mkTempDir(t, "TestProjectStackPath")
+			tmpDir := mkTempDir(t)
 			cwd, err := os.Getwd()
 			assert.NoError(t, err)
 			defer func() { err := os.Chdir(cwd); assert.NoError(t, err) }()

sdk/go/common/workspace/plugins_install_test.go

@@ -84,8 +84,7 @@ func prepareTestPluginTGZ(t *testing.T, files map[string][]byte) io.ReadCloser {
 func prepareTestDir(t *testing.T, files map[string][]byte) (string, io.ReadCloser, PluginSpec) {
 	tarball := prepareTestPluginTGZ(t, files)
 
-	dir, err := ioutil.TempDir("", "plugins-test-dir")
-	require.NoError(t, err)
+	dir := t.TempDir()
 
 	v1 := semver.MustParse("0.1.0")
 	plugin := PluginSpec{
@@ -163,7 +162,6 @@ func testPluginInstall(t *testing.T, expectedDir string, files map[string][]byte
 	}
 
 	dir, tarball, plugin := prepareTestDir(t, files)
-	defer os.RemoveAll(dir)
 
 	err := plugin.Install(tarball, false)
 	assert.NoError(t, err)
@@ -182,7 +180,6 @@ func TestInstallNoDeps(t *testing.T) {
 	content := []byte("hello\n")
 
 	dir, tarball, plugin := prepareTestDir(t, map[string][]byte{name: content})
-	defer os.RemoveAll(dir)
 
 	err := plugin.Install(tarball, false)
 	require.NoError(t, err)
@@ -201,7 +198,6 @@ func TestReinstall(t *testing.T) {
 	content := []byte("hello\n")
 
 	dir, tarball, plugin := prepareTestDir(t, map[string][]byte{name: content})
-	defer os.RemoveAll(dir)
 
 	err := plugin.Install(tarball, false)
 	require.NoError(t, err)
@@ -231,7 +227,6 @@ func TestConcurrentInstalls(t *testing.T) {
 	content := []byte("hello\n")
 
 	dir, tarball, plugin := prepareTestDir(t, map[string][]byte{name: content})
-	defer os.RemoveAll(dir)
 
 	assertSuccess := func() PluginInfo {
 		pluginInfo := assertPluginInstalled(t, dir, plugin)
@@ -266,7 +261,6 @@ func TestConcurrentInstalls(t *testing.T) {
 
 func TestInstallCleansOldFiles(t *testing.T) {
 	dir, tarball, plugin := prepareTestDir(t, nil)
-	defer os.RemoveAll(dir)
 
 	// Leftover temp dirs.
 	tempDir1, err := ioutil.TempDir(dir, fmt.Sprintf("%s.tmp", plugin.Dir()))
@@ -298,7 +292,6 @@ func TestInstallCleansOldFiles(t *testing.T) {
 
 func TestGetPluginsSkipsPartial(t *testing.T) {
 	dir, tarball, plugin := prepareTestDir(t, nil)
-	defer os.RemoveAll(dir)
 
 	err := plugin.Install(tarball, false)
 	assert.NoError(t, err)

sdk/go/common/workspace/plugins_test.go

@@ -812,7 +812,7 @@ func TestParsePluginDownloadURLOverride(t *testing.T) {
 //nolint:paralleltest // changes directory for process
 func TestUnmarshalProjectWithProviderList(t *testing.T) {
 	t.Parallel()
-	tempdir, _ := ioutil.TempDir("", "test-env")
+	tempdir := t.TempDir()
 	pyaml := filepath.Join(tempdir, "Pulumi.yaml")
 
 	//write to pyaml

sdk/nodejs/cmd/pulumi-language-nodejs/main_test.go

@@ -16,7 +16,6 @@ package main
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -123,9 +122,7 @@ func TestCompatibleVersions(t *testing.T) {
 func TestGetRequiredPlugins(t *testing.T) {
 	t.Parallel()
 
-	dir, err := ioutil.TempDir("", "test-dir")
-	assert.NoError(t, err)
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 
 	files := []struct {
 		path    string

sdk/nodejs/npm/npm_test.go

@@ -57,8 +57,7 @@ func testInstall(t *testing.T, expectedBin string, production bool) {
 	}
 
 	// Create a new empty test directory and change the current working directory to it.
-	tempdir, _ := ioutil.TempDir("", "test-env")
-	t.Cleanup(func() { os.RemoveAll(tempdir) })
+	tempdir := t.TempDir()
 	chdir(t, tempdir)
 
 	// Create a package directory to install dependencies into.