Print cloudfunctions.net URL instead of run.app URL for 2nd Gen function

src/deploy/functions/backend.spec.ts

@@ -52,15 +52,16 @@ describe("Backend", () => {
       maxInstanceRequestConcurrency: 80,
     },
   };
-  const RUN_URI = "https://id-nonce-region-project.run.app";
+  const GCF_URL = "https://region-project.cloudfunctions.net/id";
   const HAVE_CLOUD_FUNCTION_V2: gcfV2.OutputCloudFunction = {
     ...CLOUD_FUNCTION_V2,
     serviceConfig: {
       service: "service",
-      uri: RUN_URI,
+      uri: GCF_URL,
       availableCpu: "1",
       maxInstanceRequestConcurrency: 80,
     },
+    url: GCF_URL,
     state: "ACTIVE",
     updateTime: new Date(),
   };

src/deploy/functions/release/fabricator.ts

@@ -123,7 +123,7 @@
       try {
         await fn();
         this.logOpSuccess(op, endpoint);
       } catch (err: any) {
         result.error = err as Error;
       }
       result.durationMs = timer.stop();
@@ -223,7 +223,7 @@
   }
 
   async createV1Function(endpoint: backend.Endpoint, scraper: SourceTokenScraper): Promise<void> {
     const sourceUrl = this.sources[endpoint.codebase!]?.sourceUrl;
     if (!sourceUrl) {
       logger.debug("Precondition failed. Cannot create a GCF function without sourceUrl");
       throw new Error("Precondition failed");
@@ -242,7 +242,7 @@
         const op: { name: string } = await gcf.createFunction(apiFunction);
         return poller.pollOperation<gcf.CloudFunction>({
           ...gcfV1PollerOptions,
           pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`,
           operationResourceName: op.name,
           onPoll: scraper.poller,
         });
@@ -279,7 +279,7 @@
       }
     } else if (
       backend.isBlockingTriggered(endpoint) &&
       AUTH_BLOCKING_EVENTS.includes(endpoint.blockingTrigger.eventType as any)
     ) {
       // Auth Blocking functions should always be public
       await this.executor
@@ -291,7 +291,7 @@
   }
 
   async createV2Function(endpoint: backend.Endpoint, scraper: SourceTokenScraper): Promise<void> {
     const storageSource = this.sources[endpoint.codebase!]?.storage;
     if (!storageSource) {
       logger.debug("Precondition failed. Cannot create a GCFv2 function without storage");
       throw new Error("Precondition failed");
@@ -307,15 +307,15 @@
         .run(async () => {
           try {
             await pubsub.createTopic({ name: topic });
           } catch (err: any) {
             // Pub/Sub uses HTTP 409 (CONFLICT) with a status message of
             // ALREADY_EXISTS if the topic already exists.
             if (err.status === 409) {
               return;
             }
             throw new FirebaseError("Unexpected error creating Pub/Sub topic", {
               original: err as Error,
               status: err.status,
             });
           }
         })
@@ -394,7 +394,7 @@
         });
     }
 
-    endpoint.uri = resultFunction.serviceConfig?.uri;
+    endpoint.uri = resultFunction.url;
     const serviceName = resultFunction.serviceConfig?.service;
     endpoint.runServiceId = utils.last(serviceName?.split("/"));
     if (!serviceName) {

src/gcp/cloudfunctionsv2.spec.ts

@@ -49,12 +49,14 @@ describe("cloudfunctionsv2", () => {
   };
 
   const RUN_URI = "https://id-nonce-region-project.run.app";
+  const GCF_URL = "https://region-project.cloudfunctions.net/id";
   const HAVE_CLOUD_FUNCTION_V2: cloudfunctionsv2.OutputCloudFunction = {
     ...CLOUD_FUNCTION_V2,
     serviceConfig: {
       service: "service",
       uri: RUN_URI,
     },
+    url: GCF_URL,
     state: "ACTIVE",
     updateTime: new Date(),
   };
@@ -408,7 +410,7 @@ describe("cloudfunctionsv2", () => {
         ...ENDPOINT,
         httpsTrigger: {},
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
       });
     });
 
@@ -425,7 +427,7 @@ describe("cloudfunctionsv2", () => {
         ...ENDPOINT,
         httpsTrigger: {},
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
         runServiceId: "service-id",
       });
     });
@@ -434,7 +436,7 @@ describe("cloudfunctionsv2", () => {
       let want: backend.Endpoint = {
         ...ENDPOINT,
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
         eventTrigger: {
           eventType: events.v2.PUBSUB_PUBLISH_EVENT,
           eventFilters: { topic: "projects/p/topics/t" },
@@ -561,7 +563,7 @@ describe("cloudfunctionsv2", () => {
       const want: backend.Endpoint = {
         ...ENDPOINT,
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
         eventTrigger: {
           eventType: "com.custom.event",
           eventFilters: { customattr: "customvalue" },
@@ -596,7 +598,7 @@ describe("cloudfunctionsv2", () => {
         ...ENDPOINT,
         taskQueueTrigger: {},
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
         labels: { "deployment-taskqueue": "true" },
       });
     });
@@ -613,7 +615,7 @@ describe("cloudfunctionsv2", () => {
           eventType: events.v1.BEFORE_CREATE_EVENT,
         },
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
         labels: { "deployment-blocking": "before-create" },
       });
     });
@@ -630,7 +632,7 @@ describe("cloudfunctionsv2", () => {
           eventType: events.v1.BEFORE_SIGN_IN_EVENT,
         },
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
         labels: { "deployment-blocking": "before-sign-in" },
       });
     });
@@ -668,7 +670,7 @@ describe("cloudfunctionsv2", () => {
         ...ENDPOINT,
         platform: "gcfv2",
         httpsTrigger: {},
-        uri: RUN_URI,
+        uri: GCF_URL,
         ...extraFields,
         serviceAccount: "[email protected]",
         vpc,
@@ -703,7 +705,7 @@ describe("cloudfunctionsv2", () => {
       ).to.deep.equal({
         ...ENDPOINT,
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
         httpsTrigger: {},
         ...extraFields,
       });
@@ -721,7 +723,7 @@ describe("cloudfunctionsv2", () => {
       ).to.deep.equal({
         ...ENDPOINT,
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
         httpsTrigger: {},
         labels: {
           ...ENDPOINT.labels,
@@ -744,7 +746,7 @@ describe("cloudfunctionsv2", () => {
       ).to.deep.equal({
         ...ENDPOINT,
         platform: "gcfv2",
-        uri: RUN_URI,
+        uri: GCF_URL,
         httpsTrigger: {},
         labels: {
           ...ENDPOINT.labels,
@@ -761,6 +763,7 @@ describe("cloudfunctionsv2", () => {
         ...ENDPOINT,
         platform: "gcfv2",
         httpsTrigger: {},
+        uri: GCF_URL,
       };
       delete expectedEndpoint.runServiceId;
       expect(

src/gcp/cloudfunctionsv2.ts

@@ -166,6 +166,7 @@ export type OutputCloudFunction = CloudFunctionBase & {
   state: FunctionState;
   updateTime: Date;
   serviceConfig?: RequireKeys<ServiceConfig, "service" | "uri">;
+  url: string;
 };
 
 export type InputCloudFunction = CloudFunctionBase & {
@@ -781,6 +782,7 @@ export function endpointFromFunction(gcfFunction: OutputCloudFunction): backend.
       endpoint.runServiceId = utils.last(serviceName.split("/"));
     }
   }
+  proto.renameIfPresent(endpoint, gcfFunction, "uri", "url");
   endpoint.codebase = gcfFunction.labels?.[CODEBASE_LABEL] || projectConfig.DEFAULT_CODEBASE;
   if (gcfFunction.labels?.[HASH_LABEL]) {
     endpoint.hash = gcfFunction.labels[HASH_LABEL];