swapped files to remove all import changes, got most non-integ tests passing, in addition to all integ tests

Author: PavelSafronov

etc/build-runtime-barrel.mjs

@@ -7,8 +7,8 @@ const useBundled = process.env.MONGODB_BUNDLED === 'true';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const rootDir = path.join(__dirname, '..');
-const outputBarrelFile = path.join(rootDir, 'test/mongodb_runtime-testing.ts');
-const source = useBundled ? './mongodb_bundled' : './mongodb';
+const outputBarrelFile = path.join(rootDir, 'test/mongodb.ts');
+const source = useBundled ? './mongodb_bundled' : './mongodb_all';
 
 const contents =
   `// This file is auto-generated. Do not edit.\n` +

etc/bundle-driver.mjs

@@ -14,7 +14,7 @@ await fs.rm(outdir, { recursive: true, force: true });
 
 const outputBundleFile = path.join(outdir, 'driver-bundle.js');
 await esbuild.build({
-  entryPoints: [path.join(rootDir, 'test/mongodb.ts')],
+  entryPoints: [path.join(rootDir, 'test/mongodb_all.ts')],
   bundle: true,
   outfile: outputBundleFile,
   platform: 'node',

src/client-side-encryption/providers/azure.ts

@@ -163,7 +163,10 @@ export async function fetchAzureKMSToken(
     const response = await get(url, { headers });
     return await parseResponse(response);
   } catch (error) {
-    if (error instanceof MongoNetworkTimeoutError) {
+    if (
+      error instanceof MongoNetworkTimeoutError ||
+      (error && error.constructor && error.constructor.name === 'MongoNetworkTimeoutError')
+    ) {
       throw new MongoCryptAzureKMSRequestError(`[Azure KMS] ${error.message}`);
     }
     throw error;

src/operations/client_bulk_write/command_builder.ts

@@ -242,7 +242,7 @@ function validateBufferSize(name: string, buffer: Uint8Array, maxBsonObjectSize:
 }
 
 /** @internal */
-interface ClientInsertOperation {
+export interface ClientInsertOperation {
   insert: number;
   document: OptionalId<Document>;
 }

test/action/dependency.test.ts

@@ -5,7 +5,7 @@ import * as path from 'node:path';
 import { expect } from 'chai';
 
 import { dependencies, peerDependencies, peerDependenciesMeta } from '../../package.json';
-import { setDifference } from '../mongodb_runtime-testing';
+import { setDifference } from '../mongodb';
 import { alphabetically, itInNodeProcess, sorted } from '../tools/utils';
 
 const EXPECTED_DEPENDENCIES = sorted(

test/csfle-kms-providers.ts

@@ -1,6 +1,6 @@
 import * as process from 'process';
 
-import { type KMSProviders } from './mongodb_runtime-testing';
+import { type KMSProviders } from './mongodb_all';
 
 const csfleKMSProviders = {
   aws: {

test/integration/auth/auth.prose.test.ts

@@ -2,12 +2,7 @@ import { expect } from 'chai';
 import * as process from 'process';
 import * as sinon from 'sinon';
 
-import {
-  Connection,
-  LEGACY_HELLO_COMMAND,
-  type MongoClient,
-  ScramSHA256
-} from '../../mongodb_runtime-testing';
+import { Connection, LEGACY_HELLO_COMMAND, type MongoClient, ScramSHA256 } from '../../mongodb';
 import { type TestConfiguration } from '../../tools/runner/config';
 
 function makeConnectionString(config, username, password) {

test/integration/auth/mongodb_aws.prose.test.ts

@@ -1,11 +1,7 @@
 import { expect } from 'chai';
 import * as process from 'process';
 
-import {
-  AWSSDKCredentialProvider,
-  type MongoClient,
-  MongoServerError
-} from '../../mongodb_runtime-testing';
+import { AWSSDKCredentialProvider, type MongoClient, MongoServerError } from '../../mongodb';
 const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
 
 describe('MONGODB-AWS Prose Tests', function () {

test/integration/auth/mongodb_aws.test.ts

@@ -21,7 +21,7 @@ import {
   MongoServerError,
   refreshKMSCredentials,
   setDifference
-} from '../../mongodb_runtime-testing';
+} from '../../mongodb';
 const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
 
 describe('MONGODB-AWS', function () {

test/integration/auth/mongodb_oidc.prose.test.ts

@@ -14,7 +14,7 @@ import {
   type OIDCCallbackFunction,
   type OIDCCallbackParams,
   type OIDCResponse
-} from '../../mongodb_runtime-testing';
+} from '../../mongodb';
 const createCallback = (tokenFile = 'test_user1', expiresInSeconds?: number, extraFields?: any) => {
   return async (params: OIDCCallbackParams) => {
     const token = await readFile(path.join(process.env.OIDC_TOKEN_DIR, tokenFile), {