firebase-functions 4.0.1 → 4.0.2

package/lib/common/encoding.d.ts

@@ -1,3 +1,10 @@
+/**
+ * A type alias used to annotate interfaces as using a google.protobuf.Duration.
+ * This type is parsed/encoded as a string of seconds + the "s" prefix.
+ */
+export declare type Duration = string;
+/** Get a google.protobuf.Duration for a number of seconds. */
+export declare function durationFromSeconds(s: number): Duration;
 /**
  * Utility function to help copy fields from type A to B.
  * As a safety net, catches typos or fields that aren't named the same
@@ -5,4 +12,5 @@
  */
 export declare function copyIfPresent<Src, Dest>(dest: Dest, src: Src, ...fields: Array<keyof Src & keyof Dest>): void;
 export declare function convertIfPresent<Src, Dest>(dest: Dest, src: Src, destField: keyof Dest, srcField: keyof Src, converter?: (from: any) => any): void;
+export declare function serviceAccountFromShorthand(serviceAccount: string): string | null;
 export declare function convertInvoker(invoker: string | string[]): string[];

package/lib/common/encoding.js

@@ -21,8 +21,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertInvoker = exports.convertIfPresent = exports.copyIfPresent = void 0;
-// Copied from firebase-tools/src/gcp/proto
+exports.convertInvoker = exports.serviceAccountFromShorthand = exports.convertIfPresent = exports.copyIfPresent = exports.durationFromSeconds = void 0;
+/** Get a google.protobuf.Duration for a number of seconds. */
+function durationFromSeconds(s) {
+    return `${s}s`;
+}
+exports.durationFromSeconds = durationFromSeconds;
 /**
  * Utility function to help copy fields from type A to B.
  * As a safety net, catches typos or fields that aren't named the same
@@ -52,6 +56,24 @@ function convertIfPresent(dest, src, destField, srcField, converter = (from) =>
     dest[destField] = converter(src[srcField]);
 }
 exports.convertIfPresent = convertIfPresent;
+function serviceAccountFromShorthand(serviceAccount) {
+    if (serviceAccount === "default") {
+        return null;
+    }
+    else if (serviceAccount.endsWith("@")) {
+        if (!process.env.GCLOUD_PROJECT) {
+            throw new Error(`Unable to determine email for service account '${serviceAccount}' because process.env.GCLOUD_PROJECT is not set.`);
+        }
+        return `${serviceAccount}${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`;
+    }
+    else if (serviceAccount.includes("@")) {
+        return serviceAccount;
+    }
+    else {
+        throw new Error(`Invalid option for serviceAccount: '${serviceAccount}'. Valid options are 'default', a service account email, or '{serviceAccountName}@'`);
+    }
+}
+exports.serviceAccountFromShorthand = serviceAccountFromShorthand;
 function convertInvoker(invoker) {
     if (typeof invoker === "string") {
         invoker = [invoker];

package/lib/params/types.d.ts

@@ -148,6 +148,8 @@ export declare class SecretParam {
     static type: ParamValueType;
     name: string;
     constructor(name: string);
+    /** Returns the secret's value at runtime. Throws an error if accessed during deployment. */
+    value(): string;
 }
 /**
  *  A parametrized value of String type that will be read from .env files

package/lib/params/types.js

@@ -204,7 +204,11 @@ class SecretParam {
     }
     /** @internal */
     runtimeValue() {
-        return process.env[this.name] || "";
+        const val = process.env[this.name];
+        if (val === undefined) {
+            logger.warn(`No value found for secret parameter "${this.name}". A function can only access a secret if you include the secret in the function's dependency array.`);
+        }
+        return val || "";
     }
     /** @internal */
     toSpec() {
@@ -213,6 +217,13 @@ class SecretParam {
             name: this.name,
         };
     }
+    /** Returns the secret's value at runtime. Throws an error if accessed during deployment. */
+    value() {
+        if (process.env.FUNCTIONS_CONTROL_API === "true") {
+            throw new Error(`Cannot access the value of secret "${this.name}" during function deployment. Secret values are only available at runtime.`);
+        }
+        return this.runtimeValue();
+    }
 }
 exports.SecretParam = SecretParam;
 SecretParam.type = "secret";

package/lib/v1/cloud-functions.d.ts

@@ -1,4 +1,5 @@
 import { Request, Response } from "express";
+import { DeploymentOptions, FailurePolicy, Schedule } from "./function-configuration";
 export { Request, Response };
 import { ManifestEndpoint, ManifestRequiredAPI } from "../runtime/manifest";
 export { Change } from "../common/change";
@@ -174,6 +175,37 @@ export interface Resource {
         [tag: string]: string;
     };
 }
+/**
+ * TriggerAnnotion is used internally by the firebase CLI to understand what
+ * type of Cloud Function to deploy.
+ */
+interface TriggerAnnotation {
+    availableMemoryMb?: number;
+    blockingTrigger?: {
+        eventType: string;
+        options?: Record<string, unknown>;
+    };
+    eventTrigger?: {
+        eventType: string;
+        resource: string;
+        service: string;
+    };
+    failurePolicy?: FailurePolicy;
+    httpsTrigger?: {
+        invoker?: string[];
+    };
+    labels?: {
+        [key: string]: string;
+    };
+    regions?: string[];
+    schedule?: Schedule;
+    timeout?: string;
+    vpcConnector?: string;
+    vpcConnectorEgressSettings?: string;
+    serviceAccountEmail?: string;
+    ingressSettings?: string;
+    secrets?: string[];
+}
 /**
  * A Runnable has a `run` method which directly invokes the user-defined
  * function - useful for unit testing.
@@ -195,6 +227,8 @@ export interface Runnable<T> {
 export interface HttpsFunction {
     (req: Request, resp: Response): void | Promise<void>;
     /** @alpha */
+    __trigger: TriggerAnnotation;
+    /** @alpha */
     __endpoint: ManifestEndpoint;
     /** @alpha */
     __requiredAPIs?: ManifestRequiredAPI[];
@@ -212,6 +246,8 @@ export interface BlockingFunction {
     /** @public */
     (req: Request, resp: Response): void | Promise<void>;
     /** @alpha */
+    __trigger: TriggerAnnotation;
+    /** @alpha */
     __endpoint: ManifestEndpoint;
     /** @alpha */
     __requiredAPIs?: ManifestRequiredAPI[];
@@ -226,7 +262,12 @@ export interface BlockingFunction {
 export interface CloudFunction<T> extends Runnable<T> {
     (input: any, context?: any): PromiseLike<any> | any;
     /** @alpha */
+    __trigger: TriggerAnnotation;
+    /** @alpha */
     __endpoint: ManifestEndpoint;
     /** @alpha */
     __requiredAPIs?: ManifestRequiredAPI[];
 }
+/** @hidden */
+export declare function optionsToTrigger(options: DeploymentOptions): any;
+export declare function optionsToEndpoint(options: DeploymentOptions): ManifestEndpoint;

package/lib/v1/cloud-functions.js

@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optionsToEndpoint = exports.makeCloudFunction = exports.Change = void 0;
+exports.optionsToEndpoint = exports.optionsToTrigger = exports.makeCloudFunction = exports.Change = void 0;
 const logger_1 = require("../logger");
 const function_configuration_1 = require("./function-configuration");
 const encoding_1 = require("../common/encoding");
@@ -83,6 +83,25 @@ function makeCloudFunction({ contextOnlyHandler, dataConstructor = (raw) => raw.
         }
         return Promise.resolve(promise);
     };
+    Object.defineProperty(cloudFunction, "__trigger", {
+        get: () => {
+            if (triggerResource() == null) {
+                return {};
+            }
+            const trigger = {
+                ...optionsToTrigger(options),
+                eventTrigger: {
+                    resource: triggerResource(),
+                    eventType: legacyEventType || provider + "." + eventType,
+                    service,
+                },
+            };
+            if (!!labels && Object.keys(labels).length) {
+                trigger.labels = { ...trigger.labels, ...labels };
+            }
+            return trigger;
+        },
+    });
     Object.defineProperty(cloudFunction, "__endpoint", {
         get: () => {
             if (triggerResource() == null) {
@@ -171,7 +190,38 @@ function _detectAuthType(event) {
     }
     return "UNAUTHENTICATED";
 }
-/** @internal */
+/** @hidden */
+function optionsToTrigger(options) {
+    const trigger = {};
+    (0, encoding_1.copyIfPresent)(trigger, options, "regions", "schedule", "minInstances", "maxInstances", "ingressSettings", "vpcConnectorEgressSettings", "vpcConnector", "labels", "secrets");
+    (0, encoding_1.convertIfPresent)(trigger, options, "failurePolicy", "failurePolicy", (policy) => {
+        if (policy === false) {
+            return undefined;
+        }
+        else if (policy === true) {
+            return function_configuration_1.DEFAULT_FAILURE_POLICY;
+        }
+        else {
+            return policy;
+        }
+    });
+    (0, encoding_1.convertIfPresent)(trigger, options, "timeout", "timeoutSeconds", encoding_1.durationFromSeconds);
+    (0, encoding_1.convertIfPresent)(trigger, options, "availableMemoryMb", "memory", (mem) => {
+        const memoryLookup = {
+            "128MB": 128,
+            "256MB": 256,
+            "512MB": 512,
+            "1GB": 1024,
+            "2GB": 2048,
+            "4GB": 4096,
+            "8GB": 8192,
+        };
+        return memoryLookup[mem];
+    });
+    (0, encoding_1.convertIfPresent)(trigger, options, "serviceAccountEmail", "serviceAccount", encoding_1.serviceAccountFromShorthand);
+    return trigger;
+}
+exports.optionsToTrigger = optionsToTrigger;
 function optionsToEndpoint(options) {
     const endpoint = {};
     (0, encoding_1.copyIfPresent)(endpoint, options, "minInstances", "maxInstances", "ingressSettings", "labels", "timeoutSeconds");

package/lib/v1/function-configuration.d.ts

@@ -107,6 +107,7 @@ export interface FailurePolicy {
      */
     retry: Record<string, never>;
 }
+export declare const DEFAULT_FAILURE_POLICY: FailurePolicy;
 export declare const MAX_NUMBER_USER_LABELS = 58;
 /**
  * Configuration options for a function that applicable at runtime.

package/lib/v1/function-configuration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_NUMBER_USER_LABELS = exports.INGRESS_SETTINGS_OPTIONS = exports.VPC_EGRESS_SETTINGS_OPTIONS = exports.VALID_MEMORY_OPTIONS = exports.MAX_TIMEOUT_SECONDS = exports.MIN_TIMEOUT_SECONDS = exports.SUPPORTED_REGIONS = exports.RESET_VALUE = void 0;
+exports.MAX_NUMBER_USER_LABELS = exports.DEFAULT_FAILURE_POLICY = exports.INGRESS_SETTINGS_OPTIONS = exports.VPC_EGRESS_SETTINGS_OPTIONS = exports.VALID_MEMORY_OPTIONS = exports.MAX_TIMEOUT_SECONDS = exports.MIN_TIMEOUT_SECONDS = exports.SUPPORTED_REGIONS = exports.RESET_VALUE = void 0;
 var options_1 = require("../common/options");
 Object.defineProperty(exports, "RESET_VALUE", { enumerable: true, get: function () { return options_1.RESET_VALUE; } });
 /**
@@ -67,4 +67,7 @@ exports.INGRESS_SETTINGS_OPTIONS = [
     "ALLOW_INTERNAL_ONLY",
     "ALLOW_INTERNAL_AND_GCLB",
 ];
+exports.DEFAULT_FAILURE_POLICY = {
+    retry: {},
+};
 exports.MAX_NUMBER_USER_LABELS = 58;

package/lib/v1/providers/auth.js

@@ -131,6 +131,18 @@ class UserBuilder {
         const wrappedHandler = (user, context) => handler(user, context);
         const func = (0, identity_1.wrapHandler)(eventType, wrappedHandler);
         const legacyEventType = `providers/cloud.auth/eventTypes/user.${eventType}`;
+        func.__trigger = {
+            labels: {},
+            ...(0, cloud_functions_1.optionsToTrigger)(this.options),
+            blockingTrigger: {
+                eventType: legacyEventType,
+                options: {
+                    accessToken,
+                    idToken,
+                    refreshToken,
+                },
+            },
+        };
         func.__endpoint = {
             platform: "gcfv1",
             labels: {},

package/lib/v1/providers/https.js

@@ -50,6 +50,11 @@ function _onRequestWithOptions(handler, options) {
     const cloudFunction = (req, res) => {
         return handler(req, res);
     };
+    cloudFunction.__trigger = {
+        ...(0, cloud_functions_1.optionsToTrigger)(options),
+        httpsTrigger: {},
+    };
+    (0, encoding_1.convertIfPresent)(cloudFunction.__trigger.httpsTrigger, options, "invoker", "invoker", encoding_1.convertInvoker);
     // TODO parse the options
     cloudFunction.__endpoint = {
         platform: "gcfv1",
@@ -71,6 +76,12 @@ function _onCallWithOptions(handler, options) {
         enforceAppCheck: options.enforceAppCheck,
         cors: { origin: true, methods: "POST" },
     }, fixedLen);
+    func.__trigger = {
+        labels: {},
+        ...(0, cloud_functions_1.optionsToTrigger)(options),
+        httpsTrigger: {},
+    };
+    func.__trigger.labels["deployment-callable"] = "true";
     func.__endpoint = {
         platform: "gcfv1",
         labels: {},

package/lib/v1/providers/tasks.d.ts

@@ -25,6 +25,8 @@ export interface TaskQueueOptions {
 export interface TaskQueueFunction {
     (req: Request, res: express.Response): Promise<void>;
     /** @alpha */
+    __trigger: unknown;
+    /** @alpha */
     __endpoint: ManifestEndpoint;
     /** @alpha */
     __requiredAPIs?: ManifestRequiredAPI[];

package/lib/v1/providers/tasks.js

@@ -46,6 +46,13 @@ class TaskQueueBuilder {
         // in another handler to avoid accidentally triggering the v2 API
         const fixedLen = (data, context) => handler(data, context);
         const func = (0, tasks_1.onDispatchHandler)(fixedLen);
+        func.__trigger = {
+            ...(0, cloud_functions_1.optionsToTrigger)(this.depOpts || {}),
+            taskQueueTrigger: {},
+        };
+        (0, encoding_1.copyIfPresent)(func.__trigger.taskQueueTrigger, this.tqOpts, "retryConfig");
+        (0, encoding_1.copyIfPresent)(func.__trigger.taskQueueTrigger, this.tqOpts, "rateLimits");
+        (0, encoding_1.convertIfPresent)(func.__trigger.taskQueueTrigger, this.tqOpts, "invoker", "invoker", encoding_1.convertInvoker);
         func.__endpoint = {
             platform: "gcfv1",
             ...(0, manifest_1.initV1Endpoint)(this.depOpts),

package/lib/v2/core.d.ts

@@ -37,6 +37,8 @@ export interface CloudEvent<T> {
 export interface CloudFunction<EventType extends CloudEvent<unknown>> {
     (raw: CloudEvent<unknown>): any | Promise<any>;
     /** @alpha */
+    __trigger?: unknown;
+    /** @alpha */
     __endpoint: ManifestEndpoint;
     /**
      * The callback passed to the CloudFunction constructor.

package/lib/v2/options.js

@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__getSpec = exports.optionsToEndpoint = exports.getGlobalOptions = exports.setGlobalOptions = exports.RESET_VALUE = void 0;
+exports.__getSpec = exports.optionsToEndpoint = exports.optionsToTriggerAnnotations = exports.getGlobalOptions = exports.setGlobalOptions = exports.RESET_VALUE = void 0;
 /**
  * Options to configure cloud functions.
  * @packageDocumentation
@@ -65,6 +65,30 @@ function getGlobalOptions() {
     return globalOptions || {};
 }
 exports.getGlobalOptions = getGlobalOptions;
+/**
+ * Apply GlobalOptions to trigger definitions.
+ * @internal
+ */
+function optionsToTriggerAnnotations(opts) {
+    const annotation = {};
+    (0, encoding_1.copyIfPresent)(annotation, opts, "concurrency", "minInstances", "maxInstances", "ingressSettings", "labels", "vpcConnector", "vpcConnectorEgressSettings", "secrets");
+    (0, encoding_1.convertIfPresent)(annotation, opts, "availableMemoryMb", "memory", (mem) => {
+        return MemoryOptionToMB[mem];
+    });
+    (0, encoding_1.convertIfPresent)(annotation, opts, "regions", "region", (region) => {
+        if (typeof region === "string") {
+            return [region];
+        }
+        return region;
+    });
+    (0, encoding_1.convertIfPresent)(annotation, opts, "serviceAccountEmail", "serviceAccount", encoding_1.serviceAccountFromShorthand);
+    (0, encoding_1.convertIfPresent)(annotation, opts, "timeout", "timeoutSeconds", encoding_1.durationFromSeconds);
+    (0, encoding_1.convertIfPresent)(annotation, opts, "failurePolicy", "retry", (retry) => {
+        return retry ? { retry: true } : null;
+    });
+    return annotation;
+}
+exports.optionsToTriggerAnnotations = optionsToTriggerAnnotations;
 /**
  * Apply GlobalOptions to endpoint manifest.
  * @internal

package/lib/v2/providers/alerts/appDistribution.d.ts

@@ -26,8 +26,6 @@ export interface NewTesterDevicePayload {
 /**
  * The internal payload object for receiving in-app feedback from a tester.
  * Payload is wrapped inside a `FirebaseAlertData` object.
- *
- * @alpha
  */
 export interface InAppFeedbackPayload {
     ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroInAppFeedbackPayload";
@@ -166,8 +164,6 @@ export declare function onNewTesterIosDevicePublished(opts: AppDistributionOptio
  * Declares a function that can handle receiving new in-app feedback from a tester.
  * @param handler - Event handler which is run every time new feedback is received.
  * @returns A function that you can export and deploy.
- *
- * @alpha
  */
 export declare function onInAppFeedbackPublished(handler: (event: AppDistributionEvent<InAppFeedbackPayload>) => any | Promise<any>): CloudFunction<AppDistributionEvent<InAppFeedbackPayload>>;
 /**
@@ -175,8 +171,6 @@ export declare function onInAppFeedbackPublished(handler: (event: AppDistributio
  * @param appId - A specific application the handler will trigger on.
  * @param handler - Event handler which is run every time new feedback is received.
  * @returns A function that you can export and deploy.
- *
- * @alpha
  */
 export declare function onInAppFeedbackPublished(appId: string, handler: (event: AppDistributionEvent<InAppFeedbackPayload>) => any | Promise<any>): CloudFunction<AppDistributionEvent<InAppFeedbackPayload>>;
 /**
@@ -184,7 +178,5 @@ export declare function onInAppFeedbackPublished(appId: string, handler: (event:
  * @param opts - Options that can be set on the function.
  * @param handler - Event handler which is run every time new feedback is received.
  * @returns A function that you can export and deploy.
- *
- * @alpha
  */
 export declare function onInAppFeedbackPublished(opts: AppDistributionOptions, handler: (event: AppDistributionEvent<InAppFeedbackPayload>) => any | Promise<any>): CloudFunction<AppDistributionEvent<InAppFeedbackPayload>>;

package/lib/v2/providers/alerts/appDistribution.js

@@ -53,8 +53,6 @@ exports.onNewTesterIosDevicePublished = onNewTesterIosDevicePublished;
  * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function.
  * @param handler - Event handler which is run every time new feedback is received.
  * @returns A function that you can export and deploy.
- *
- * @alpha
  */
 function onInAppFeedbackPublished(appIdOrOptsOrHandler, handler) {
     if (typeof appIdOrOptsOrHandler === "function") {

package/lib/v2/providers/https.d.ts

@@ -114,6 +114,8 @@ export declare type HttpsFunction = ((
 req: Request, 
 /** An Express response object, for this function to respond to callers. */
 res: express.Response) => void | Promise<void>) & {
+    /** @alpha */
+    __trigger?: unknown;
     /** @alpha */
     __endpoint: ManifestEndpoint;
 };

package/lib/v2/providers/https.js

@@ -56,6 +56,28 @@ function onRequest(optsOrHandler, handler) {
         };
     }
     handler = (0, trace_1.wrapTraceContext)(handler);
+    Object.defineProperty(handler, "__trigger", {
+        get: () => {
+            const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());
+            // global options calls region a scalar and https allows it to be an array,
+            // but optionsToTriggerAnnotations handles both cases.
+            const specificOpts = options.optionsToTriggerAnnotations(opts);
+            const trigger = {
+                platform: "gcfv2",
+                ...baseOpts,
+                ...specificOpts,
+                labels: {
+                    ...baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.labels,
+                    ...specificOpts === null || specificOpts === void 0 ? void 0 : specificOpts.labels,
+                },
+                httpsTrigger: {
+                    allowInsecure: false,
+                },
+            };
+            (0, encoding_1.convertIfPresent)(trigger.httpsTrigger, opts, "invoker", "invoker", encoding_1.convertInvoker);
+            return trigger;
+        },
+    });
     const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
     // global options calls region a scalar and https allows it to be an array,
     // but optionsToTriggerAnnotations handles both cases.
@@ -94,6 +116,27 @@ function onCall(optsOrHandler, handler) {
         cors: { origin, methods: "POST" },
         enforceAppCheck: (_a = opts.enforceAppCheck) !== null && _a !== void 0 ? _a : options.getGlobalOptions().enforceAppCheck,
     }, fixedLen);
+    Object.defineProperty(func, "__trigger", {
+        get: () => {
+            const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());
+            // global options calls region a scalar and https allows it to be an array,
+            // but optionsToTriggerAnnotations handles both cases.
+            const specificOpts = options.optionsToTriggerAnnotations(opts);
+            return {
+                platform: "gcfv2",
+                ...baseOpts,
+                ...specificOpts,
+                labels: {
+                    ...baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.labels,
+                    ...specificOpts === null || specificOpts === void 0 ? void 0 : specificOpts.labels,
+                    "deployment-callable": "true",
+                },
+                httpsTrigger: {
+                    allowInsecure: false,
+                },
+            };
+        },
+    });
     const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
     // global options calls region a scalar and https allows it to be an array,
     // but optionsToEndpoint handles both cases.

package/lib/v2/providers/pubsub.js

@@ -128,6 +128,25 @@ function onMessagePublished(topicOrOptions, handler) {
         return (0, trace_1.wrapTraceContext)(handler)(raw);
     };
     func.run = handler;
+    Object.defineProperty(func, "__trigger", {
+        get: () => {
+            const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());
+            const specificOpts = options.optionsToTriggerAnnotations(opts);
+            return {
+                platform: "gcfv2",
+                ...baseOpts,
+                ...specificOpts,
+                labels: {
+                    ...baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.labels,
+                    ...specificOpts === null || specificOpts === void 0 ? void 0 : specificOpts.labels,
+                },
+                eventTrigger: {
+                    eventType: "google.cloud.pubsub.topic.v1.messagePublished",
+                    resource: `projects/${process.env.GCLOUD_PROJECT}/topics/${topic}`,
+                },
+            };
+        },
+    });
     const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
     const specificOpts = options.optionsToEndpoint(opts);
     const endpoint = {

package/lib/v2/providers/storage.js

@@ -105,6 +105,25 @@ function onOperation(eventType, bucketOrOptsOrHandler, handler) {
         return (0, trace_1.wrapTraceContext)(handler)(raw);
     };
     func.run = handler;
+    Object.defineProperty(func, "__trigger", {
+        get: () => {
+            const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());
+            const specificOpts = options.optionsToTriggerAnnotations(opts);
+            return {
+                platform: "gcfv2",
+                ...baseOpts,
+                ...specificOpts,
+                labels: {
+                    ...baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.labels,
+                    ...specificOpts === null || specificOpts === void 0 ? void 0 : specificOpts.labels,
+                },
+                eventTrigger: {
+                    eventType,
+                    resource: bucket, // TODO(colerogers): replace with 'bucket,' eventually
+                },
+            };
+        },
+    });
     // TypeScript doesn't recognize defineProperty as adding a property and complains
     // that __endpoint doesn't exist. We can either cast to any and lose all type safety
     // or we can just assign a meaningless value before calling defineProperty.

package/lib/v2/providers/tasks.js

@@ -44,8 +44,28 @@ function onTaskDispatched(optsOrHandler, handler) {
     // fix the length to prevent api versions from being mismatched.
     const fixedLen = (req) => handler(req);
     const func = (0, trace_1.wrapTraceContext)((0, tasks_1.onDispatchHandler)(fixedLen));
-    const globalOpts = options.getGlobalOptions();
-    const baseOpts = options.optionsToEndpoint(globalOpts);
+    Object.defineProperty(func, "__trigger", {
+        get: () => {
+            const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());
+            // global options calls region a scalar and https allows it to be an array,
+            // but optionsToTriggerAnnotations handles both cases.
+            const specificOpts = options.optionsToTriggerAnnotations(opts);
+            const taskQueueTrigger = {};
+            (0, encoding_1.copyIfPresent)(taskQueueTrigger, opts, "retryConfig", "rateLimits");
+            (0, encoding_1.convertIfPresent)(taskQueueTrigger, opts, "invoker", "invoker", encoding_1.convertInvoker);
+            return {
+                platform: "gcfv2",
+                ...baseOpts,
+                ...specificOpts,
+                labels: {
+                    ...baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.labels,
+                    ...specificOpts === null || specificOpts === void 0 ? void 0 : specificOpts.labels,
+                },
+                taskQueueTrigger,
+            };
+        },
+    });
+    const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
     // global options calls region a scalar and https allows it to be an array,
     // but optionsToManifestEndpoint handles both cases.
     const specificOpts = options.optionsToEndpoint(opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",
@@ -36,6 +36,7 @@
     "./v1/auth": "./lib/v1/providers/auth.js",
     "./v1/database": "./lib/v1/providers/database.js",
     "./v1/firestore": "./lib/v1/providers/firestore.js",
+    "./v1/https": "./lib/v1/providers/https.js",
     "./v1/pubsub": "./lib/v1/providers/pubsub.js",
     "./v1/remoteConfig": "./lib/v1/providers/remoteConfig.js",
     "./v1/storage": "./lib/v1/providers/storage.js",
@@ -75,31 +76,34 @@
         "lib/v1"
       ],
       "v1/analytics": [
-        "./lib/v1/providers/analytics"
+        "lib/v1/providers/analytics"
       ],
       "v1/auth": [
-        "./lib/v1/providers/auth"
+        "lib/v1/providers/auth"
       ],
       "v1/database": [
-        "./lib/v1/privders/database"
+        "lib/v1/privders/database"
       ],
       "v1/firestore": [
-        "./lib/v1/providers/firestore"
+        "lib/v1/providers/firestore"
+      ],
+      "v1/https": [
+        "./lib/v1/providers/https"
       ],
       "v1/pubsub": [
-        "./lib/v1/providers/pubsub"
+        "lib/v1/providers/pubsub"
       ],
-      "/v1/remoteConfig": [
-        "./lib/v1/providers/remoteConfig"
+      "v1/remoteConfig": [
+        "lib/v1/providers/remoteConfig"
       ],
-      "/v1/storage": [
-        "./lib/v1/providers/storage"
+      "v1/storage": [
+        "lib/v1/providers/storage"
       ],
-      "/v1/tasks": [
-        "./lib/v1/providers/tasks"
+      "v1/tasks": [
+        "lib/v1/providers/tasks"
       ],
-      "/v1/testLab": [
-        "./lib/v1/providers/testLab"
+      "v1/testLab": [
+        "lib/v1/providers/testLab"
       ],
       "v2": [
         "lib/v2"