Upgrades functions::list command to utilize Cloud Run API

src/commands/functions-list.ts

@@ -1,31 +1,50 @@
 import { Command } from "../command";
-import * as args from "../deploy/functions/args";
 import { needProjectId } from "../projectUtils";
 import { Options } from "../options";
 import { requirePermissions } from "../requirePermissions";
 import * as backend from "../deploy/functions/backend";
 import { logger } from "../logger";
 import * as Table from "cli-table3";
+import { listServices, endpointFromService } from "../gcp/runv2";
 
 export const command = new Command("functions:list")
   .description("list all deployed functions in your Firebase project")
-  .before(requirePermissions, ["cloudfunctions.functions.list"])
+  .before(requirePermissions, ["run.services.list"])
   .action(async (options: Options) => {
-    const context = {
-      projectId: needProjectId(options),
-    } as args.Context;
-    const existing = await backend.existingBackend(context);
-    const endpointsList = backend.allEndpoints(existing).sort(backend.compareFunctions);
+    const projectId = needProjectId(options);
+
+    let services: any[] = [];
+    try {
+      logger.info(`Listing functions in project ${projectId}...`);
+      services = await listServices(projectId);
+    } catch (err: any) {
+      logger.debug(`Failed to list services:`, err);
+      logger.error(
+        `Failed to list functions. Ensure you have the Cloud Run Admin API enabled and the necessary permissions.`,
+      );
+      return [];
+    }
+
+    if (services.length === 0) {
+      logger.info(`No functions found in project ${projectId}.`);
+      return [];
+    }
+
+    const endpointsList = services
+      .map((service) => endpointFromService(service))
+      .sort(backend.compareFunctions);
+
     const table = new Table({
-      head: ["Function", "Version", "Trigger", "Location", "Memory", "Runtime"],
+      head: ["Function", "Platform", "Trigger", "Location", "Memory", "Runtime"],
       style: { head: ["yellow"] },
     });
+
     for (const endpoint of endpointsList) {
       const trigger = backend.endpointTriggerType(endpoint);
       const availableMemoryMb = endpoint.availableMemoryMb || "---";
       const entry = [
         endpoint.id,
-        endpoint.platform === "gcfv2" ? "v2" : "v1",
+        endpoint.platform,
         trigger,
         endpoint.region,
         availableMemoryMb,

src/gcp/runv2.spec.ts

@@ -1,9 +1,12 @@
 import { expect } from "chai";
+import * as sinon from "sinon";
 
 import * as runv2 from "./runv2";
 import * as backend from "../deploy/functions/backend";
 import { latest } from "../deploy/functions/runtimes/supported";
 import { CODEBASE_LABEL } from "../functions/constants";
+import { Client } from "../apiv2";
+import { FirebaseError } from "../error";
 
 describe("runv2", () => {
   const PROJECT_ID = "project-id";
@@ -95,13 +98,13 @@
         httpsTrigger: {},
         environmentVariables: { FOO: "bar" },
       };
       const expectedServiceInput = JSON.parse(
         JSON.stringify({
           ...BASE_RUN_SERVICE,
           name: `projects/${PROJECT_ID}/locations/${LOCATION}/services/${FUNCTION_ID.toLowerCase()}`,
         }),
       );
       expectedServiceInput.template.containers[0].env.unshift({ name: "FOO", value: "bar" });
 
       expect(runv2.serviceFromEndpoint(endpoint, IMAGE_URI)).to.deep.equal(expectedServiceInput);
     });
@@ -114,13 +117,13 @@
           { key: "MY_SECRET", secret: "secret-name", projectId: PROJECT_ID, version: "1" },
         ],
       };
       const expectedServiceInput = JSON.parse(
         JSON.stringify({
           ...BASE_RUN_SERVICE,
           name: `projects/${PROJECT_ID}/locations/${LOCATION}/services/${FUNCTION_ID.toLowerCase()}`,
         }),
       );
       expectedServiceInput.template.containers[0].env.unshift({
         name: "MY_SECRET",
         valueSource: { secretKeyRef: { secret: "secret-name", version: "1" } },
       });
@@ -134,7 +137,7 @@
         minInstances: 1,
         maxInstances: 10,
       };
       const expectedServiceInput = JSON.parse(
         JSON.stringify({
           ...BASE_RUN_SERVICE,
           name: `projects/${PROJECT_ID}/locations/${LOCATION}/services/${FUNCTION_ID.toLowerCase()}`,
@@ -201,13 +204,11 @@
       const service: Omit<runv2.Service, runv2.ServiceOutputFields> = {
         ...BASE_RUN_SERVICE,
         name: `projects/${PROJECT_ID}/locations/${LOCATION}/services/${SERVICE_ID}`,
-        labels: {
-          [runv2.RUNTIME_LABEL]: latest("nodejs"),
-        },
         annotations: {
           ...BASE_RUN_SERVICE.annotations,
           [runv2.FUNCTION_ID_ANNOTATION]: FUNCTION_ID, // Using FUNCTION_ID_ANNOTATION as primary source for id
           [runv2.FUNCTION_TARGET_ANNOTATION]: "customEntryPoint",
+          [runv2.TRIGGER_TYPE_ANNOTATION]: "HTTP_TRIGGER",
         },
         template: {
           containers: [
@@ -239,6 +240,7 @@
         httpsTrigger: {},
         labels: {
           [runv2.RUNTIME_LABEL]: latest("nodejs"),
+          [runv2.CLIENT_NAME_LABEL]: "firebase-functions",
         },
         environmentVariables: {},
         secretEnvironmentVariables: [],
@@ -259,6 +261,7 @@
           ...BASE_RUN_SERVICE.annotations,
           [runv2.FUNCTION_ID_ANNOTATION]: FUNCTION_ID, // Using FUNCTION_ID_ANNOTATION as primary source for id
           [runv2.FUNCTION_TARGET_ANNOTATION]: "customEntryPoint",
+          [runv2.TRIGGER_TYPE_ANNOTATION]: "HTTP_TRIGGER",
         },
         template: {
           containers: [
@@ -379,7 +382,7 @@
       const service: runv2.Service = JSON.parse(JSON.stringify(BASE_RUN_SERVICE));
       service.template.containers![0].env = [
         { name: "FOO", value: "bar" },
-        {
+        { 
           name: "MY_SECRET",
           valueSource: {
             secretKeyRef: {
@@ -442,7 +445,7 @@
         entryPoint: SERVICE_ID, // No FUNCTION_TARGET_ANNOTATION
         availableMemoryMb: 128,
         cpu: 0.5,
-        httpsTrigger: {},
+        eventTrigger: { eventType: "unknown", retry: false },
         labels: {},
         environmentVariables: {},
         secretEnvironmentVariables: [],
@@ -452,4 +455,70 @@
       expect(runv2.endpointFromService(service)).to.deep.equal(expectedEndpoint);
     });
   });
+
+  describe("listServices", () => {
+    let sandbox: sinon.SinonSandbox;
+    let getStub: sinon.SinonStub;
+
+    beforeEach(() => {
+      sandbox = sinon.createSandbox();
+      getStub = sandbox.stub(Client.prototype, "get");
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it("should return a list of services", async () => {
+      const mockServices = [
+        { name: "service1" },
+        { name: "service2" },
+      ];
+      getStub.resolves({ status: 200, body: { services: mockServices } });
+
+      const services = await runv2.listServices(PROJECT_ID);
+
+      expect(services).to.deep.equal(mockServices);
+      expect(getStub).to.have.been.calledOnceWithExactly(
+        `/projects/${PROJECT_ID}/locations/-/services`,
+        { queryParams: {} },
+      );
+    });
+
+    it("should handle pagination", async () => {
+      const mockServices1 = [{ name: "service1" }];
+      const mockServices2 = [{ name: "service2" }];
+      getStub
+        .onFirstCall()
+        .resolves({ status: 200, body: { services: mockServices1, nextPageToken: "nextPage" } });
+      getStub
+        .onSecondCall()
+        .resolves({ status: 200, body: { services: mockServices2 } });
+
+      const services = await runv2.listServices(PROJECT_ID);
+
+      expect(services).to.deep.equal([...mockServices1, ...mockServices2]);
+      expect(getStub).to.have.been.calledTwice;
+      expect(getStub.firstCall).to.have.been.calledWithExactly(
+        `/projects/${PROJECT_ID}/locations/-/services`,
+        { queryParams: {} },
+      );
+      expect(getStub.secondCall).to.have.been.calledWithExactly(
+        `/projects/${PROJECT_ID}/locations/-/services`,
+        { queryParams: { pageToken: "nextPage" } },
+      );
+    });
+
+    it("should throw an error if the API call fails", async () => {
+      getStub.resolves({ status: 500, body: "Internal Server Error" });
+
+      try {
+        await runv2.listServices(PROJECT_ID);
+        expect.fail("Should have thrown an error");
+      } catch (err: any) {
+        expect(err).to.be.instanceOf(FirebaseError);
+        expect(err.message).to.contain("Failed to list services: 500 Internal Server Error");
+      }
+    });
+  });
 });

src/gcp/runv2.ts

@@ -200,6 +200,34 @@
   return svc;
 }
 
+export async function listServices(projectId: string): Promise<Service[]> {
+  let allServices: Service[] = [];
+  let pageToken: string | undefined = undefined;
+
+  do {
+    const queryParams: Record<string, string> = {};
+    if (pageToken) {
+      queryParams["pageToken"] = pageToken;
+    }
+
+    const res = await client.get<{ services?: Service[]; nextPageToken?: string }>(
+      `/projects/${projectId}/locations/-/services`,
+      { queryParams },
+    );
+
+    if (res.status !== 200) {
+      throw new FirebaseError(`Failed to list services: ${res.status} ${res.body}`);
+    }
+
+    if (res.body.services) {
+      allServices = allServices.concat(res.body.services);
+    }
+    pageToken = res.body.nextPageToken;
+  } while (pageToken);
+
+  return allServices;
+}
+
 // TODO: Replace with real version:
 function functionNameToServiceName(id: string): string {
   return id.toLowerCase().replace(/_/g, "-");
@@ -486,10 +514,11 @@
       env.find((e) => e.name === FUNCTION_TARGET_ENV)?.value ||
       service.annotations?.[FUNCTION_TARGET_ANNOTATION] ||
       service.annotations?.[FUNCTION_ID_ANNOTATION] ||
+
       id,
-
-    // TODO: trigger types.
-    httpsTrigger: {},
+    ...(service.annotations?.[TRIGGER_TYPE_ANNOTATION] === "HTTP_TRIGGER"
+      ? { httpsTrigger: {} }
+      : { eventTrigger: { eventType: service.annotations?.[TRIGGER_TYPE_ANNOTATION] || "unknown", retry: false } }),
   };
   proto.renameIfPresent(endpoint, service.template, "concurrency", "containerConcurrency");
   proto.renameIfPresent(endpoint, service.labels || {}, "codebase", CODEBASE_LABEL);