test: remove --proxyquire-shim from bigtable, spanner, and storage

handwritten/bigtable/cloudbuild.yaml

@@ -5,7 +5,7 @@ steps:
   args:
   - '-c'
   - |
-    cd ../.. && corepack enable pnpm && pnpm install --filter "...{./handwritten/bigtable}"
+    cd ../.. && corepack enable pnpm && pnpm install --filter "./core/test-utils" --filter "...{./handwritten/bigtable}" --ignore-scripts && pnpm --dir core/test-utils run compile && node -e "require('./bin/run-test.cjs').ensureWorkspacePackagesLinked()" && pnpm --filter "...{./handwritten/bigtable}" run prepare --if-present
   dir: 'handwritten/bigtable'
   id: 'install-dependencies'
 

handwritten/bigtable/package.json

@@ -42,7 +42,7 @@
     "presystem-test": "pnpm run compile",
     "system-test": "node ../../bin/run-test.cjs build/system-test --timeout 600000 --retries 3",
     "pretest": "pnpm run compile",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
+    "test": "node ../../bin/run-test.cjs build/test",
     "test:snap": "SNAPSHOT_UPDATE=1 pnpm test",
     "testproxy": "pnpm run compile && node build/testproxy/index.js",
     "clean": "gts clean",
@@ -93,6 +93,7 @@
     "c8": "^10.1.3",
     "codecov": "^3.8.3",
     "gapic-tools": "^2.0.0",
+    "google-test-utils": "^0.3.0",
     "gts": "^6.0.2",
     "jsdoc": "^4.0.4",
     "jsdoc-fresh": "^6.0.0",

handwritten/bigtable/system-test/client-side-metrics-all-methods.ts

@@ -21,7 +21,7 @@ import {
 import {ResourceMetrics} from '@opentelemetry/sdk-metrics';
 import * as assert from 'assert';
 import {GCPMetricsHandler} from '../src/client-side-metrics/gcp-metrics-handler';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {Bigtable, RawFilter} from '../src';
 import {Mutation} from '../src/mutation';
 import {Row} from '../src/row';

handwritten/bigtable/system-test/client-side-metrics.ts

@@ -21,7 +21,7 @@ import {
 import {ResourceMetrics} from '@opentelemetry/sdk-metrics';
 import * as assert from 'assert';
 import {GCPMetricsHandler} from '../src/client-side-metrics/gcp-metrics-handler';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {Bigtable, BigtableOptions} from '../src';
 import {Row} from '../src/row';
 import {

handwritten/bigtable/system-test/gcp-metrics-handler.ts

@@ -26,7 +26,7 @@ import {Bigtable} from '../src';
 import {ResourceMetrics} from '@opentelemetry/sdk-metrics';
 import * as assert from 'assert';
 import {ClientOptions} from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 function getHandler(Exporter: typeof CloudMonitoringExporter) {
   const FakeCGPMetricsHandler = proxyquire(

handwritten/bigtable/system-test/read-rows.ts

@@ -26,7 +26,7 @@ import {EventEmitter} from 'events';
 import {Test} from './testTypes';
 import {ServiceError, GrpcClient, GoogleError, CallOptions} from 'google-gax';
 import {PassThrough} from 'stream';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {TabularApiSurface} from '../src/tabular-api-surface';
 import * as mocha from 'mocha';
 import {generateId} from './common';
@@ -141,7 +141,10 @@ describe('Bigtable/Table', () => {
             'An error should have been thrown because the client is closed',
           );
         } catch (err: any) {
-          assert.strictEqual(err.message, 'The client has already been closed.');
+          assert.strictEqual(
+            err.message,
+            'The client has already been closed.',
+          );
         }
       } finally {
         const bigtableSecondClient = new Bigtable();

handwritten/bigtable/test/app-profile.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {CallOptions} from 'google-gax';
 
 let promisified = false;
@@ -48,7 +48,7 @@
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     id: any;
     name: string;
     bigtable: any;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     constructor(instance: any, id: any) {
       this.instance = instance;

handwritten/bigtable/test/backup.ts

@@ -16,7 +16,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, describe, it, afterEach} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as pumpify from 'pumpify';
 import {ServiceError} from 'google-gax';
 
@@ -259,7 +259,7 @@
         (
           err?: ServiceError | Error | null,
           backup?: Backup | null,
           config?: any,
         ) => {
           assert.strictEqual(
             backup?.name,

handwritten/bigtable/test/base64keymap.ts

@@ -13,10 +13,9 @@
 // limitations under the License.
 
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, afterEach} from 'mocha';
 import Long = require('long');
-import * as proxyquire from 'proxyquire';
 import * as sn from 'sinon';
 
 import {RowStateEnum} from '../src/chunktransformer.js';
 import {Mutation} from '../src/mutation.js';

handwritten/bigtable/test/chunktransformer.ts

@@ -15,7 +15,7 @@
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, afterEach} from 'mocha';
 import Long = require('long');
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sn from 'sinon';
 
 import {RowStateEnum} from '../src/chunktransformer.js';

handwritten/bigtable/test/cluster.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {PassThrough, Readable} from 'stream';
 import {CallOptions} from 'google-gax';
 import {PreciseDate} from '@google-cloud/precise-date';

handwritten/bigtable/test/executequery.ts

@@ -15,7 +15,7 @@ import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import * as sinon from 'sinon';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {grpc} from 'google-gax';
 import * as inst from '../src/instance';
 import {Bigtable} from '../src';

handwritten/bigtable/test/family.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import {protos} from '@google-cloud/bigtable-api';
 import google = protos.google;

handwritten/bigtable/test/filter.ts

@@ -14,7 +14,7 @@
 
 import * as assert from 'assert';
 import {afterEach, before, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import * as fr from '../src/filter';
 import {Row} from '../src/row';

handwritten/bigtable/test/index.ts

@@ -17,7 +17,7 @@ import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {afterEach, before, beforeEach, describe, it} from 'mocha';
 import * as gax from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sn from 'sinon';
 
 import {Cluster} from '../src/cluster.js';
@@ -1216,6 +1216,7 @@ describe('Bigtable', () => {
   });
   describe('close', () => {
     it('should have failed request after close is called', done => {
+      // eslint-disable-next-line promise/catch-or-return, promise/always-return
       bigtable.close().then(() => {
         bigtable.getInstances((err: Error) => {
           if (err) {

handwritten/bigtable/test/instance.ts

@@ -16,7 +16,7 @@ import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import * as sinon from 'sinon';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {ServiceError} from 'google-gax';
 import * as snapshot from 'snap-shot-it';
 import {Readable} from 'stream';

handwritten/bigtable/test/metric-service-client-credentials.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {ClientOptions, grpc} from 'google-gax';
 import * as assert from 'assert';
 import {MetricServiceClient} from '@google-cloud/monitoring';

handwritten/bigtable/test/metrics-collector/gcp-metrics-handler.ts

@@ -30,7 +30,7 @@ import {
 } from '../../test-common/expected-otel-export-input';
 import * as assert from 'assert';
 import {replaceTimestamps} from '../../test-common/replace-timestamps';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 /**
  * Cleans a ResourceMetrics object by replacing client UUIDs with a placeholder.

handwritten/bigtable/test/metrics-collector/metrics-collector.ts

@@ -23,7 +23,7 @@ import {
 import {grpc} from 'google-gax';
 import {expectedRequestsHandled} from '../../test-common/metrics-handler-fixture';
 import * as gax from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {GCPMetricsHandler} from '../../src/client-side-metrics/gcp-metrics-handler';
 import {getProtoPath} from '../../src/utils/protos';
 const protoPath = getProtoPath('google/bigtable/v2/response_params.proto');

handwritten/bigtable/test/row.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {afterEach, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import {Mutation} from '../src/mutation.js';
 import * as rw from '../src/row';

handwritten/bigtable/test/table.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {afterEach, before, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as pumpify from 'pumpify';
 import * as sinon from 'sinon';
 import {PassThrough, Writable, Duplex} from 'stream';

handwritten/spanner/cloudbuild.yaml

@@ -5,7 +5,7 @@ steps:
   args:
   - '-c'
   - |
-    cd ../.. && corepack enable pnpm && pnpm install --filter "...{./handwritten/spanner}"
+    cd ../.. && corepack enable pnpm && pnpm install --filter "./core/test-utils" --filter "...{./handwritten/spanner}" --ignore-scripts && pnpm --dir core/test-utils run compile && node -e "require('./bin/run-test.cjs').ensureWorkspacePackagesLinked()" && pnpm --filter "...{./handwritten/spanner}" run prepare --if-present
   dir: 'handwritten/spanner'
   id: 'install-dependencies'
 

handwritten/spanner/observability-test/batch-transaction.ts

@@ -21,7 +21,7 @@ import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, after, beforeEach, afterEach, describe, it} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 const {
   AlwaysOnSampler,

handwritten/spanner/observability-test/database.ts

@@ -30,7 +30,7 @@ import {
 } from '../src/transaction';
 import {util} from '@google-cloud/common';
 import {Transform} from 'stream';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 const {SpanStatusCode} = require('@opentelemetry/api');
 const {

handwritten/spanner/observability-test/helper.ts

@@ -43,6 +43,7 @@ export const cacheSessionEvents = ['Cache hit: has usable multiplexed session'];
  * and referring to context causes type/value collision errors.
  */
 export function setGlobalContextManager(manager: ContextManager) {
+  context.disable();
   if (typeof manager.enable === 'function') {
     manager.enable();
   }

handwritten/spanner/observability-test/spanner.ts

@@ -188,6 +188,7 @@ describe('EndToEnd', async () => {
   const database = instance.database('database');
 
   beforeEach(async () => {
+    setGlobalContextManager(contextManager);
     // To deflake expectations of session creation, let's
     // issue out a warm-up request request that'll ensure
     // that the MultiplexedSession is created deterministically.

handwritten/spanner/observability-test/table.ts

@@ -18,7 +18,7 @@ import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import * as through from 'through2';
 

handwritten/spanner/observability-test/transaction.ts

@@ -17,7 +17,7 @@
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import {EventEmitter} from 'events';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 
 import {codec} from '../src/codec';

handwritten/spanner/package.json

@@ -35,9 +35,9 @@
     "predocs": "pnpm run compile",
     "lint": "gts check",
     "system-test": "node ../../bin/run-test.cjs build/system-test --timeout 1600000",
-    "observability-test": "node ../../bin/run-test.cjs --proxyquire-shim build/observability-test --timeout 1600000",
+    "observability-test": "node ../../bin/run-test.cjs build/observability-test --timeout 1600000",
     "cleanup": "node ../../bin/run-test.cjs scripts/cleanup.js --timeout 30000",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test build/test/common build/observability-test",
+    "test": "node ../../bin/run-test.cjs build/test build/test/common build/observability-test",
     "ycsb": "node ./benchmark/ycsb.js  run -P ./benchmark/workloada -p table=usertable -p cloudspanner.instance=ycsb-instance -p operationcount=100 -p cloudspanner.database=ycsb",
     "fix": "gts fix",
     "clean": "gts clean",
@@ -107,7 +107,7 @@
     "dedent": "^1.5.3",
     "execa": "^5.0.0",
     "gapic-tools": "^2.0.0",
-    "google-test-utils": "^0.2.0",
+    "google-test-utils": "^0.3.0",
     "grpc-health-check": "^2.1.0",
     "gts": "^6.0.2",
     "jsdoc": "^4.0.4",

handwritten/spanner/test/backup.ts

@@ -17,7 +17,7 @@
 
 import * as assert from 'assert';
 import {EventEmitter} from 'events';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import {util} from '@google-cloud/common';
 import * as pfy from '@google-cloud/promisify';

handwritten/spanner/test/batch-transaction.ts

@@ -20,7 +20,7 @@ import {util} from '@google-cloud/common';
 import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 
 import {Session, Database, Spanner, protos} from '../src';

handwritten/spanner/test/common/service-object.ts

@@ -19,7 +19,7 @@ import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, describe, it} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 let promisified = false;
 const fakePfy = Object.assign({}, pfy, {

handwritten/spanner/test/common/service.ts

@@ -20,7 +20,7 @@ import {before, beforeEach, after, afterEach, describe, it} from 'mocha';
 import * as duplexify from 'duplexify';
 import * as extend from 'extend';
 import {grpc, GrpcClient} from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as retryRequest from 'retry-request';
 import * as sn from 'sinon';
 import {PassThrough} from 'stream';

handwritten/spanner/test/database.ts

@@ -21,7 +21,7 @@ import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import {EventEmitter} from 'events';
 import * as extend from 'extend';
 import {ApiError, util} from '@google-cloud/common';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import {Transform, Duplex} from 'stream';
 import * as through from 'through2';

handwritten/spanner/test/index.ts

@@ -20,7 +20,7 @@ import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import * as extend from 'extend';
 import * as path from 'path';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as through from 'through2';
 import {util} from '@google-cloud/common';
 import {PreciseDate} from '@google-cloud/precise-date';

handwritten/spanner/test/instance-config.ts

@@ -18,7 +18,7 @@
 import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import {grpc} from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as pfy from '@google-cloud/promisify';
 import * as sinon from 'sinon';
 

handwritten/spanner/test/instance.ts

@@ -20,7 +20,7 @@ import * as assert from 'assert';
 import {before, beforeEach, afterEach, describe, it} from 'mocha';
 import {ApiError} from '@google-cloud/common';
 import {grpc} from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as pfy from '@google-cloud/promisify';
 import * as sinon from 'sinon';
 import snakeCase = require('lodash.snakecase');

handwritten/spanner/test/partial-result-stream.ts

@@ -19,7 +19,6 @@ import {before, beforeEach, afterEach, describe, it} from 'mocha';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const concat = require('concat-stream');
-import * as proxyquire from 'proxyquire';
 import * as sinon from 'sinon';
 import {Transform, finished} from 'stream';
 import * as through from 'through2';
@@ -28,7 +27,7 @@ import {codec} from '../src/codec';
 import {PreciseDate} from '@google-cloud/precise-date';
 import * as prs from '../src/partial-result-stream';
 import {grpc} from 'google-gax';
-import {assertArraySubclassStrictEqual} from 'google-test-utils';
+import {assertArraySubclassStrictEqual, proxyquire} from 'google-test-utils';
 import {Row} from '../src/partial-result-stream';
 
 function toRawValue(value: any): any {

handwritten/spanner/test/session.ts

@@ -19,7 +19,7 @@
 import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {
   CLOUD_RESOURCE_HEADER,
   LEADER_AWARE_ROUTING_HEADER,