fix(deps): bump mongosh, driver, bson (#6333)

Co-authored-by: Rhys Howell <[email protected]>
mongodb-js · Oct 9, 2024 · dc82588 · dc82588
1 parent e81b808
commit dc82588
Show file tree

Hide file tree

Showing 36 changed files with 890 additions and 204 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/atlas-service/package.json b/packages/atlas-service/package.json
@@ -79,8 +79,8 @@
     "@mongodb-js/compass-user-data": "^0.3.8",
     "@mongodb-js/compass-utils": "^0.6.12",
     "@mongodb-js/connection-info": "^0.9.0",
-    "@mongodb-js/devtools-connect": "^3.2.10",
-    "@mongodb-js/devtools-proxy-support": "^0.3.9",
+    "@mongodb-js/devtools-connect": "^3.3.1",
+    "@mongodb-js/devtools-proxy-support": "^0.4.1",
     "@mongodb-js/oidc-plugin": "^1.1.1",
     "hadron-app-registry": "^9.2.7",
     "compass-preferences-model": "^2.29.0",

diff --git a/packages/compass-aggregations/package.json b/packages/compass-aggregations/package.json
@@ -78,13 +78,13 @@
     "@mongodb-js/mongodb-constants": "^0.10.0",
     "@mongodb-js/my-queries-storage": "^0.17.0",
     "@mongodb-js/shell-bson-parser": "^1.1.2",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
     "hadron-document": "^8.6.3",
     "hadron-type-checker": "^7.2.2",
     "lodash": "^4.17.21",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-collection-model": "^5.23.4",
     "mongodb-data-service": "^22.23.4",
     "mongodb-database-model": "^2.23.4",

diff --git a/packages/compass-components/package.json b/packages/compass-components/package.json
@@ -76,7 +76,7 @@
     "@react-aria/interactions": "^3.9.1",
     "@react-aria/utils": "^3.13.1",
     "@react-aria/visually-hidden": "^3.3.1",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "focus-trap-react": "^9.0.2",
     "hadron-document": "^8.6.3",
     "hadron-type-checker": "^7.2.2",

diff --git a/packages/compass-connections/package.json b/packages/compass-connections/package.json
@@ -59,7 +59,7 @@
     "@mongodb-js/connection-form": "^1.41.1",
     "@mongodb-js/connection-info": "^0.9.0",
     "@mongodb-js/connection-storage": "^0.22.0",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
     "lodash": "^4.17.21",

diff --git a/packages/compass-crud/package.json b/packages/compass-crud/package.json
@@ -87,7 +87,7 @@
     "@mongodb-js/shell-bson-parser": "^1.1.2",
     "ag-grid-community": "^20.2.0",
     "ag-grid-react": "^20.2.0",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
     "hadron-document": "^8.6.3",

diff --git a/packages/compass-e2e-tests/package.json b/packages/compass-e2e-tests/package.json
@@ -44,7 +44,7 @@
     "@types/cross-spawn": "^6.0.2",
     "@types/puppeteer": "^5.4.4",
     "@wdio/types": "^8.32.2",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "clipboardy": "^2.3.0",
@@ -59,7 +59,7 @@
     "hadron-build": "^25.5.11",
     "lodash": "^4.17.21",
     "mocha": "^10.2.0",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-log-writer": "^1.4.2",
     "mongodb-runner": "^5.6.3",

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.2.7",
     "lodash": "^4.17.21",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "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
@@ -56,10 +56,10 @@
     "@mongodb-js/compass-components": "^1.30.0",
     "@mongodb-js/compass-intercom": "^0.13.0",
     "@mongodb-js/compass-logging": "^1.4.8",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-schema": "^12.2.0",
     "react": "^17.0.2"
   },

diff --git a/packages/compass-import-export/package.json b/packages/compass-import-export/package.json
@@ -56,15 +56,15 @@
     "@mongodb-js/compass-telemetry": "^1.2.0",
     "@mongodb-js/compass-utils": "^0.6.12",
     "@mongodb-js/compass-workspaces": "^0.24.2",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "debug": "^4.3.4",
     "electron": "^30.5.1",
     "hadron-app-registry": "^9.2.7",
     "hadron-document": "^8.6.3",
     "hadron-ipc": "^3.2.23",
     "lodash": "^4.17.21",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-data-service": "^22.23.4",
     "mongodb-ns": "^2.4.2",
     "mongodb-query-parser": "^4.2.3",

diff --git a/packages/compass-indexes/package.json b/packages/compass-indexes/package.json
@@ -79,11 +79,11 @@
     "@mongodb-js/connection-storage": "^0.22.0",
     "@mongodb-js/mongodb-constants": "^0.10.0",
     "@mongodb-js/shell-bson-parser": "^1.1.2",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
     "lodash": "^4.17.21",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-collection-model": "^5.23.4",
     "mongodb-data-service": "^22.23.4",
     "mongodb-query-parser": "^4.2.3",

diff --git a/packages/compass-preferences-model/package.json b/packages/compass-preferences-model/package.json
@@ -51,8 +51,8 @@
   "dependencies": {
     "@mongodb-js/compass-logging": "^1.4.8",
     "@mongodb-js/compass-user-data": "^0.3.8",
-    "@mongodb-js/devtools-proxy-support": "^0.3.9",
-    "bson": "^6.7.0",
+    "@mongodb-js/devtools-proxy-support": "^0.4.1",
+    "bson": "^6.8.0",
     "hadron-app-registry": "^9.2.7",
     "hadron-ipc": "^3.2.23",
     "js-yaml": "^4.1.0",

diff --git a/packages/compass-query-bar/package.json b/packages/compass-query-bar/package.json
@@ -78,11 +78,11 @@
     "@mongodb-js/compass-telemetry": "^1.2.0",
     "@mongodb-js/mongodb-constants": "^0.10.0",
     "@mongodb-js/my-queries-storage": "^0.17.0",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
     "lodash": "^4.17.21",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-instance-model": "^12.24.4",
     "mongodb-ns": "^2.4.2",
     "mongodb-query-parser": "^4.2.3",

diff --git a/packages/compass-saved-aggregations-queries/package.json b/packages/compass-saved-aggregations-queries/package.json
@@ -57,7 +57,7 @@
     "@mongodb-js/connection-form": "^1.41.1",
     "@mongodb-js/connection-info": "^0.9.0",
     "@mongodb-js/my-queries-storage": "^0.17.0",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "fuse.js": "^6.5.3",
     "hadron-app-registry": "^9.2.7",

diff --git a/packages/compass-schema-validation/package.json b/packages/compass-schema-validation/package.json
@@ -78,7 +78,7 @@
     "@mongodb-js/compass-field-store": "^9.18.1",
     "@mongodb-js/compass-logging": "^1.4.8",
     "@mongodb-js/compass-telemetry": "^1.2.0",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
     "javascript-stringify": "^2.0.1",

diff --git a/packages/compass-schema/package.json b/packages/compass-schema/package.json
@@ -80,7 +80,7 @@
     "@mongodb-js/compass-telemetry": "^1.2.0",
     "@mongodb-js/compass-query-bar": "^8.44.2",
     "@mongodb-js/connection-storage": "^0.22.0",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "d3": "^3.5.17",
     "hadron-app-registry": "^9.2.7",
@@ -90,7 +90,7 @@
     "leaflet-draw": "^1.0.4",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-query-util": "^2.2.8",
     "mongodb-schema": "^12.2.0",
     "numeral": "^1.5.6",

diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json
@@ -56,10 +56,10 @@
     "@mongodb-js/compass-user-data": "^0.3.8",
     "@mongodb-js/compass-utils": "^0.6.12",
     "@mongodb-js/compass-workspaces": "^0.24.2",
-    "@mongosh/browser-repl": "^2.3.1",
-    "@mongosh/logging": "^2.3.1",
-    "@mongosh/node-runtime-worker-thread": "^2.3.1",
-    "bson": "^6.7.0",
+    "@mongosh/browser-repl": "^2.3.2",
+    "@mongosh/logging": "^2.3.2",
+    "@mongosh/node-runtime-worker-thread": "^2.3.2",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
     "react": "^17.0.2",

diff --git a/packages/compass-sidebar/package.json b/packages/compass-sidebar/package.json
@@ -62,7 +62,7 @@
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
     "lodash": "^4.17.21",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-instance-model": "^12.24.4",
     "mongodb-ns": "^2.4.2",
     "react": "^17.0.2",

diff --git a/packages/compass-web/package.json b/packages/compass-web/package.json
@@ -85,7 +85,7 @@
     "@mongodb-js/compass-welcome": "^0.41.2",
     "@mongodb-js/compass-workspaces": "^0.24.2",
     "@mongodb-js/connection-storage": "^0.22.0",
-    "@mongodb-js/devtools-proxy-support": "^0.3.9",
+    "@mongodb-js/devtools-proxy-support": "^0.4.1",
     "@mongodb-js/eslint-config-compass": "^1.1.7",
     "@mongodb-js/mocha-config-compass": "^1.4.2",
     "@mongodb-js/prettier-config-compass": "^1.0.2",
@@ -117,7 +117,7 @@
     "is-ip": "^5.0.1",
     "lodash": "^4.17.21",
     "mocha": "^10.2.0",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.23.4",
     "mongodb-ns": "^2.4.2",

diff --git a/packages/compass-workspaces/package.json b/packages/compass-workspaces/package.json
@@ -55,7 +55,7 @@
     "@mongodb-js/compass-components": "^1.30.0",
     "@mongodb-js/compass-connections": "^1.43.1",
     "@mongodb-js/compass-logging": "^1.4.8",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "hadron-app-registry": "^9.2.7",
     "lodash": "^4.17.21",

diff --git a/packages/compass/package.json b/packages/compass/package.json
@@ -180,7 +180,7 @@
     "email": "[email protected]"
   },
   "dependencies": {
-    "@mongosh/node-runtime-worker-thread": "^2.3.1",
+    "@mongosh/node-runtime-worker-thread": "^2.3.2",
     "clipboard": "^2.0.6",
     "kerberos": "^2.1.1",
     "keytar": "^7.9.0",
@@ -224,7 +224,7 @@
     "@mongodb-js/compass-workspaces": "^0.24.2",
     "@mongodb-js/connection-info": "^0.9.0",
     "@mongodb-js/connection-storage": "^0.22.0",
-    "@mongodb-js/devtools-proxy-support": "^0.3.9",
+    "@mongodb-js/devtools-proxy-support": "^0.4.1",
     "@mongodb-js/eslint-config-compass": "^1.1.7",
     "@mongodb-js/get-os-info": "^0.3.24",
     "@mongodb-js/mocha-config-compass": "^1.4.2",
@@ -256,7 +256,7 @@
     "local-links": "^1.4.0",
     "make-fetch-happen": "^8.0.14",
     "marky": "^1.2.1",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-build-info": "^1.7.2",
     "mongodb-cloud-info": "^2.1.2",
     "mongodb-connection-string-url": "^3.0.1",

diff --git a/packages/compass/src/app/utils/telemetry.spec.ts b/packages/compass/src/app/utils/telemetry.spec.ts
@@ -346,7 +346,6 @@ describe('connection tracking', function () {
           autoEncryption: {
             kmsProviders: {
               local: { key: 'asdf' },
-              // @ts-expect-error with next driver release, this will be fixed
               'local:12': { key: 'asdf' },
               aws: { accessKeyId: 'asdf', secretAccessKey: 'asdf' },
               'kmip:1': { endpoint: 'asdf' },

diff --git a/packages/compass/src/main/validate-connection-string.ts b/packages/compass/src/main/validate-connection-string.ts
@@ -13,6 +13,8 @@ const allowedConnectionStringOptions = [
   'authMechanism',
   'authMechanismProperties', // Partially. See allowed and disallowed AuthMechanismProperties below.
   'authSource',
+  'autoSelectFamily',
+  'autoSelectFamilyAttemptTimeout',
   'bsonRegExp',
   'cert',
   'checkKeys',
@@ -75,6 +77,7 @@ const allowedConnectionStringOptions = [
 ] as const;
 
 const disallowedConnectionStringOptions = [
+  'allowPartialTrustChain',
   'ALPNProtocols',
   'auth',
   'autoEncryption',

diff --git a/packages/connection-form/package.json b/packages/connection-form/package.json
@@ -53,7 +53,7 @@
     "@mongodb-js/connection-info": "^0.9.0",
     "@mongodb-js/shell-bson-parser": "^1.1.2",
     "lodash": "^4.17.21",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.23.4",
@@ -71,7 +71,7 @@
     "@types/mocha": "^9.0.0",
     "@types/react": "^17.0.5",
     "@types/sinon-chai": "^3.2.5",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "chai": "^4.3.4",
     "depcheck": "^1.4.1",
     "electron-mocha": "^12.2.0",

diff --git a/packages/connection-form/src/utils/csfle-handler.spec.ts b/packages/connection-form/src/utils/csfle-handler.spec.ts
@@ -301,7 +301,6 @@ describe('csfle-handler', function () {
         storeCredentials: false,
         autoEncryption: {
           kmsProviders: {
-            // @ts-expect-error multiple kms providers are supported in next driver release
             'local:2': {
               key: 'asdf',
             },

diff --git a/packages/connection-form/src/utils/csfle-handler.ts b/packages/connection-form/src/utils/csfle-handler.ts
@@ -233,13 +233,15 @@ export function unsetFleOptionsIfEmptyAutoEncryption(
 
   function filterEmptyValues<T extends object>(
     obj: T | undefined
-  ): Partial<T | undefined> {
+  ): { [k in keyof T]: Exclude<T[k], Record<string, never>> } | undefined {
     const values = Object.fromEntries(
       Object.entries(obj ?? {}).filter(
         ([, v]) => Object.keys(v ?? {}).length > 0
       )
     );
-    return Object.keys(values).length > 0 ? (values as Partial<T>) : undefined;
+    return Object.keys(values).length > 0
+      ? (values as { [k in keyof T]: Exclude<T[k], Record<string, never>> })
+      : undefined;
   }
   // Filter out the empty kmsProviders or the tlsOptions
   const kmsProviders = filterEmptyValues(autoEncryption.kmsProviders);
@@ -419,7 +421,6 @@ export function handleRenameKmsProvider<T extends KMSProviderType>({
 
   const kmsProviders = renameDataKey(
     autoEncryption.kmsProviders,
-    // @ts-expect-error multiple kms providers are supported in next driver release
     action.name,
     action.newName
   );

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.8.0",
+    "mongodb": "^6.9.0",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.23.4"
   },
@@ -64,7 +64,7 @@
     "@types/chai": "^4.2.21",
     "@types/mocha": "^9.0.0",
     "@types/sinon-chai": "^3.2.5",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "chai": "^4.3.6",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",

diff --git a/packages/connection-info/src/connection-secrets.spec.ts b/packages/connection-info/src/connection-secrets.spec.ts
@@ -197,7 +197,6 @@ describe('connection secrets', function () {
                   secretAccessKey: 'secretAccessKey',
                   sessionToken: 'sessionToken',
                 },
-                // @ts-expect-error multiple kms providers are supported in next driver release
                 'aws:1': {
                   accessKeyId: 'accessKeyId',
                   secretAccessKey: 'secretAccessKey',

diff --git a/packages/connection-info/src/connection-secrets.ts b/packages/connection-info/src/connection-secrets.ts
@@ -183,8 +183,10 @@ export function extractSecrets(connectionInfo: Readonly<ConnectionInfo>): {
 
 function omitPropertiesWhoseValuesAreEmptyObjects<T extends Document>(obj: T) {
   return Object.fromEntries(
-    Object.entries(obj).filter(([, value]) => Object.keys(value).length > 0)
-  ) as Partial<T>;
+    Object.entries(obj).filter(
+      ([, value]) => Object.keys(value ?? {}).length > 0
+    )
+  ) as { [k in keyof T]: Exclude<T[k], Record<string, never>> };
 }
 
 const KMS_PROVIDER_SECRET_PATHS = {

diff --git a/packages/connection-storage/package.json b/packages/connection-storage/package.json
@@ -61,7 +61,7 @@
     "@mongodb-js/compass-user-data": "^0.3.8",
     "@mongodb-js/compass-utils": "^0.6.12",
     "@mongodb-js/connection-info": "^0.9.0",
-    "bson": "^6.7.0",
+    "bson": "^6.8.0",
     "compass-preferences-model": "^2.29.0",
     "electron": "^30.5.1",
     "hadron-app-registry": "^9.2.7",