test(NODE-6101): cherry-pick test fixes from main (#4087)

Co-authored-by: Durran Jordan <[email protected]>
Co-authored-by: Neal Beeken <[email protected]>

Author: 3 people

.evergreen/config.in.yml

@@ -1169,17 +1169,7 @@ tasks:
           binary: bash
           add_expansions_to_env: true
           args:
-            - src/.evergreen/copy-driver-to-azure.sh
-      - command: subprocess.exec
-        type: test
-        params:
-          working_dir: src
-          binary: bash
-          add_expansions_to_env: true
-          env:
-            AZUREKMS_CMD: "env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh"
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
+            - src/.evergreen/copy-driver-to-azure-and-run.sh
 
   - name: "test-azurekms-fail-task"
     commands:
@@ -1269,14 +1259,8 @@ task_groups:
         params:
           working_dir: "src"
           binary: bash
-          add_expansions_to_env: true
-          env:
-            testgcpkms_key_file: ${gcpkms_key_file}
-            GCPKMS_SERVICEACCOUNT: ${gcpkms_service_account}
-            GCPKMS_DRIVERS_TOOLS: ${DRIVERS_TOOLS}
-            GCPKMS_MACHINETYPE: "e2-standard-4"
           args:
-            - .evergreen/setup-gcp-instance.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/setup.sh
       - command: expansions.update
         # Load the GCPKMS_GCLOUD, GCPKMS_INSTANCE, GCPKMS_REGION, and GCPKMS_ZONE expansions.
         params:
@@ -1293,7 +1277,7 @@ task_groups:
             GCPKMS_ZONE: ${GCPKMS_ZONE}
             GCPKMS_INSTANCENAME: ${GCPKMS_INSTANCENAME}
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/delete-instance.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/teardown.sh
     tasks:
       - test-gcpkms-task
 
@@ -1306,9 +1290,10 @@ task_groups:
         params:
           working_dir: "src"
           binary: bash
-          add_expansions_to_env: true
+          env:
+            AZUREKMS_VMNAME_PREFIX: "NODE_DRIVER"
           args:
-            - .evergreen/setup-azure-vm.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh
       - command: expansions.update
         # Load AZUREKMS_VMNAME into the expansions.
         params:
@@ -1324,7 +1309,7 @@ task_groups:
           binary: bash
           add_expansions_to_env: true
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh
     tasks:
       - test-azurekms-task
 

.evergreen/config.yml

@@ -1125,17 +1125,7 @@ tasks:
           binary: bash
           add_expansions_to_env: true
           args:
-            - src/.evergreen/copy-driver-to-azure.sh
-      - command: subprocess.exec
-        type: test
-        params:
-          working_dir: src
-          binary: bash
-          add_expansions_to_env: true
-          env:
-            AZUREKMS_CMD: env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
+            - src/.evergreen/copy-driver-to-azure-and-run.sh
   - name: test-azurekms-fail-task
     commands:
       - command: expansions.update
@@ -3596,14 +3586,8 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
-          env:
-            testgcpkms_key_file: ${gcpkms_key_file}
-            GCPKMS_SERVICEACCOUNT: ${gcpkms_service_account}
-            GCPKMS_DRIVERS_TOOLS: ${DRIVERS_TOOLS}
-            GCPKMS_MACHINETYPE: e2-standard-4
           args:
-            - .evergreen/setup-gcp-instance.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/setup.sh
       - command: expansions.update
         params:
           file: src/testgcpkms-expansions.yml
@@ -3618,7 +3602,7 @@ task_groups:
             GCPKMS_ZONE: ${GCPKMS_ZONE}
             GCPKMS_INSTANCENAME: ${GCPKMS_INSTANCENAME}
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/delete-instance.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/teardown.sh
     tasks:
       - test-gcpkms-task
   - name: test_azurekms_task_group
@@ -3630,9 +3614,10 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
+          env:
+            AZUREKMS_VMNAME_PREFIX: NODE_DRIVER
           args:
-            - .evergreen/setup-azure-vm.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh
       - command: expansions.update
         params:
           file: src/testazurekms-expansions.yml
@@ -3645,7 +3630,7 @@ task_groups:
           binary: bash
           add_expansions_to_env: true
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh
     tasks:
       - test-azurekms-task
   - name: test_atlas_task_group

.evergreen/copy-driver-to-azure.sh renamed to .evergreen/copy-driver-to-azure-and-run.sh

@@ -1,13 +1,16 @@
 #! /usr/bin/env bash
 
 set -o errexit
+source "${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/secrets-export.sh"
 
 if [ -z ${AZUREKMS_RESOURCEGROUP+omitted} ]; then echo "AZUREKMS_RESOURCEGROUP is unset" && exit 1; fi
 if [ -z ${AZUREKMS_VMNAME+omitted} ]; then echo "AZUREKMS_VMNAME is unset" && exit 1; fi
-if [ -z ${AZUREKMS_PRIVATEKEYPATH+omitted} ]; then echo "AZUREKMS_PRIVATEKEYPATH is unset" && exit 1; fi
 
 source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
 
+export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey
+export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
+
 echo "compressing node driver source ... begin"
 tar -czf node-driver-source.tgz src
 echo "compressing node driver source ... end"
@@ -22,3 +25,8 @@ echo "decompressing node driver tar on azure ... begin"
 export AZUREKMS_CMD="tar xf node-driver-source.tgz"
 "${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh"
 echo "decompressing node driver tar on azure ... end"
+
+echo "Running test ... begin"
+export AZUREKMS_CMD="env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh"
+${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
+echo "Running test ... end"

.evergreen/setup-azure-vm.sh

@@ -1,5 +1,7 @@
 #! /usr/bin/env bash
 
+source "${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/secrets-export.sh"
+
 # Assert required environment variables are present without printing them
 if [ -z ${GCPKMS_GCLOUD+omitted} ]; then echo "GCPKMS_GCLOUD is unset" && exit 1; fi
 if [ -z ${GCPKMS_PROJECT+omitted} ]; then echo "GCPKMS_PROJECT is unset" && exit 1; fi

.evergreen/setup-gcp-instance.sh

@@ -20,7 +20,9 @@ const metaData: MongoDBMetadataUI = {
 
     // The Range Explicit Encryption tests require MongoDB server 7.0+ for QE v2.
     // The tests must not run against a standalone.
-    mongodb: '>=7.0.0',
+    //
+    // `rangePreview` is not supported on 8.0+ servers.
+    mongodb: '>=7.0.0 <8.0.0',
     topology: '!single'
   }
 };
@@ -132,7 +134,7 @@ describe('Range Explicit Encryption', function () {
   let encryptedTwoHundred;
   let compareNumericValues;
   for (const { type: dataType, rangeOptions, factory } of dataTypes) {
-    context(`datatype ${dataType}`, async function () {
+    context(`datatype ${dataType}`, function () {
       beforeEach(async function () {
         compareNumericValues = function (value: unknown, expected: number): void {
           if (dataType === 'DoubleNoPrecision' || dataType === 'DoublePrecision') {

.evergreen/setup-gcp-testing.sh

@@ -652,32 +652,37 @@ describe('Bulk', function () {
     }
   });
 
-  it('should correctly execute ordered batch using w:0', function (done) {
-    client.connect((err, client) => {
-      const db = client.db();
-      const col = db.collection('batch_write_ordered_ops_9');
+  it(
+    'should correctly execute ordered batch using w:0',
+    // TODO(NODE-6060): set `moreToCome` op_msg bit when `w: 0` is specified
+    { requires: { mongodb: '<8.0.0' } },
+    function (done) {
+      client.connect((err, client) => {
+        const db = client.db();
+        const col = db.collection('batch_write_ordered_ops_9');
 
-      const bulk = col.initializeOrderedBulkOp();
-      for (let i = 0; i < 100; i++) {
-        bulk.insert({ a: 1 });
-      }
+        const bulk = col.initializeOrderedBulkOp();
+        for (let i = 0; i < 100; i++) {
+          bulk.insert({ a: 1 });
+        }
 
-      bulk.find({ b: 1 }).upsert().update({ b: 1 });
-      bulk.find({ c: 1 }).delete();
+        bulk.find({ b: 1 }).upsert().update({ b: 1 });
+        bulk.find({ c: 1 }).delete();
 
-      bulk.execute({ writeConcern: { w: 0 } }, function (err, result) {
-        expect(err).to.not.exist;
-        test.equal(0, result.upsertedCount);
-        test.equal(0, result.insertedCount);
-        test.equal(0, result.matchedCount);
-        test.ok(0 === result.modifiedCount || result.modifiedCount == null);
-        test.equal(0, result.deletedCount);
-        test.equal(false, result.hasWriteErrors());
+        bulk.execute({ writeConcern: { w: 0 } }, function (err, result) {
+          expect(err).to.not.exist;
+          test.equal(0, result.upsertedCount);
+          test.equal(0, result.insertedCount);
+          test.equal(0, result.matchedCount);
+          test.ok(0 === result.modifiedCount || result.modifiedCount == null);
+          test.equal(0, result.deletedCount);
+          test.equal(false, result.hasWriteErrors());
 
-        client.close(done);
+          client.close(done);
+        });
       });
-    });
-  });
+    }
+  );
 
   it('should correctly handle single unordered batch API', function (done) {
     client.connect((err, client) => {

test/integration/client-side-encryption/client_side_encryption.prose.22.range_explicit_encryption.test.ts

@@ -54,7 +54,7 @@
   "key_vault_data": [],
   "tests": [
     {
-      "description": "FLE2 encrypt fails with mising key",
+      "description": "FLE2 encrypt fails with missing key",
       "clientOptions": {
         "autoEncryptOpts": {
           "kmsProviders": {
@@ -85,7 +85,7 @@
       ]
     },
     {
-      "description": "FLE2 decrypt fails with mising key",
+      "description": "FLE2 decrypt fails with missing key",
       "clientOptions": {
         "autoEncryptOpts": {
           "kmsProviders": {

test/integration/crud/bulk.test.ts

@@ -19,7 +19,7 @@ data: [
 encrypted_fields: {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]}
 key_vault_data: []
 tests:
-  - description: "FLE2 encrypt fails with mising key"
+  - description: "FLE2 encrypt fails with missing key"
     clientOptions:
       autoEncryptOpts:
         kmsProviders:
@@ -30,7 +30,7 @@ tests:
           document: { _id: 1, encryptedIndexed: "123" }
         result:
           errorContains: "not all keys requested were satisfied"
-  - description: "FLE2 decrypt fails with mising key"
+  - description: "FLE2 decrypt fails with missing key"
     clientOptions:
       autoEncryptOpts:
         kmsProviders: