firebase-functions 7.0.1-rc.0 → 7.0.2-rc.0

package/lib/esm/runtime/manifest.mjs

@@ -99,8 +99,7 @@ const RESETTABLE_V2_SCHEDULE_OPTIONS = {
 	maxDoublings: null,
 	maxRetrySeconds: null,
 	minBackoffSeconds: null,
-	maxBackoffSeconds: null,
-	attemptDeadlineSeconds: null
+	maxBackoffSeconds: null
 };
 function initScheduleTrigger(resetOptions, schedule, ...opts) {
 	let scheduleTrigger = {
@@ -109,11 +108,7 @@ function initScheduleTrigger(resetOptions, schedule, ...opts) {
 	};
 	if (opts.every((opt) => !opt?.preserveExternalChanges)) {
 		for (const key of Object.keys(resetOptions)) {
-			if (key === "attemptDeadlineSeconds") {
-				scheduleTrigger[key] = RESET_VALUE;
-			} else {
-				scheduleTrigger.retryConfig[key] = RESET_VALUE;
-			}
+			scheduleTrigger.retryConfig[key] = RESET_VALUE;
 		}
 		scheduleTrigger = {
 			...scheduleTrigger,

package/lib/esm/v1/cloud-functions.mjs

@@ -1,5 +1,4 @@
 import { warn } from "../logger/index.mjs";
-import { SecretParam } from "../params/types.mjs";
 import { RESET_VALUE, ResetValue } from "../common/options.mjs";
 import { initV1Endpoint, initV1ScheduleTrigger } from "../runtime/manifest.mjs";
 import { Change } from "../common/change.mjs";
@@ -177,7 +176,7 @@ function optionsToEndpoint(options) {
 	copyIfPresent(endpoint, options, "omit", "minInstances", "maxInstances", "ingressSettings", "labels", "timeoutSeconds");
 	convertIfPresent(endpoint, options, "region", "regions");
 	convertIfPresent(endpoint, options, "serviceAccountEmail", "serviceAccount", (sa) => sa);
-	convertIfPresent(endpoint, options, "secretEnvironmentVariables", "secrets", (secrets) => secrets.map((secret) => ({ key: secret instanceof SecretParam ? secret.name : secret })));
+	convertIfPresent(endpoint, options, "secretEnvironmentVariables", "secrets", (secrets) => secrets.map((secret) => ({ key: typeof secret === "string" ? secret : secret.name })));
 	if (options?.vpcConnector !== undefined) {
 		if (options.vpcConnector === null || options.vpcConnector instanceof ResetValue) {
 			endpoint.vpc = RESET_VALUE;

package/lib/esm/v1/function-builder.mjs

@@ -1,4 +1,4 @@
-import { Expression, SecretParam } from "../params/types.mjs";
+import { Expression } from "../params/types.mjs";
 import { ResetValue } from "../common/options.mjs";
 import { INGRESS_SETTINGS_OPTIONS, MAX_NUMBER_USER_LABELS, MAX_TIMEOUT_SECONDS, VALID_MEMORY_OPTIONS, VPC_EGRESS_SETTINGS_OPTIONS } from "./function-configuration.mjs";
 import { _eventWithOptions } from "./providers/analytics.mjs";
@@ -84,7 +84,7 @@ function assertRuntimeOptionsValid(runtimeOptions) {
 		}
 	}
 	if (runtimeOptions.secrets !== undefined) {
-		const invalidSecrets = runtimeOptions.secrets.filter((s) => !/^[A-Za-z\d\-_]+$/.test(s instanceof SecretParam ? s.name : s));
+		const invalidSecrets = runtimeOptions.secrets.filter((s) => !/^[A-Za-z\d\-_]+$/.test(typeof s === "string" ? s : s.name));
 		if (invalidSecrets.length > 0) {
 			throw new Error(`Invalid secrets: ${invalidSecrets.join(",")}. ` + "Secret must be configured using the resource id (e.g. API_KEY)");
 		}

package/lib/esm/v2/options.mjs

@@ -1,5 +1,4 @@
 import { warn } from "../logger/index.mjs";
-import { SecretParam } from "../params/types.mjs";
 import { declaredParams } from "../params/index.mjs";
 import { RESET_VALUE, ResetValue } from "../common/options.mjs";
 import { convertIfPresent, copyIfPresent, durationFromSeconds, serviceAccountFromShorthand } from "../common/encoding.mjs";
@@ -84,7 +83,7 @@ function optionsToEndpoint(opts) {
 		}
 		return region;
 	});
-	convertIfPresent(endpoint, opts, "secretEnvironmentVariables", "secrets", (secrets) => secrets.map((secret) => ({ key: secret instanceof SecretParam ? secret.name : secret })));
+	convertIfPresent(endpoint, opts, "secretEnvironmentVariables", "secrets", (secrets) => secrets.map((secret) => ({ key: typeof secret === "string" ? secret : secret.name })));
 	return endpoint;
 }
 /**

package/lib/esm/v2/providers/scheduler.mjs

@@ -22,7 +22,6 @@ function getOpts(args) {
 	return {
 		schedule: args.schedule,
 		timeZone: args.timeZone,
-		attemptDeadlineSeconds: args.attemptDeadlineSeconds,
 		retryConfig: {
 			retryCount: args.retryCount,
 			maxRetrySeconds: args.maxRetrySeconds,
@@ -71,7 +70,7 @@ function onSchedule(args, handler) {
 		},
 		scheduleTrigger: initV2ScheduleTrigger(separatedOpts.schedule, globalOpts, separatedOpts.opts)
 	};
-	copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone", "attemptDeadlineSeconds");
+	copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone");
 	copyIfPresent(ep.scheduleTrigger.retryConfig, separatedOpts.retryConfig, "retryCount", "maxRetrySeconds", "minBackoffSeconds", "maxBackoffSeconds", "maxDoublings");
 	func.__endpoint = ep;
 	func.__requiredAPIs = [{

package/lib/params/index.d.ts

@@ -4,7 +4,7 @@
  */
 import { BooleanParam, Expression, IntParam, Param, ParamOptions, SecretParam, JsonSecretParam, StringParam, ListParam } from "./types";
 export { BUCKET_PICKER, select, multiSelect } from "./types";
-export type { TextInput, SelectInput, SelectOptions, MultiSelectInput } from "./types";
+export type { TextInput, SelectInput, SelectOptions, MultiSelectInput, Param, SecretParam, JsonSecretParam, StringParam, BooleanParam, IntParam, ListParam, } from "./types";
 export { Expression };
 export type { ParamOptions };
 type SecretOrExpr = Param<any> | SecretParam | JsonSecretParam<any>;

package/lib/params/types.d.ts

@@ -203,6 +203,11 @@ export declare class JsonSecretParam<T = any> {
     /** Returns the secret's parsed JSON value at runtime. Throws an error if accessed during deployment, if the secret is not set, or if the value is not valid JSON. */
     value(): T;
 }
+/**
+ * A union type representing all valid secret parameter types that can be used
+ * in a function's `secrets` configuration array.
+ */
+export type SupportedSecretParam = string | SecretParam | JsonSecretParam<unknown>;
 /**
  *  A parametrized value of String type that will be read from .env files
  *  if present, or prompted for by the CLI if missing.

package/lib/runtime/manifest.d.ts

@@ -70,7 +70,6 @@ export interface ManifestEndpoint {
     scheduleTrigger?: {
         schedule: string | Expression<string>;
         timeZone?: string | Expression<string> | ResetValue;
-        attemptDeadlineSeconds?: number | Expression<number> | ResetValue;
         retryConfig?: {
             retryCount?: number | Expression<number> | ResetValue;
             maxRetrySeconds?: string | Expression<string> | ResetValue;

package/lib/runtime/manifest.js

@@ -99,8 +99,7 @@ const RESETTABLE_V2_SCHEDULE_OPTIONS = {
 	maxDoublings: null,
 	maxRetrySeconds: null,
 	minBackoffSeconds: null,
-	maxBackoffSeconds: null,
-	attemptDeadlineSeconds: null
+	maxBackoffSeconds: null
 };
 function initScheduleTrigger(resetOptions, schedule, ...opts) {
 	let scheduleTrigger = {
@@ -109,11 +108,7 @@ function initScheduleTrigger(resetOptions, schedule, ...opts) {
 	};
 	if (opts.every((opt) => !opt?.preserveExternalChanges)) {
 		for (const key of Object.keys(resetOptions)) {
-			if (key === "attemptDeadlineSeconds") {
-				scheduleTrigger[key] = require_common_options.RESET_VALUE;
-			} else {
-				scheduleTrigger.retryConfig[key] = require_common_options.RESET_VALUE;
-			}
+			scheduleTrigger.retryConfig[key] = require_common_options.RESET_VALUE;
 		}
 		scheduleTrigger = {
 			...scheduleTrigger,

package/lib/v1/cloud-functions.js

@@ -1,5 +1,4 @@
 const require_logger_index = require('../logger/index.js');
-const require_params_types = require('../params/types.js');
 const require_common_options = require('../common/options.js');
 const require_runtime_manifest = require('../runtime/manifest.js');
 const require_common_change = require('../common/change.js');
@@ -177,7 +176,7 @@ function optionsToEndpoint(options) {
 	require_common_encoding.copyIfPresent(endpoint, options, "omit", "minInstances", "maxInstances", "ingressSettings", "labels", "timeoutSeconds");
 	require_common_encoding.convertIfPresent(endpoint, options, "region", "regions");
 	require_common_encoding.convertIfPresent(endpoint, options, "serviceAccountEmail", "serviceAccount", (sa) => sa);
-	require_common_encoding.convertIfPresent(endpoint, options, "secretEnvironmentVariables", "secrets", (secrets) => secrets.map((secret) => ({ key: secret instanceof require_params_types.SecretParam ? secret.name : secret })));
+	require_common_encoding.convertIfPresent(endpoint, options, "secretEnvironmentVariables", "secrets", (secrets) => secrets.map((secret) => ({ key: typeof secret === "string" ? secret : secret.name })));
 	if (options?.vpcConnector !== undefined) {
 		if (options.vpcConnector === null || options.vpcConnector instanceof require_common_options.ResetValue) {
 			endpoint.vpc = require_common_options.RESET_VALUE;

package/lib/v1/function-builder.js

@@ -84,7 +84,7 @@ function assertRuntimeOptionsValid(runtimeOptions) {
 		}
 	}
 	if (runtimeOptions.secrets !== undefined) {
-		const invalidSecrets = runtimeOptions.secrets.filter((s) => !/^[A-Za-z\d\-_]+$/.test(s instanceof require_params_types.SecretParam ? s.name : s));
+		const invalidSecrets = runtimeOptions.secrets.filter((s) => !/^[A-Za-z\d\-_]+$/.test(typeof s === "string" ? s : s.name));
 		if (invalidSecrets.length > 0) {
 			throw new Error(`Invalid secrets: ${invalidSecrets.join(",")}. ` + "Secret must be configured using the resource id (e.g. API_KEY)");
 		}

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

@@ -1,6 +1,6 @@
 import { Expression } from "../params";
 import { ResetValue } from "../common/options";
-import { SecretParam } from "../params/types";
+import { SupportedSecretParam } from "../params/types";
 export { RESET_VALUE } from "../common/options";
 /**
  * List of all regions supported by Cloud Functions.
@@ -162,7 +162,7 @@ export interface RuntimeOptions {
      * Invoker to set access control on https functions.
      */
     invoker?: "public" | "private" | string | string[];
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /**
      * Determines whether Firebase AppCheck is enforced.
      *

package/lib/v2/options.d.ts

@@ -1,6 +1,6 @@
 import { ResetValue } from "../common/options";
 import { Expression } from "../params";
-import { ParamSpec, SecretParam } from "../params/types";
+import { ParamSpec, SupportedSecretParam } from "../params/types";
 export { RESET_VALUE } from "../common/options";
 /**
  * List of all regions supported by Cloud Functions (2nd gen).
@@ -104,7 +104,7 @@ export interface GlobalOptions {
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /**
      * Determines whether Firebase App Check is enforced. Defaults to false.
      *

package/lib/v2/options.js

@@ -1,5 +1,4 @@
 const require_logger_index = require('../logger/index.js');
-const require_params_types = require('../params/types.js');
 const require_params_index = require('../params/index.js');
 const require_common_options = require('../common/options.js');
 const require_common_encoding = require('../common/encoding.js');
@@ -84,7 +83,7 @@ function optionsToEndpoint(opts) {
 		}
 		return region;
 	});
-	require_common_encoding.convertIfPresent(endpoint, opts, "secretEnvironmentVariables", "secrets", (secrets) => secrets.map((secret) => ({ key: secret instanceof require_params_types.SecretParam ? secret.name : secret })));
+	require_common_encoding.convertIfPresent(endpoint, opts, "secretEnvironmentVariables", "secrets", (secrets) => secrets.map((secret) => ({ key: typeof secret === "string" ? secret : secret.name })));
 	return endpoint;
 }
 /**

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

@@ -2,7 +2,7 @@ import { ResetValue } from "../../../common/options";
 import { CloudEvent, CloudFunction } from "../../core";
 import { Expression } from "../../../params";
 import * as options from "../../options";
-import { SecretParam } from "../../../params/types";
+import { SupportedSecretParam } from "../../../params/types";
 /**
  * The CloudEvent data emitted by Firebase Alerts.
  * @typeParam T - the payload type that is expected for this alert.
@@ -117,7 +117,7 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions {
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /** Whether failed executions should be delivered again. */
     retry?: boolean | Expression<boolean> | ResetValue;
 }

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

@@ -7,7 +7,7 @@ import { Expression } from "../../../params";
 import { CloudEvent, CloudFunction } from "../../core";
 import { FirebaseAlertData } from "./alerts";
 import * as options from "../../options";
-import { SecretParam } from "../../../params/types";
+import { SupportedSecretParam } from "../../../params/types";
 /**
  * The internal payload object for adding a new tester device to app distribution.
  * Payload is wrapped inside a `FirebaseAlertData` object.
@@ -140,7 +140,7 @@ export interface AppDistributionOptions extends options.EventHandlerOptions {
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /** Whether failed executions should be delivered again. */
     retry?: boolean | Expression<boolean> | ResetValue;
 }

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

@@ -7,7 +7,7 @@ import { Expression } from "../../../params";
 import { CloudEvent, CloudFunction } from "../../core";
 import { FirebaseAlertData } from "./alerts";
 import * as options from "../../options";
-import { SecretParam } from "../../../params/types";
+import { SupportedSecretParam } from "../../../params/types";
 /** Generic Crashlytics issue interface */
 export interface Issue {
     /** The ID of the Crashlytics issue */
@@ -206,7 +206,7 @@ export interface CrashlyticsOptions extends options.EventHandlerOptions {
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /** Whether failed executions should be delivered again. */
     retry?: boolean | Expression<boolean> | ResetValue;
 }

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

@@ -5,7 +5,7 @@ import { DataSnapshot } from "../../common/providers/database";
 import { CloudEvent, CloudFunction } from "../core";
 import { Expression } from "../../params";
 import * as options from "../options";
-import { SecretParam } from "../../params/types";
+import { SupportedSecretParam } from "../../params/types";
 export { DataSnapshot };
 /** @hidden */
 export interface RawRTDBCloudEventData {
@@ -128,7 +128,7 @@ export interface ReferenceOptions<Ref extends string = string> extends options.E
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /** Whether failed executions should be delivered again. */
     retry?: boolean | Expression<boolean> | ResetValue;
 }

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

@@ -2,7 +2,7 @@ import { ResetValue } from "../../common/options";
 import { CloudEvent, CloudFunction } from "../core";
 import { Expression } from "../../params";
 import * as options from "../options";
-import { SecretParam } from "../../params/types";
+import { SupportedSecretParam } from "../../params/types";
 /** Options that can be set on an Eventarc trigger. */
 export interface EventarcTriggerOptions extends options.EventHandlerOptions {
     /**
@@ -105,7 +105,7 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions {
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /** Whether failed executions should be delivered again. */
     retry?: boolean | Expression<boolean> | ResetValue;
 }

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

@@ -4,7 +4,7 @@ import { type CallableRequest, type CallableResponse, type FunctionsErrorCode, H
 import { ManifestEndpoint } from "../../runtime/manifest";
 import { GlobalOptions, SupportedRegion } from "../options";
 import { Expression } from "../../params";
-import { SecretParam } from "../../params/types";
+import { SupportedSecretParam } from "../../params/types";
 import * as options from "../options";
 export type { Request, CallableRequest, CallableResponse, FunctionsErrorCode };
 export { HttpsError };
@@ -93,7 +93,7 @@ export interface HttpsOptions extends Omit<GlobalOptions, "region" | "enforceApp
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /**
      * Invoker to set access control on https functions.
      */

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

@@ -7,7 +7,7 @@ import { AuthBlockingEvent, AuthBlockingEventType, AuthUserRecord, BeforeCreateR
 import { BlockingFunction } from "../../v1/cloud-functions";
 import { Expression } from "../../params";
 import * as options from "../options";
-import { SecretParam } from "../../params/types";
+import { SupportedSecretParam } from "../../params/types";
 export { HttpsError };
 export type { AuthUserRecord, AuthBlockingEvent };
 /** @hidden Internally used when parsing the options. */
@@ -104,7 +104,7 @@ export interface BlockingOptions {
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
 }
 /**
  * Handles an event that is triggered before a user is created.

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

@@ -2,7 +2,7 @@ import { ResetValue } from "../../common/options";
 import { CloudEvent, CloudFunction } from "../core";
 import { Expression } from "../../params";
 import * as options from "../options";
-import { SecretParam } from "../../params/types";
+import { SupportedSecretParam } from "../../params/types";
 /**
  * Google Cloud Pub/Sub is a globally distributed message bus that automatically scales as you need it.
  * You can create a function ({@link onMessagePublished}) that handles pub/sub events by using functions.pubsub.
@@ -161,7 +161,7 @@ export interface PubSubOptions extends options.EventHandlerOptions {
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /** Whether failed executions should be delivered again. */
     retry?: boolean | Expression<boolean> | ResetValue;
 }

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

@@ -36,12 +36,6 @@ export interface ScheduleOptions extends options.GlobalOptions {
     schedule: string;
     /** The timezone that the schedule executes in. */
     timeZone?: timezone | Expression<string> | ResetValue;
-    /**
-     * The deadline for job attempts in seconds. If the request handler does not respond by this deadline,
-     * the request is cancelled and the attempt is marked as a `DEADLINE_EXCEEDED` failure.
-     * The value must be between 15 and 1800. Defaults to 180.
-     */
-    attemptDeadlineSeconds?: number | Expression<number> | ResetValue;
     /** The number of retry attempts for a failed run. */
     retryCount?: number | Expression<number> | ResetValue;
     /** The time limit for retrying. */

package/lib/v2/providers/scheduler.js

@@ -22,7 +22,6 @@ function getOpts(args) {
 	return {
 		schedule: args.schedule,
 		timeZone: args.timeZone,
-		attemptDeadlineSeconds: args.attemptDeadlineSeconds,
 		retryConfig: {
 			retryCount: args.retryCount,
 			maxRetrySeconds: args.maxRetrySeconds,
@@ -71,7 +70,7 @@ function onSchedule(args, handler) {
 		},
 		scheduleTrigger: require_runtime_manifest.initV2ScheduleTrigger(separatedOpts.schedule, globalOpts, separatedOpts.opts)
 	};
-	require_common_encoding.copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone", "attemptDeadlineSeconds");
+	require_common_encoding.copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone");
 	require_common_encoding.copyIfPresent(ep.scheduleTrigger.retryConfig, separatedOpts.retryConfig, "retryCount", "maxRetrySeconds", "minBackoffSeconds", "maxBackoffSeconds", "maxDoublings");
 	func.__endpoint = ep;
 	func.__requiredAPIs = [{

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

@@ -2,7 +2,7 @@ import { ResetValue } from "../../common/options";
 import { CloudEvent, CloudFunction } from "../core";
 import { Expression } from "../../params";
 import * as options from "../options";
-import { SecretParam } from "../../params/types";
+import { SupportedSecretParam } from "../../params/types";
 /**
  * An object within Google Cloud Storage.
  * Ref: https://github.com/googleapis/google-cloudevents-nodejs/blob/main/cloud/storage/v1/StorageObjectData.ts
@@ -237,7 +237,7 @@ export interface StorageOptions extends options.EventHandlerOptions {
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /** Whether failed executions should be delivered again. */
     retry?: boolean | Expression<boolean> | ResetValue;
 }

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

@@ -3,7 +3,7 @@ import { AuthData, RateLimits, Request, RetryConfig } from "../../common/provide
 import * as options from "../options";
 import { HttpsFunction } from "./https";
 import { Expression } from "../../params";
-import { SecretParam } from "../../params/types";
+import { SupportedSecretParam } from "../../params/types";
 export type { AuthData, Request, RateLimits, RetryConfig };
 export interface TaskQueueOptions extends options.EventHandlerOptions {
     /** How a task should be retried in the event of a non-2xx return. */
@@ -96,7 +96,7 @@ export interface TaskQueueOptions extends options.EventHandlerOptions {
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: (string | SecretParam)[];
+    secrets?: SupportedSecretParam[];
     /** Whether failed executions should be delivered again. */
     retry?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "7.0.1-rc.0",
+  "version": "7.0.2-rc.0",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",