Merge #13330

13330: test(cmd/pulumi): Always use a valid project directory name r=abhinav a=abhinav Using `t.TempDir()` or a hex-encoded string isn't enough because the name may start with a number. This switches all such temporary directories to use: $tempDir/test-$random Where `$tempDir` is managed by the current test. This will address flaky errors like: ``` === FAIL: cmd/pulumi TestCreatingStackWithArgsSpecifiedOrgName (0.69s) new_test.go:74: Error Trace: /home/runner/work/pulumi/pulumi/pkg/cmd/pulumi/new_test.go:74 Error: Received unexpected error: '001' is not a valid project name. a project with this name already exists: 001 Test: TestCreatingStackWithArgsSpecifiedOrgName ``` Because the temporary directory was: /tmp/TestCreatingStackWithArgsSpecifiedOrgName963299567/001 Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>
pulumi · Jun 29, 2023 · c0c14fc · c0c14fc
2 parents 7edd2da + d07eda9
commit c0c14fc
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/pkg/cmd/pulumi/new_acceptance_test.go b/pkg/cmd/pulumi/new_acceptance_test.go
@@ -45,7 +45,7 @@ func chdir(t *testing.T, dir string) {
 func TestCreatingStackWithArgsSpecifiedName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	args := newArgs{
@@ -69,7 +69,7 @@ func TestCreatingStackWithArgsSpecifiedName(t *testing.T) {
 func TestCreatingStackWithNumericName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	// This test requires a numeric project name.
@@ -105,8 +105,7 @@ func TestCreatingStackWithNumericName(t *testing.T) {
 func TestCreatingStackWithPromptedName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := filepath.Join(t.TempDir(), genUniqueName(t))
-	require.NoError(t, os.MkdirAll(tempdir, 0o700))
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 	uniqueProjectName := filepath.Base(tempdir)
 
@@ -128,8 +127,7 @@ func TestCreatingStackWithPromptedName(t *testing.T) {
 func TestCreatingProjectWithDefaultName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := filepath.Join(t.TempDir(), genUniqueName(t))
-	require.NoError(t, os.MkdirAll(tempdir, 0o700))
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 	defaultProjectName := filepath.Base(tempdir)
 
@@ -168,8 +166,7 @@ func TestCreatingProjectWithPulumiBackendURL(t *testing.T) {
 	t.Setenv(workspace.PulumiBackendURLEnvVar, backendURL)
 
 	backendInstance = nil
-	tempdir := filepath.Join(t.TempDir(), genUniqueName(t))
-	require.NoError(t, os.MkdirAll(tempdir, 0o700))
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 	defaultProjectName := filepath.Base(tempdir)
 
@@ -235,7 +232,7 @@ func currentUser(t *testing.T) string {
 
 func loadStackName(t *testing.T) string {
 	w, err := workspace.New()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	return w.Settings().Stack
 }
 

diff --git a/pkg/cmd/pulumi/new_test.go b/pkg/cmd/pulumi/new_test.go
@@ -36,7 +36,7 @@ import (
 func TestFailInInteractiveWithoutYes(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	args := newArgs{
@@ -56,7 +56,7 @@ func TestFailInInteractiveWithoutYes(t *testing.T) {
 func TestCreatingStackWithArgsSpecifiedOrgName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	orgStackName := fmt.Sprintf("%s/%s", currentUser(t), stackName)
@@ -81,8 +81,7 @@ func TestCreatingStackWithArgsSpecifiedOrgName(t *testing.T) {
 func TestCreatingStackWithPromptedOrgName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := filepath.Join(t.TempDir(), genUniqueName(t))
-	require.NoError(t, os.MkdirAll(tempdir, 0o700))
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	uniqueProjectName := filepath.Base(tempdir)
@@ -106,8 +105,7 @@ func TestCreatingStackWithPromptedOrgName(t *testing.T) {
 func TestCreatingStackWithArgsSpecifiedFullNameSucceeds(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := filepath.Join(t.TempDir(), genUniqueName(t))
-	require.NoError(t, os.MkdirAll(tempdir, 0o700))
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	// the project name and the project name in the stack name must match
@@ -134,8 +132,7 @@ func TestCreatingStackWithArgsSpecifiedFullNameSucceeds(t *testing.T) {
 func TestCreatingProjectWithArgsSpecifiedName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := filepath.Join(t.TempDir(), genUniqueName(t))
-	require.NoError(t, os.MkdirAll(tempdir, 0o700))
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 	uniqueProjectName := filepath.Base(tempdir) + "test"
 
@@ -162,8 +159,7 @@ func TestCreatingProjectWithArgsSpecifiedName(t *testing.T) {
 func TestCreatingProjectWithPromptedName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := filepath.Join(t.TempDir(), genUniqueName(t))
-	require.NoError(t, os.MkdirAll(tempdir, 0o700))
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 	uniqueProjectName := filepath.Base(tempdir) + "test"
 
@@ -187,7 +183,7 @@ func TestCreatingProjectWithPromptedName(t *testing.T) {
 func TestCreatingProjectWithExistingArgsSpecifiedNameFails(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	backendInstance = &backend.MockBackend{
@@ -214,7 +210,7 @@ func TestCreatingProjectWithExistingArgsSpecifiedNameFails(t *testing.T) {
 func TestCreatingProjectWithExistingPromptedNameFails(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	backendInstance = &backend.MockBackend{
@@ -239,7 +235,7 @@ func TestCreatingProjectWithExistingPromptedNameFails(t *testing.T) {
 func TestGeneratingProjectWithExistingArgsSpecifiedNameSucceeds(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	backendInstance = &backend.MockBackend{
@@ -270,7 +266,7 @@ func TestGeneratingProjectWithExistingArgsSpecifiedNameSucceeds(t *testing.T) {
 func TestGeneratingProjectWithExistingPromptedNameSucceeds(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	backendInstance = &backend.MockBackend{
@@ -300,8 +296,7 @@ func TestCreatingProjectWithEmptyConfig(t *testing.T) {
 	// Regression test for https://github.com/pulumi/pulumi/issues/4081
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := filepath.Join(t.TempDir(), genUniqueName(t))
-	require.NoError(t, os.MkdirAll(tempdir, 0o700))
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 	uniqueProjectName := filepath.Base(tempdir) + "test"
 
@@ -339,7 +334,7 @@ func TestCreatingProjectWithEmptyConfig(t *testing.T) {
 func TestGeneratingProjectWithInvalidArgsSpecifiedNameFails(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	backendInstance = &backend.MockBackend{
@@ -368,7 +363,7 @@ func TestGeneratingProjectWithInvalidArgsSpecifiedNameFails(t *testing.T) {
 func TestGeneratingProjectWithInvalidPromptedNameFails(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	backendInstance = &backend.MockBackend{
@@ -404,7 +399,7 @@ func TestInvalidTemplateName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
 	t.Run("NoTemplateSpecified", func(t *testing.T) {
-		tempdir := t.TempDir()
+		tempdir := tempProjectDir(t)
 		chdir(t, tempdir)
 
 		args := newArgs{
@@ -421,7 +416,7 @@ func TestInvalidTemplateName(t *testing.T) {
 	})
 
 	t.Run("RemoteTemplateNotFound", func(t *testing.T) {
-		tempdir := t.TempDir()
+		tempdir := tempProjectDir(t)
 		chdir(t, tempdir)
 
 		// A template that will never exist.
@@ -441,7 +436,7 @@ func TestInvalidTemplateName(t *testing.T) {
 	})
 
 	t.Run("LocalTemplateNotFound", func(t *testing.T) {
-		tempdir := t.TempDir()
+		tempdir := tempProjectDir(t)
 		chdir(t, tempdir)
 
 		// A template that will never exist remotely.
@@ -811,12 +806,20 @@ func TestErrorIfNotEmptyDirectory(t *testing.T) {
 	}
 }
 
+func tempProjectDir(t *testing.T) string {
+	t.Helper()
+
+	dir := filepath.Join(t.TempDir(), genUniqueName(t))
+	require.NoError(t, os.MkdirAll(dir, 0o700))
+	return dir
+}
+
 func genUniqueName(t *testing.T) string {
 	t.Helper()
 
 	var bs [8]byte
 	_, err := rand.Read(bs[:])
 	require.NoError(t, err)
 
-	return hex.EncodeToString(bs[:])
+	return "test-" + hex.EncodeToString(bs[:])
 }
diff --git a/pkg/cmd/pulumi/policy_new_acceptance_test.go b/pkg/cmd/pulumi/policy_new_acceptance_test.go
@@ -27,7 +27,7 @@ import (
 func TestCreatingPolicyPackWithArgsSpecifiedName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	args := newPolicyArgs{

diff --git a/pkg/cmd/pulumi/policy_new_test.go b/pkg/cmd/pulumi/policy_new_test.go
@@ -28,7 +28,7 @@ import (
 func TestCreatingPolicyPackWithPromptedName(t *testing.T) {
 	skipIfShortOrNoPulumiAccessToken(t)
 
-	tempdir := t.TempDir()
+	tempdir := tempProjectDir(t)
 	chdir(t, tempdir)
 
 	args := newPolicyArgs{
@@ -51,7 +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 := t.TempDir()
+		tempdir := tempProjectDir(t)
 		chdir(t, tempdir)
 
 		args := newPolicyArgs{
@@ -66,7 +66,7 @@ func TestInvalidPolicyPackTemplateName(t *testing.T) {
 	})
 
 	t.Run("LocalTemplateNotFound", func(t *testing.T) {
-		tempdir := t.TempDir()
+		tempdir := tempProjectDir(t)
 		chdir(t, tempdir)
 
 		args := newPolicyArgs{