Merge branch 'master' into rosalyntan.schema

Author: rosalyntan

CHANGELOG.md

@@ -1 +0,0 @@
-- Adds listServices and also defines trigger within runv2.ts [#9482]

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "14.25.1",
+  "version": "14.26.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {

package.json

@@ -7,6 +7,7 @@
                 "nodejs18",
                 "nodejs20",
                 "nodejs22",
+                "nodejs24",
                 "python310",
                 "python311",
                 "python312",
@@ -915,6 +916,7 @@
                         "nodejs18",
                         "nodejs20",
                         "nodejs22",
+                        "nodejs24",
                         "python310",
                         "python311",
                         "python312",

schema/firebase-config.json

@@ -1,7 +1,6 @@
 import * as clc from "colorette";
 
 import { queryTimeSeries, CmQuery } from "../gcp/cloudmonitoring";
-import * as utils from "../utils";
 
 export function freeTrialTermsLink(): string {
   return "https://firebase.google.com/pricing";
@@ -28,19 +27,11 @@ export async function checkFreeTrialInstanceUsed(projectId: string): Promise<boo
     // If the metric doesn't exist, free trial is not used.
     used = false;
   }
-  if (used) {
-    utils.logLabeledWarning(
-      "dataconnect",
-      "CloudSQL no cost trial has already been used on this project.",
-    );
-  } else {
-    utils.logLabeledSuccess("dataconnect", "CloudSQL no cost trial available!");
-  }
   return used;
 }
 
-export function upgradeInstructions(projectId: string): string {
-  return `To provision a CloudSQL Postgres instance on the Firebase Data Connect no-cost trial:
+export function upgradeInstructions(projectId: string, trialUsed: boolean): string {
+  return `To provision a ${trialUsed ? "paid CloudSQL Postgres instance" : "CloudSQL Postgres instance on the Firebase Data Connect no-cost trial"}:
 
   1. Please upgrade to the pay-as-you-go (Blaze) billing plan. Visit the following page:
 

src/dataconnect/freeTrial.ts

@@ -9,6 +9,7 @@ import { promiseWithSpinner } from "../utils";
 import { trackGA4 } from "../track";
 import * as utils from "../utils";
 import { Source } from "../init/features/dataconnect";
+import { checkBillingEnabled } from "../gcp/cloudbilling";
 
 const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 
@@ -147,7 +148,12 @@ async function createInstance(args: {
     });
     utils.logLabeledBullet(
       "dataconnect",
-      cloudSQLBeingCreated(projectId, instanceId, freeTrialLabel === "ft"),
+      cloudSQLBeingCreated(
+        projectId,
+        instanceId,
+        freeTrialLabel === "ft",
+        await checkBillingEnabled(projectId),
+      ),
     );
   }
 }
@@ -158,18 +164,22 @@ async function createInstance(args: {
 export function cloudSQLBeingCreated(
   projectId: string,
   instanceId: string,
-  includeFreeTrialToS?: boolean,
+  isFreeTrial?: boolean,
+  billingEnabled?: boolean,
 ): string {
   return (
     `Cloud SQL Instance ${clc.bold(instanceId)} is being created.` +
-    (includeFreeTrialToS
+    (isFreeTrial
       ? `\nThis instance is provided under the terms of the Data Connect no-cost trial ${freeTrialTermsLink()}`
       : "") +
-    `
-   Meanwhile, your data are saved in a temporary database and will be migrated once complete. Monitor its progress at
-
-   ${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}
-`
+    `\n
+   Meanwhile, your data are saved in a temporary database and will be migrated once complete.` +
+    (isFreeTrial && !billingEnabled
+      ? ` 
+   Your free trial instance won't show in google cloud console until a billing account is added.
+   However, you can still use the gcloud cli to monitor your database instance:\n\n\te.g. gcloud sql instances list --project ${projectId}\n`
+      : ` 
+   Monitor its progress at\n\n\t${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}\n`)
   );
 }
 

src/dataconnect/provisionCloudSql.ts

@@ -9,16 +9,15 @@ import * as filters from "../../dataconnect/filters";
 import * as build from "../../dataconnect/build";
 import * as ensureApis from "../../dataconnect/ensureApis";
 import * as requireTosAcceptance from "../../requireTosAcceptance";
-import * as cloudbilling from "../../gcp/cloudbilling";
 import * as schemaMigration from "../../dataconnect/schemaMigration";
 import * as provisionCloudSql from "../../dataconnect/provisionCloudSql";
+import * as cloudbilling from "../../gcp/cloudbilling";
 import { FirebaseError } from "../../error";
 
 describe("dataconnect prepare", () => {
   let sandbox: sinon.SinonSandbox;
   let loadAllStub: sinon.SinonStub;
   let buildStub: sinon.SinonStub;
-  let checkBillingEnabledStub: sinon.SinonStub;
   let getResourceFiltersStub: sinon.SinonStub;
   let diffSchemaStub: sinon.SinonStub;
   let setupCloudSqlStub: sinon.SinonStub;
@@ -27,14 +26,14 @@ describe("dataconnect prepare", () => {
     sandbox = sinon.createSandbox();
     loadAllStub = sandbox.stub(load, "loadAll").resolves([]);
     buildStub = sandbox.stub(build, "build").resolves({} as any);
-    checkBillingEnabledStub = sandbox.stub(cloudbilling, "checkBillingEnabled").resolves(true);
     sandbox.stub(ensureApis, "ensureApis").resolves();
     sandbox.stub(requireTosAcceptance, "requireTosAcceptance").returns(() => Promise.resolve());
     getResourceFiltersStub = sandbox.stub(filters, "getResourceFilters").returns(undefined);
     diffSchemaStub = sandbox.stub(schemaMigration, "diffSchema").resolves();
     setupCloudSqlStub = sandbox.stub(provisionCloudSql, "setupCloudSql").resolves();
     sandbox.stub(projectUtils, "needProjectId").returns("test-project");
     sandbox.stub(utils, "logLabeledBullet");
+    sandbox.stub(cloudbilling, "checkBillingEnabled").resolves();
   });
 
   afterEach(() => {
@@ -57,16 +56,6 @@ describe("dataconnect prepare", () => {
     });
   });
 
-  it("should throw an error if billing is not enabled", async () => {
-    checkBillingEnabledStub.resolves(false);
-    const context = {};
-    const options = { config: {} } as any;
-    await expect(prepare.default(context, options)).to.be.rejectedWith(
-      FirebaseError,
-      "To provision a CloudSQL Postgres instance on the Firebase Data Connect no-cost trial",
-    );
-  });
-
   it("should build services", async () => {
     const serviceInfos = [{ sourceDirectory: "a" }, { sourceDirectory: "b" }];
     loadAllStub.resolves(serviceInfos as any);

src/deploy/dataconnect/prepare.spec.ts

@@ -11,12 +11,11 @@ import { ensureApis } from "../../dataconnect/ensureApis";
 import { requireTosAcceptance } from "../../requireTosAcceptance";
 import { DATA_CONNECT_TOS_ID } from "../../gcp/firedata";
 import { setupCloudSql } from "../../dataconnect/provisionCloudSql";
-import { checkBillingEnabled } from "../../gcp/cloudbilling";
 import { parseServiceName } from "../../dataconnect/names";
 import { FirebaseError } from "../../error";
 import { mainSchema, requiresVector } from "../../dataconnect/types";
 import { diffSchema } from "../../dataconnect/schemaMigration";
-import { upgradeInstructions } from "../../dataconnect/freeTrial";
+import { checkBillingEnabled } from "../../gcp/cloudbilling";
 import { Context, initDeployStats } from "./context";
 
 /**
@@ -35,7 +34,6 @@ export default async function (context: Context, options: DeployOptions): Promis
   const { serviceInfos, filters, deployStats } = context.dataconnect;
   if (!(await checkBillingEnabled(projectId))) {
     deployStats.missingBilling = true;
-    throw new FirebaseError(upgradeInstructions(projectId));
   }
   await requireTosAcceptance(DATA_CONNECT_TOS_ID)(options);
   for (const si of serviceInfos) {

src/deploy/dataconnect/prepare.ts

@@ -89,6 +89,12 @@ export const RUNTIMES = runtimes({
     deprecationDate: "2027-04-30",
     decommissionDate: "2028-10-31",
   },
+  nodejs24: {
+    friendly: "Node.js 24",
+    status: "beta",
+    deprecationDate: "2028-04-30",
+    decommissionDate: "2028-10-31",
+  },
   python310: {
     friendly: "Python 3.10",
     status: "GA",

src/deploy/functions/runtimes/supported/types.ts

@@ -54,36 +54,36 @@
   },
   "dataconnect": {
     "darwin": {
-      "version": "2.17.1",
-      "expectedSize": 30004064,
-      "expectedChecksum": "89314d496595b250e149d8705ccd2ddc",
-      "expectedChecksumSHA256": "1e95733bf75fd433047345cb4c069ff4ddd2a2e296c53da3787dd708a26a8642",
-      "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v2.17.1",
-      "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1"
+      "version": "2.17.2",
+      "expectedSize": 30012256,
+      "expectedChecksum": "9e8d43abb6e93f4c969088078fdaf780",
+      "expectedChecksumSHA256": "6001b86795f727f90755b497cba7ebcd2f50d024b0e56d1d6e957fcb98ff463c",
+      "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v2.17.2",
+      "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.2"
     },
     "darwin_arm64": {
-      "version": "2.17.1",
-      "expectedSize": 29476450,
-      "expectedChecksum": "038125be57400e11f5013001cf68ce9e",
-      "expectedChecksumSHA256": "a11f6ea1f8b8d80f502df6e9b34865fb12186b4157f2c282a0e6f99c53077ca2",
-      "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v2.17.1",
-      "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1"
+      "version": "2.17.2",
+      "expectedSize": 29475730,
+      "expectedChecksum": "1a82213baded25c2a6c584a72a5600f2",
+      "expectedChecksumSHA256": "c51a6810e975e13ac5ea5f038addf259da8b0d17b0b739dab1267dca133e5a54",
+      "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v2.17.2",
+      "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.2"
     },
     "win32": {
-      "version": "2.17.1",
-      "expectedSize": 30496768,
-      "expectedChecksum": "939a77bb9a549bc9460f888ac3442397",
-      "expectedChecksumSHA256": "04d6859668c4afc1fa301f5cc892623669bcbf26ce5195bc80dc208783c33853",
-      "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v2.17.1",
-      "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1.exe"
+      "version": "2.17.2",
+      "expectedSize": 30507008,
+      "expectedChecksum": "1a071a45267279463516f8264aaa5a97",
+      "expectedChecksumSHA256": "8f84b312a049f80e2f9466eb1f77d15e1dedec8ce0696c51fc221fbb3b436eee",
+      "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v2.17.2",
+      "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.2.exe"
     },
     "linux": {
-      "version": "2.17.1",
-      "expectedSize": 29925560,
-      "expectedChecksum": "239d20f4aedf0bf6f79caca7453bf5cf",
-      "expectedChecksumSHA256": "756fa6343a659a8a2606ee0df2a321ffaf47645fff8f4b209286681ee36820e3",
-      "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v2.17.1",
-      "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1"
+      "version": "2.17.2",
+      "expectedSize": 29937848,
+      "expectedChecksum": "70bc4fc8eecc1c1c6dd4f404ed7e2b89",
+      "expectedChecksumSHA256": "9b90874daf84f0cfb7ae72f3a8c4ccec523593ccd318cd967f5bef7d574efa77",
+      "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v2.17.2",
+      "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.2"
     }
   }
 }