adding global options invoker (#1424)

Author: colerogers

spec/v2/providers/https.spec.ts

@@ -37,6 +37,7 @@ describe("onRequest", () => {
   });
 
   afterEach(() => {
+    options.setGlobalOptions({});
     delete process.env.GCLOUD_PROJECT;
   });
 
@@ -136,6 +137,33 @@ describe("onRequest", () => {
     });
   });
 
+  it("should take globalOptions invoker", () => {
+    options.setGlobalOptions({
+      invoker: "private",
+    });
+
+    const result = https.onRequest((req, res) => {
+      res.send();
+    });
+
+    expect(result.__trigger).to.deep.eq({
+      platform: "gcfv2",
+      httpsTrigger: {
+        allowInsecure: false,
+        invoker: ["private"],
+      },
+      labels: {},
+    });
+    expect(result.__endpoint).to.deep.equal({
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
+      httpsTrigger: {
+        invoker: ["private"],
+      },
+      labels: {},
+    });
+  });
+
   it("should be an express handler", async () => {
     const func = https.onRequest((req, res) => {
       res.send("Works");

spec/v2/providers/tasks.spec.ts

@@ -70,6 +70,31 @@ describe("onTaskDispatched", () => {
     });
   });
 
+  it("should take globalOptions invoker", () => {
+    options.setGlobalOptions({
+      invoker: "private",
+    });
+
+    const result = onTaskDispatched(() => undefined);
+
+    expect(result.__trigger).to.deep.equal({
+      platform: "gcfv2",
+      taskQueueTrigger: {
+        invoker: ["private"],
+      },
+      labels: {},
+    });
+    expect(result.__endpoint).to.deep.equal({
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
+      labels: {},
+      taskQueueTrigger: {
+        ...MINIMIAL_TASK_QUEUE_TRIGGER,
+        invoker: ["private"],
+      },
+    });
+  });
+
   it("should create a complex trigger/endpoint with appropriate values", () => {
     const result = onTaskDispatched(
       {

src/v2/providers/https.ts

@@ -296,17 +296,25 @@ export function onRequest(
           allowInsecure: false,
         },
       };
+      convertIfPresent(
+        trigger.httpsTrigger,
+        options.getGlobalOptions(),
+        "invoker",
+        "invoker",
+        convertInvoker
+      );
       convertIfPresent(trigger.httpsTrigger, opts, "invoker", "invoker", convertInvoker);
       return trigger;
     },
   });
 
-  const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
+  const globalOpts = options.getGlobalOptions();
+  const baseOpts = options.optionsToEndpoint(globalOpts);
   // global options calls region a scalar and https allows it to be an array,
   // but optionsToTriggerAnnotations handles both cases.
   const specificOpts = options.optionsToEndpoint(opts as options.GlobalOptions);
   const endpoint: Partial<ManifestEndpoint> = {
-    ...initV2Endpoint(options.getGlobalOptions(), opts),
+    ...initV2Endpoint(globalOpts, opts),
     platform: "gcfv2",
     ...baseOpts,
     ...specificOpts,
@@ -316,6 +324,7 @@ export function onRequest(
     },
     httpsTrigger: {},
   };
+  convertIfPresent(endpoint.httpsTrigger, globalOpts, "invoker", "invoker", convertInvoker);
   convertIfPresent(endpoint.httpsTrigger, opts, "invoker", "invoker", convertInvoker);
   (handler as HttpsFunction).__endpoint = endpoint;
 

src/v2/providers/tasks.ts

@@ -220,6 +220,13 @@ export function onTaskDispatched<Args = any>(
       const specificOpts = options.optionsToTriggerAnnotations(opts as options.GlobalOptions);
       const taskQueueTrigger: Record<string, unknown> = {};
       copyIfPresent(taskQueueTrigger, opts, "retryConfig", "rateLimits");
+      convertIfPresent(
+        taskQueueTrigger,
+        options.getGlobalOptions(),
+        "invoker",
+        "invoker",
+        convertInvoker
+      );
       convertIfPresent(taskQueueTrigger, opts, "invoker", "invoker", convertInvoker);
       return {
         platform: "gcfv2",
@@ -266,6 +273,13 @@ export function onTaskDispatched<Args = any>(
     "maxConcurrentDispatches",
     "maxDispatchesPerSecond"
   );
+  convertIfPresent(
+    func.__endpoint.taskQueueTrigger,
+    options.getGlobalOptions(),
+    "invoker",
+    "invoker",
+    convertInvoker
+  );
   convertIfPresent(func.__endpoint.taskQueueTrigger, opts, "invoker", "invoker", convertInvoker);
 
   func.__requiredAPIs = [