asdf

Author: baileympearson

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

@@ -236,6 +236,10 @@ export class UnifiedMongoClient extends MongoClient {
       config.setupLogging?.(options, description.id);
     }
 
+    if (description.autoEncryptOpts) {
+      options.autoEncryption = description.autoEncryptOpts;
+    }
+
     super(uri, options);
     this.observedEventEmitter.on('error', () => null);
     this.logCollector = logCollector;

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);
@@ -147,12 +147,13 @@ async function runUnifiedTest(
           writeConcern: { w: 'majority' }
         });
 
-        trace('listCollections');
-        const collectionList = await db.listCollections({ name: collectionName }).toArray();
-        if (collectionList.length !== 0) {
-          trace('drop');
-          expect(await collection.drop()).to.be.true;
-        }
+        trace('drop');
+        expect(
+          await collection.drop({
+            // Specifying any encrypted fields causes `collection.drop()` to drop the esoc and esc collections as well.
+            encryptedFields: {}
+          })
+        ).to.be.true;
       }
 
       for (const {
@@ -262,10 +263,10 @@ async function runUnifiedTest(
         expect(testClient, `No client entity found with id ${clientId}`).to.exist;
         const filteredTestClientLogs = expectedLogsForClient.ignoreMessages
           ? filterIgnoredMessages(
-              expectedLogsForClient.ignoreMessages,
-              testClient!.collectedLogs,
-              entities
-            )
+            expectedLogsForClient.ignoreMessages,
+            testClient!.collectedLogs,
+            entities
+          )
           : testClient!.collectedLogs;
         compareLogs(
           expectedLogsForClient.messages,

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'],
+    | 'kmsProviders'
+    | 'keyVaultNamespace'
+    | 'bypassAutoEncryption'
+    | 'schemaMap'
+    | 'encryptedFieldsMap'
+    | 'extraOptions'
+    | 'bypassQueryAnalysis'
+    | 'keyExpirationMS'
+  >;
 }
+
 export interface DatabaseEntity {
   id: string;
   client: string;
@@ -214,12 +227,12 @@ export interface ClientEncryptionEntity {
     keyVaultNamespace: string;
     kmsProviders: UnnamedKMSProviders & {
       [key: string]:
-        | UnnamedKMSProviders['aws']
-        | UnnamedKMSProviders['gcp']
-        | UnnamedKMSProviders['azure']
-        | UnnamedKMSProviders['kmip']
-        | UnnamedKMSProviders['local']
-        | undefined;
+      | UnnamedKMSProviders['aws']
+      | UnnamedKMSProviders['gcp']
+      | UnnamedKMSProviders['azure']
+      | UnnamedKMSProviders['kmip']
+      | UnnamedKMSProviders['local']
+      | undefined;
     };
     keyExpirationMS?: number;
   };