fix server api tests

Author: baileympearson

.evergreen/config.yml

@@ -1701,6 +1701,8 @@ tasks:
             - {key: REQUIRE_API_VERSION, value: '1'}
             - {key: MONGODB_API_VERSION, value: '1'}
             - {key: AUTH, value: auth}
+            - {key: TEST_CSFLE, value: 'true'}
+            - {key: CLIENT_ENCRYPTION, value: 'true'}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: bootstrap kms servers
@@ -1881,6 +1883,8 @@ tasks:
             - {key: TOPOLOGY, value: replica_set}
             - {key: TEST_SOCKS5_CSFLE, value: 'true'}
             - {key: AUTH, value: auth}
+            - {key: CLIENT_ENCRYPTION, value: 'true'}
+            - {key: TEST_CSFLE, value: 'true'}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: bootstrap kms servers
@@ -1897,6 +1901,8 @@ tasks:
             - {key: TOPOLOGY, value: replica_set}
             - {key: TEST_SOCKS5_CSFLE, value: 'true'}
             - {key: AUTH, value: noauth}
+            - {key: CLIENT_ENCRYPTION, value: 'true'}
+            - {key: TEST_CSFLE, value: 'true'}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: bootstrap kms servers

.evergreen/generate_evergreen_tasks.js

@@ -105,7 +105,9 @@ BASE_TASKS.push({
       TOPOLOGY: 'server',
       REQUIRE_API_VERSION: '1',
       MONGODB_API_VERSION: '1',
-      AUTH: 'auth'
+      AUTH: 'auth',
+      TEST_CSFLE: 'true',
+      CLIENT_ENCRYPTION: 'true'
     }),
     { func: 'install dependencies' },
     { func: 'bootstrap mongo-orchestration' },
@@ -187,7 +189,9 @@ TASKS.push(
           VERSION: 'latest',
           TOPOLOGY: 'replica_set',
           TEST_SOCKS5_CSFLE: 'true',
-          AUTH: 'auth'
+          AUTH: 'auth',
+          CLIENT_ENCRYPTION: 'true',
+          TEST_CSFLE: 'true'
         }),
         { func: 'install dependencies' },
         { func: 'bootstrap mongo-orchestration' },
@@ -203,7 +207,9 @@ TASKS.push(
           VERSION: 'latest',
           TOPOLOGY: 'replica_set',
           TEST_SOCKS5_CSFLE: 'true',
-          AUTH: 'noauth'
+          AUTH: 'noauth',
+          CLIENT_ENCRYPTION: 'true',
+          TEST_CSFLE: 'true'
         }),
         { func: 'install dependencies' },
         { func: 'bootstrap mongo-orchestration' },

test/integration/client-side-operations-timeout/client_side_operations_timeout.unit.test.ts

@@ -18,6 +18,7 @@ import {
   CSOTTimeoutContext,
   type MongoClient,
   MongoOperationTimeoutError,
+  ObjectId,
   Timeout,
   TimeoutContext,
   Topology
@@ -90,20 +91,20 @@ describe('CSOT spec unit tests', function () {
     /* eslint-disable @typescript-eslint/no-empty-function */
     context.skip(
       'If a new connection is required to execute an operation, min(remaining computedServerSelectionTimeout, connectTimeoutMS) should apply to socket establishment.',
-      () => {}
+      () => { }
     ).skipReason =
       'TODO(DRIVERS-2347): Requires this ticket to be implemented before we can assert on connection CSOT behaviour';
 
     context(
       'For drivers that have control over OCSP behavior, min(remaining computedServerSelectionTimeout, 5 seconds) should apply to HTTP requests against OCSP responders.',
-      () => {}
+      () => { }
     );
   });
 
   context.skip('Socket timeouts', function () {
     context(
       'If timeoutMS is unset, operations fail after two non-consecutive socket timeouts.',
-      () => {}
+      () => { }
     );
   }).skipReason =
     'TODO(NODE-6518): Add CSOT support for socket read/write at the connection layer for CRUD APIs';
@@ -112,7 +113,7 @@ describe('CSOT spec unit tests', function () {
     describe('KMS requests', function () {
       const stateMachine = new StateMachine({} as any);
       const request = {
-        addResponse: _response => {},
+        addResponse: _response => { },
         status: {
           type: 1,
           code: 1,
@@ -126,7 +127,7 @@ describe('CSOT spec unit tests', function () {
 
       context('when StateMachine.kmsRequest() is passed a `CSOTimeoutContext`', function () {
         beforeEach(async function () {
-          sinon.stub(TLSSocket.prototype, 'connect').callsFake(function (..._args) {});
+          sinon.stub(TLSSocket.prototype, 'connect').callsFake(function (..._args) { });
         });
 
         afterEach(async function () {
@@ -195,11 +196,10 @@ describe('CSOT spec unit tests', function () {
               {
                 autoEncryption: {
                   extraOptions: {
-                    mongocryptdBypassSpawn: true,
-                    mongocryptdURI: 'mongodb://localhost:27017/db?serverSelectionTimeoutMS=1000',
+                    mongocryptdURI: 'mongodb://localhost:27020/db?serverSelectionTimeoutMS=2000',
                     mongocryptdSpawnArgs: [
-                      '--pidfilepath=bypass-spawning-mongocryptd.pid',
-                      '--port=27017'
+                      `--pidfilepath=${new ObjectId().toHexString()}.pid`,
+                      '--port=27020'
                     ]
                   },
                   keyVaultNamespace: 'admin.datakeys',
@@ -211,6 +211,7 @@ describe('CSOT spec unit tests', function () {
                 timeoutMS
               }
             );
+
             await encryptedClient.connect();
 
             const stub = sinon
@@ -249,7 +250,7 @@ describe('CSOT spec unit tests', function () {
   context.skip('Background Connection Pooling', function () {
     context(
       'When doing minPoolSize maintenance, connectTimeoutMS is used as the timeout for socket establishment.',
-      () => {}
+      () => { }
     );
   }).skipReason = 'TODO(NODE-6091): Implement CSOT logic for Background Connection Pooling';
   /* eslint-enable @typescript-eslint/no-empty-function */

test/tools/runner/config.ts

@@ -116,11 +116,11 @@ export class TestConfiguration {
       replicaSet: url.searchParams.get('replicaSet'),
       proxyURIParams: url.searchParams.get('proxyHost')
         ? {
-            proxyHost: url.searchParams.get('proxyHost'),
-            proxyPort: Number(url.searchParams.get('proxyPort')),
-            proxyUsername: url.searchParams.get('proxyUsername'),
-            proxyPassword: url.searchParams.get('proxyPassword')
-          }
+          proxyHost: url.searchParams.get('proxyHost'),
+          proxyPort: Number(url.searchParams.get('proxyPort')),
+          proxyUsername: url.searchParams.get('proxyUsername'),
+          proxyPassword: url.searchParams.get('proxyPassword')
+        }
         : undefined
     };
     if (url.username) {
@@ -198,7 +198,6 @@ export class TestConfiguration {
 
   newClient(urlOrQueryOptions?: string | Record<string, any>, serverOptions?: MongoClientOptions) {
     serverOptions = Object.assign({}, getEnvironmentalOptions(), serverOptions);
-
     // Support MongoClient constructor form (url, options) for `newClient`.
     if (typeof urlOrQueryOptions === 'string') {
       if (Reflect.has(serverOptions, 'host') || Reflect.has(serverOptions, 'port')) {