Fix apptesting enablement (#8905)

* Fix an issue with apptesting enablement

Co-authored-by: Joe Hanley <[email protected]>

Author: jakeouellette

CHANGELOG.md

@@ -1,2 +1,3 @@
 - Fixed ext:export command so that it correctly returns system params in the .env file (#8881)
 - Fixed an issue where the MCP server could not successfully use Application Default Credentials. (#8896)
+- Fixed an issue where the incorrect API was enabled for `apptesting` commands.

src/apptesting/ensureProjectConfigured.spec.ts

@@ -41,13 +41,29 @@ describe("ensureProjectConfigured", () => {
 
     await apptesting.ensureProjectConfigured(projectId);
 
-    expect(ensureApiEnabledStub).to.be.calledThrice;
-    expect(ensureApiEnabledStub).to.be.calledWith(projectId, sinon.match.any, "storage", false);
-    expect(ensureApiEnabledStub).to.be.calledWith(projectId, sinon.match.any, "run", false);
+    expect(ensureApiEnabledStub).to.be.callCount(4);
     expect(ensureApiEnabledStub).to.be.calledWith(
       projectId,
-      sinon.match.any,
-      "artifactregistry",
+      "https://firebaseapptesting.googleapis.com",
+      "Firebase App Testing",
+      false,
+    );
+    expect(ensureApiEnabledStub).to.be.calledWith(
+      projectId,
+      "https://run.googleapis.com",
+      "Cloud Run",
+      false,
+    );
+    expect(ensureApiEnabledStub).to.be.calledWith(
+      projectId,
+      "https://storage.googleapis.com",
+      "Cloud Storage",
+      false,
+    );
+    expect(ensureApiEnabledStub).to.be.calledWith(
+      projectId,
+      "https://artifactregistry.googleapis.com",
+      "Artifact Registry",
       false,
     );
   });

src/apptesting/ensureProjectConfigured.ts

@@ -1,6 +1,6 @@
 import { addServiceAccountToRoles, serviceAccountHasRoles } from "../gcp/resourceManager";
 import { ensure } from "../ensureApiEnabled";
-import { appTestingOrigin } from "../api";
+import { appTestingOrigin, artifactRegistryDomain, cloudRunApiOrigin, storageOrigin } from "../api";
 import { logBullet, logWarning } from "../utils";
 import { FirebaseError, getErrStatus } from "../error";
 import * as iam from "../gcp/iam";
@@ -10,9 +10,10 @@ const TEST_RUNNER_ROLE = "roles/firebaseapptesting.testRunner";
 const TEST_RUNNER_SERVICE_ACCOUNT_NAME = "firebaseapptesting-test-runner";
 
 export async function ensureProjectConfigured(projectId: string) {
-  await ensure(projectId, appTestingOrigin(), "storage", false);
-  await ensure(projectId, appTestingOrigin(), "run", false);
-  await ensure(projectId, appTestingOrigin(), "artifactregistry", false);
+  await ensure(projectId, appTestingOrigin(), "Firebase App Testing", false);
+  await ensure(projectId, cloudRunApiOrigin(), "Cloud Run", false);
+  await ensure(projectId, storageOrigin(), "Cloud Storage", false);
+  await ensure(projectId, artifactRegistryDomain(), "Artifact Registry", false);
   const serviceAccount = runnerServiceAccount(projectId);
 
   const serviceAccountExistsAndIsRunner = await serviceAccountHasRoles(