Просмотр исходного кода

Merge pull request #15318 from overleaf/csh-issue-11625-mongoug-5-object-persistor

Upgrade mongodb for object-persistor from 3.5.9 to 6.1.0

GitOrigin-RevId: e6b97ae93092a77c46f043979dd9eb5caf234866
Christopher Hoskin 2 лет назад
Родитель
Сommit
6d86e14b05

+ 1 - 1
libraries/object-persistor/package.json

@@ -36,7 +36,7 @@
     "chai-as-promised": "^7.1.1",
     "mocha": "^10.2.0",
     "mock-fs": "^5.2.0",
-    "mongodb": "^3.5.9",
+    "mongodb": "^6.1.0",
     "sandboxed-module": "^2.0.4",
     "sinon": "^9.2.4",
     "sinon-chai": "^3.7.0"

+ 1 - 1
libraries/object-persistor/test/unit/GcsPersistorTests.js

@@ -552,7 +552,7 @@ describe('GcsPersistorTests', function () {
   })
 
   describe('deleteDirectory', function () {
-    const directoryName = `${ObjectId()}/${ObjectId()}`
+    const directoryName = `${new ObjectId()}/${new ObjectId()}`
     const directoryPrefix = `${directoryName}/`
     describe('with valid parameters', function () {
       beforeEach(async function () {

+ 103 - 2
package-lock.json

@@ -344,7 +344,7 @@
         "chai-as-promised": "^7.1.1",
         "mocha": "^10.2.0",
         "mock-fs": "^5.2.0",
-        "mongodb": "^3.5.9",
+        "mongodb": "^6.1.0",
         "sandboxed-module": "^2.0.4",
         "sinon": "^9.2.4",
         "sinon-chai": "^3.7.0"
@@ -353,6 +353,76 @@
         "@overleaf/logger": "*"
       }
     },
+    "libraries/object-persistor/node_modules/bson": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-6.1.0.tgz",
+      "integrity": "sha512-yiQ3KxvpVoRpx1oD1uPz4Jit9tAVTJgjdmjDKtUErkOoL9VNoF8Dd58qtAOL5E40exx2jvAT9sqdRSK/r+SHlA==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.20.1"
+      }
+    },
+    "libraries/object-persistor/node_modules/gcp-metadata": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz",
+      "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "gaxios": "^5.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "libraries/object-persistor/node_modules/mongodb": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.1.0.tgz",
+      "integrity": "sha512-AvzNY0zMkpothZ5mJAaIo2bGDjlJQqqAbn9fvtVgwIIUPEfdrqGxqNjjbuKyrgQxg2EvCmfWdjq+4uj96c0YPw==",
+      "dev": true,
+      "dependencies": {
+        "@mongodb-js/saslprep": "^1.1.0",
+        "bson": "^6.1.0",
+        "mongodb-connection-string-url": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=16.20.1"
+      },
+      "peerDependencies": {
+        "@aws-sdk/credential-providers": "^3.188.0",
+        "@mongodb-js/zstd": "^1.1.0",
+        "gcp-metadata": "^5.2.0",
+        "kerberos": "^2.0.1",
+        "mongodb-client-encryption": ">=6.0.0 <7",
+        "snappy": "^7.2.2",
+        "socks": "^2.7.1"
+      },
+      "peerDependenciesMeta": {
+        "@aws-sdk/credential-providers": {
+          "optional": true
+        },
+        "@mongodb-js/zstd": {
+          "optional": true
+        },
+        "gcp-metadata": {
+          "optional": true
+        },
+        "kerberos": {
+          "optional": true
+        },
+        "mongodb-client-encryption": {
+          "optional": true
+        },
+        "snappy": {
+          "optional": true
+        },
+        "socks": {
+          "optional": true
+        }
+      }
+    },
     "libraries/overleaf-editor-core": {
       "version": "1.0.0",
       "license": "Proprietary",
@@ -51033,12 +51103,43 @@
         "glob": "^7.1.6",
         "mocha": "^10.2.0",
         "mock-fs": "^5.2.0",
-        "mongodb": "^3.5.9",
+        "mongodb": "^6.1.0",
         "range-parser": "^1.2.1",
         "sandboxed-module": "^2.0.4",
         "sinon": "^9.2.4",
         "sinon-chai": "^3.7.0",
         "tiny-async-pool": "^1.1.0"
+      },
+      "dependencies": {
+        "bson": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/bson/-/bson-6.1.0.tgz",
+          "integrity": "sha512-yiQ3KxvpVoRpx1oD1uPz4Jit9tAVTJgjdmjDKtUErkOoL9VNoF8Dd58qtAOL5E40exx2jvAT9sqdRSK/r+SHlA==",
+          "dev": true
+        },
+        "gcp-metadata": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz",
+          "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "gaxios": "^5.0.0",
+            "json-bigint": "^1.0.0"
+          }
+        },
+        "mongodb": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.1.0.tgz",
+          "integrity": "sha512-AvzNY0zMkpothZ5mJAaIo2bGDjlJQqqAbn9fvtVgwIIUPEfdrqGxqNjjbuKyrgQxg2EvCmfWdjq+4uj96c0YPw==",
+          "dev": true,
+          "requires": {
+            "@mongodb-js/saslprep": "^1.1.0",
+            "bson": "^6.1.0",
+            "mongodb-connection-string-url": "^2.6.0"
+          }
+        }
       }
     },
     "@overleaf/project-history": {