Merge branch 'main' into NODE-7223-v2

Author: durran

.evergreen/config.in.yml

@@ -617,6 +617,9 @@ functions:
           export AWS_ACCESS_KEY_ID=${aws_key}
           export AWS_SECRET_ACCESS_KEY=${aws_secret}
 
+          # use Node20
+          export PATH=/opt/devtools/node20/bin:/opt/dev/tools/bin:$PATH
+
           # Download all the task coverage files.
           # NOTE: All coverage files are too large for V8 to handle the resulting call to
           #       JSON.stringify from within nyc, so with stick to Fermiun to include the

.evergreen/config.yml

@@ -556,6 +556,9 @@ functions:
           export AWS_ACCESS_KEY_ID=${aws_key}
           export AWS_SECRET_ACCESS_KEY=${aws_secret}
 
+          # use Node20
+          export PATH=/opt/devtools/node20/bin:/opt/dev/tools/bin:$PATH
+
           # Download all the task coverage files.
           # NOTE: All coverage files are too large for V8 to handle the resulting call to
           #       JSON.stringify from within nyc, so with stick to Fermiun to include the
@@ -1994,24 +1997,6 @@ tasks:
       - func: install mongodb-client-encryption from source
       - func: assume secrets manager role
       - func: run custom csfle tests
-  - name: test-latest-driver-mongodb-client-encryption-6.0.0
-    tags:
-      - run-custom-dependency-tests
-    commands:
-      - command: expansions.update
-        type: setup
-        params:
-          updates:
-            - {key: NODE_LTS_VERSION, value: 20.19.0}
-            - {key: VERSION, value: '7.0'}
-            - {key: TOPOLOGY, value: replica_set}
-            - {key: CLIENT_ENCRYPTION, value: 'true'}
-      - func: install dependencies
-      - func: bootstrap mongo-orchestration
-      - func: install package
-        vars:
-          PACKAGE: [email protected]
-      - func: run tests
   - name: test-alpine-fle
     tags:
       - alpine-fle
@@ -3205,7 +3190,6 @@ buildvariants:
       - run-custom-csfle-tests-5.0
       - run-custom-csfle-tests-rapid
       - run-custom-csfle-tests-latest
-      - test-latest-driver-mongodb-client-encryption-6.0.0
   - name: rhel8-test-gcp-kms
     display_name: GCP KMS Test
     run_on: debian11-small

.evergreen/generate_evergreen_tasks.js

@@ -623,27 +623,28 @@ for (const serverVersion of ['5.0', 'rapid', 'latest']) {
   });
 }
 
-customDependencyTests.push({
-  name: `test-latest-driver-mongodb-client-encryption-6.0.0`,
-  tags: ['run-custom-dependency-tests'],
-  commands: [
-    updateExpansions({
-      NODE_LTS_VERSION: LOWEST_LTS,
-      VERSION: '7.0',
-      TOPOLOGY: 'replica_set',
-      CLIENT_ENCRYPTION: true
-    }),
-    { func: 'install dependencies' },
-    { func: 'bootstrap mongo-orchestration' },
-    {
-      func: 'install package',
-      vars: {
-        PACKAGE: '[email protected]'
-      }
-    },
-    { func: 'run tests' }
-  ]
-});
+// TODO(NODE-6997): update to 7.0.0 after release
+// customDependencyTests.push({
+//   name: `test-latest-driver-mongodb-client-encryption-6.0.0`,
+//   tags: ['run-custom-dependency-tests'],
+//   commands: [
+//     updateExpansions({
+//       NODE_LTS_VERSION: LOWEST_LTS,
+//       VERSION: '7.0',
+//       TOPOLOGY: 'replica_set',
+//       CLIENT_ENCRYPTION: true
+//     }),
+//     { func: 'install dependencies' },
+//     { func: 'bootstrap mongo-orchestration' },
+//     {
+//       func: 'install package',
+//       vars: {
+//         PACKAGE: '[email protected]'
+//       }
+//     },
+//     { func: 'run tests' }
+//   ]
+// });
 
 const coverageTask = {
   name: 'download and merge coverage'.split(' ').join('-'),

.evergreen/install-mongodb-client-encryption.sh

@@ -12,8 +12,7 @@ rm -rf mongodb-client-encryption
 git clone https://github.com/mongodb-js/mongodb-client-encryption.git
 pushd mongodb-client-encryption
 
-# TODO(NODE-7218): test against latest mongodb-client-encryption
-git checkout aa61a35f5e174cd1c1e247e036093e18c88268c6
+git checkout main
 
 node --version
 npm --version

drivers-evergreen-tools

@@ -34,7 +34,7 @@
     "@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
     "gcp-metadata": "^5.2.0",
     "kerberos": "^2.0.1",
-    "mongodb-client-encryption": ">=6.0.0 <7",
+    "mongodb-client-encryption": "^7.0.0-alpha",
     "snappy": "^7.3.2",
     "socks": "^2.7.1"
   },
@@ -96,7 +96,7 @@
     "js-yaml": "^4.1.0",
     "mocha": "^11.7.1",
     "mocha-sinon": "^2.1.2",
-    "mongodb-client-encryption": "^6.5.0",
+    "mongodb-client-encryption": "^7.0.0-alpha.1",
     "mongodb-legacy": "^6.1.3",
     "nyc": "^15.1.0",
     "prettier": "^3.6.2",
@@ -174,4 +174,4 @@
       "moduleResolution": "node"
     }
   }
-}
+}

package-lock.json

@@ -20,7 +20,6 @@ import type { Topology } from '../sdam/topology';
 import { type Sort } from '../sort';
 import { TimeoutContext } from '../timeout';
 import {
-  applyRetryableWrites,
   getTopology,
   hasAtomicOperators,
   maybeAddIdToDocuments,
@@ -527,15 +526,15 @@ async function executeCommands(
       finalOptions.checkKeys = false;
     }
 
-    if (finalOptions.retryWrites) {
+    if (bulkOperation.retryWrites) {
       if (isUpdateBatch(batch)) {
-        finalOptions.retryWrites =
-          finalOptions.retryWrites && !batch.operations.some(op => op.multi);
+        bulkOperation.retryWrites =
+          bulkOperation.retryWrites && !batch.operations.some(op => op.multi);
       }
 
       if (isDeleteBatch(batch)) {
-        finalOptions.retryWrites =
-          finalOptions.retryWrites && !batch.operations.some(op => op.limit === 0);
+        bulkOperation.retryWrites =
+          bulkOperation.retryWrites && !batch.operations.some(op => op.limit === 0);
       }
     }
 
@@ -859,13 +858,16 @@ export abstract class BulkOperationBase {
   s: BulkOperationPrivate;
   operationId?: number;
   private collection: Collection;
+  /** @internal */
+  retryWrites?: boolean;
 
   /**
    * Create a new OrderedBulkOperation or UnorderedBulkOperation instance
    * @internal
    */
   constructor(collection: Collection, options: BulkWriteOptions, isOrdered: boolean) {
     this.collection = collection;
+    this.retryWrites = collection.db.options?.retryWrites;
     // determine whether bulkOperation is ordered or unordered
     this.isOrdered = isOrdered;
 
@@ -898,10 +900,6 @@ export abstract class BulkOperationBase {
     //   + 1 bytes for null terminator
     const maxKeySize = (maxWriteBatchSize - 1).toString(10).length + 2;
 
-    // Final options for retryable writes
-    let finalOptions = Object.assign({}, options);
-    finalOptions = applyRetryableWrites(finalOptions, collection.db);
-
     // Final results
     const bulkResult: BulkResult = {
       ok: 1,
@@ -943,7 +941,7 @@ export abstract class BulkOperationBase {
       // Topology
       topology,
       // Options
-      options: finalOptions,
+      options: options,
       // BSON options
       bsonOptions: resolveBSONOptions(options),
       // Current operation

package.json

@@ -17,8 +17,7 @@ import {
 import { MongoClient } from './mongo_client';
 import { type InferIdType, TypedEventEmitter } from './mongo_types';
 import type { AggregateOptions } from './operations/aggregate';
-import type { CollationOptions, OperationParent } from './operations/command';
-import type { ReadPreference } from './read_preference';
+import type { OperationParent } from './operations/command';
 import { type AsyncDisposable, configureResourceManagement } from './resource_management';
 import type { ServerSessionId } from './sessions';
 import { CSOTTimeoutContext, type TimeoutContext } from './timeout';
@@ -45,21 +44,6 @@ const NO_RESUME_TOKEN_ERROR =
   'A change stream document has been received that lacks a resume token (_id).';
 const CHANGESTREAM_CLOSED_ERROR = 'ChangeStream is closed';
 
-/**
- * @public
- * @deprecated Please use the ChangeStreamCursorOptions type instead.
- */
-export interface ResumeOptions {
-  startAtOperationTime?: Timestamp;
-  batchSize?: number;
-  maxAwaitTimeMS?: number;
-  collation?: CollationOptions;
-  readPreference?: ReadPreference;
-  resumeAfter?: ResumeToken;
-  startAfter?: ResumeToken;
-  fullDocument?: string;
-}
-
 /**
  * Represents the logical starting point for a new ChangeStream or resuming a ChangeStream on the server.
  * @see https://www.mongodb.com/docs/manual/changeStreams/#std-label-change-stream-resume