Point v2 function target to entryPoint

CHANGELOG.md

@@ -1,3 +1,4 @@
+- Point v2 function target to entrypoint. (#6698)
 - Fixed issue where Auth emulator sign in with Google only shows default tenant. (#6683)
 - Prevent the use of pinTags + minInstances on the same function, as the features are not mutually compatible (#6684)
 - Added force flag to delete backend (#6635).

src/gcp/cloudfunctionsv2.ts

@@ -248,8 +248,8 @@
  * @param type Type of deployment - create, update, or delete.
  * @param err The error returned from the operation.
  */
 function functionsOpLogReject(func: InputCloudFunction, type: string, err: any): void {
   if (err?.message?.includes("maxScale may not exceed")) {
     const maxInstances = func.serviceConfig.maxInstanceCount || DEFAULT_MAX_INSTANCE_COUNT;
     utils.logLabeledWarning(
       "functions",
@@ -265,14 +265,14 @@
       `You can adjust the max instances value in your function's runtime options:\n\t${suggestedFix}`
     );
   } else {
     utils.logLabeledWarning("functions", `${err?.message}`);
     if (err?.context?.response?.statusCode === 429) {
       utils.logLabeledWarning(
         "functions",
         `Got "Quota Exceeded" error while trying to ${type} ${func.name}. Waiting to retry...`
       );
     } else if (
       err?.message?.includes(
         "If you recently started to use Eventarc, it may take a few minutes before all necessary permissions are propagated to the Service Agent"
       )
     ) {
@@ -288,8 +288,8 @@
     );
   }
   throw new FirebaseError(`Failed to ${type} function ${func.name}`, {
     original: err,
     status: err?.context?.response?.statusCode,
     context: { function: func.name },
   });
 }
@@ -331,7 +331,7 @@
 
   cloudFunction.serviceConfig.environmentVariables = {
     ...cloudFunction.serviceConfig.environmentVariables,
-    FUNCTION_TARGET: functionId.replaceAll("-", "."),
+    FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."),
   };
 
   try {
@@ -418,8 +418,6 @@
  * Customers can force a field to be deleted by setting that field to `undefined`
  */
 export async function updateFunction(cloudFunction: InputCloudFunction): Promise<Operation> {
-  const components = cloudFunction.name.split("/");
-  const functionId = components.splice(-1, 1)[0];
   // Keys in labels and environmentVariables and secretEnvironmentVariables are user defined, so we don't recurse
   // for field masks.
   const fieldMasks = proto.fieldMasks(
@@ -439,7 +437,7 @@
 
   cloudFunction.serviceConfig.environmentVariables = {
     ...cloudFunction.serviceConfig.environmentVariables,
-    FUNCTION_TARGET: functionId.replaceAll("-", "."),
+    FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."),
   };
 
   try {