sync tests and fixes?

Author: baileympearson

src/client-side-encryption/auto_encrypter.ts

@@ -403,7 +403,6 @@ export class AutoEncrypter {
     }
 
     const commandBuffer = Buffer.isBuffer(cmd) ? cmd : serialize(cmd, options);
-
     const context = this._mongocrypt.makeEncryptionContext(
       MongoDBCollectionNamespace.fromString(ns).db,
       commandBuffer

test/spec/client-side-encryption/tests/unified/localSchema.json

@@ -333,7 +333,8 @@
             }
           },
           "expectError": {
-            "isClientError": true
+            "isError": true,
+            "errorContains": "JSON schema keyword 'required' is only allowed with a remote schema"
           }
         }
       ]

test/spec/client-side-encryption/tests/unified/localSchema.yml

@@ -99,4 +99,5 @@ tests:
         arguments:
           document: &doc0 { _id: 1, encrypted_string: "string0" }
         expectError:
-          isClientError: true
+          isError: true
+          errorContains: "JSON schema keyword 'required' is only allowed with a remote schema"

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

@@ -45,14 +45,16 @@ import {
   type TopologyOpeningEvent,
   WriteConcern
 } from '../../mongodb';
-import { getEnvironmentalOptions } from '../../tools/utils';
+import { getEncryptExtraOptions, getEnvironmentalOptions } from '../../tools/utils';
 import type { TestConfiguration } from '../runner/config';
 import { EntityEventRegistry } from './entity_event_registry';
 import { trace } from './runner';
 import type { ClientEntity, EntityDescription, ExpectedLogMessage } from './schema';
 import {
   createClientEncryption,
+  getCSFLETestDataFromEnvironment,
   makeConnectionString,
+  mergeKMSProviders,
   patchCollectionOptions,
   patchDbOptions
 } from './unified-utils';
@@ -236,6 +238,29 @@ export class UnifiedMongoClient extends MongoClient {
       config.setupLogging?.(options, description.id);
     }
 
+    if (description.autoEncryptOpts) {
+      const { kmsProviders: kmsProvidersFromEnvironment } = getCSFLETestDataFromEnvironment(
+        process.env
+      );
+
+      const extraOptions =
+        getEncryptExtraOptions().cryptSharedLibPath != null
+          ? {
+              cryptSharedLibPath: getEncryptExtraOptions().cryptSharedLibPath,
+              ...description.autoEncryptOpts.extraOptions
+            }
+          : {};
+
+      options.autoEncryption = {
+        ...description.autoEncryptOpts,
+        kmsProviders: mergeKMSProviders(
+          description.autoEncryptOpts.kmsProviders,
+          kmsProvidersFromEnvironment
+        ),
+        extraOptions
+      };
+    }
+
     super(uri, options);
     this.observedEventEmitter.on('error', () => null);
     this.logCollector = logCollector;

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

@@ -758,6 +758,14 @@ function isMongoCryptError(err): boolean {
   if (err.constructor.name === 'MongoCryptError') {
     return true;
   }
+  if (
+    err instanceof TypeError &&
+    err.message.includes(
+      `csfle "analyze_query" failed: JSON schema keyword 'required' is only allowed with a remote schema`
+    )
+  ) {
+    return true;
+  }
   return err.stack.includes('at ClientEncryption');
 }
 

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

@@ -81,7 +81,7 @@ async function runUnifiedTest(
     ctx.skip();
   }
 
-  let utilClient;
+  let utilClient: MongoClient;
   if (ctx.configuration.isLoadBalanced) {
     // The util client can always point at the single mongos LB frontend.
     utilClient = ctx.configuration.newClient(ctx.configuration.singleMongosLoadBalancerUri);
@@ -143,13 +143,26 @@ async function runUnifiedTest(
       trace('initialData');
       for (const { databaseName, collectionName } of unifiedSuite.initialData) {
         const db = utilClient.db(databaseName);
-        const collection = db.collection(collectionName, {
-          writeConcern: { w: 'majority' }
-        });
 
         trace('listCollections');
-        const collectionList = await db.listCollections({ name: collectionName }).toArray();
-        if (collectionList.length !== 0) {
+        const allCollections = new Set(
+          await db
+            .listCollections()
+            .map(({ name }) => name)
+            .toArray()
+        );
+
+        const collections = [
+          collectionName,
+          `enxcol_.${collectionName}.esc`,
+          `enxcol_.${collectionName}.ecoc`
+        ].filter(allCollections.has.bind(allCollections));
+
+        for (const name of collections) {
+          const collection = db.collection(name, {
+            writeConcern: { w: 'majority' }
+          });
+
           trace('drop');
           expect(await collection.drop()).to.be.true;
         }

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

@@ -1,5 +1,6 @@
 import type {
   Document,
+  MongoClientOptions,
   MongoLoggableComponent,
   ObjectId,
   ReadConcernLevel,
@@ -152,7 +153,19 @@ export interface ClientEntity {
   observeSensitiveCommands?: boolean;
   // Was optionally scheduled for removal in NODE-6783, but opted to keep it for potential future use.
   storeEventsAsEntities?: StoreEventsAsEntity[];
+  autoEncryptOpts?: Pick<
+    MongoClientOptions['autoEncryption'],
+    | 'keyVaultNamespace'
+    | 'bypassAutoEncryption'
+    | 'schemaMap'
+    | 'encryptedFieldsMap'
+    | 'extraOptions'
+    | 'bypassQueryAnalysis'
+    | 'keyExpirationMS'
+  > &
+    Pick<ClientEncryptionEntity['clientEncryptionOpts'], 'kmsProviders'>;
 }
+
 export interface DatabaseEntity {
   id: string;
   client: string;