Merge branch 'main' into ni/cta

mongodb-js · Dec 16, 2024 · 9d87c8d · 9d87c8d
2 parents 156a2cf + 7c26c7a
commit 9d87c8d
Show file tree

Hide file tree

Showing 46 changed files with 1,689 additions and 1,199 deletions.
diff --git a/.evergreen.yml b/.evergreen.yml
@@ -7590,7 +7590,6 @@ functions:
           {
           export NODE_JS_VERSION=${node_js_version}
           source .evergreen/setup-env.sh
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           npm run evergreen-release draft
           }
 
@@ -7608,7 +7607,6 @@ functions:
           node_js_version: ${node_js_version}
         script: |
           set -e
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           .evergreen/run-evergreen-release.sh download-and-list-artifacts
     - command: shell.exec
       params:
@@ -7637,7 +7635,6 @@ functions:
           node_js_version: ${node_js_version}
         script: |
           set -e
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           .evergreen/run-evergreen-release.sh publish -- --dry-run
 
   release_publish:
@@ -7656,7 +7653,6 @@ functions:
           node_js_version: ${node_js_version}
         script: |
           set -e
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           .evergreen/run-evergreen-release.sh publish
 
   run_perf_tests:
@@ -15880,10 +15876,6 @@ buildvariants:
     tasks:
       - name: compile_artifact
       - name: e2e_tests_darwin_x64
-      - name: package_artifact_darwin_x64
-      - name: sign_artifact_darwin_x64
-      - name: package_artifact_darwin_arm64
-      - name: sign_artifact_darwin_arm64
   - name: darwin_arm64
     display_name: "MacOS Big Sur (arm64)"
     run_on: macos-11-arm64
@@ -15892,6 +15884,10 @@ buildvariants:
     tasks:
       - name: compile_artifact
       - name: e2e_tests_darwin_arm64
+      - name: package_artifact_darwin_x64
+      - name: sign_artifact_darwin_x64
+      - name: package_artifact_darwin_arm64
+      - name: sign_artifact_darwin_arm64
 
   - name: linux_compile
     display_name: "Ubuntu 20.04 x64 (Compile and Check)"

diff --git a/.evergreen/compile-artifact.sh b/.evergreen/compile-artifact.sh
@@ -74,7 +74,6 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
   export LD_LIBRARY_PATH=/tmp/m/opt/lib
 fi
 
-export PUPPETEER_SKIP_DOWNLOAD="true"
 npm run evergreen-release compile
 dist/mongosh --version
 dist/mongosh --build-info

diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
@@ -1002,7 +1002,6 @@ functions:
           {
           export NODE_JS_VERSION=${node_js_version}
           source .evergreen/setup-env.sh
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           npm run evergreen-release draft
           }
 
@@ -1020,7 +1019,6 @@ functions:
           node_js_version: ${node_js_version}
         script: |
           set -e
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           .evergreen/run-evergreen-release.sh download-and-list-artifacts
     - command: shell.exec
       params:
@@ -1049,7 +1047,6 @@ functions:
           node_js_version: ${node_js_version}
         script: |
           set -e
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           .evergreen/run-evergreen-release.sh publish -- --dry-run
 
   release_publish:
@@ -1068,7 +1065,6 @@ functions:
           node_js_version: ${node_js_version}
         script: |
           set -e
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           .evergreen/run-evergreen-release.sh publish
 
   run_perf_tests:
@@ -1147,7 +1143,7 @@ tasks:
   ###
   <% for (const { id, packageName } of ALL_UNIT_TESTS) { %>
   - name: test_<% out(id) %>
-    tags: <% out(["assigned_to_jira_team_mongosh_mongosh", "unit-test"]) %>
+    tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
       - name: compile_ts
         variant: linux_compile
@@ -1569,10 +1565,6 @@ buildvariants:
     tasks:
       - name: compile_artifact
       - name: e2e_tests_darwin_x64
-      - name: package_artifact_darwin_x64
-      - name: sign_artifact_darwin_x64
-      - name: package_artifact_darwin_arm64
-      - name: sign_artifact_darwin_arm64
   - name: darwin_arm64
     display_name: "MacOS Big Sur (arm64)"
     run_on: macos-11-arm64
@@ -1581,6 +1573,10 @@ buildvariants:
     tasks:
       - name: compile_artifact
       - name: e2e_tests_darwin_arm64
+      - name: package_artifact_darwin_x64
+      - name: sign_artifact_darwin_x64
+      - name: package_artifact_darwin_arm64
+      - name: sign_artifact_darwin_arm64
 
   - name: linux_compile
     display_name: "Ubuntu 20.04 x64 (Compile and Check)"

diff --git a/.evergreen/package-and-upload-artifact.sh b/.evergreen/package-and-upload-artifact.sh
@@ -13,7 +13,7 @@ if [ "$(uname)" == Linux ]; then
   cp "$(pwd)/../tmp/expansions.yaml" tmp/expansions.yaml
   (cd scripts/docker && bash "$BASEDIR/retry-with-backoff.sh" docker build -t rocky8-package -f rocky8-package.Dockerfile .)
   echo Starting Docker container packaging
-  docker run -e PUPPETEER_SKIP_DOWNLOAD \
+  docker run -e PUPPETEER_SKIP_DOWNLOAD=1 \
     -e EVERGREEN_EXPANSIONS_PATH=/tmp/build/tmp/expansions.yaml \
     -e NODE_JS_VERSION \
     -e PACKAGE_VARIANT \

diff --git a/.evergreen/run-evergreen-release.sh b/.evergreen/run-evergreen-release.sh
@@ -5,5 +5,4 @@ echo "//registry.npmjs.org/:_authToken=${devtoolsbot_npm_token}" > .npmrc
 set -x
 export NODE_JS_VERSION=${node_js_version}
 source .evergreen/setup-env.sh
-export PUPPETEER_SKIP_DOWNLOAD="true"
 npm run evergreen-release $@
diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh
@@ -16,6 +16,7 @@ export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/
 export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
 export IS_MONGOSH_EVERGREEN_CI=1
 export DEBUG="mongodb*,$DEBUG"
+export PUPPETEER_SKIP_DOWNLOAD="true"
 
 if [ "$OS" != "Windows_NT" ]; then
   if which realpath; then # No realpath on macOS, but also not needed there

diff --git a/AUTHORS b/AUTHORS
@@ -44,3 +44,4 @@ Gagik Amaryan <me@gagik.co>
 Nikola Irinchev <irinchev@me.com>
 mongodb-matthew-normyle <120420718+mongodb-matthew-normyle@users.noreply.github.com>
 mongodb-devtools-bot[bot] <189715634+mongodb-devtools-bot[bot]@users.noreply.github.com>
+Dylan Richardson <dylan.jack.richardson@gmail.com>
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **mongosh**.
-This document was automatically generated on Sun Dec 01 2024.
+This document was automatically generated on Mon Dec 16 2024.
 
 ## List of dependencies
 
@@ -177,7 +177,7 @@ Package|Version|License
 **[bplist-parser](#a012056f1b32796d923573a3b1ef72cf36943d95e5e2f6af0f7eeab57a21be24)**|0.2.0|MIT
 **[brace-expansion](#2ba3ee23cc6a2718243e9c0c59ce154058f292965f563aa291b459a414e863cb)**|1.1.11|MIT
 **[browserslist](#a95274c46e5fc3c90b90fdf6cc259a6b44331ddca76e255afd128465621592ed)**|4.23.3|MIT
-**[bson](#f2d0bdff40fb1096ef8f7c55e46c6aaa857f74071c79d0dbe89d52b50d5aad81)**|6.10.0|Apache-2.0
+**[bson](#88bcf6ee33d70cc1bf263aac89726781fb724e29ba9647909ffb24584ef23cf4)**|6.10.1|Apache-2.0
 **[buffer-alloc-unsafe](#1022220a813dd092d3ced592ac36121a00bd08a9c2020e08ad370dc29ed217f0)**|1.1.0|MIT
 **[buffer-alloc](#d5cbc95b9dde4a46cd45334630efe3bc9025c904074bee845376bd60651441c0)**|1.2.0|MIT
 **[buffer-fill](#c3747dfd267829ceeb564a1717d0c65d88d2b366e215f640067abefac59e3fd4)**|1.0.0|MIT
@@ -241,7 +241,7 @@ Package|Version|License
 **[execa](#a0c2c672c3fccddd8bd85ffff34f8f18d893b9f136946e6225b9abc9a8fae10e)**|5.0.0|MIT
 **[execa](#099ba5f976333854bfd5aa2237fd12d883c4477af76007a7963109833edef012)**|7.2.0|MIT
 **[expand-template](#46d3e73ca0d4a8c14e99252386f0a5c1a4fd8b2747331373d7b4da97105c15bb)**|2.0.3|(MIT OR WTFPL)
-**[express](#96b5945aa9b5ba9189eb3e9f50f6522e976d90a93dc42f2f3aa13cbcffb434a2)**|4.21.1|MIT
+**[express](#4d2041a77bd4922bcebeb1bb80240f087b10510d23d4a3142db7206a9feb739a)**|4.21.2|MIT
 **[fast-xml-parser](#ebbe8cacbca0e6da2c884ade309dddffc2df1cf8f3532ffda03e31aa6d3a9a3b)**|4.4.1|MIT
 **[fault](#387740fc7544e813d0a9ad480550d0bb536270783b1ce8c1ee83cd7d18b1472e)**|1.0.4|MIT
 **[fetch-blob](#9a40c73e2482c1cc651991133722a6fedd12dc752d2858a21da24395e6fc8461)**|3.2.0|MIT
@@ -341,7 +341,7 @@ Package|Version|License
 **[mongodb-crypt-library-version](#003bd2892d6f6fdac0613ba8f9a2fbb054ddd1c26901e1d2fc7e83861b21cf4d)**|1.0.5|Apache-2.0
 **[mongodb-log-writer](#c4945018f8490fc8e56e1414e262fcf1b802800e05cd15f2bd6b7a9d0b94af85)**|1.4.2|Apache-2.0
 **[mongodb-redact](#d246d19a773f4cc2f2d0431d018a38295c9f9b1b45cfbe7ee16230056b667453)**|1.1.2|Apache-2.0
-**[mongodb](#c9c06bd3e18f2425756e0f577c44b2aa70191f47342cb344dea10dbc9a784d05)**|6.11.0|Apache-2.0
+**[mongodb](#cb726cf7a5329fc15d51574a4bc2e29682afe46afb788a94370b09643ab98a72)**|6.12.0|Apache-2.0
 **[ms](#484b814b85d5028e34246147c8fc901d33570202bd7cdc3703c0ed1078eba0aa)**|2.0.0|MIT
 **[ms](#0a987b2f79ff37005e452a5afa7dacd3042061a7077054d2ba9cabacd88506d2)**|2.1.2|MIT
 **[ms](#2083576c5af8054927640b4788059806d07e250a26066c9ccb2d928394fb9226)**|2.1.3|MIT
@@ -375,7 +375,7 @@ Package|Version|License
 **[parseurl](#c3fdd1b6fb725cb30e8fed82cf929953b46129d347d8404a4a51b633389fbae8)**|1.3.3|MIT
 **[path-key](#e1a2a032096ace66b422351e00b11b0229e42e4b49c2146f439f8fe442218451)**|3.1.1|MIT
 **[path-key](#8e0734b8abb76579df2174822606e692914e985fc58363a78e6ad4b2a4a5831f)**|4.0.0|MIT
-**[path-to-regexp](#96d230365f414cce8d80ceb9d99d855685dfa922f931b49ea01952a1efe64266)**|0.1.10|MIT
+**[path-to-regexp](#a36c8f7aea129a341c589b7722e2c873fab8a2d01a0c3e2e426f5b28ba793621)**|0.1.12|MIT
 **[path-to-regexp](#571cfd74ecd5ea999273383b83a44bf35d4a62383c67a63fef169cc42eb2d859)**|1.9.0|MIT
 **[picocolors](#f964752f1f8cfd947506fd51ce1c148469ecf3b6f531d826511b720670e556f1)**|1.1.0|ISC
 **[prebuild-install](#93d13a9b3a51a6a802fcd35aa031d3ae7369aa6fd47d3a89f28a6d31ea3c9dc5)**|7.1.2|MIT
@@ -459,7 +459,7 @@ Package|Version|License
 **[xtend](#ef439651e21b69e8811099e984a3a42de35b6d0fc30a5c230715bea4c96e4940)**|4.0.2|MIT
 **[yallist](#63b110ffd18712146937e9f182800c6f2b5783e76d1659a0bd4b457789b0df07)**|3.1.1|ISC
 **[yallist](#d400799c4e1f58dbbbe68b4d9c1b6e80e023f744bd7d16da491005fd8439200f)**|4.0.0|ISC
-**[yargs-parser](#63435b27312552eefd317cb6b5bc59549a3e8c028b3e9510ccd5d5ac644cfa77)**|20.2.4|ISC
+**[yargs-parser](#d114360895423d9e902d0d2591b959ed4b0c309f8cec3e7b22fb6ed5502d1c19)**|20.2.9|ISC
 
 ## Package details
 
@@ -20576,8 +20576,8 @@ License files:
 
 
 
-<a id="f2d0bdff40fb1096ef8f7c55e46c6aaa857f74071c79d0dbe89d52b50d5aad81"></a>
-### [bson](https://www.npmjs.com/package/bson) (version 6.10.0)
+<a id="88bcf6ee33d70cc1bf263aac89726781fb724e29ba9647909ffb24584ef23cf4"></a>
+### [bson](https://www.npmjs.com/package/bson) (version 6.10.1)
 License tags: Apache-2.0
 
 License files:
@@ -22956,8 +22956,8 @@ License files:
       THE SOFTWARE.
 
 
-<a id="96b5945aa9b5ba9189eb3e9f50f6522e976d90a93dc42f2f3aa13cbcffb434a2"></a>
-### [express](https://www.npmjs.com/package/express) (version 4.21.1)
+<a id="4d2041a77bd4922bcebeb1bb80240f087b10510d23d4a3142db7206a9feb739a"></a>
+### [express](https://www.npmjs.com/package/express) (version 4.21.2)
 License tags: MIT
 
 License files:
@@ -27766,8 +27766,8 @@ License files:
 
 
 
-<a id="c9c06bd3e18f2425756e0f577c44b2aa70191f47342cb344dea10dbc9a784d05"></a>
-### [mongodb](https://www.npmjs.com/package/mongodb) (version 6.11.0)
+<a id="cb726cf7a5329fc15d51574a4bc2e29682afe46afb788a94370b09643ab98a72"></a>
+### [mongodb](https://www.npmjs.com/package/mongodb) (version 6.12.0)
 License tags: Apache-2.0
 
 License files:
@@ -28860,8 +28860,8 @@ License files:
 
 
 
-<a id="96d230365f414cce8d80ceb9d99d855685dfa922f931b49ea01952a1efe64266"></a>
-### [path-to-regexp](https://www.npmjs.com/package/path-to-regexp) (version 0.1.10)
+<a id="a36c8f7aea129a341c589b7722e2c873fab8a2d01a0c3e2e426f5b28ba793621"></a>
+### [path-to-regexp](https://www.npmjs.com/package/path-to-regexp) (version 0.1.12)
 License tags: MIT
 
 License files:
@@ -31765,8 +31765,8 @@ License files:
 
 
 
-<a id="63435b27312552eefd317cb6b5bc59549a3e8c028b3e9510ccd5d5ac644cfa77"></a>
-### [yargs-parser](https://www.npmjs.com/package/yargs-parser) (version 20.2.4)
+<a id="d114360895423d9e902d0d2591b959ed4b0c309f8cec3e7b22fb6ed5502d1c19"></a>
+### [yargs-parser](https://www.npmjs.com/package/yargs-parser) (version 20.2.9)
 License tags: ISC
 
 License files: