Restore the "genkit-action" label as a booelan

CHANGELOG.md

@@ -1 +1,2 @@
 - Fixes issue with custom 404 pages not being returned in Next.js in the emulator (#8035).
+- Annotate onCallGenkit functions to allow for future Firebase Console annotations (#8135)

src/deploy/functions/backend.ts

@@ -42,9 +42,6 @@
 
 /** API agnostic version of a Firebase callable function. */
 export type CallableTrigger = {
-  // NOTE: This is currently unused because GCF 2nd gen labels do not support
-  // the characterset that may be in a genkit action name.
-  // This should be set as a Cloud Run attribute once we move to Cloud Run Functions.
   genkitAction?: string;
 };
 
@@ -519,7 +516,7 @@
     await loadExistingBackend(context);
   }
   // loadExisting guarantees the validity of existingBackend and unreachableRegions
   return context.existingBackend!;
 }
 
 async function loadExistingBackend(ctx: Context): Promise<void> {
@@ -552,8 +549,8 @@
       ctx.existingBackend.endpoints[endpoint.region][endpoint.id] = endpoint;
     }
     ctx.unreachableRegions.gcfV2 = gcfV2Results.unreachable;
   } catch (err: any) {
     if (err.status === 404 && err.message?.toLowerCase().includes("method not found")) {
       return; // customer has preview enabled without allowlist set
     }
     throw err;

src/gcp/cloudfunctionsv2.spec.ts

@@ -221,6 +221,23 @@ describe("cloudfunctionsv2", () => {
           [BLOCKING_LABEL]: "before-sign-in",
         },
       });
+
+      expect(
+        cloudfunctionsv2.functionFromEndpoint({
+          ...ENDPOINT,
+          platform: "gcfv2",
+          callableTrigger: {
+            genkitAction: "flows/flow",
+          },
+        }),
+      ).to.deep.equal({
+        ...CLOUD_FUNCTION_V2,
+        labels: {
+          ...CLOUD_FUNCTION_V2.labels,
+          "deployment-callable": "true",
+          "genkit-action": "true",
+        },
+      });
     });
 
     it("should copy trival fields", () => {

src/gcp/cloudfunctionsv2.ts

@@ -249,8 +249,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",
@@ -609,6 +609,9 @@
     gcfFunction.labels = { ...gcfFunction.labels, "deployment-taskqueue": "true" };
   } else if (backend.isCallableTriggered(endpoint)) {
     gcfFunction.labels = { ...gcfFunction.labels, "deployment-callable": "true" };
+    if (endpoint.callableTrigger.genkitAction) {
+      gcfFunction.labels["genkit-action"] = "true";
+    }
   } else if (backend.isBlockingTriggered(endpoint)) {
     gcfFunction.labels = {
       ...gcfFunction.labels,