From 9c2437c0bf87dd727b63427d8b4b3472ca45cd32 Mon Sep 17 00:00:00 2001 From: gagik Date: Thu, 16 Jan 2025 13:38:24 +0100 Subject: [PATCH 1/5] fix(deps): bump oidc-plugin to fix failing test The OIDC tests have been failing on Linux so we are bumping it to the latest version of the OIDC plugin to fix this. --- package-lock.json | 64 ++++++++--------------------------------------- package.json | 4 +-- 2 files changed, 13 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index bdd2b5b41..616f60a86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,8 +47,8 @@ "devDependencies": { "@babel/preset-typescript": "^7.25.7", "@babel/types": "^7.25.8", - "@mongodb-js/oidc-mock-provider": "^0.10.1", - "@mongodb-js/oidc-plugin": "^0.4.0", + "@mongodb-js/oidc-mock-provider": "^0.10.2", + "@mongodb-js/oidc-plugin": "^1.1.5", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/sbom-tools": "^0.7.2", "@mongodb-js/signing-utils": "^0.3.6", @@ -3876,10 +3876,11 @@ "integrity": "sha512-I704bSQRu/SusTcCV8qqtdFVvAJf1aKZtgGM2VnYjPn2njZd5j7864k/CF9TeeR8+r0At5qqNa3N4MX9YxPnEg==" }, "node_modules/@mongodb-js/oidc-mock-provider": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-mock-provider/-/oidc-mock-provider-0.10.1.tgz", - "integrity": "sha512-RIIkEo0gsjlMO6zY11JsKH4UhX8/EAaxD3DxhhY/m7ncCo6pIp4bGT8rWvqTHnf+rheyxeyEilpU1jQaUzqENQ==", + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-mock-provider/-/oidc-mock-provider-0.10.2.tgz", + "integrity": "sha512-mH9tpgqYvF2ZRBbFKta+ziN48V+t/+NPLQoe7nZ8bYbWsGfXY79QKMIElaXlU8HnemnqUbOqBSYuizgs62OxfQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "yargs": "17.7.2" }, @@ -3929,18 +3930,17 @@ } }, "node_modules/@mongodb-js/oidc-plugin": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-0.4.0.tgz", - "integrity": "sha512-tinXSz6O2AmgMAgorXUcCJtDhayghkmsXVVTd5UiXhzSA/NNVtlleZXSVkG6tr46WXGzLISgVX+lUzzcEIiwJQ==", - "dev": true, + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.5.tgz", + "integrity": "sha512-K76ADgrDpL+lg6L/QsEBIGbSjTEUljYDGDX75Tq4+zIkx3JQgeQhS5J3qZNzKwJa4nj+EwhihaADLRgsMpAtrA==", + "license": "Apache-2.0", "dependencies": { - "abort-controller": "^3.0.0", "express": "^4.18.2", "open": "^9.1.0", "openid-client": "^5.6.4" }, "engines": { - "node": ">= 14.18.0" + "node": ">= 16.20.1" } }, "node_modules/@mongodb-js/prettier-config-devtools": { @@ -4192,19 +4192,6 @@ "mongodb-log-writer": "^1.4.2" } }, - "node_modules/@mongosh/service-provider-node-driver/node_modules/@mongodb-js/oidc-plugin": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.1.tgz", - "integrity": "sha512-u2t3dvUpQJeTmMvXyZu730yJzqJ3aKraQ7ELlNwpKpl1AGxL6Dd9Z2AEu9ycExZjXhyjBW/lbaWuEhdNZHEgeg==", - "dependencies": { - "express": "^4.18.2", - "open": "^9.1.0", - "openid-client": "^5.6.4" - }, - "engines": { - "node": ">= 16.20.1" - } - }, "node_modules/@mongosh/shell-api": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.3.tgz", @@ -4272,21 +4259,6 @@ "mongodb-log-writer": "^1.4.2" } }, - "node_modules/@mongosh/types/node_modules/@mongodb-js/oidc-plugin": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.1.tgz", - "integrity": "sha512-u2t3dvUpQJeTmMvXyZu730yJzqJ3aKraQ7ELlNwpKpl1AGxL6Dd9Z2AEu9ycExZjXhyjBW/lbaWuEhdNZHEgeg==", - "license": "Apache-2.0", - "peer": true, - "dependencies": { - "express": "^4.18.2", - "open": "^9.1.0", - "openid-client": "^5.6.4" - }, - "engines": { - "node": ">= 16.20.1" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -14931,20 +14903,6 @@ "mongodb-log-writer": "^1.4.2" } }, - "node_modules/mongodb-data-service/node_modules/@mongodb-js/oidc-plugin": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.1.tgz", - "integrity": "sha512-u2t3dvUpQJeTmMvXyZu730yJzqJ3aKraQ7ELlNwpKpl1AGxL6Dd9Z2AEu9ycExZjXhyjBW/lbaWuEhdNZHEgeg==", - "peer": true, - "dependencies": { - "express": "^4.18.2", - "open": "^9.1.0", - "openid-client": "^5.6.4" - }, - "engines": { - "node": ">= 16.20.1" - } - }, "node_modules/mongodb-download-url": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/mongodb-download-url/-/mongodb-download-url-1.5.4.tgz", diff --git a/package.json b/package.json index 4e0fac3db..8de1d6130 100644 --- a/package.json +++ b/package.json @@ -1244,8 +1244,8 @@ "devDependencies": { "@babel/preset-typescript": "^7.25.7", "@babel/types": "^7.25.8", - "@mongodb-js/oidc-mock-provider": "^0.10.1", - "@mongodb-js/oidc-plugin": "^0.4.0", + "@mongodb-js/oidc-mock-provider": "^0.10.2", + "@mongodb-js/oidc-plugin": "^1.1.5", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/sbom-tools": "^0.7.2", "@mongodb-js/signing-utils": "^0.3.6", From 4ac72e93278cce1cc4a170d18aa97580a41cc68f Mon Sep 17 00:00:00 2001 From: gagik Date: Thu, 16 Jan 2025 13:53:47 +0100 Subject: [PATCH 2/5] fix(deps): update mongodb-runner and use debug --- package-lock.json | 96 +++++++++++++++++++++++++++---------- package.json | 2 +- src/test/suite/oidc.test.ts | 1 + 3 files changed, 74 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 616f60a86..844ef0159 100644 --- a/package-lock.json +++ b/package-lock.json @@ -94,7 +94,7 @@ "mocha-multi": "^1.1.7", "mongodb-client-encryption": "^6.1.0", "mongodb-rag-core": "^0.4.1", - "mongodb-runner": "^5.7.0", + "mongodb-runner": "^5.7.1", "node-fetch": "^2.7.0", "node-loader": "^0.6.0", "npm-run-all": "^4.1.5", @@ -3858,14 +3858,15 @@ } }, "node_modules/@mongodb-js/mongodb-downloader": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@mongodb-js/mongodb-downloader/-/mongodb-downloader-0.3.6.tgz", - "integrity": "sha512-Cu82TRmAP/OIRizx9o+fReQf8FfovI28rjY0pu8wHyCoUlG7q3Zkxb/lppB7a9/kzQfONeHAoXIOQkvSasKYrw==", + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/@mongodb-js/mongodb-downloader/-/mongodb-downloader-0.3.7.tgz", + "integrity": "sha512-zX18NlZNvN9Yao94VOxubeVOU0BaYX7X1giew1o0fWoIbUIiGzDDVQFRwRNybN+wD7dMFJYvLc6EOlmB9shd5w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "debug": "^4.3.4", "decompress": "^4.2.1", - "mongodb-download-url": "^1.5.1", + "mongodb-download-url": "^1.5.5", "node-fetch": "^2.6.11", "tar": "^6.1.15" } @@ -7238,6 +7239,7 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", "dev": true, + "license": "MIT", "dependencies": { "readable-stream": "^2.3.5", "safe-buffer": "^5.1.1" @@ -7247,13 +7249,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/bl/node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7268,13 +7272,15 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/bl/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -7551,6 +7557,7 @@ "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, + "license": "MIT", "dependencies": { "buffer-alloc-unsafe": "^1.1.0", "buffer-fill": "^1.0.0" @@ -7560,7 +7567,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/buffer-crc32": { "version": "0.2.13", @@ -7580,7 +7588,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/buffer-from": { "version": "0.1.2", @@ -8644,6 +8653,7 @@ "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz", "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==", "dev": true, + "license": "MIT", "dependencies": { "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", @@ -8688,6 +8698,7 @@ "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz", "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==", "dev": true, + "license": "MIT", "dependencies": { "file-type": "^5.2.0", "is-stream": "^1.1.0", @@ -8702,6 +8713,7 @@ "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", "dev": true, + "license": "MIT", "dependencies": { "decompress-tar": "^4.1.0", "file-type": "^6.1.0", @@ -8718,6 +8730,7 @@ "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -8727,6 +8740,7 @@ "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", "dev": true, + "license": "MIT", "dependencies": { "decompress-tar": "^4.1.1", "file-type": "^5.2.0", @@ -8741,6 +8755,7 @@ "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", "integrity": "sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==", "dev": true, + "license": "MIT", "dependencies": { "file-type": "^3.8.0", "get-stream": "^2.2.0", @@ -8756,6 +8771,7 @@ "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", "integrity": "sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -8765,6 +8781,7 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", "integrity": "sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==", "dev": true, + "license": "MIT", "dependencies": { "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" @@ -11147,6 +11164,7 @@ "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", "integrity": "sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -11552,6 +11570,7 @@ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -11564,6 +11583,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -11575,7 +11595,8 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/fs-monkey": { "version": "1.0.5", @@ -13101,7 +13122,8 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", "integrity": "sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-negative-zero": { "version": "2.0.2", @@ -13213,6 +13235,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -14053,6 +14076,7 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, + "license": "MIT", "dependencies": { "pify": "^3.0.0" }, @@ -14065,6 +14089,7 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -14449,6 +14474,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=8" } @@ -14458,6 +14484,7 @@ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, + "license": "MIT", "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" @@ -14471,6 +14498,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -14482,7 +14510,8 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/mkdirp": { "version": "1.0.4", @@ -14904,10 +14933,11 @@ } }, "node_modules/mongodb-download-url": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/mongodb-download-url/-/mongodb-download-url-1.5.4.tgz", - "integrity": "sha512-+2pnlKikAo6U4PQX4GXPNYoBxASzWQdivVkb8RuoToCeSM1acZJ1fnMLtY4JtNq93OAd5CScIs9WAnlC5bC0YQ==", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/mongodb-download-url/-/mongodb-download-url-1.5.5.tgz", + "integrity": "sha512-8HLqKVVuKQBinKRZbDu0YSzwLfD/Wb//vOIm3CMk0/2AzZzp0pg+8E+DAkx7VLEdoyuPVWLU5v/doODjXlPYSA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "debug": "^4.1.1", "minimist": "^1.2.3", @@ -15015,12 +15045,13 @@ } }, "node_modules/mongodb-runner": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/mongodb-runner/-/mongodb-runner-5.7.0.tgz", - "integrity": "sha512-G7GmVj5SzoSL/GY7lMnhNSSrPUZLkWuV1/CtSwdadsrA7aGuxB0KDviTmyecfI2/OWsT39t8X3ISE5R30EV5Xg==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/mongodb-runner/-/mongodb-runner-5.7.1.tgz", + "integrity": "sha512-/MBEP2DcMpNbpSsXqG+lgFqYehCd2qasdWIfKuv4jGKwLoDPv/mWoQYAQDFAC2xaxjb576Y2LwUAeYeB1KPZdg==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@mongodb-js/mongodb-downloader": "^0.3.6", + "@mongodb-js/mongodb-downloader": "^0.3.7", "@mongodb-js/saslprep": "^1.1.9", "debug": "^4.3.4", "mongodb": "^6.9.0", @@ -16573,6 +16604,7 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -16582,6 +16614,7 @@ "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -16591,6 +16624,7 @@ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", "dev": true, + "license": "MIT", "dependencies": { "pinkie": "^2.0.0" }, @@ -17799,6 +17833,7 @@ "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz", "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==", "dev": true, + "license": "MIT", "dependencies": { "commander": "^2.8.1" }, @@ -17811,7 +17846,8 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/select": { "version": "1.1.2", @@ -18762,6 +18798,7 @@ "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", "dev": true, + "license": "MIT", "dependencies": { "is-natural-number": "^4.0.1" } @@ -19052,6 +19089,7 @@ "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, + "license": "ISC", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -19155,6 +19193,7 @@ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", "dev": true, + "license": "MIT", "dependencies": { "bl": "^1.0.0", "buffer-alloc": "^1.2.0", @@ -19172,13 +19211,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/tar-stream/node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -19193,13 +19234,15 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/tar-stream/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -19209,6 +19252,7 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -19217,7 +19261,8 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/terser": { "version": "5.31.1", @@ -19395,7 +19440,8 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/to-fast-properties": { "version": "2.0.0", @@ -19819,6 +19865,7 @@ "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", "dev": true, + "license": "MIT", "dependencies": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -19843,6 +19890,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" diff --git a/package.json b/package.json index 8de1d6130..f8985a145 100644 --- a/package.json +++ b/package.json @@ -1291,7 +1291,7 @@ "mocha-multi": "^1.1.7", "mongodb-client-encryption": "^6.1.0", "mongodb-rag-core": "^0.4.1", - "mongodb-runner": "^5.7.0", + "mongodb-runner": "^5.7.1", "node-fetch": "^2.7.0", "node-loader": "^0.6.0", "npm-run-all": "^4.1.5", diff --git a/src/test/suite/oidc.test.ts b/src/test/suite/oidc.test.ts index 054aa5b39..17fcae966 100644 --- a/src/test/suite/oidc.test.ts +++ b/src/test/suite/oidc.test.ts @@ -125,6 +125,7 @@ suite('OIDC Tests', function () { downloadOptions: { enterprise: true }, args: [ '--setParameter', + '--debug', 'authenticationMechanisms=SCRAM-SHA-256,MONGODB-OIDC', // enableTestCommands allows using http:// issuers such as http://localhost '--setParameter', From e92815b06d3115112f5fa94a46e466b4ab55b9c3 Mon Sep 17 00:00:00 2001 From: gagik Date: Thu, 16 Jan 2025 14:09:50 +0100 Subject: [PATCH 3/5] fix(deps): bump mongodb-client-encryption --- package-lock.json | 13 ++++++------- package.json | 2 +- src/test/suite/oidc.test.ts | 35 ++++++++++++++++++++--------------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 844ef0159..3194a3e8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -92,7 +92,7 @@ "mocha": "^10.7.3", "mocha-junit-reporter": "^2.2.1", "mocha-multi": "^1.1.7", - "mongodb-client-encryption": "^6.1.0", + "mongodb-client-encryption": "^6.1.1", "mongodb-rag-core": "^0.4.1", "mongodb-runner": "^5.7.1", "node-fetch": "^2.7.0", @@ -7229,7 +7229,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "devOptional": true, + "optional": true, "dependencies": { "file-uri-to-path": "1.0.0" } @@ -11173,7 +11173,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "devOptional": true + "optional": true }, "node_modules/fill-range": { "version": "7.1.1", @@ -14806,14 +14806,13 @@ } }, "node_modules/mongodb-client-encryption": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.1.0.tgz", - "integrity": "sha512-Y3Hakre82nXD/pNDUzBjxfgwWSj5E1ar9ZLkqyXDfvirv4huHMbg8Q2qVO/TXlNJuf1B2bzrEDXsTqHKQSQLtw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.1.1.tgz", + "integrity": "sha512-hqy68WWNZmkoqldFlpw8TQNaJUOor4YCM/FuxETZTeTZpGEbQwkTwdrQlgiV14qyOizPw8abbAxGi3zX+raA9w==", "devOptional": true, "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { - "bindings": "^1.5.0", "node-addon-api": "^4.3.0", "prebuild-install": "^7.1.2" }, diff --git a/package.json b/package.json index f8985a145..d796f2189 100644 --- a/package.json +++ b/package.json @@ -1289,7 +1289,7 @@ "mocha": "^10.7.3", "mocha-junit-reporter": "^2.2.1", "mocha-multi": "^1.1.7", - "mongodb-client-encryption": "^6.1.0", + "mongodb-client-encryption": "^6.1.1", "mongodb-rag-core": "^0.4.1", "mongodb-runner": "^5.7.1", "node-fetch": "^2.7.0", diff --git a/src/test/suite/oidc.test.ts b/src/test/suite/oidc.test.ts index 17fcae966..ecfec27c9 100644 --- a/src/test/suite/oidc.test.ts +++ b/src/test/suite/oidc.test.ts @@ -119,21 +119,26 @@ suite('OIDC Tests', function () { authNamePrefix: 'dev', }; - cluster = await MongoCluster.start({ - ...defaultClusterOptions, - version: '7.0.x', - downloadOptions: { enterprise: true }, - args: [ - '--setParameter', - '--debug', - 'authenticationMechanisms=SCRAM-SHA-256,MONGODB-OIDC', - // enableTestCommands allows using http:// issuers such as http://localhost - '--setParameter', - 'enableTestCommands=true', - '--setParameter', - `oidcIdentityProviders=${JSON.stringify([serverOidcConfig])}`, - ], - }); + try { + cluster = await MongoCluster.start({ + ...defaultClusterOptions, + version: '7.0.x', + downloadOptions: { enterprise: true }, + args: [ + '--setParameter', + '--debug', + 'authenticationMechanisms=SCRAM-SHA-256,MONGODB-OIDC', + // enableTestCommands allows using http:// issuers such as http://localhost + '--setParameter', + 'enableTestCommands=true', + '--setParameter', + `oidcIdentityProviders=${JSON.stringify([serverOidcConfig])}`, + ], + }); + } catch (error) { + console.error(JSON.stringify((error as any).errorLogEntries, null, 2)); + throw error; + } const cs = new ConnectionString(cluster.connectionString); cs.searchParams.set('authMechanism', 'MONGODB-OIDC'); From d8cbaf2b5e58746ed7a60ebd7cac9e80dbb7eeaa Mon Sep 17 00:00:00 2001 From: Nikola Irinchev Date: Thu, 16 Jan 2025 19:33:58 +0100 Subject: [PATCH 4/5] Use 8.0.x --- src/test/suite/oidc.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/suite/oidc.test.ts b/src/test/suite/oidc.test.ts index ecfec27c9..a78650f07 100644 --- a/src/test/suite/oidc.test.ts +++ b/src/test/suite/oidc.test.ts @@ -122,11 +122,10 @@ suite('OIDC Tests', function () { try { cluster = await MongoCluster.start({ ...defaultClusterOptions, - version: '7.0.x', + version: '8.0.x', downloadOptions: { enterprise: true }, args: [ '--setParameter', - '--debug', 'authenticationMechanisms=SCRAM-SHA-256,MONGODB-OIDC', // enableTestCommands allows using http:// issuers such as http://localhost '--setParameter', From 5ea34799a1bb001276428d13ce5c338aefe0f6e4 Mon Sep 17 00:00:00 2001 From: Nikola Irinchev Date: Fri, 17 Jan 2025 01:28:07 +0100 Subject: [PATCH 5/5] Remove try-catch --- src/test/suite/oidc.test.ts | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/test/suite/oidc.test.ts b/src/test/suite/oidc.test.ts index a78650f07..41aa63099 100644 --- a/src/test/suite/oidc.test.ts +++ b/src/test/suite/oidc.test.ts @@ -119,25 +119,20 @@ suite('OIDC Tests', function () { authNamePrefix: 'dev', }; - try { - cluster = await MongoCluster.start({ - ...defaultClusterOptions, - version: '8.0.x', - downloadOptions: { enterprise: true }, - args: [ - '--setParameter', - 'authenticationMechanisms=SCRAM-SHA-256,MONGODB-OIDC', - // enableTestCommands allows using http:// issuers such as http://localhost - '--setParameter', - 'enableTestCommands=true', - '--setParameter', - `oidcIdentityProviders=${JSON.stringify([serverOidcConfig])}`, - ], - }); - } catch (error) { - console.error(JSON.stringify((error as any).errorLogEntries, null, 2)); - throw error; - } + cluster = await MongoCluster.start({ + ...defaultClusterOptions, + version: '8.0.x', + downloadOptions: { enterprise: true }, + args: [ + '--setParameter', + 'authenticationMechanisms=SCRAM-SHA-256,MONGODB-OIDC', + // enableTestCommands allows using http:// issuers such as http://localhost + '--setParameter', + 'enableTestCommands=true', + '--setParameter', + `oidcIdentityProviders=${JSON.stringify([serverOidcConfig])}`, + ], + }); const cs = new ConnectionString(cluster.connectionString); cs.searchParams.set('authMechanism', 'MONGODB-OIDC');