Have onGraphRequest set a dataConnectHttpsTrigger instead of an httpsTrigger.

Author: rosalyntan

spec/v2/providers/dataconnect.spec.ts

@@ -605,7 +605,7 @@ describe("dataconnect", () => {
   });
 
   describe("onGraphRequest", () => {
-    it("returns callable function", () => {
+    it("returns callable function with Data Connect trigger", () => {
       const opts = {
         schema: "type Query { hello: String }",
         schemaFilePath: "schema.gql",
@@ -616,12 +616,30 @@ describe("dataconnect", () => {
         },
       };
       const func = dataconnect.onGraphRequest(opts);
-      expect(func.__trigger).to.deep.equal({
-        platform: "gcfv2",
-        httpsTrigger: {
-          allowInsecure: false,
+      expect(func.__endpoint).to.deep.equal({
+        ...expectedEndpointBase,
+        dataConnectHttpsTrigger: {},
+      });
+    });
+    it("returns callable function with request opts with Data Connect trigger", () => {
+      const opts = {
+        invoker: ["[email protected]"],
+        region: "us-east4",
+        schema: "type Query { hello: String }",
+        schemaFilePath: "schema.gql",
+        resolvers: {
+          query: {
+            hello: () => "Hello, world!",
+          },
+        },
+      };
+      const func = dataconnect.onGraphRequest(opts);
+      expect(func.__endpoint).to.deep.equal({
+        ...expectedEndpointBase,
+        dataConnectHttpsTrigger: {
+          invoker: ["[email protected]"],
         },
-        labels: {},
+        region: ["us-east4"],
       });
     });
   });

src/runtime/manifest.ts

@@ -71,6 +71,10 @@ export interface ManifestEndpoint {
     genkitAction?: string;
   };
 
+  dataConnectHttpsTrigger?: {
+    invoker?: string[];
+  };
+
   eventTrigger?: {
     eventFilters: Record<string, string | Expression<string>>;
     eventFilterPathPatterns?: Record<string, string | Expression<string>>;

src/v2/providers/dataconnect.ts

@@ -24,7 +24,7 @@ import cors from "cors";
 import express from "express";
 import fs from "fs";
 import { GraphQLResolveInfo } from "graphql";
-import { HttpsFunction, onRequest } from "./https";
+import { HttpsFunction, HttpsOptions, onRequest } from "./https";
 import { CloudEvent, CloudFunction } from "../core";
 import { ParamsOf, VarName } from "../../common/params";
 import {
@@ -423,15 +423,22 @@ let serverPromise: Promise<express.Express> | null = null;
  * @returns {HttpsFunction} A function you can export and deploy.
  */
 export function onGraphRequest(opts: GraphqlServerOptions): HttpsFunction {
-  return onRequest(async (req, res) => {
+  const func = onRequest(opts, async (req, res) => {
     serverPromise = serverPromise ?? initGraphqlServer(opts);
     const app = await serverPromise;
     app(req, res);
   });
+  func.__endpoint.dataConnectHttpsTrigger = {};
+  const invoker = func.__endpoint.httpsTrigger?.invoker;
+  if (invoker && invoker.length) {
+    func.__endpoint.dataConnectHttpsTrigger.invoker = invoker;
+  }
+  delete func.__endpoint.httpsTrigger;
+  return func;
 }
 
 /** Options for configuring the GraphQL server. */
-export interface GraphqlServerOptions {
+export interface GraphqlServerOptions extends HttpsOptions {
   /**
    * A valid SDL string that represents the GraphQL server's schema.
    * Either `schema` or `schemaFilePath` is required.