fix(integration_tests): scope cleanup to declared project

Author: cabljac

integration_test/README.md

@@ -413,20 +413,20 @@ The integration tests use **separate Cloud Build configurations** for V1 and V2
 **V1 Tests:**
 ```bash
 # Run V1 tests on functions-integration-tests project
-gcloud builds submit --config=integration_test/cloudbuild-v1.yaml
+gcloud builds submit --config=integration_test/cloudbuild-v1.yaml --project=functions-integration-tests
 ```
 
 **V2 Tests:**
 ```bash
 # Run V2 tests on functions-integration-tests-v2 project
-gcloud builds submit --config=integration_test/cloudbuild-v2.yaml
+gcloud builds submit --config=integration_test/cloudbuild-v2.yaml --project=functions-integration-tests-v2
 ```
 
 **Both Tests (Parallel):**
 ```bash
 # Run both V1 and V2 tests simultaneously
-gcloud builds submit --config=integration_test/cloudbuild-v1.yaml &
-gcloud builds submit --config=integration_test/cloudbuild-v2.yaml &
+gcloud builds submit --config=integration_test/cloudbuild-v1.yaml --project=functions-integration-tests &
+gcloud builds submit --config=integration_test/cloudbuild-v2.yaml --project=functions-integration-tests-v2 &
 wait
 ```
 

integration_test/cloudbuild-v1.yaml

@@ -32,7 +32,7 @@ steps:
         npm install -g firebase-tools
         # Install gcloud CLI for Cloud Tasks cleanup
         curl https://sdk.cloud.google.com | bash
-        export PATH="$PATH:/root/google-cloud-sdk/bin"
+        export PATH="$$PATH:/root/google-cloud-sdk/bin"
         # Verify tools are installed
         firebase --version
         gcloud --version

integration_test/cloudbuild-v2.yaml

@@ -32,7 +32,7 @@ steps:
         npm install -g firebase-tools
         # Install gcloud CLI for Cloud Tasks cleanup
         curl https://sdk.cloud.google.com | bash
-        export PATH="$PATH:/root/google-cloud-sdk/bin"
+        export PATH="$$PATH:/root/google-cloud-sdk/bin"
         # Verify tools are installed
         firebase --version
         gcloud --version

integration_test/package.json

@@ -17,9 +17,9 @@
     "test:all:sequential": "node scripts/run-tests.js --sequential",
     "test:v1:auth-before-create": "node scripts/run-tests.js v1_auth_before_create",
     "test:v1:auth-before-signin": "node scripts/run-tests.js v1_auth_before_signin",
-    "cloudbuild:v1": "gcloud builds submit --config=cloudbuild-v1.yaml",
-    "cloudbuild:v2": "gcloud builds submit --config=cloudbuild-v2.yaml",
-    "cloudbuild:both": "gcloud builds submit --config=cloudbuild-v1.yaml & gcloud builds submit --config=cloudbuild-v2.yaml & wait",
+    "cloudbuild:v1": "gcloud builds submit --config=cloudbuild-v1.yaml --project=functions-integration-tests",
+    "cloudbuild:v2": "gcloud builds submit --config=cloudbuild-v2.yaml --project=functions-integration-tests-v2",
+    "cloudbuild:both": "gcloud builds submit --config=cloudbuild-v1.yaml --project=functions-integration-tests & gcloud builds submit --config=cloudbuild-v2.yaml --project=functions-integration-tests-v2 & wait",
     "cloudbuild:all": "npm run cloudbuild:both",
     "cleanup": "./scripts/cleanup-suite.sh",
     "cleanup:list": "./scripts/cleanup-suite.sh --list-artifacts",

integration_test/scripts/run-tests.js

@@ -703,82 +703,80 @@ class TestRunner {
   async cleanupExistingResources() {
     this.log("🧹 Checking for existing test functions...", "warn");
 
-    const { v1ProjectId, v2ProjectId } = this.getProjectIds();
-    const projects = [v1ProjectId, v2ProjectId];
+    // Only clean up the project that's being used for this test run
+    const projectId = this.projectId;
+    this.log(`   Checking project: ${projectId}`, "warn");
 
-    for (const projectId of projects) {
-      this.log(`   Checking project: ${projectId}`, "warn");
-
-      try {
-        // List functions and find test functions
-        const result = await this.exec(`firebase functions:list --project ${projectId}`, {
-          silent: true,
-        });
+    try {
+      // List functions and find test functions
+      const result = await this.exec(`firebase functions:list --project ${projectId}`, {
+        silent: true,
+      });
 
-        // Parse the table output from firebase functions:list
-        const lines = result.stdout.split("\n");
-        const testFunctions = [];
-
-        for (const line of lines) {
-          // Look for table rows with function names (containing │)
-          if (line.includes("│") && line.includes("Test")) {
-            const parts = line.split("│");
-            if (parts.length >= 2) {
-              const functionName = parts[1].trim();
-              // Check if it's a test function (contains Test + test run ID pattern)
-              if (functionName.match(/Test.*t[a-z0-9]{7,10}/)) {
-                testFunctions.push(functionName);
-              }
+      // Parse the table output from firebase functions:list
+      const lines = result.stdout.split("\n");
+      const testFunctions = [];
+
+      for (const line of lines) {
+        // Look for table rows with function names (containing │)
+        if (line.includes("│") && line.includes("Test")) {
+          const parts = line.split("│");
+          if (parts.length >= 2) {
+            const functionName = parts[1].trim();
+            // Check if it's a test function (contains Test + test run ID pattern)
+            if (functionName.match(/Test.*t[a-z0-9]{7,10}/)) {
+              testFunctions.push(functionName);
             }
           }
         }
+      }
 
-        if (testFunctions.length > 0) {
-          this.log(
-            `   Found ${testFunctions.length} test function(s) in ${projectId}. Cleaning up...`,
-            "warn"
-          );
+      if (testFunctions.length > 0) {
+        this.log(
+          `   Found ${testFunctions.length} test function(s) in ${projectId}. Cleaning up...`,
+          "warn"
+        );
 
-          for (const func of testFunctions) {
-            try {
-              // Function names from firebase functions:list are just the name, no region suffix
-              const functionName = func.trim();
-              const region = DEFAULT_REGION;
+        for (const func of testFunctions) {
+          try {
+            // Function names from firebase functions:list are just the name, no region suffix
+            const functionName = func.trim();
+            const region = DEFAULT_REGION;
 
-              this.log(`   Deleting function: ${functionName} in region: ${region}`, "warn");
+            this.log(`   Deleting function: ${functionName} in region: ${region}`, "warn");
 
-              // Try Firebase CLI first
+            // Try Firebase CLI first
+            try {
+              await this.exec(
+                `firebase functions:delete ${functionName} --project ${projectId} --region ${region} --force`,
+                { silent: true }
+              );
+              this.log(`   ✅ Deleted via Firebase CLI: ${functionName}`);
+            } catch (firebaseError) {
+              // If Firebase CLI fails, try gcloud as fallback
+              this.log(`   Firebase CLI failed, trying gcloud for: ${functionName}`, "warn");
               try {
                 await this.exec(
-                  `firebase functions:delete ${functionName} --project ${projectId} --region ${region} --force`,
+                  `gcloud functions delete ${functionName} --region=${region} --project=${projectId} --quiet`,
                   { silent: true }
                 );
-                this.log(`   ✅ Deleted via Firebase CLI: ${functionName}`);
-              } catch (firebaseError) {
-                // If Firebase CLI fails, try gcloud as fallback
-                this.log(`   Firebase CLI failed, trying gcloud for: ${functionName}`, "warn");
-                try {
-                  await this.exec(
-                    `gcloud functions delete ${functionName} --region=${region} --project=${projectId} --quiet`,
-                    { silent: true }
-                  );
-                  this.log(`   ✅ Deleted via gcloud: ${functionName}`);
-                } catch (gcloudError) {
-                  this.log(`   ❌ Failed to delete: ${functionName}`, "error");
-                  this.log(`   Firebase error: ${firebaseError.message}`, "error");
-                  this.log(`   Gcloud error: ${gcloudError.message}`, "error");
-                }
+                this.log(`   ✅ Deleted via gcloud: ${functionName}`);
+              } catch (gcloudError) {
+                this.log(`   ❌ Failed to delete: ${functionName}`, "error");
+                this.log(`   Firebase error: ${firebaseError.message}`, "error");
+                this.log(`   Gcloud error: ${gcloudError.message}`, "error");
               }
-            } catch (e) {
-              this.log(`   ❌ Unexpected error deleting ${func}: ${e.message}`, "error");
             }
+          } catch (e) {
+            this.log(`   ❌ Unexpected error deleting ${func}: ${e.message}`, "error");
           }
-        } else {
-          this.log(`   ✅ No test functions found in ${projectId}`, "success");
         }
-      } catch (e) {
-        // Project might not be accessible
+      } else {
+        this.log(`   ✅ No test functions found in ${projectId}`, "success");
       }
+    } catch (e) {
+      this.log(`   ⚠️  Could not check functions in ${projectId}: ${e.message}`, "warn");
+      // Project might not be accessible
     }
 
     // Clean up orphaned Cloud Tasks queues
@@ -797,58 +795,55 @@ class TestRunner {
   async cleanupOrphanedCloudTasksQueues() {
     this.log("   Checking for orphaned Cloud Tasks queues...", "warn");
 
-    const { v1ProjectId, v2ProjectId } = this.getProjectIds();
-    const projects = [v1ProjectId, v2ProjectId];
+    // Only clean up the project that's being used for this test run
+    const projectId = this.projectId;
     const region = DEFAULT_REGION;
+    this.log(`   Checking Cloud Tasks queues in project: ${projectId}`, "warn");
 
-    for (const projectId of projects) {
-      this.log(`   Checking Cloud Tasks queues in project: ${projectId}`, "warn");
-
-      try {
-        // List all queues in the project
-        const result = await this.exec(
-          `gcloud tasks queues list --location=${region} --project=${projectId} --format="value(name)"`,
-          { silent: true }
-        );
-
-        const queueNames = result.stdout
-          .split("\n")
-          .map((line) => line.trim())
-          .filter((line) => line.length > 0);
+    try {
+      // List all queues in the project
+      const result = await this.exec(
+        `gcloud tasks queues list --location=${region} --project=${projectId} --format="value(name)"`,
+        { silent: true }
+      );
 
-        // Find test queues (containing "Tests" and test run ID pattern)
-        const testQueues = queueNames.filter((queueName) => {
-          const queueId = queueName.split("/").pop(); // Extract queue ID from full path
-          return queueId && queueId.match(/Tests.*t[a-z0-9]{7,10}/);
-        });
+      const queueNames = result.stdout
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0);
 
-        if (testQueues.length > 0) {
-          this.log(
-            `   Found ${testQueues.length} orphaned test queue(s) in ${projectId}. Cleaning up...`,
-            "warn"
-          );
+      // Find test queues (containing "Tests" and test run ID pattern)
+      const testQueues = queueNames.filter((queueName) => {
+        const queueId = queueName.split("/").pop(); // Extract queue ID from full path
+        return queueId && queueId.match(/Tests.*t[a-z0-9]{7,10}/);
+      });
 
-          for (const queuePath of testQueues) {
-            try {
-              const queueId = queuePath.split("/").pop();
-              this.log(`   Deleting orphaned queue: ${queueId}`, "warn");
+      if (testQueues.length > 0) {
+        this.log(
+          `   Found ${testQueues.length} orphaned test queue(s) in ${projectId}. Cleaning up...`,
+          "warn"
+        );
 
-              await this.exec(
-                `gcloud tasks queues delete ${queueId} --location=${region} --project=${projectId} --quiet`,
-                { silent: true }
-              );
-              this.log(`   ✅ Deleted orphaned queue: ${queueId}`);
-            } catch (error) {
-              this.log(`   ⚠️  Could not delete queue ${queuePath}: ${error.message}`, "warn");
-            }
+        for (const queuePath of testQueues) {
+          try {
+            const queueId = queuePath.split("/").pop();
+            this.log(`   Deleting orphaned queue: ${queueId}`, "warn");
+
+            await this.exec(
+              `gcloud tasks queues delete ${queueId} --location=${region} --project=${projectId} --quiet`,
+              { silent: true }
+            );
+            this.log(`   ✅ Deleted orphaned queue: ${queueId}`);
+          } catch (error) {
+            this.log(`   ⚠️  Could not delete queue ${queuePath}: ${error.message}`, "warn");
           }
-        } else {
-          this.log(`   ✅ No orphaned test queues found in ${projectId}`, "success");
         }
-      } catch (e) {
-        // Project might not be accessible or Cloud Tasks API not enabled
-        this.log(`   ⚠️  Could not check queues in ${projectId}: ${e.message}`, "warn");
+      } else {
+        this.log(`   ✅ No orphaned test queues found in ${projectId}`, "success");
       }
+    } catch (e) {
+      // Project might not be accessible or Cloud Tasks API not enabled
+      this.log(`   ⚠️  Could not check queues in ${projectId}: ${e.message}`, "warn");
     }
   }