clean up utilities

Author: baileympearson

test/integration/change-streams/change_stream.test.ts

@@ -2,7 +2,6 @@ import { strict as assert } from 'assert';
 import { Long, UUID } from 'bson';
 import { expect } from 'chai';
 import { on, once } from 'events';
-import * as process from 'process';
 import { gte, lt } from 'semver';
 import * as sinon from 'sinon';
 import { PassThrough } from 'stream';

test/integration/connection-monitoring-and-pooling/connection_monitoring_and_pooling.spec.test.ts

@@ -39,7 +39,7 @@ const INTERRUPT_IN_USE_SKIPPED_TESTS: SkipDescription[] = [
   }
 ];
 
-describe.only('Connection Monitoring and Pooling Spec Tests (Integration) - cmap-format', function () {
+describe('Connection Monitoring and Pooling Spec Tests (Integration) - cmap-format', function () {
   const tests: CmapTest[] = loadSpecTests('connection-monitoring-and-pooling', 'cmap-format');
 
   runCmapTestSuite(tests, {

test/tools/cmap_spec_runner.ts

@@ -17,7 +17,7 @@ import { CMAP_EVENTS } from '../../src/constants';
 import { TimeoutContext } from '../../src/timeout';
 import { shuffle } from '../../src/utils';
 import { isAnyRequirementSatisfied } from './unified-spec-runner/unified-utils';
-import { type FailCommandFailPoint, getTLSOptions, sleep } from './utils';
+import { type FailCommandFailPoint, sleep } from './utils';
 
 type CmapOperation =
   | { name: 'start' | 'waitForThread'; target: string }

test/tools/runner/config.ts

@@ -220,7 +220,7 @@ export class TestConfiguration {
     return uri.indexOf('MONGODB-OIDC') > -1 && uri.indexOf(`ENVIRONMENT:${env}`) > -1;
   }
 
-  protected buildClientOptions(serverOptions?: MongoClientOptions): MongoClientOptions {
+  newClient(urlOrQueryOptions?: string | Record<string, any>, serverOptions?: MongoClientOptions) {
     const baseOptions: MongoClientOptions = this.compressor
       ? {
           compressors: this.compressor
@@ -233,14 +233,12 @@ export class TestConfiguration {
       serverOptions = this.setupLogging(serverOptions);
     }
 
-    return serverOptions;
-  }
-
-  newClient(urlOrQueryOptions?: string | Record<string, any>, serverOptions?: MongoClientOptions) {
-    serverOptions = this.buildClientOptions(serverOptions);
-
     // Support MongoClient constructor form (url, options) for `newClient`.
     if (typeof urlOrQueryOptions === 'string') {
+      if ('host' in serverOptions || 'port' in serverOptions) {
+        throw new Error(`Cannot use options to specify host/port, must be in ${urlOrQueryOptions}`);
+      }
+
       return new MongoClient(urlOrQueryOptions, serverOptions);
     }
 

test/tools/utils.ts

@@ -18,6 +18,7 @@ import {
   type HostAddress,
   MongoClient,
   type MongoClientOptions,
+  ServerApiVersion,
   type TopologyOptions
 } from '../../src';
 import { OP_MSG } from '../../src/cmap/wire_protocol/constants';
@@ -112,7 +113,10 @@ export function getEncryptExtraOptions(): MongoClientOptions['autoEncryption']['
   return {};
 }
 
-export function getTLSOptions() {
+export function getTLSOptions(): Pick<
+  MongoClientOptions,
+  'tls' | 'tlsCertificateKeyFile' | 'tlsCAFile' | 'tlsCRLFile'
+> {
   if (!isTLSEnabled) return {};
 
   const requiredTLSEnv = ['TLS_KEY_FILE', 'TLS_CA_FILE', 'TLS_CRL_FILE'];
@@ -123,21 +127,28 @@ export function getTLSOptions() {
       `TLS requires the following additional environment variables: ${missingVariables.join(',')}`
     );
 
-  const { TLS_KEY_FILE: tlsCertificateKeyFile, TLS_CA_FILE: tlsCAFile } = process.env;
+  const {
+    TLS_KEY_FILE: tlsCertificateKeyFile,
+    TLS_CA_FILE: tlsCAFile,
+    TLS_CRL_FILE: tlsCRLFile
+  } = process.env;
 
   return {
     tlsCertificateKeyFile,
     tlsCAFile,
+    tlsCRLFile,
     tls: true
   };
 }
 
-export function getEnvironmentalOptions(): MongoClientOptions {
-  const options = {};
+export function getEnvironmentalOptions(): Pick<
+  MongoClientOptions,
+  'tls' | 'tlsCertificateKeyFile' | 'tlsCAFile' | 'tlsCRLFile' | 'serverApi'
+> {
+  const options: ReturnType<typeof getEnvironmentalOptions> = {};
+
   if (process.env.MONGODB_API_VERSION) {
-    Object.assign(options, {
-      serverApi: { version: process.env.MONGODB_API_VERSION }
-    });
+    options.serverApi = { version: process.env.MONGODB_API_VERSION as ServerApiVersion };
   }
 
   return {