Merge branch 'main' into NODE-3607

Author: durran

.evergreen/config.yml

@@ -2534,7 +2534,7 @@ tasks:
       - func: bootstrap kms servers
       - func: run custom csfle tests
         vars:
-          CSFLE_GIT_REF: cd7e938619aa52ce652d13690780df5f383bbef0
+          CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
   - name: run-custom-csfle-tests-5.0-master
     tags:
       - run-custom-dependency-tests
@@ -2564,7 +2564,7 @@ tasks:
       - func: bootstrap kms servers
       - func: run custom csfle tests
         vars:
-          CSFLE_GIT_REF: cd7e938619aa52ce652d13690780df5f383bbef0
+          CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
   - name: run-custom-csfle-tests-rapid-master
     tags:
       - run-custom-dependency-tests
@@ -2594,7 +2594,7 @@ tasks:
       - func: bootstrap kms servers
       - func: run custom csfle tests
         vars:
-          CSFLE_GIT_REF: cd7e938619aa52ce652d13690780df5f383bbef0
+          CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
   - name: run-custom-csfle-tests-latest-master
     tags:
       - run-custom-dependency-tests

.evergreen/generate_evergreen_tasks.js

@@ -595,7 +595,7 @@ BUILD_VARIANTS.push({
 
 const oneOffFuncAsTasks = [];
 
-const FLE_PINNED_COMMIT = 'cd7e938619aa52ce652d13690780df5f383bbef0';
+const FLE_PINNED_COMMIT = '1524eac203e4145e9f4835e519f1e4663ff15953';
 
 for (const version of ['5.0', 'rapid', 'latest']) {
   for (const ref of [FLE_PINNED_COMMIT, 'master']) {

.evergreen/install-dependencies.sh

@@ -105,4 +105,5 @@ fi
 
 echo "npm version: $(npm -v)"
 
-npm install "${NPM_OPTIONS}"
+# TODO(NODE-5180): remove --force option
+npm install --force "${NPM_OPTIONS}"

.evergreen/run-azure-kms-tests.sh

@@ -9,7 +9,8 @@ source ".evergreen/init-nvm.sh"
 
 set -o xtrace
 
-npm install --force 'mongodb-client-encryption@latest'
+# TODO(NODE-5180): remove --force option
+npm install --force 'mongodb-client-encryption@alpha'
 
 export MONGODB_URI="mongodb://localhost:27017"
 

.evergreen/run-custom-csfle-tests.sh

@@ -52,7 +52,8 @@ popd # mongo-c-driver
 
 pushd libmongocrypt/bindings/node
 
-npm install --production --ignore-scripts
+# TODO(NODE-5180): remove --force option
+npm install --force --production --ignore-scripts
 bash ./etc/build-static.sh
 
 popd # libmongocrypt/bindings/node
@@ -81,7 +82,8 @@ pushd ../csfle-deps-tmp/libmongocrypt/bindings/node
 killall mongocryptd || true
 
 # only prod deps were installed earlier, install devDependencies here (except for mongodb!)
-npm install --ignore-scripts
+# TODO(NODE-5180): remove --force option
+npm install --force --ignore-scripts
 
 # copy mongodb into CSFLE's node_modules
 rm -rf node_modules/mongodb

.evergreen/run-gcp-kms-tests.sh

@@ -9,8 +9,9 @@ source ".evergreen/init-nvm.sh"
 
 set -o xtrace
 
-npm install 'mongodb-client-encryption@latest'
-npm install 'gcp-metadata'
+# TODO(NODE-5180): remove --force option
+npm install --force 'mongodb-client-encryption@alpha'
+npm install --force 'gcp-metadata'
 
 export MONGODB_URI="mongodb://localhost:27017"
 

.evergreen/run-serverless-tests.sh

@@ -10,7 +10,8 @@ if [ -z ${MONGODB_URI+omitted} ]; then echo "MONGODB_URI is unset" && exit 1; fi
 if [ -z ${SERVERLESS_ATLAS_USER+omitted} ]; then echo "SERVERLESS_ATLAS_USER is unset" && exit 1; fi
 if [ -z ${SERVERLESS_ATLAS_PASSWORD+omitted} ]; then echo "SERVERLESS_ATLAS_PASSWORD is unset" && exit 1; fi
 
-npm install 'mongodb-client-encryption@latest'
+# TODO(NODE-5180): remove --force option
+npm install --force 'mongodb-client-encryption@alpha'
 
 npx mocha \
   --config test/mocha_mongodb.json \

.evergreen/run-tests.sh

@@ -52,9 +52,10 @@ else
   source "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
 fi
 
-npm install 'mongodb-client-encryption@latest'
-npm install @mongodb-js/zstd
-npm install snappy
+# TODO(NODE-5180): remove --force option
+npm install --force 'mongodb-client-encryption@alpha'
+npm install --force @mongodb-js/zstd
+npm install --force snappy
 
 export AUTH=$AUTH
 export SINGLE_MONGOS_LB_URI=${SINGLE_MONGOS_LB_URI}

HISTORY.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [5.2.0](https://github.com/mongodb/node-mongodb-native/compare/v5.1.0...v5.2.0) (2023-04-04)
+
+
+### Features
+
+* **NODE-5035:** enable OIDC authentication ([#3577](https://github.com/mongodb/node-mongodb-native/issues/3577)) ([35879f6](https://github.com/mongodb/node-mongodb-native/commit/35879f66dd1bd906d6b38cb7cd21ff1fb51c52a1))
+* **NODE-5036:** reauthenticate OIDC and retry ([#3589](https://github.com/mongodb/node-mongodb-native/issues/3589)) ([a41846d](https://github.com/mongodb/node-mongodb-native/commit/a41846db3d769e2c10aedbf6feec53271fdb0a48))
+* **NODE-5077:** automatic Azure kms credential refresh ([#3599](https://github.com/mongodb/node-mongodb-native/issues/3599)) ([8e87e5c](https://github.com/mongodb/node-mongodb-native/commit/8e87e5c5be04902a75887c968f06325c1c7f0477))
+
+
+### Bug Fixes
+
+* **NODE-3998:** metadata duplication in handshake ([#3615](https://github.com/mongodb/node-mongodb-native/issues/3615)) ([6d894d6](https://github.com/mongodb/node-mongodb-native/commit/6d894d6652d6a286d8a699f4be0a7127a795b1ac))
+* **NODE-4518:** error message with invalid authMechanism is provided (#undefined) ([1a16b7e](https://github.com/mongodb/node-mongodb-native/commit/1a16b7e2c4c2de9890591e9ac0196705684eb62c))
+* **NODE-4854:** set timeout on write and reset on message ([#3582](https://github.com/mongodb/node-mongodb-native/issues/3582)) ([4a7b5ec](https://github.com/mongodb/node-mongodb-native/commit/4a7b5ec7dfcc3d0c4825ee939cb3eaf7bc79347b))
+* **NODE-5106:** prevent multiple mongo client connect()s from leaking topology ([#3596](https://github.com/mongodb/node-mongodb-native/issues/3596)) ([eb836bb](https://github.com/mongodb/node-mongodb-native/commit/eb836bbd1d0029c78acead0ec985ec11ea94f978))
+* **NODE-5126:** find operations fail when passed an ObjectId as filter ([#3604](https://github.com/mongodb/node-mongodb-native/issues/3604)) ([2647b61](https://github.com/mongodb/node-mongodb-native/commit/2647b6154069731f566a4066a01e5d75bc2318b0))
+
 ## [5.1.0](https://github.com/mongodb/node-mongodb-native/compare/v5.0.1...v5.1.0) (2023-02-23)
 
 

docs/4.15/.nojekyll

@@ -0,0 +1 @@
+TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.