Merge branch 'main' into refactor/migrate-to-native-fetch

Author: joehan

CHANGELOG.md

@@ -1,5 +0,0 @@
-- Migrate from `node-fetch` to Node.js's native `fetch` API, and replace `nock` with a custom `undici.MockAgent` compatibility helper.
-- Upgrade `zod` to v4 and drop the deprecated `zod-to-json-schema` dependency in favor of zod v4's built-in `z.toJSONSchema()`.
-- Updated the Firebase Data Connect local toolkit to v3.4.14, which includes the following changes:
-  - Fix linter warnings in generated Kotlin SDK files.
-- Fixed an intermittent "Premature close" error during login and API requests by retrying once without keep-alive. (#10692)

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "15.22.1",
+  "version": "15.22.3",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "mcpName": "io.github.firebase/firebase-mcp",

package.json

@@ -134,16 +134,17 @@ steps:
         sleep 60
         echo "Package firebase-tools@$(cat /workspace/version_number.txt) is now available on npm."
 
-  # Set up the hub credentials for firepit-builder.
+  # Set up the hub and npm credentials for firepit-builder.
   - name: "gcr.io/$PROJECT_ID/firepit-builder"
     entrypoint: "bash"
     args:
       - "-c"
       - |
         if [ "${_VERSION}" != "preview" ]; then
           mkdir -vp ~/.config && cp -v hub ~/.config/hub
+          cp -v npmrc ~/.npmrc
         else
-          echo "Skipping hub credentials for firepit-builder for preview."
+          echo "Skipping credentials for firepit-builder for preview."
         fi
 
   # Publish the firepit builds.

scripts/publish/cloudbuild.yaml

@@ -167,7 +167,7 @@ function proxyURIFromEnv(): string | undefined {
 // https://github.com/node-fetch/node-fetch/issues/1767.
 const httpAgentNoKeepAlive = new http.Agent({ keepAlive: false });
 const httpsAgentNoKeepAlive = new https.Agent({ keepAlive: false });
-function noKeepAliveAgent(parsedURL: URL): http.Agent | https.Agent {
+export function noKeepAliveAgent(parsedURL: URL): http.Agent | https.Agent {
   return parsedURL.protocol === "https:" ? httpsAgentNoKeepAlive : httpAgentNoKeepAlive;
 }
 

src/apiv2.ts

@@ -47,10 +47,10 @@ describe("checkProjectBilling", () => {
       await checkProjectBilling.enableBilling(projectId);
     }
 
-    expect(listBillingAccountsStub.notCalled);
-    expect(setBillingAccountStub.notCalled);
-    expect(confirmStub.notCalled);
-    expect(selectStub.notCalled);
+    expect(listBillingAccountsStub.notCalled).to.be.true;
+    expect(setBillingAccountStub.notCalled).to.be.true;
+    expect(confirmStub.notCalled).to.be.true;
+    expect(selectStub.notCalled).to.be.true;
   });
 
   it("should list accounts if no billing account set, but accounts available.", async () => {
@@ -73,9 +73,11 @@ describe("checkProjectBilling", () => {
       await checkProjectBilling.enableBilling(projectId);
     }
 
-    expect(listBillingAccountsStub.calledOnce);
-    expect(setBillingAccountStub.calledOnce);
-    expect(setBillingAccountStub.calledWith(projectId, "test-cloud-billing-account-name"));
+    expect(listBillingAccountsStub.calledOnce).to.be.true;
+    expect(listBillingAccountsStub.calledWith(projectId)).to.be.true;
+    expect(setBillingAccountStub.calledOnce).to.be.true;
+    expect(setBillingAccountStub.calledWith(projectId, "test-cloud-billing-account-name")).to.be
+      .true;
   });
 
   it("should not list accounts if no billing accounts set or available.", async () => {
@@ -90,8 +92,9 @@ describe("checkProjectBilling", () => {
       await checkProjectBilling.enableBilling(projectId);
     }
 
-    expect(listBillingAccountsStub.calledOnce);
-    expect(setBillingAccountStub.notCalled);
+    expect(listBillingAccountsStub.calledOnce).to.be.true;
+    expect(listBillingAccountsStub.calledWith(projectId)).to.be.true;
+    expect(setBillingAccountStub.notCalled).to.be.true;
     expect(checkBillingEnabledStub.callCount).to.equal(2);
   });
 });

src/extensions/checkProjectBilling.spec.ts

@@ -99,7 +99,7 @@ async function setUpBillingAccount(projectId: string) {
  * @param {string} projectId
  */
 export async function enableBilling(projectId: string): Promise<void> {
-  const billingAccounts = await cloudbilling.listBillingAccounts();
+  const billingAccounts = await cloudbilling.listBillingAccounts(projectId);
   if (billingAccounts) {
     const accounts = billingAccounts.filter((account) => account.open);
     return accounts.length > 0

src/extensions/checkProjectBilling.ts

@@ -1,21 +1,31 @@
 import { expect } from "chai";
 import nock from "../test/helpers/nock";
+import * as sinon from "sinon";
 import * as cloudbilling from "./cloudbilling";
 import { cloudbillingOrigin } from "../api";
 import { Setup } from "../init";
+import * as ensureApiEnabled from "../ensureApiEnabled";
 
 const PROJECT_ID = "test-project";
 
 describe("cloudbilling", () => {
+  let ensureStub: sinon.SinonStub;
+
+  beforeEach(() => {
+    ensureStub = sinon.stub(ensureApiEnabled, "ensure").resolves();
+  });
+
   afterEach(() => {
     nock.cleanAll();
     cloudbilling.clearCache();
+    ensureStub.restore();
   });
 
   describe("checkBillingEnabled", () => {
     it("should resolve with true if billing is enabled", async () => {
       nock(cloudbillingOrigin())
         .get(`/v1/projects/${PROJECT_ID}/billingInfo`)
+        .matchHeader("x-goog-user-project", PROJECT_ID)
         .reply(200, { billingEnabled: true });
 
       const result = await cloudbilling.checkBillingEnabled(PROJECT_ID);
@@ -27,6 +37,7 @@ describe("cloudbilling", () => {
     it("should resolve with false if billing is not enabled", async () => {
       nock(cloudbillingOrigin())
         .get(`/v1/projects/${PROJECT_ID}/billingInfo`)
+        .matchHeader("x-goog-user-project", PROJECT_ID)
         .reply(200, { billingEnabled: false });
 
       const result = await cloudbilling.checkBillingEnabled(PROJECT_ID);
@@ -38,6 +49,7 @@ describe("cloudbilling", () => {
     it("should reject if the API call fails", async () => {
       nock(cloudbillingOrigin())
         .get(`/v1/projects/${PROJECT_ID}/billingInfo`)
+        .matchHeader("x-goog-user-project", PROJECT_ID)
         .reply(404, { error: { message: "Not Found" } });
 
       await expect(cloudbilling.checkBillingEnabled(PROJECT_ID)).to.be.rejectedWith("Not Found");
@@ -106,6 +118,7 @@ describe("cloudbilling", () => {
       };
       nock(cloudbillingOrigin())
         .get(`/v1/projects/${PROJECT_ID}/billingInfo`)
+        .matchHeader("x-goog-user-project", PROJECT_ID)
         .reply(200, { billingEnabled: true });
 
       const result = await cloudbilling.isBillingEnabled(setup);
@@ -123,6 +136,7 @@ describe("cloudbilling", () => {
         .put(`/v1/projects/${PROJECT_ID}/billingInfo`, {
           billingAccountName: billingAccountName,
         })
+        .matchHeader("x-goog-user-project", PROJECT_ID)
         .reply(200, { billingEnabled: true });
 
       const result = await cloudbilling.setBillingAccount(PROJECT_ID, billingAccountName);
@@ -136,6 +150,7 @@ describe("cloudbilling", () => {
         .put(`/v1/projects/${PROJECT_ID}/billingInfo`, {
           billingAccountName: billingAccountName,
         })
+        .matchHeader("x-goog-user-project", PROJECT_ID)
         .reply(403, { error: { message: "Permission Denied" } });
 
       await expect(
@@ -195,5 +210,17 @@ describe("cloudbilling", () => {
       await expect(cloudbilling.listBillingAccounts()).to.be.rejectedWith("Not Found");
       expect(nock.isDone()).to.be.true;
     });
+
+    it("should include x-goog-user-project header when projectId is provided", async () => {
+      nock(cloudbillingOrigin())
+        .get("/v1/billingAccounts")
+        .matchHeader("x-goog-user-project", PROJECT_ID)
+        .reply(200, { billingAccounts: [billingAccount] });
+
+      const result = await cloudbilling.listBillingAccounts(PROJECT_ID);
+
+      expect(result).to.deep.equal([billingAccount]);
+      expect(nock.isDone()).to.be.true;
+    });
   });
 });

src/gcp/cloudbilling.spec.ts

@@ -2,6 +2,7 @@ import { cloudbillingOrigin } from "../api";
 import { Client } from "../apiv2";
 import { Setup } from "../init";
 import * as utils from "../utils";
+import { ensure } from "../ensureApiEnabled";
 
 const API_VERSION = "v1";
 const client = new Client({ urlPrefix: cloudbillingOrigin(), apiVersion: API_VERSION });
@@ -51,16 +52,21 @@ export function checkBillingEnabled(projectId: string, forceRefresh = false): Pr
       return cached;
     }
   }
-  const promise = client
-    .get<{ billingEnabled: boolean }>(utils.endpoint(["projects", projectId, "billingInfo"]), {
-      retries: 3,
-      retryCodes: [429, 500, 503],
-    })
-    .then((res) => res.body.billingEnabled)
-    .catch((err) => {
-      billingEnabledCache.delete(projectId);
-      throw err;
-    });
+  const promise = (async () => {
+    await ensure(projectId, "cloudbilling.googleapis.com", "billing", true);
+    const res = await client.get<{ billingEnabled: boolean }>(
+      utils.endpoint(["projects", projectId, "billingInfo"]),
+      {
+        retries: 3,
+        retryCodes: [429, 500, 503],
+        headers: { "x-goog-user-project": projectId },
+      },
+    );
+    return res.body.billingEnabled;
+  })().catch((err) => {
+    billingEnabledCache.delete(projectId);
+    throw err;
+  });
 
   billingEnabledCache.set(projectId, promise);
   return promise;
@@ -75,12 +81,16 @@ export async function setBillingAccount(
   projectId: string,
   billingAccountName: string,
 ): Promise<boolean> {
+  await ensure(projectId, "cloudbilling.googleapis.com", "billing", true);
   const res = await client.put<{ billingAccountName: string }, { billingEnabled: boolean }>(
     utils.endpoint(["projects", projectId, "billingInfo"]),
     {
       billingAccountName: billingAccountName,
     },
-    { retryCodes: [429, 500, 503] },
+    {
+      retryCodes: [429, 500, 503],
+      headers: { "x-goog-user-project": projectId },
+    },
   );
   const enabled = res.body.billingEnabled;
   billingEnabledCache.set(projectId, Promise.resolve(enabled));
@@ -91,10 +101,16 @@ export async function setBillingAccount(
  * Lists the billing accounts that the current authenticated user has permission to view.
  * @return {!Promise<Object[]>}
  */
-export async function listBillingAccounts(): Promise<BillingAccount[]> {
+export async function listBillingAccounts(projectId?: string): Promise<BillingAccount[]> {
+  if (projectId) {
+    await ensure(projectId, "cloudbilling.googleapis.com", "billing", true);
+  }
   const res = await client.get<{ billingAccounts: BillingAccount[] }>(
     utils.endpoint(["billingAccounts"]),
-    { retryCodes: [429, 500, 503] },
+    {
+      retryCodes: [429, 500, 503],
+      headers: projectId ? { "x-goog-user-project": projectId } : undefined,
+    },
   );
   return res.body.billingAccounts || [];
 }

src/gcp/cloudbilling.ts

@@ -28,7 +28,18 @@ function getAuthClient(config: GoogleAuthOptions): GoogleAuth {
     return authClient;
   }
 
-  authClient = new GoogleAuth(config);
+  const authConfig: GoogleAuthOptions = {
+    ...config,
+    clientOptions: {
+      ...config.clientOptions,
+      transporterOptions: {
+        ...config.clientOptions?.transporterOptions,
+        agent: apiv2.noKeepAliveAgent,
+      },
+    },
+  };
+
+  authClient = new GoogleAuth(authConfig);
   return authClient;
 }