test: remove --proxyquire-shim from logging and pubsub packages by danieljbruce · Pull Request #9644 · googleapis/google-cloud-node

danieljbruce · 2026-10-15T21:10:59Z

Description

Replaces the global --proxyquire-shim in handwritten/logging, handwritten/logging-bunyan, handwritten/logging-winston, and handwritten/pubsub using the centralized proxyquire helper from google-test-utils (Path 1B).

Impact

Removes --proxyquire-shim from logging, logging-bunyan, logging-winston, and pubsub test scripts without duplicating per-package test/proxyquire.ts helpers.

Changes

Part 3 of 5 in stacked PR series: test: replace proxyquire with sinon in gax, common, error-reporting, translate #9642 -> test: remove --proxyquire-shim from common, bigquery, datastore, and dns #9643 -> test: remove --proxyquire-shim from logging and pubsub packages #9644 -> test: remove --proxyquire-shim from bigtable, spanner, and storage #9645 -> chore: remove proxyquire-bun-shim.cjs and runner flags #9646 (b/570091189).
Stacked on test: remove --proxyquire-shim from common, bigquery, datastore, and dns #9643.
handwritten/logging, handwritten/logging-bunyan, handwritten/logging-winston, handwritten/pubsub: Import {proxyquire} from 'google-test-utils', remove per-package test/proxyquire.ts helpers, and remove --proxyquire-shim from package.json test scripts.

Testing

Executed pnpm test under both Node.js and Bun (JS_RUNTIME=bun) in handwritten/logging, handwritten/logging-bunyan, handwritten/logging-winston, and handwritten/pubsub.
Verified strict lint and type checks pass via bin/linter.mjs --strict.

Alternatives

Per-package test/proxyquire.ts files (Path 1A) were replaced with the centralized google-test-utils helper (Path 1B) per review discussion in b/570091189.

gemini-code-assist

Code Review

This pull request replaces the global proxyquire dependency with a custom local proxyquire.ts implementation across multiple packages (logging-bunyan, logging-winston, logging, and pubsub), updating the corresponding test scripts and imports. Feedback on the changes highlights two main areas of improvement: first, in the new proxyquire.ts files, wrapping individual property assignments in a try...catch block inside the loop would prevent the entire copy process from aborting if a single property assignment fails; second, across several test files, replacing the .then(noop, ...) promise rejection pattern with assert.rejects would make the tests more robust and prevent silent passes on unexpected promise resolutions.

danieljbruce · 2026-10-19T18:05:10Z

This seems to just create a localized shim which is better and acceptable, but adjustments to the exact tests would likely be ideal.

…properties in proxyquire helper

…translate (#9642) ## Description Replaces proxyquire with sinon and direct stubs across four packages. ## Impact Removes --proxyquire-shim from gax, googleapis-common, error-reporting, and translate unit tests. ## Changes - **Part 1 of 5 in stacked PR series**: **#9642** -> #9643 -> #9644 -> #9645 -> #9646 (b/570680750). - `core/packages/gax`: Replace `proxyquire` in `test/unit/grpc.ts` with `sinon.stub(fs, 'existsSync')` and remove `--proxyquire-shim` from `package.json`. - `core/packages/nodejs-googleapis-common`: Replace `proxyquire` in `test/test.authplus.ts` and `test/test.http2.ts` with `sinon.stub(auth.GoogleAuth.prototype, 'getClient')` and `sinon.stub(coreHttp2, 'connect')`, and remove `--proxyquire-shim` from `package.json`. - `handwritten/error-reporting`: Stub `util.makeAuthenticatedRequestFactory` and `RequestHandler.prototype.request` directly in `test/unit/google-apis/auth-client.ts` and remove `--proxyquire-shim` from `package.json`. - `packages/google-cloud-translate`: Intercept `Module.prototype.require` directly in `test/index.ts` `before()` hook and remove `--proxyquire-shim` from `package.json`. ## Testing - Executed `pnpm test` under both Node.js and Bun (`JS_RUNTIME=bun`) in `core/packages/gax`, `core/packages/nodejs-googleapis-common`, `handwritten/error-reporting`, and `packages/google-cloud-translate`. - Verified strict lint and type checks pass via `bin/linter.mjs --strict`. ## Alternatives - Not merging this pull request was considered, which would leave these four packages dependent on the global `bin/proxyquire-bun-shim.cjs` preload shim.

…properties in proxyquire helper

…se rejection assertions

…ls (Path 1B)

…ove-proxyquire-shim-logging-pubsub

…-utils (Path 1B)

… under Bun + Jest

…ove-proxyquire-shim-logging-pubsub

…re-shim-core-dns-ds-bq # Conflicts: # core/common/test/util.ts # handwritten/datastore/package.json # pnpm-lock.yaml

… parallel turbo build race

… in arrow failure test

…ove-proxyquire-shim-logging-pubsub # Conflicts: # handwritten/logging/package.json # handwritten/pubsub/package.json # pnpm-lock.yaml

danieljbruce · 2026-10-28T13:37:21Z

[Generated] Per #9643 (comment), we opened #9759 (feat(test-utils): add createProxyquire and proxyquire helper) to add createProxyquire and proxyquire to core/test-utils (google-test-utils) in a standalone PR first.

We are waiting for #9759 to be merged and a new release of google-test-utils to be published before removing the extra --filter "./core/test-utils" --ignore-scripts, pnpm --dir core/test-utils run compile, ensureWorkspacePackagesLinked(), and run prepare --if-present flags in the .yaml files (cloudbuild.yaml and .github/actions/pnpm-lockfile-check/action.yaml).

## Description Adds runtime-agnostic `createProxyquire` and `proxyquire` helpers to `google-test-utils`. ## Impact Releasing `createProxyquire` in `google-test-utils` avoids extra YAML flags across stacked PRs. ## Changes - Per #9643 (comment), extracts just the `createProxyquire` and `proxyquire` implementation in `core/test-utils` (`google-test-utils`) into a standalone PR. - We want to merge and release `google-test-utils` (`core/test-utils`) with `createProxyquire` first so that the rest of the stacked PRs (#9643, #9644, #9645, #9646) can consume the published `google-test-utils` package and do not need the extra `--filter "./core/test-utils" --ignore-scripts`, `pnpm --dir core/test-utils run compile`, `ensureWorkspacePackagesLinked()`, and `run prepare --if-present` flags in the `.yaml` files (`cloudbuild.yaml` and `.github/actions/pnpm-lockfile-check/action.yaml`). - `core/test-utils/src/proxyquire.ts`: Adds `createProxyquire`, `proxyquire`, `Proxyquire`, and `ProxyquireStubs` built on `Module.prototype.require` and `require.cache` with automatic caller path resolution (`Error.prepareStackTrace`) for Node.js and Bun (`JS_RUNTIME=bun`). - `core/test-utils/src/index.ts`: Exports `createProxyquire`, `proxyquire`, `Proxyquire`, and `ProxyquireStubs`. - `core/test-utils/test/proxyquire.test.ts`: Adds unit tests covering direct/transitive `@global` stubbing, `@noCallThru` / `noCallThru()` / `callThru()`, `noPreserveCache()` / `preserveCache()`, `null` stub `MODULE_NOT_FOUND` handling, and bare module stubs. ## Testing - Executed `pnpm --dir core/test-utils test` 5x on Node.js and `JS_RUNTIME=bun MOCHA_PARALLEL=false bun --bun run --cwd core/test-utils test` 5x on Bun ($\ge 95\%$ confidence, 25/25 unit tests passing). - Verified strict lint and TypeScript checks pass via `node ./bin/linter.mjs --strict` and `ci/run_conditional_tests.sh --strict`. ## Alternatives - Including `createProxyquire` directly inside #9643 alongside the `common`, `bigquery`, `datastore`, and `google-cloud-dns` migrations was considered, but because `.npmrc` sets `link-workspace-packages=false` and `enable-pre-post-scripts=true`, doing so before releasing `google-test-utils` requires extra `--filter "./core/test-utils" --ignore-scripts` and workspace-linking flags across the YAML files in the stack. - Not merging this PR would leave those temporary YAML workarounds in the stack PRs. --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

…aml flags

…thout yaml flags

danieljbruce

LGTM

feywind · 2026-10-30T18:06:33Z


      after(() => {
-        sdk.shutdown();
+        return sdk.shutdown();


Nice catch returning sdk.shutdown() here (and on line 506) as well as returning assert.rejects(...) in test/index.ts and test/sink.ts so Mocha properly awaits teardown and rejection assertions.

…dns (#9643) ## Description Centralizes the runtime-agnostic `proxyquire` helper in `core/test-utils` (`google-test-utils`, Path 1B) and replaces the global `--proxyquire-shim` in `core/common`, `handwritten/bigquery`, `handwritten/datastore`, and `handwritten/google-cloud-dns`. ## Impact Removes `--proxyquire-shim` from `common`, `bigquery`, `datastore`, and `google-cloud-dns` test scripts while eliminating per-package `test/proxyquire.ts` duplication by exporting `proxyquire` and `createProxyquire` from `google-test-utils`. ## Changes - **Part 2 of 5 in stacked PR series**: #9642 -> **#9643** -> #9644 -> #9645 -> #9646 (b/570091189). - `core/test-utils`: Add runtime-agnostic `src/proxyquire.ts` helper (`proxyquire`, `createProxyquire`, `Proxyquire`, `ProxyquireStubs`) built on `Module.prototype.require` and `require.cache` with automatic caller path resolution (`Error.prepareStackTrace`) and unit tests in `test/proxyquire.test.ts`. - `core/common`, `handwritten/bigquery`, `handwritten/datastore`, `handwritten/google-cloud-dns`: Import `{proxyquire}` from `'google-test-utils'`, remove per-package `test/proxyquire.ts` shims, and remove `--proxyquire-shim` from `package.json` test scripts. ## Testing - Executed `pnpm test` in `core/test-utils` and under both Node.js and Bun (`JS_RUNTIME=bun`) in `core/common`, `handwritten/bigquery`, `handwritten/datastore`, and `handwritten/google-cloud-dns`. - Verified strict lint and type checks pass via `bin/linter.mjs --strict`. ## Alternatives - Per-package `test/proxyquire.ts` files (Path 1A) were replaced with a single centralized implementation in `core/test-utils` (`google-test-utils`, Path 1B) per review discussion in b/570091189.

…9645) ## Description Replaces the global `--proxyquire-shim` in `handwritten/bigtable`, `handwritten/spanner`, and `handwritten/storage` using the centralized `proxyquire` helper from `google-test-utils` (Path 1B). ## Impact Removes `--proxyquire-shim` from `bigtable`, `spanner`, and `storage` unit test scripts without duplicating per-package `test/proxyquire.ts` helpers. ## Changes - **Part 4 of 5 in stacked PR series**: #9642 -> #9643 -> #9644 -> **#9645** -> #9646 (b/570091189). - Stacked on #9644. - `handwritten/bigtable`, `handwritten/spanner`, `handwritten/storage`: Import `{proxyquire}` from `'google-test-utils'`, remove per-package `test/proxyquire.ts` helpers, and remove `--proxyquire-shim` from `package.json` test scripts. - `handwritten/bigtable/test/base64keymap.ts`: Remove unused `proxyquire` import. - `handwritten/spanner/observability-test/helper.ts` & `spanner.ts`: Call `context.disable()` in `setGlobalContextManager` and re-register the active context manager in `EndToEnd` `beforeEach` so OpenTelemetry context propagation remains isolated across test suites. ## Testing - Executed `pnpm test` under both Node.js and Bun (`JS_RUNTIME=bun`) in `handwritten/bigtable`, `handwritten/spanner`, and `handwritten/storage`. - Verified strict lint and type checks pass via `bin/linter.mjs --strict`. ## Alternatives - Per-package `test/proxyquire.ts` files (Path 1A) were replaced with the centralized `google-test-utils` helper (Path 1B) per review discussion in b/570091189.

## Description Removes bin/proxyquire-bun-shim.cjs and all remaining Mocha and runner shim configuration. ## Impact Eliminates the global Bun proxyquire preload shim from the test runner. ## Changes - **Part 5 of 5 in stacked PR series**: #9642 -> #9643 -> #9644 -> #9645 -> **#9646** (b/570680750). - Stacked on #9645. - Delete `bin/proxyquire-bun-shim.cjs`. - Remove `--proxyquire-shim`, `BUN_ENABLE_PROXYQUIRE_SHIM`, and `proxyquire-bun-shim.cjs` preloading from `bin/run-test.cjs`. - Remove `proxyquire-bun-shim.cjs` from `.mocharc.cjs` and all 11 `core/packages/*/.mocharc.js` configuration files. ## Testing - Verified unit tests across all migrated packages pass under both Node.js and Bun (`JS_RUNTIME=bun`) without `bin/proxyquire-bun-shim.cjs`. - Verified strict lint and type checks pass via `bin/linter.mjs --strict`. ## Alternatives - Not merging this pull request was considered, which would leave dead shim code and unused `--proxyquire-shim` runner flags in the repository.

gemini-code-assist Bot reviewed Oct 15, 2026

View reviewed changes

danieljbruce added this pull request to stack #9647 October 15, 2026 21:18

danieljbruce added 2 commits October 20, 2026 10:27

test: remove --proxyquire-shim from common, bigquery, datastore, and dns

5df863c

[Address CI errors] test: support function stubs and guard read-only …

d2820c8

…properties in proxyquire helper

danieljbruce added 3 commits October 20, 2026 10:27

test: remove --proxyquire-shim from logging and pubsub packages

0a61c5e

[Address CI errors] test: support function stubs and guard read-only …

1b74f20

…properties in proxyquire helper

[Address review comments] test(logging): use assert.rejects for promi…

3ab8240

…se rejection assertions

danieljbruce force-pushed the fix/remove-proxyquire-shim-logging-pubsub branch from 0e7ca7c to 3ab8240 Compare October 20, 2026 14:27

danieljbruce added 9 commits October 20, 2026 19:08

refactor(test-utils): centralize proxyquire helper in google-test-uti…

f8fe217

…ls (Path 1B)

Merge branch 'fix/remove-proxyquire-shim-core-dns-ds-bq' into fix/rem…

c4635f4

…ove-proxyquire-shim-logging-pubsub

refactor(logging,pubsub): use centralized proxyquire from google-test…

dd814a5

…-utils (Path 1B)

[Address CI errors] test(test-utils): use native Module.createRequire…

c239d88

… under Bun + Jest

Merge branch 'fix/remove-proxyquire-shim-core-dns-ds-bq' into fix/rem…

97552c5

…ove-proxyquire-shim-logging-pubsub

Merge remote-tracking branch 'upstream/main' into fix/remove-proxyqui…

0933524

…re-shim-core-dns-ds-bq # Conflicts: # core/common/test/util.ts # handwritten/datastore/package.json # pnpm-lock.yaml

[Address CI errors] fix(test-utils): remove precompile clean to avoid…

31b82b9

… parallel turbo build race

[Address CI errors] test(bigquery): avoid jobs.insert completion race…

36f3c04

… in arrow failure test

Merge branch 'fix/remove-proxyquire-shim-core-dns-ds-bq' into fix/rem…

c946661

…ove-proxyquire-shim-logging-pubsub # Conflicts: # handwritten/logging/package.json # handwritten/pubsub/package.json # pnpm-lock.yaml

danieljbruce mentioned this pull request Oct 28, 2026

feat(test-utils): add createProxyquire and proxyquire helper #9759

Merged

danieljbruce added 2 commits October 29, 2026 14:20

chore: merge main and use released google-test-utils@^0.4.0 without y…

2d02efb

…aml flags

chore: merge base branch and use released google-test-utils@^0.4.0 wi…

beff05e

…thout yaml flags

danieljbruce commented Oct 29, 2026

View reviewed changes

danieljbruce marked this pull request as ready for review October 29, 2026 15:46

danieljbruce requested a review from a team as a code owner October 29, 2026 15:46

github-actions Bot requested a review from shivanee-p October 29, 2026 15:46

danieljbruce requested a review from quirogas October 29, 2026 15:50

feywind approved these changes Oct 30, 2026

View reviewed changes

Base automatically changed from fix/remove-proxyquire-shim-core-dns-ds-bq to main October 30, 2026 19:09

danieljbruce requested a review from a team as a code owner October 30, 2026 19:09

danieljbruce merged commit cae33e8 into main Oct 30, 2026
49 of 68 checks passed

danieljbruce deleted the fix/remove-proxyquire-shim-logging-pubsub branch October 30, 2026 19:24

Navigation Menu

Repository navigation

test: remove --proxyquire-shim from logging and pubsub packages - #9644

test: remove --proxyquire-shim from logging and pubsub packages#9644
danieljbruce merged 16 commits into
mainfrom
fix/remove-proxyquire-shim-logging-pubsub

danieljbruce commented Oct 15, 2026 •

edited

Loading

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danieljbruce commented Oct 19, 2026

Uh oh!

danieljbruce commented Oct 28, 2026

Uh oh!

danieljbruce left a comment

Uh oh!

feywind Oct 30, 2026

Uh oh!

danieljbruce Oct 30, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

danieljbruce commented Oct 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Impact

Changes

Testing

Alternatives

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

danieljbruce commented Oct 19, 2026

Uh oh!

danieljbruce commented Oct 28, 2026

Uh oh!

danieljbruce left a comment

Choose a reason for hiding this comment

Uh oh!

feywind Oct 30, 2026

Choose a reason for hiding this comment

Uh oh!

danieljbruce Oct 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

danieljbruce commented Oct 15, 2026 •

edited

Loading