firebase-functions 3.24.1 → 4.0.0-rc.0

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

@@ -0,0 +1,63 @@
+import { CloudEvent, CloudFunction } from "../core";
+import { EventHandlerOptions } from "../options";
+/** All the fields associated with the person/service account that wrote a Remote Config template. */
+export interface ConfigUser {
+    /** Display name. */
+    name: string;
+    /** Email address. */
+    email: string;
+    /** Image URL. */
+    imageUrl: string;
+}
+/** What type of update was associated with the Remote Config template version. */
+export declare type ConfigUpdateOrigin = 
+/** Catch-all for unrecognized values. */
+"REMOTE_CONFIG_UPDATE_ORIGIN_UNSPECIFIED"
+/** The update came from the Firebase UI. */
+ | "CONSOLE"
+/** The update came from the Remote Config REST API. */
+ | "REST_API"
+/** The update came from the Firebase Admin Node SDK. */
+ | "ADMIN_SDK_NODE";
+/** Where the Remote Config update action originated. */
+export declare type ConfigUpdateType = 
+/** Catch-all for unrecognized enum values */
+"REMOTE_CONFIG_UPDATE_TYPE_UNSPECIFIED"
+/** A regular incremental update */
+ | "INCREMENTAL_UPDATE"
+/** A forced update. The ETag was specified as "*" in an UpdateRemoteConfigRequest request or the "Force Update" button was pressed on the console */
+ | "FORCED_UPDATE"
+/** A rollback to a previous Remote Config template */
+ | "ROLLBACK";
+/** The data within Firebase Remote Config update events. */
+export interface ConfigUpdateData {
+    /** The version number of the version's corresponding Remote Config template. */
+    versionNumber: number;
+    /** When the Remote Config template was written to the Remote Config server. */
+    updateTime: string;
+    /** Aggregation of all metadata fields about the account that performed the update. */
+    updateUser: ConfigUser;
+    /** The user-provided description of the corresponding Remote Config template. */
+    description: string;
+    /** Where the update action originated. */
+    updateOrigin: ConfigUpdateOrigin;
+    /** What type of update was made. */
+    updateType: ConfigUpdateType;
+    /** Only present if this version is the result of a rollback, and will be the version number of the Remote Config template that was rolled-back to. */
+    rollbackSource: number;
+}
+/**
+ * Event handler which triggers when data is updated in a Remote Config.
+ *
+ * @param handler - Event handler which is run every time a Remote Config update occurs.
+ * @returns A function that you can export and deploy.
+ */
+export declare function onConfigUpdated(handler: (event: CloudEvent<ConfigUpdateData>) => any | Promise<any>): CloudFunction<CloudEvent<ConfigUpdateData>>;
+/**
+ * Event handler which triggers when data is updated in a Remote Config.
+ *
+ * @param opts - Options that can be set on an individual event-handling function.
+ * @param handler - Event handler which is run every time a Remote Config update occurs.
+ * @returns A function that you can export and deploy.
+ */
+export declare function onConfigUpdated(opts: EventHandlerOptions, handler: (event: CloudEvent<ConfigUpdateData>) => any | Promise<any>): CloudFunction<CloudEvent<ConfigUpdateData>>;

package/lib/v2/providers/remoteConfig.js

@@ -0,0 +1,65 @@
+"use strict";
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onConfigUpdated = exports.eventType = void 0;
+const manifest_1 = require("../../runtime/manifest");
+const options_1 = require("../options");
+/** @internal */
+exports.eventType = "google.firebase.remoteconfig.remoteConfig.v1.updated";
+/**
+ * Event handler which triggers when data is updated in a Remote Config.
+ *
+ * @param optsOrHandler - Options or an event handler.
+ * @param handler - Event handler which is run every time a Remote Config update occurs.
+ * @returns A function that you can export and deploy.
+ */
+function onConfigUpdated(optsOrHandler, handler) {
+    if (typeof optsOrHandler === "function") {
+        handler = optsOrHandler;
+        optsOrHandler = {};
+    }
+    const baseOpts = (0, options_1.optionsToEndpoint)((0, options_1.getGlobalOptions)());
+    const specificOpts = (0, options_1.optionsToEndpoint)(optsOrHandler);
+    const func = (raw) => {
+        return handler(raw);
+    };
+    func.run = handler;
+    const ep = {
+        ...(0, manifest_1.initV2Endpoint)((0, options_1.getGlobalOptions)(), optsOrHandler),
+        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: exports.eventType,
+            eventFilters: {},
+            retry: !!optsOrHandler.retry,
+        },
+    };
+    func.__endpoint = ep;
+    return func;
+}
+exports.onConfigUpdated = onConfigUpdated;

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

@@ -1,7 +1,9 @@
-import { timezone } from '../../common/timezone';
-import { ManifestRequiredAPI } from '../../runtime/manifest';
-import * as options from '../options';
-import { HttpsFunction } from './https';
+import { ResetValue } from "../../common/options";
+import { timezone } from "../../common/timezone";
+import { ManifestRequiredAPI } from "../../runtime/manifest";
+import { HttpsFunction } from "./https";
+import { Expression } from "../../params";
+import * as options from "../options";
 /**
  * Interface representing a ScheduleEvent that is passed to the function handler.
  */
@@ -33,17 +35,17 @@ export interface ScheduleOptions extends options.GlobalOptions {
     /** The schedule, in Unix Crontab or AppEngine syntax. */
     schedule: string;
     /** The timezone that the schedule executes in. */
-    timeZone?: timezone;
+    timeZone?: timezone | Expression<string> | ResetValue;
     /** The number of retry attempts for a failed run. */
-    retryCount?: number;
+    retryCount?: number | Expression<number> | ResetValue;
     /** The time limit for retrying. */
-    maxRetrySeconds?: number;
+    maxRetrySeconds?: number | Expression<number> | ResetValue;
     /** The minimum time to wait before retying. */
-    minBackoffSeconds?: number;
+    minBackoffSeconds?: number | Expression<number> | ResetValue;
     /** The maximum time to wait before retrying. */
-    maxBackoffSeconds?: number;
+    maxBackoffSeconds?: number | Expression<number> | ResetValue;
     /** The time between will double max doublings times. */
-    maxDoublings?: number;
+    maxDoublings?: number | Expression<number> | ResetValue;
 }
 /**
  * Handler for scheduled functions. Triggered whenever the associated
@@ -52,7 +54,7 @@ export interface ScheduleOptions extends options.GlobalOptions {
  * @param handler - A function to execute when triggered.
  * @returns A function that you can export and deploy.
  */
-export declare function onSchedule(schedule: string, handler: (req: ScheduledEvent) => void | Promise<void>): ScheduleFunction;
+export declare function onSchedule(schedule: string, handler: (event: ScheduledEvent) => void | Promise<void>): ScheduleFunction;
 /**
  * Handler for scheduled functions. Triggered whenever the associated
  * scheduler job sends a http request.
@@ -60,4 +62,4 @@ export declare function onSchedule(schedule: string, handler: (req: ScheduledEve
  * @param handler - A function to execute when triggered.
  * @returns A function that you can export and deploy.
  */
-export declare function onSchedule(options: ScheduleOptions, handler: (req: ScheduledEvent) => void | Promise<void>): ScheduleFunction;
+export declare function onSchedule(options: ScheduleOptions, handler: (event: ScheduledEvent) => void | Promise<void>): ScheduleFunction;

package/lib/v2/providers/scheduler.js

@@ -23,11 +23,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onSchedule = exports.getOpts = void 0;
 const encoding_1 = require("../../common/encoding");
+const manifest_1 = require("../../runtime/manifest");
+const trace_1 = require("../trace");
 const logger = require("../../logger");
 const options = require("../options");
 /** @internal */
 function getOpts(args) {
-    if (typeof args === 'string') {
+    if (typeof args === "string") {
         return {
             schedule: args,
             opts: {},
@@ -54,10 +56,10 @@ exports.getOpts = getOpts;
  */
 function onSchedule(args, handler) {
     const separatedOpts = getOpts(args);
-    const func = async (req, res) => {
+    const httpFunc = async (req, res) => {
         const event = {
-            jobName: req.header('X-CloudScheduler-JobName') || undefined,
-            scheduleTime: req.header('X-CloudScheduler-ScheduleTime') || new Date().toISOString(),
+            jobName: req.header("X-CloudScheduler-JobName") || undefined,
+            scheduleTime: req.header("X-CloudScheduler-ScheduleTime") || new Date().toISOString(),
         };
         try {
             await handler(event);
@@ -68,29 +70,29 @@ function onSchedule(args, handler) {
             res.status(500).send();
         }
     };
+    const func = (0, trace_1.wrapTraceContext)(httpFunc);
     func.run = handler;
-    const baseOptsEndpoint = options.optionsToEndpoint(options.getGlobalOptions());
+    const globalOpts = options.getGlobalOptions();
+    const baseOptsEndpoint = options.optionsToEndpoint(globalOpts);
     const specificOptsEndpoint = options.optionsToEndpoint(separatedOpts.opts);
     const ep = {
-        platform: 'gcfv2',
+        ...(0, manifest_1.initV2Endpoint)(globalOpts, separatedOpts.opts),
+        platform: "gcfv2",
         ...baseOptsEndpoint,
         ...specificOptsEndpoint,
         labels: {
             ...baseOptsEndpoint === null || baseOptsEndpoint === void 0 ? void 0 : baseOptsEndpoint.labels,
             ...specificOptsEndpoint === null || specificOptsEndpoint === void 0 ? void 0 : specificOptsEndpoint.labels,
         },
-        scheduleTrigger: {
-            schedule: separatedOpts.schedule,
-            retryConfig: {},
-        },
+        scheduleTrigger: (0, manifest_1.initV2ScheduleTrigger)(separatedOpts.schedule, globalOpts, separatedOpts.opts),
     };
-    (0, encoding_1.copyIfPresent)(ep.scheduleTrigger, separatedOpts, 'timeZone');
-    (0, encoding_1.copyIfPresent)(ep.scheduleTrigger.retryConfig, separatedOpts, 'retryCount', 'maxRetrySeconds', 'minBackoffSeconds', 'maxBackoffSeconds', 'maxDoublings');
+    (0, encoding_1.copyIfPresent)(ep.scheduleTrigger, separatedOpts, "timeZone");
+    (0, encoding_1.copyIfPresent)(ep.scheduleTrigger.retryConfig, separatedOpts, "retryCount", "maxRetrySeconds", "minBackoffSeconds", "maxBackoffSeconds", "maxDoublings");
     func.__endpoint = ep;
     func.__requiredAPIs = [
         {
-            api: 'cloudscheduler.googleapis.com',
-            reason: 'Needed for scheduled functions.',
+            api: "cloudscheduler.googleapis.com",
+            reason: "Needed for scheduled functions.",
         },
     ];
     return func;

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

@@ -1,6 +1,8 @@
-import { CloudEvent, CloudFunction } from '../core';
-import * as options from '../options';
-import { Expression } from '../params';
+import { ResetValue } from "../../common/options";
+import { CloudEvent, CloudFunction } from "../core";
+import { Expression } from "../../params";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 /**
  * An object within Google Cloud Storage.
  * Ref: https://github.com/googleapis/google-cloudevents-nodejs/blob/main/cloud/storage/v1/StorageObjectData.ts
@@ -9,7 +11,7 @@ export interface StorageObjectData {
     /**
      * The name of the bucket containing this object.
      */
-    bucket?: string;
+    bucket: string;
     /**
      * Cache-Control directive for the object data, matching
      * [https://tools.ietf.org/html/rfc7234#section-5.2"][RFC 7234 §5.2].
@@ -64,12 +66,12 @@ export interface StorageObjectData {
      * The content generation of this object. Used for object versioning.
      * Attempting to set this field will result in an error.
      */
-    generation?: number;
+    generation: number;
     /**
      * The ID of the object, including the bucket name, object name, and
      * generation number.
      */
-    id?: string;
+    id: string;
     /**
      * The kind of item this is. For objects, this is always "storage#object".
      */
@@ -98,11 +100,11 @@ export interface StorageObjectData {
      * number is only meaningful in the context of a particular generation of a
      * particular object.
      */
-    metageneration?: number;
+    metageneration: number;
     /**
      * The name of the object.
      */
-    name?: string;
+    name: string;
     /**
      * The link to this object.
      */
@@ -111,11 +113,11 @@ export interface StorageObjectData {
      * Content-Length of the object data in bytes, matching
      * [https://tools.ietf.org/html/rfc7230#section-3.3.2][RFC 7230 §3.3.2].
      */
-    size?: number;
+    size: number;
     /**
      * Storage class of the object.
      */
-    storageClass?: string;
+    storageClass: string;
     /**
      * The creation time of the object.
      * Attempting to set this field will result in an error.
@@ -164,76 +166,76 @@ export interface StorageOptions extends options.EventHandlerOptions {
     region?: options.SupportedRegion | string;
     /**
      * Amount of memory to allocate to a function.
-     * A value of null restores the defaults of 256MB.
      */
-    memory?: options.MemoryOption | Expression<number> | null;
+    memory?: options.MemoryOption | Expression<number> | ResetValue;
     /**
      * Timeout for the function in sections, possible values are 0 to 540.
      * HTTPS functions can specify a higher timeout.
-     * A value of null restores the default of 60s
+     *
+     * @remarks
      * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
      * function depends on the type of function: Event handling functions have a
      * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
      * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
      * timeout of 1,800s (30 minutes)
      */
-    timeoutSeconds?: number | Expression<number> | null;
+    timeoutSeconds?: number | Expression<number> | ResetValue;
     /**
      * Min number of actual instances to be running at a given time.
+     *
+     * @remarks
      * Instances will be billed for memory allocation and 10% of CPU allocation
      * while idle.
-     * A value of null restores the default min instances.
      */
-    minInstances?: number | Expression<number> | null;
+    minInstances?: number | Expression<number> | ResetValue;
     /**
      * Max number of instances to be running in parallel.
-     * A value of null restores the default max instances.
      */
-    maxInstances?: number | Expression<number> | null;
+    maxInstances?: number | Expression<number> | ResetValue;
     /**
      * Number of requests a function can serve at once.
+     *
+     * @remarks
      * Can only be applied to functions running on Cloud Functions v2.
      * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
      * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
      * The maximum value for concurrency is 1,000.
      */
-    concurrency?: number | Expression<number> | null;
+    concurrency?: number | Expression<number> | ResetValue;
     /**
      * Fractional number of CPUs to allocate to a function.
+     *
+     * @remarks
      * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
      * This is different from the defaults when using the gcloud utility and is different from
      * the fixed amount assigned in Google Cloud Functions generation 1.
      * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
      * to the value "gcf_gen1"
      */
-    cpu?: number | 'gcf_gen1';
+    cpu?: number | "gcf_gen1";
     /**
      * Connect cloud function to specified VPC connector.
-     * A value of null removes the VPC connector
      */
-    vpcConnector?: string | null;
+    vpcConnector?: string | ResetValue;
     /**
      * Egress settings for VPC connector.
-     * A value of null turns off VPC connector egress settings
      */
-    vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+    vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
     /**
      * Specific service account for the function to run as.
-     * A value of null restores the default service account.
      */
-    serviceAccount?: string | null;
+    serviceAccount?: string | ResetValue;
     /**
      * Ingress settings which control where this function can be called from.
-     * A value of null turns off ingress settings.
      */
-    ingressSettings?: options.IngressSetting | null;
+    ingressSettings?: options.IngressSetting | ResetValue;
     /**
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: string[];
+    secrets?: (string | SecretParam)[];
     /** Whether failed executions should be delivered again. */
-    retry?: boolean;
+    retry?: boolean | Expression<boolean> | ResetValue;
 }
 /**
  * Event handler sent only when a bucket has enabled object versioning.

package/lib/v2/providers/storage.js

@@ -26,17 +26,19 @@ exports.getOptsAndBucket = exports.onOperation = exports.onObjectMetadataUpdated
  * Cloud functions to handle events from Google Cloud Storage.
  * @packageDocumentation
  */
+const config_1 = require("../../common/config");
 const encoding_1 = require("../../common/encoding");
-const config_1 = require("../../config");
+const manifest_1 = require("../../runtime/manifest");
+const trace_1 = require("../trace");
 const options = require("../options");
 /** @internal */
-exports.archivedEvent = 'google.cloud.storage.object.v1.archived';
+exports.archivedEvent = "google.cloud.storage.object.v1.archived";
 /** @internal */
-exports.finalizedEvent = 'google.cloud.storage.object.v1.finalized';
+exports.finalizedEvent = "google.cloud.storage.object.v1.finalized";
 /** @internal */
-exports.deletedEvent = 'google.cloud.storage.object.v1.deleted';
+exports.deletedEvent = "google.cloud.storage.object.v1.deleted";
 /** @internal */
-exports.metadataUpdatedEvent = 'google.cloud.storage.object.v1.metadataUpdated';
+exports.metadataUpdatedEvent = "google.cloud.storage.object.v1.metadataUpdated";
 /**
  * Event handler sent only when a bucket has enabled object versioning.
  * This event indicates that the live version of an object has become an
@@ -94,46 +96,28 @@ function onObjectMetadataUpdated(bucketOrOptsOrHandler, handler) {
 exports.onObjectMetadataUpdated = onObjectMetadataUpdated;
 /** @internal */
 function onOperation(eventType, bucketOrOptsOrHandler, handler) {
-    if (typeof bucketOrOptsOrHandler === 'function') {
+    if (typeof bucketOrOptsOrHandler === "function") {
         handler = bucketOrOptsOrHandler;
         bucketOrOptsOrHandler = {};
     }
     const [opts, bucket] = getOptsAndBucket(bucketOrOptsOrHandler);
     const func = (raw) => {
-        return handler(raw);
+        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.
     func.__endpoint = {};
     // SDK may attempt to read FIREBASE_CONFIG env var to fetch the default bucket name.
     // To prevent runtime errors when FIREBASE_CONFIG env var is missing, we use getters.
-    Object.defineProperty(func, '__endpoint', {
+    Object.defineProperty(func, "__endpoint", {
         get: () => {
             const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
             const specificOpts = options.optionsToEndpoint(opts);
             const endpoint = {
-                platform: 'gcfv2',
+                platform: "gcfv2",
+                ...(0, manifest_1.initV2Endpoint)(options.getGlobalOptions(), opts),
                 ...baseOpts,
                 ...specificOpts,
                 labels: {
@@ -146,7 +130,7 @@ function onOperation(eventType, bucketOrOptsOrHandler, handler) {
                     retry: false,
                 },
             };
-            (0, encoding_1.copyIfPresent)(endpoint.eventTrigger, opts, 'retry', 'retry');
+            (0, encoding_1.copyIfPresent)(endpoint.eventTrigger, opts, "retry", "retry");
             return endpoint;
         },
     });
@@ -158,7 +142,7 @@ function getOptsAndBucket(bucketOrOpts) {
     var _a;
     let bucket;
     let opts;
-    if (typeof bucketOrOpts === 'string') {
+    if (typeof bucketOrOpts === "string") {
         bucket = bucketOrOpts;
         opts = {};
     }
@@ -168,8 +152,8 @@ function getOptsAndBucket(bucketOrOpts) {
         delete opts.bucket;
     }
     if (!bucket) {
-        throw new Error('Missing bucket name. If you are unit testing, please provide a bucket name' +
-            ' by providing bucket name directly in the event handler or by setting process.env.FIREBASE_CONFIG.');
+        throw new Error("Missing bucket name. If you are unit testing, please provide a bucket name" +
+            " by providing bucket name directly in the event handler or by setting process.env.FIREBASE_CONFIG.");
     }
     if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) {
         throw new Error(`Invalid bucket name ${bucket}`);

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

@@ -1,7 +1,9 @@
-import { AuthData, RateLimits, Request, RetryConfig } from '../../common/providers/tasks';
-import * as options from '../options';
-import { Expression } from '../params';
-import { HttpsFunction } from './https';
+import { ResetValue } from "../../common/options";
+import { AuthData, RateLimits, Request, RetryConfig } from "../../common/providers/tasks";
+import * as options from "../options";
+import { HttpsFunction } from "./https";
+import { Expression } from "../../params";
+import { SecretParam } from "../../params/types";
 export { AuthData, Request };
 export interface TaskQueueOptions extends options.EventHandlerOptions {
     /** How a task should be retried in the event of a non-2xx return. */
@@ -10,85 +12,87 @@ export interface TaskQueueOptions extends options.EventHandlerOptions {
     rateLimits?: RateLimits;
     /**
      * Who can enqueue tasks for this function.
+     *
+     * @remakrs
      * If left unspecified, only service accounts which have
      * `roles/cloudtasks.enqueuer` and `roles/cloudfunctions.invoker`
      * will have permissions.
      */
-    invoker?: 'private' | string | string[];
+    invoker?: "private" | string | string[];
     /**
      * Region where functions should be deployed.
      */
     region?: options.SupportedRegion | string;
     /**
      * Amount of memory to allocate to a function.
-     * A value of null restores the defaults of 256MB.
      */
-    memory?: options.MemoryOption | Expression<number> | null;
+    memory?: options.MemoryOption | Expression<number> | ResetValue;
     /**
      * Timeout for the function in sections, possible values are 0 to 540.
      * HTTPS functions can specify a higher timeout.
-     * A value of null restores the default of 60s
+     *
+     * @remarks
      * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
      * function depends on the type of function: Event handling functions have a
      * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
      * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
      * timeout of 1,800s (30 minutes)
      */
-    timeoutSeconds?: number | Expression<number> | null;
+    timeoutSeconds?: number | Expression<number> | ResetValue;
     /**
      * Min number of actual instances to be running at a given time.
+     *
+     * @remarks
      * Instances will be billed for memory allocation and 10% of CPU allocation
      * while idle.
-     * A value of null restores the default min instances.
      */
-    minInstances?: number | Expression<number> | null;
+    minInstances?: number | Expression<number> | ResetValue;
     /**
      * Max number of instances to be running in parallel.
-     * A value of null restores the default max instances.
      */
-    maxInstances?: number | Expression<number> | null;
+    maxInstances?: number | Expression<number> | ResetValue;
     /**
      * Number of requests a function can serve at once.
+     *
+     * @remarks
      * Can only be applied to functions running on Cloud Functions v2.
      * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
      * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
      * The maximum value for concurrency is 1,000.
      */
-    concurrency?: number | Expression<number> | null;
+    concurrency?: number | Expression<number> | ResetValue;
     /**
      * Fractional number of CPUs to allocate to a function.
+     *
+     * @remarks
      * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
      * This is different from the defaults when using the gcloud utility and is different from
      * the fixed amount assigned in Google Cloud Functions generation 1.
      * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
      * to the value "gcf_gen1"
      */
-    cpu?: number | 'gcf_gen1';
+    cpu?: number | "gcf_gen1";
     /**
      * Connect cloud function to specified VPC connector.
-     * A value of null removes the VPC connector
      */
-    vpcConnector?: string | null;
+    vpcConnector?: string | ResetValue;
     /**
      * Egress settings for VPC connector.
-     * A value of null turns off VPC connector egress settings
      */
-    vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+    vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
     /**
      * Specific service account for the function to run as.
-     * A value of null restores the default service account.
      */
-    serviceAccount?: string | null;
+    serviceAccount?: string | ResetValue;
     /**
      * Ingress settings which control where this function can be called from.
-     * A value of null turns off ingress settings.
      */
-    ingressSettings?: options.IngressSetting | null;
+    ingressSettings?: options.IngressSetting | ResetValue;
     /**
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: string[];
+    secrets?: (string | SecretParam)[];
     /** Whether failed executions should be delivered again. */
     retry?: boolean;
 }
@@ -110,7 +114,7 @@ export interface TaskQueueFunction<T = any> extends HttpsFunction {
  * Creates a handler for tasks sent to a Google Cloud Tasks queue.
  * @param handler - A callback to handle task requests.
  * @typeParam Args - The interface for the request's `data` field.
- * @returns A Cloud Function you can export and deploy.
+ * @returns A function you can export and deploy.
  */
 export declare function onTaskDispatched<Args = any>(handler: (request: Request<Args>) => void | Promise<void>): TaskQueueFunction<Args>;
 /**
@@ -118,6 +122,6 @@ export declare function onTaskDispatched<Args = any>(handler: (request: Request<
  * @param options - Configuration for the task queue or Cloud Function.
  * @param handler - A callback to handle task requests.
  * @typeParam Args - The interface for the request's `data` field.
- * @returns A Cloud Function you can export and deploy.
+ * @returns A function you can export and deploy.
  */
 export declare function onTaskDispatched<Args = any>(options: TaskQueueOptions, handler: (request: Request<Args>) => void | Promise<void>): TaskQueueFunction<Args>;