Comments

Author: baileympearson

.github/workflows/encryption-tests.yml

@@ -4,7 +4,7 @@ on:
   push: 
     branches: ['master']
   pull_request:
-    branches: [ 'master' ]
+    branches: [ 'master', 'csfle' ]
   workflow_dispatch: {}
 
 permissions:

lib/drivers/node-mongodb-native/index.js

@@ -7,3 +7,4 @@
 exports.BulkWriteResult = require('./bulkWriteResult');
 exports.Collection = require('./collection');
 exports.Connection = require('./connection');
+exports.ClientEncryption = require('mongodb').ClientEncryption;

lib/model.js

@@ -69,8 +69,7 @@ const minimize = require('./helpers/minimize');
 const MongooseBulkSaveIncompleteError = require('./error/bulkSaveIncompleteError');
 const ObjectExpectedError = require('./error/objectExpected');
 const decorateBulkWriteResult = require('./helpers/model/decorateBulkWriteResult');
-const { ClientEncryption } = require('mongodb');
-
+const driver = require('./driver');
 const modelCollectionSymbol = Symbol('mongoose#Model#collection');
 const modelDbSymbol = Symbol('mongoose#Model#db');
 const modelSymbol = require('./helpers/symbols').modelSymbol;
@@ -4882,7 +4881,11 @@ Model.compile = function compile(name, schema, collectionName, connection, base)
 };
 
 Model.clientEncryption = function clientEncryption() {
-  /** @type(import('mongodb').MongoClient) */
+  const ClientEncryption = driver.get().ClientEncryption;
+  if (!ClientEncryption) {
+    throw new Error('The mongodb driver must be used to obtain a ClientEncryption object.');
+  }
+
   const client = this.collection?.conn?.client;
 
   if (!client) return null;

scripts/configure-cluster-with-encryption.sh

@@ -49,7 +49,7 @@ if [ ! -d "data" ]; then
   echo 'Configuring Cluster...'
 
   # start cluster
-  (bash $DRIVERS_TOOLS/.evergreen/run-orchestration.sh) 1>/dev/null 2>/dev/null
+  (bash $DRIVERS_TOOLS/.evergreen/run-orchestration.sh)
 
   echo 'Cluster Configuration Finished!'