try new project for ear

Author: oarbusi

internal/testutil/acc/encryption_at_rest.go

@@ -164,7 +164,7 @@ func EncryptionAtRestExecution(tb testing.TB) string {
 	SkipInUnitTest(tb)
 	require.True(tb, sharedInfo.init, "SetupSharedResources must called from TestMain test package")
 
-	projectID := ProjectIDExecution(tb)
+	projectID := createProject(tb, "encryption-at-rest-delete-on-create-timeout-test")
 
 	sharedInfo.mu.Lock()
 	defer sharedInfo.mu.Unlock()

internal/testutil/acc/shared_resource.go

@@ -53,12 +53,21 @@ func cleanupSharedResources() {
 		deletePrivateLinkEndpoint(projectID, sharedInfo.privateLinkProviderName, sharedInfo.privateLinkEndpointID)
 	}
 	if sharedInfo.encryptionAtRestEnabled {
-		projectID := sharedInfo.projectID
+		projectID := sharedInfo.encryptionAtRestProjectID
 		if projectID == "" {
-			projectID = projectIDLocal()
+			projectID = sharedInfo.projectID
+			if projectID == "" {
+				projectID = projectIDLocal()
+			}
 		}
 		fmt.Printf("Deleting execution encryption at rest: project id: %s\n", projectID)
 		deleteEncryptionAtRest(projectID)
+
+		// If we created a dedicated project, delete it
+		if sharedInfo.encryptionAtRestProjectID != "" && sharedInfo.encryptionAtRestProjectID != sharedInfo.projectID {
+			fmt.Printf("Deleting execution encryption at rest project: %s, id: %s\n", sharedInfo.encryptionAtRestProjectName, sharedInfo.encryptionAtRestProjectID)
+			deleteProject(sharedInfo.encryptionAtRestProjectID)
+		}
 	}
 	if sharedInfo.projectID != "" {
 		fmt.Printf("Deleting execution project: %s, id: %s\n", sharedInfo.projectName, sharedInfo.projectID)
@@ -216,17 +225,19 @@ type projectInfo struct {
 }
 
 var sharedInfo = struct {
-	projectID               string
-	projectName             string
-	clusterName             string
-	streamInstanceName      string
-	privateLinkEndpointID   string
-	privateLinkProviderName string
-	projects                []projectInfo
-	mu                      sync.Mutex
-	muSleep                 sync.Mutex
-	encryptionAtRestEnabled bool
-	init                    bool
+	encryptionAtRestProjectName string
+	projectName                 string
+	clusterName                 string
+	streamInstanceName          string
+	privateLinkEndpointID       string
+	privateLinkProviderName     string
+	projectID                   string
+	encryptionAtRestProjectID   string
+	projects                    []projectInfo
+	mu                          sync.Mutex
+	muSleep                     sync.Mutex
+	encryptionAtRestEnabled     bool
+	init                        bool
 }{
 	projects: []projectInfo{},
 }