feat(deps): bump mongosh, driver to latest COMPASS-9056

addaleax · addaleax · commit 83bd44f08ccf · 2025-03-05T17:55:16.000+01:00
This includes adjusting the CSFLE/QE collection tracker for the Node.js
driver changes related to `$lookup` support, where filters for listCollections
can now list multiple collections in an `$in` clause.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/compass-aggregations/package.json b/packages/compass-aggregations/package.json
@@ -84,7 +84,7 @@
     "hadron-document": "^8.8.3",
     "hadron-type-checker": "^7.4.3",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-collection-model": "^5.25.3",
     "mongodb-data-service": "^22.25.3",
     "mongodb-database-model": "^2.25.3",
diff --git a/packages/compass-connections/package.json b/packages/compass-connections/package.json
@@ -62,7 +62,7 @@
     "compass-preferences-model": "^2.33.3",
     "hadron-app-registry": "^9.4.3",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.25.3",
diff --git a/packages/compass-e2e-tests/package.json b/packages/compass-e2e-tests/package.json
@@ -58,7 +58,7 @@
     "hadron-build": "^25.7.3",
     "lodash": "^4.17.21",
     "mocha": "^10.2.0",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-log-writer": "^2.3.4",
diff --git a/packages/compass-explain-plan/package.json b/packages/compass-explain-plan/package.json
@@ -82,7 +82,7 @@
     "d3-hierarchy": "^3.1.2",
     "hadron-app-registry": "^9.4.3",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",
     "redux": "^4.2.1",
diff --git a/packages/compass-generative-ai/package.json b/packages/compass-generative-ai/package.json
@@ -61,7 +61,7 @@
     "bson": "^6.10.3",
     "compass-preferences-model": "^2.33.3",
     "hadron-app-registry": "^9.4.3",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-schema": "^12.4.0",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",
diff --git a/packages/compass-import-export/package.json b/packages/compass-import-export/package.json
@@ -64,7 +64,7 @@
     "hadron-document": "^8.8.3",
     "hadron-ipc": "^3.4.3",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-data-service": "^22.25.3",
     "mongodb-ns": "^2.4.2",
     "mongodb-query-parser": "^4.3.0",
diff --git a/packages/compass-indexes/package.json b/packages/compass-indexes/package.json
@@ -82,7 +82,7 @@
     "compass-preferences-model": "^2.33.3",
     "hadron-app-registry": "^9.4.3",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-collection-model": "^5.25.3",
     "mongodb-data-service": "^22.25.3",
     "mongodb-query-parser": "^4.3.0",
diff --git a/packages/compass-query-bar/package.json b/packages/compass-query-bar/package.json
@@ -82,7 +82,7 @@
     "compass-preferences-model": "^2.33.3",
     "hadron-app-registry": "^9.4.3",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-instance-model": "^12.26.3",
     "mongodb-ns": "^2.4.2",
     "mongodb-query-parser": "^4.3.0",
diff --git a/packages/compass-schema/package.json b/packages/compass-schema/package.json
@@ -90,7 +90,7 @@
     "leaflet-defaulticon-compatibility": "^0.1.1",
     "leaflet-draw": "^1.0.4",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-query-util": "^2.4.3",
     "mongodb-schema": "^12.4.0",
     "numeral": "^1.5.6",
diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json
@@ -57,9 +57,9 @@
     "@mongodb-js/compass-user-data": "^0.5.3",
     "@mongodb-js/compass-utils": "^0.8.3",
     "@mongodb-js/compass-workspaces": "^0.31.3",
-    "@mongosh/browser-repl": "^3.5.0",
-    "@mongosh/logging": "^3.5.0",
-    "@mongosh/node-runtime-worker-thread": "^3.3.0",
+    "@mongosh/browser-repl": "^3.6.0",
+    "@mongosh/logging": "^3.6.0",
+    "@mongosh/node-runtime-worker-thread": "^3.3.1",
     "bson": "^6.10.3",
     "compass-preferences-model": "^2.33.3",
     "hadron-app-registry": "^9.4.3",
diff --git a/packages/compass-sidebar/package.json b/packages/compass-sidebar/package.json
@@ -61,7 +61,7 @@
     "compass-preferences-model": "^2.33.3",
     "hadron-app-registry": "^9.4.3",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-instance-model": "^12.26.3",
     "mongodb-ns": "^2.4.2",
     "react": "^17.0.2",
diff --git a/packages/compass-web/package.json b/packages/compass-web/package.json
@@ -118,7 +118,7 @@
     "is-ip": "^5.0.1",
     "lodash": "^4.17.21",
     "mocha": "^10.2.0",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.25.3",
     "mongodb-ns": "^2.4.2",
diff --git a/packages/compass/package.json b/packages/compass/package.json
@@ -180,11 +180,11 @@
     "email": "compass@mongodb.com"
   },
   "dependencies": {
-    "@mongosh/node-runtime-worker-thread": "^3.3.0",
+    "@mongosh/node-runtime-worker-thread": "^3.3.1",
     "clipboard": "^2.0.6",
-    "kerberos": "^2.2.0",
+    "kerberos": "^2.2.1",
     "keytar": "^7.9.0",
-    "mongodb-client-encryption": "^6.1.0",
+    "mongodb-client-encryption": "^6.3.0",
     "os-dns-native": "^1.2.1",
     "system-ca": "^2.0.0"
   },
@@ -262,7 +262,7 @@
     "hadron-build": "^25.7.3",
     "hadron-ipc": "^3.4.3",
     "minimatch": "^10.0.1",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-build-info": "^1.7.2",
     "mongodb-cloud-info": "^2.1.2",
     "mongodb-connection-string-url": "^3.0.1",
diff --git a/packages/connection-form/package.json b/packages/connection-form/package.json
@@ -53,7 +53,7 @@
     "@mongodb-js/connection-info": "^0.11.3",
     "@mongodb-js/shell-bson-parser": "^1.2.0",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.25.3",
diff --git a/packages/connection-info/package.json b/packages/connection-info/package.json
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.25.3"
   },
diff --git a/packages/data-service/package.json b/packages/data-service/package.json
@@ -57,7 +57,7 @@
     "@mongodb-js/devtools-proxy-support": "^0.4.2",
     "bson": "^6.10.3",
     "lodash": "^4.17.21",
-    "mongodb": "^6.13.1",
+    "mongodb": "^6.14.1",
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-ns": "^2.4.2"
@@ -76,7 +76,7 @@
     "chai-as-promised": "^7.1.1",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
-    "kerberos": "^2.2.0",
+    "kerberos": "^2.2.1",
     "mocha": "^10.2.0",
     "mongodb-log-writer": "^2.3.4",
     "nyc": "^15.1.0",
@@ -86,6 +86,6 @@
     "typescript": "^5.0.4"
   },
   "optionalDependencies": {
-    "mongodb-client-encryption": "^6.1.0"
+    "mongodb-client-encryption": "^6.3.0"
   }
 }
diff --git a/packages/data-service/src/csfle-collection-tracker.ts b/packages/data-service/src/csfle-collection-tracker.ts
@@ -14,6 +14,7 @@ import parseNamespace from 'mongodb-ns';
 import _ from 'lodash';
 import type { UnboundDataServiceImplLogger } from './logger';
 import { mongoLogId } from './logger';
+import { EJSON } from 'bson';
 
 /**
  * A list of field paths for a document.
@@ -365,6 +366,12 @@ export class CSFLECollectionTrackerImpl implements CSFLECollectionTracker {
     return info;
   }
 
+  *_getCSFLECollectionNames(): Iterable<ReturnType<typeof parseNamespace>> {
+    for (const ns of this._nsToInfo.keys()) {
+      yield parseNamespace(ns);
+    }
+  }
+
   updateCollectionInfo(
     ns: string,
     result: CollectionInfoNameOnly & Partial<CollectionInfo>
@@ -402,19 +409,21 @@ export class CSFLECollectionTrackerImpl implements CSFLECollectionTracker {
       db: (dbName: string) => {
         return {
           listCollections: (filter: Document, opts: ListCollectionsOptions) => {
+            // eslint-disable-next-line @typescript-eslint/no-this-alias
+            const self = this; // there are no async generator arrow functions
             return {
-              toArray: async () => {
+              [Symbol.asyncIterator]: async function* () {
                 const collectionInfos = await wrappedClient
                   .db(dbName)
                   .listCollections(filter, opts)
                   .toArray();
-                const err = this._checkListCollectionsForLibmongocryptResult(
+                const err = self._checkListCollectionsForLibmongocryptResult(
                   dbName,
                   filter,
                   (collectionInfos ?? []) as CollectionInfo[]
                 );
                 if (err) {
-                  this._logger?.error(
+                  self._logger?.error(
                     'COMPASS-DATA-SERVICE',
                     mongoLogId(1_001_000_122),
                     'CSFLECollectionTracker',
@@ -423,7 +432,7 @@ export class CSFLECollectionTrackerImpl implements CSFLECollectionTracker {
                   );
                   throw err;
                 }
-                return collectionInfos;
+                yield* collectionInfos;
               },
             };
           },
@@ -437,53 +446,70 @@ export class CSFLECollectionTrackerImpl implements CSFLECollectionTracker {
     filter: Document,
     collectionInfos: CollectionInfo[]
   ): Error | undefined {
-    if (typeof filter?.name !== 'string' || collectionInfos.length > 1) {
+    // filter is either { name: string } or { name: { $in: string[] } }
+    if (
+      typeof filter?.name !== 'string' &&
+      (!filter?.name ||
+        typeof filter.name !== 'object' ||
+        !Array.isArray(filter.name.$in) ||
+        !(filter.name.$in as unknown[]).every(
+          (name) => typeof name === 'string'
+        ))
+    ) {
       // This is an assertion more than an actual error condition.
       // It ensures that we're only getting listCollections requests
       // in the format that we expect them to come in.
       return new Error(
-        `[Compass] Unexpected listCollections request on '${dbName}' with name: '${
-          filter?.name as string
-        }'`
+        `[Compass] Unexpected listCollections request on '${dbName}' with filter: ${EJSON.stringify(
+          filter
+        )}`
       );
     }
+    const filterNames: string[] =
+      typeof filter.name === 'string' ? [filter.name] : filter.name.$in;
 
-    const ns = `${dbName}.${filter.name}`;
-    const existingInfo = this._getCSFLECollectionInfo(ns);
-
-    if (collectionInfos.length === 0) {
-      if (existingInfo.serverEnforcedEncryptedFields?.encryptedFields?.length) {
-        return new Error(
-          `[Compass] Missing encrypted field information of collection '${ns}'`
-        );
+    // First check: All collections for which we had existing encrypted fields
+    // in the server schema also have a collection schema in the new listCollections response
+    for (const existingNs of this._getCSFLECollectionNames()) {
+      if (
+        existingNs.database === dbName &&
+        filterNames.includes(existingNs.collection)
+      ) {
+        const existingInfo = this._getCSFLECollectionInfo(existingNs.ns);
+        if (
+          existingInfo.serverEnforcedEncryptedFields?.encryptedFields?.length &&
+          !collectionInfos.some((info) => info.name === existingNs.collection)
+        ) {
+          return new Error(
+            `[Compass] Missing encrypted field information of collection '${existingNs.ns}'`
+          );
+        }
       }
-      return;
     }
 
-    const [info] = collectionInfos;
-    if (filter.name !== info.name) {
-      // Also just a consistency check to make sure that things
-      // didn't go *terribly* wrong somewhere.
-      return new Error(
-        `[Compass] Unexpected listCollections name mismatch: got ${info.name}, expected ${filter.name}`
+    // Second check: All fields that were previously known to be encrypted
+    // are still encrypted in the new listCollections response
+    for (const info of collectionInfos) {
+      const ns = `${dbName}.${info.name}`;
+      const existingInfo = this._getCSFLECollectionInfo(ns);
+
+      const newInfo = extractEncryptedFieldsFromListCollectionsResult(
+        info.options
       );
-    }
-    const newInfo = extractEncryptedFieldsFromListCollectionsResult(
-      info.options
-    );
 
-    for (const expectedEncryptedField of existingInfo
-      .serverEnforcedEncryptedFields?.encryptedFields ?? []) {
-      if (
-        !newInfo.encryptedFields.some((field) =>
-          _.isEqual(field, expectedEncryptedField)
-        )
-      ) {
-        return new Error(
-          `[Compass] Missing encrypted field '${expectedEncryptedField.join(
-            '.'
-          )}' of collection '${ns}' in listCollections result`
-        );
+      for (const expectedEncryptedField of existingInfo
+        .serverEnforcedEncryptedFields?.encryptedFields ?? []) {
+        if (
+          !newInfo.encryptedFields.some((field) =>
+            _.isEqual(field, expectedEncryptedField)
+          )
+        ) {
+          return new Error(
+            `[Compass] Missing encrypted field '${expectedEncryptedField.join(
+              '.'
+            )}' of collection '${ns}' in listCollections result`
+          );
+        }
       }
     }
   }
diff --git a/packages/data-service/src/run-command.ts b/packages/data-service/src/run-command.ts
@@ -193,6 +193,7 @@ export type CollectionInfoNameOnly = {
 export type CollectionInfo = CollectionInfoNameOnly & {
   /** @see https://docs.mongodb.com/manual/reference/method/db.createCollection/#mongodb-method-db.createCollection */
   options: Document;
+  name: string;
   info: {
     readOnly?: boolean;
     uuid?: Binary;
