last fixes

Author: baileympearson

test/spec/unified-test-format/valid-pass/poc-queryable-encryption.json

@@ -4,7 +4,12 @@
   "runOnRequirements": [
     {
       "minServerVersion": "7.0",
-      "csfle": true
+      "csfle": true,
+      "topologies": [
+        "replicaset",
+        "load-balanced",
+        "sharded"
+      ]
     }
   ],
   "createEntities": [

test/spec/unified-test-format/valid-pass/poc-queryable-encryption.yml

@@ -5,6 +5,8 @@ schemaVersion: "1.23"
 runOnRequirements:
   - minServerVersion: "7.0"
     csfle: true
+    # QE is not supported on standalone servers
+    topologies: [ replicaset, load-balanced, sharded ]
 
 createEntities:
   - client:

test/tools/runner/config.ts

@@ -538,6 +538,12 @@ export class AstrolabeTestConfiguration extends TestConfiguration {
 }
 
 export class AlpineTestConfiguration extends TestConfiguration {
+  get encryptDefaultExtraOptions(): MongoClientOptions['autoEncryption']['extraOptions'] {
+    return {
+      mongocryptdBypassSpawn: true,
+      mongocryptdURI: process.env.MONGOCRYPTD_URI
+    };
+  }
   override newClient(
     urlOrQueryOptions?: string | Record<string, any>,
     serverOptions?: MongoClientOptions
@@ -547,8 +553,7 @@ export class AlpineTestConfiguration extends TestConfiguration {
     if (options.autoEncryption) {
       const extraOptions: MongoClientOptions['autoEncryption']['extraOptions'] = {
         ...options.autoEncryption.extraOptions,
-        mongocryptdBypassSpawn: true,
-        mongocryptdURI: process.env.MONGOCRYPTD_URI
+        ...this.encryptDefaultExtraOptions
       };
       options.autoEncryption.extraOptions = extraOptions;
     }

test/tools/unified-spec-runner/entities.ts

@@ -46,7 +46,7 @@ import {
   WriteConcern
 } from '../../mongodb';
 import { getEncryptExtraOptions, getEnvironmentalOptions } from '../../tools/utils';
-import type { TestConfiguration } from '../runner/config';
+import { AlpineTestConfiguration, type TestConfiguration } from '../runner/config';
 import { EntityEventRegistry } from './entity_event_registry';
 import { trace } from './runner';
 import type { ClientEntity, EntityDescription, ExpectedLogMessage } from './schema';
@@ -200,14 +200,7 @@ export class UnifiedMongoClient extends MongoClient {
     topology: 'MONGODB_LOG_TOPOLOGY'
   } as const;
 
-  constructor(
-    uri: string,
-    description: ClientEntity,
-    config: {
-      loggingEnabled?: boolean;
-      setupLogging?: (options: Record<string, any>, id: string) => Record<string, any>;
-    }
-  ) {
+  constructor(uri: string, description: ClientEntity, config: TestConfiguration) {
     const options: MongoClientOptions = {
       monitorCommands: true,
       __skipPingOnConnect: true,
@@ -243,20 +236,27 @@ export class UnifiedMongoClient extends MongoClient {
         process.env
       );
 
-      const extraOptions =
-        getEncryptExtraOptions().cryptSharedLibPath != null
-          ? {
-              cryptSharedLibPath: getEncryptExtraOptions().cryptSharedLibPath,
-              ...description.autoEncryptOpts.extraOptions
-            }
-          : {};
+      let extraOptions = {};
+      if (config instanceof AlpineTestConfiguration) {
+        extraOptions = {
+          ...config.encryptDefaultExtraOptions,
+          ...description.autoEncryptOpts.extraOptions
+        };
+      } else if (getEncryptExtraOptions().cryptSharedLibPath != null) {
+        extraOptions = {
+          cryptSharedLibPath: getEncryptExtraOptions().cryptSharedLibPath,
+          ...description.autoEncryptOpts.extraOptions
+        };
+      }
+
+      const kmsProviders = mergeKMSProviders(
+        description.autoEncryptOpts.kmsProviders,
+        kmsProvidersFromEnvironment
+      );
 
       options.autoEncryption = {
         ...description.autoEncryptOpts,
-        kmsProviders: mergeKMSProviders(
-          description.autoEncryptOpts.kmsProviders,
-          kmsProvidersFromEnvironment
-        ),
+        kmsProviders,
         extraOptions
       };
     }

test/tools/unified-spec-runner/match.ts

@@ -774,6 +774,8 @@ function isMongoCryptError(err): boolean {
   if (err.constructor.name === 'MongoCryptError') {
     return true;
   }
+
+  // TODO(NODE-7043): remove special handling for FLE errors in the UTR
   if (
     err instanceof TypeError &&
     err.message.includes(