chore: replace references to csfle shared library COMPASS-5859 (#3149)

Author: addaleax

.evergreen/functions.yml

@@ -396,11 +396,11 @@ functions:
           set -e
           # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
-          rm -rf mongodb-csfle && mkdir -p mongodb-csfle
-          (cd mongodb-csfle && \
-            curl -sSfL $(npx -y mongodb-download-url --enterprise --csfle --version '>= 6.0.0-rc1') | \
+          rm -rf mongodb-crypt && mkdir -p mongodb-crypt
+          (cd mongodb-crypt && \
+            curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version '>= 6.0.0-rc1') | \
             tar -xvz)
-          export COMPASS_CSFLE_LIBRARY_PATH=$(echo $PWD/mongodb-csfle/lib/mongo_csfle_v1.*)
+          export COMPASS_CRYPT_LIBRARY_PATH=$(echo $PWD/mongodb-crypt/lib/mongo_*_v1.*)
           npm run test-csfle --workspace mongodb-data-service
 
   save-windows-artifacts:

.gitignore

@@ -27,4 +27,4 @@ coverage
 .ackrc
 env-vars.sh
 mongocryptd.pid
-mongodb-csfle
+mongodb-crypt

package-lock.json

@@ -556,5 +556,5 @@
 
                         END OF TERMS AND CONDITIONS
 
-This product also includes the MongoDB Client-Side Field-Level Encryption library
-(mongodb_csfle_v1) which is covered by the MongoDB Enterprise Agreement.
+This product also includes the MongoDB Crypt library (mongodb_crypt_v1)
+which is covered by the MongoDB Enterprise Agreement.

packages/compass/LICENSE

@@ -251,7 +251,7 @@
     "mongodb": "^4.6.0",
     "mongodb-connection-model": "^21.17.0",
     "mongodb-data-service": "^21.21.0",
-    "mongodb-download-url": "^1.2.0",
+    "mongodb-download-url": "^1.2.2",
     "mongodb-instance-model": "^11.23.0",
     "mongodb-log-writer": "^1.1.4",
     "mongodb-url": "^3.0.3",

packages/compass/package.json

@@ -66,7 +66,7 @@ const download = async(url, destDir) => {
 
   const downloadOptions = {
     enterprise: true,
-    csfle: true
+    crypt_shared: true
   };
   if (process.platform === 'linux') {
     // The CSFLE shared library is built for different distros,

packages/compass/scripts/download-csfle.js

@@ -24,6 +24,28 @@ export async function setupCSFLELibrary(): Promise<void> {
   if (!csfleLibraryPath) {
     // This is not a loop so that the require() parts receive literal strings
     // in order for webpack to process them properly
+    try {
+      const candidate = processPath(require('../deps/csfle/bin/mongo_crypt_v1.dll'));
+      await fs.access(candidate);
+      csfleLibraryPath = candidate;
+    } catch (err: any) {
+      errors.push(err);
+    }
+    try {
+      const candidate = processPath(require('../deps/csfle/lib/mongo_crypt_v1.so'));
+      await fs.access(candidate);
+      csfleLibraryPath = candidate;
+    } catch (err: any) {
+      errors.push(err);
+    }
+    try {
+      const candidate = processPath(require('../deps/csfle/lib/mongo_crypt_v1.dylib'));
+      await fs.access(candidate);
+      csfleLibraryPath = candidate;
+    } catch (err: any) {
+      errors.push(err);
+    }
+    // Drop these as soon as the rename has been completed.
     try {
       const candidate = processPath(require('../deps/csfle/bin/mongo_csfle_v1.dll'));
       await fs.access(candidate);
@@ -53,8 +75,8 @@ export async function setupCSFLELibrary(): Promise<void> {
   } else {
     log.info(mongoLogId(1_001_000_125), 'CSFLE', 'Found CSFLE library', {
       csfleLibraryPath,
-      externalOverride: process.env.COMPASS_CSFLE_LIBRARY_PATH
+      externalOverride: process.env.COMPASS_CRYPT_LIBRARY_PATH
     });
-    process.env.COMPASS_CSFLE_LIBRARY_PATH ??= csfleLibraryPath;
+    process.env.COMPASS_CRYPT_LIBRARY_PATH ??= csfleLibraryPath;
   }
 }

packages/compass/src/main/setup-csfle-library.ts

@@ -40,12 +40,12 @@ export default async function connectMongoClientCompass(
     autoEncryption: connectionOptions.fleOptions?.autoEncryption,
   };
 
-  if (options.autoEncryption && process.env.COMPASS_CSFLE_LIBRARY_PATH) {
+  if (options.autoEncryption && process.env.COMPASS_CRYPT_LIBRARY_PATH) {
     options.autoEncryption = {
       ...options.autoEncryption,
       extraOptions: {
         ...options.autoEncryption?.extraOptions,
-        csflePath: process.env.COMPASS_CSFLE_LIBRARY_PATH,
+        csflePath: process.env.COMPASS_CRYPT_LIBRARY_PATH,
       },
     };
   }

packages/data-service/src/connect-mongo-client.ts

@@ -21,7 +21,7 @@ describe('CSFLECollectionTracker', function () {
   let dbName: string;
 
   before(function () {
-    if (!process.env.COMPASS_CSFLE_LIBRARY_PATH) {
+    if (!process.env.COMPASS_CRYPT_LIBRARY_PATH) {
       return this.skip();
     }
     dbName = `test-${Date.now()}-${(Math.random() * 10000) | 0}`;
@@ -43,7 +43,7 @@ describe('CSFLECollectionTracker', function () {
           kmsProviders: { local: { key: 'A'.repeat(128) } },
           keyVaultNamespace: `${dbName}.kv`,
           extraOptions: {
-            csflePath: process.env.COMPASS_CSFLE_LIBRARY_PATH,
+            csflePath: process.env.COMPASS_CRYPT_LIBRARY_PATH,
           },
           ...autoEncryption,
         },