fixes?

Author: baileympearson

src/client-side-encryption/auto_encrypter.ts

@@ -1,4 +1,5 @@
 import {
+  MongoCryptContext,
   type MongoCrypt,
   type MongoCryptConstructor,
   type MongoCryptOptions
@@ -9,7 +10,7 @@ import { deserialize, type Document, serialize } from '../bson';
 import { type CommandOptions, type ProxyOptions } from '../cmap/connection';
 import { kDecorateResult } from '../constants';
 import { getMongoDBClientEncryption } from '../deps';
-import { MongoRuntimeError } from '../error';
+import { MongoError, MongoRuntimeError } from '../error';
 import { MongoClient, type MongoClientOptions } from '../mongo_client';
 import { type Abortable } from '../mongo_types';
 import { MongoDBCollectionNamespace } from '../utils';
@@ -403,11 +404,16 @@ export class AutoEncrypter {
     }
 
     const commandBuffer = Buffer.isBuffer(cmd) ? cmd : serialize(cmd, options);
+    let context: MongoCryptContext
+    try {
+      context = this._mongocrypt.makeEncryptionContext(
+        MongoDBCollectionNamespace.fromString(ns).db,
+        commandBuffer
+      );
 
-    const context = this._mongocrypt.makeEncryptionContext(
-      MongoDBCollectionNamespace.fromString(ns).db,
-      commandBuffer
-    );
+    } catch (error) {
+      throw new MongoError('something went wrong', { cause: error })
+    }
 
     context.id = this._contextCounter++;
     context.ns = ns;

test/integration/client-side-encryption/client_side_encryption.spec.test.ts

@@ -62,7 +62,7 @@ describe('Client Side Encryption (Legacy)', function () {
   });
 });
 
-describe('Client Side Encryption (Unified)', function () {
+describe.only('Client Side Encryption (Unified)', function () {
   runUnifiedSuite(
     loadSpecTests(path.join('client-side-encryption', 'tests', 'unified')),
     ({ description }, configuration) => {

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';
@@ -237,7 +239,22 @@ export class UnifiedMongoClient extends MongoClient {
     }
 
     if (description.autoEncryptOpts) {
-      options.autoEncryption = description.autoEncryptOpts;
+      const { kmsProviders: kmsProvidersFromEnvironment } = getCSFLETestDataFromEnvironment(
+        process.env
+      );
+
+      options.autoEncryption = {
+        ...description.autoEncryptOpts,
+        kmsProviders: mergeKMSProviders(
+          description.autoEncryptOpts.kmsProviders,
+          kmsProvidersFromEnvironment
+        ),
+
+        extraOptions: {
+          cryptSharedLibPath: getEncryptExtraOptions().cryptSharedLibPath,
+          ...description.autoEncryptOpts.extraOptions
+        }
+      };
     }
 
     super(uri, options);

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

@@ -275,10 +275,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

@@ -155,15 +155,15 @@ export interface ClientEntity {
   storeEventsAsEntities?: StoreEventsAsEntity[];
   autoEncryptOpts?: Pick<
     MongoClientOptions['autoEncryption'],
-    | 'kmsProviders'
     | 'keyVaultNamespace'
     | 'bypassAutoEncryption'
     | 'schemaMap'
     | 'encryptedFieldsMap'
     | 'extraOptions'
     | 'bypassQueryAnalysis'
     | 'keyExpirationMS'
-  >;
+  > &
+    Pick<ClientEncryptionEntity['clientEncryptionOpts'], 'kmsProviders'>;
 }
 
 export interface DatabaseEntity {
@@ -227,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;
   };