Merge branch 'master' into @invertase/integration-tests

Author: dackers86

package-lock.json

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

package.json

@@ -31,6 +31,7 @@ import {
   RESET_VALUE,
 } from "../../src/v1";
 import { MINIMAL_V1_ENDPOINT } from "../fixtures";
+import { defineJsonSecret, defineSecret } from "../../src/params";
 
 describe("makeCloudFunction", () => {
   const cloudFunctionArgs: MakeCloudFunctionArgs<any> = {
@@ -161,6 +162,31 @@ describe("makeCloudFunction", () => {
     });
   });
 
+  it("should accept all valid secret types in secrets array (type test)", () => {
+    // This is a compile-time type test. If any of these types are not assignable
+    // to the secrets array, TypeScript will fail to compile this test file.
+    const jsonSecret = defineJsonSecret<{ key: string }>("JSON_SECRET");
+    const stringSecret = defineSecret("STRING_SECRET");
+    const plainSecret = "PLAIN_SECRET";
+
+    const cf = makeCloudFunction({
+      provider: "mock.provider",
+      eventType: "mock.event",
+      service: "service",
+      triggerResource: () => "resource",
+      handler: () => null,
+      options: {
+        secrets: [plainSecret, stringSecret, jsonSecret],
+      },
+    });
+
+    expect(cf.__endpoint.secretEnvironmentVariables).to.deep.equal([
+      { key: "PLAIN_SECRET" },
+      { key: "STRING_SECRET" },
+      { key: "JSON_SECRET" },
+    ]);
+  });
+
   it("should set retry given failure policy in __endpoint", () => {
     const cf = makeCloudFunction({
       provider: "mock.provider",

spec/v1/cloud-functions.spec.ts

@@ -0,0 +1,41 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2025 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.
+
+import { expect } from "chai";
+import { defineJsonSecret, defineSecret } from "../../src/params";
+import { GlobalOptions } from "../../src/v2/options";
+
+describe("GlobalOptions", () => {
+  it("should accept all valid secret types in secrets array (type test)", () => {
+    // This is a compile-time type test. If any of these types are not assignable
+    // to the secrets array, TypeScript will fail to compile this test file.
+    const jsonSecret = defineJsonSecret<{ key: string }>("JSON_SECRET");
+    const stringSecret = defineSecret("STRING_SECRET");
+    const plainSecret = "PLAIN_SECRET";
+
+    const opts: GlobalOptions = {
+      secrets: [plainSecret, stringSecret, jsonSecret],
+    };
+
+    expect(opts.secrets).to.have.length(3);
+  });
+});

spec/v2/options.spec.ts

@@ -40,7 +40,19 @@ import {
 } 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 };

src/params/index.ts

@@ -535,6 +535,12 @@ export class JsonSecretParam<T = any> {
   }
 }
 
+/**
+ * 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.

src/params/types.ts

@@ -43,7 +43,7 @@ import {
   ManifestRequiredAPI,
 } from "../runtime/manifest";
 import { ResetValue } from "../common/options";
-import { SecretParam } from "../params/types";
+import { SupportedSecretParam } from "../params/types";
 import { withInit } from "../common/onInit";
 
 export { Change } from "../common/change";
@@ -638,8 +638,10 @@ export function optionsToEndpoint(options: DeploymentOptions): ManifestEndpoint
     options,
     "secretEnvironmentVariables",
     "secrets",
-    (secrets: (string | SecretParam)[]) =>
-      secrets.map((secret) => ({ key: secret instanceof SecretParam ? secret.name : secret }))
+    (secrets: SupportedSecretParam[]) =>
+      secrets.map((secret) => ({
+        key: typeof secret === "string" ? secret : secret.name,
+      }))
   );
   if (options?.vpcConnector !== undefined) {
     if (options.vpcConnector === null || options.vpcConnector instanceof ResetValue) {

src/v1/cloud-functions.ts

@@ -23,7 +23,7 @@
 import express from "express";
 
 import { ResetValue } from "../common/options";
-import { Expression, SecretParam } from "../params/types";
+import { Expression } from "../params/types";
 import { EventContext } from "./cloud-functions";
 import {
   DeploymentOptions,
@@ -200,7 +200,7 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
 
   if (runtimeOptions.secrets !== undefined) {
     const invalidSecrets = runtimeOptions.secrets.filter(
-      (s) => !/^[A-Za-z\d\-_]+$/.test(s instanceof SecretParam ? s.name : s)
+      (s) => !/^[A-Za-z\d\-_]+$/.test(typeof s === "string" ? s : s.name)
     );
     if (invalidSecrets.length > 0) {
       throw new Error(

src/v1/function-builder.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";
 
@@ -235,7 +235,7 @@ export interface RuntimeOptions {
   /*
    * Secrets to bind to a function instance.
    */
-  secrets?: (string | SecretParam)[];
+  secrets?: SupportedSecretParam[];
 
   /**
    * Determines whether Firebase AppCheck is enforced.

src/v1/function-configuration.ts

@@ -35,7 +35,7 @@ import { RESET_VALUE, ResetValue } from "../common/options";
 import { ManifestEndpoint } from "../runtime/manifest";
 import { TriggerAnnotation } from "./core";
 import { declaredParams, Expression } from "../params";
-import { ParamSpec, SecretParam } from "../params/types";
+import { ParamSpec, SupportedSecretParam } from "../params/types";
 import { HttpsOptions } from "./providers/https";
 import * as logger from "../logger";
 
@@ -210,7 +210,7 @@ export interface GlobalOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: (string | SecretParam)[];
+  secrets?: SupportedSecretParam[];
 
   /**
    * Determines whether Firebase App Check is enforced. Defaults to false.
@@ -396,8 +396,10 @@ export function optionsToEndpoint(
     opts,
     "secretEnvironmentVariables",
     "secrets",
-    (secrets: (string | SecretParam)[]) =>
-      secrets.map((secret) => ({ key: secret instanceof SecretParam ? secret.name : secret }))
+    (secrets: SupportedSecretParam[]) =>
+      secrets.map((secret) => ({
+        key: typeof secret === "string" ? secret : secret.name,
+      }))
   );
 
   return endpoint;