Remove label annotations for genkit functions; they break

src/deploy/functions/backend.ts

@@ -42,6 +42,9 @@
 
 /** 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;
 };
 
@@ -516,7 +519,7 @@
     await loadExistingBackend(context);
   }
   // loadExisting guarantees the validity of existingBackend and unreachableRegions
   return context.existingBackend!;
 }
 
 async function loadExistingBackend(ctx: Context): Promise<void> {
@@ -549,8 +552,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,23 +221,6 @@ 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": "flows/flow",
-        },
-      });
     });
 
     it("should copy trival fields", () => {
@@ -654,29 +637,6 @@ describe("cloudfunctionsv2", () => {
       });
     });
 
-    it("should translate genkit callables", () => {
-      expect(
-        cloudfunctionsv2.endpointFromFunction({
-          ...HAVE_CLOUD_FUNCTION_V2,
-          labels: {
-            "deployment-callable": "true",
-            "genkit-action": "flows/flow",
-          },
-        }),
-      ).to.deep.equal({
-        ...ENDPOINT,
-        callableTrigger: {
-          genkitAction: "flows/flow",
-        },
-        platform: "gcfv2",
-        uri: GCF_URL,
-        labels: {
-          "deployment-callable": "true",
-          "genkit-action": "flows/flow",
-        },
-      });
-    });
-
     it("should copy optional fields", () => {
       const extraFields: backend.ServiceConfiguration = {
         ingressSettings: "ALLOW_ALL",

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,9 +609,6 @@
     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"] = endpoint.callableTrigger.genkitAction;
-    }
   } else if (backend.isBlockingTriggered(endpoint)) {
     gcfFunction.labels = {
       ...gcfFunction.labels,
@@ -657,9 +654,6 @@
     trigger = {
       callableTrigger: {},
     };
-    if (gcfFunction.labels["genkit-action"]) {
-      trigger.callableTrigger.genkitAction = gcfFunction.labels["genkit-action"];
-    }
   } else if (gcfFunction.labels?.[BLOCKING_LABEL]) {
     trigger = {
       blockingTrigger: {