Merge branch 'main' into fix-coverage

Author: durran

.evergreen/config.yml

@@ -2753,7 +2753,6 @@ tasks:
             - {key: VERSION, value: latest}
             - {key: TOPOLOGY, value: sharded_cluster}
             - {key: AUTH, value: auth}
-            - {key: TEST_NPM_SCRIPT, value: check:csfle}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run tests
@@ -2769,7 +2768,6 @@ tasks:
             - {key: VERSION, value: rapid}
             - {key: TOPOLOGY, value: sharded_cluster}
             - {key: AUTH, value: auth}
-            - {key: TEST_NPM_SCRIPT, value: check:csfle}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run tests
@@ -2785,7 +2783,6 @@ tasks:
             - {key: VERSION, value: '8.0'}
             - {key: TOPOLOGY, value: sharded_cluster}
             - {key: AUTH, value: auth}
-            - {key: TEST_NPM_SCRIPT, value: check:csfle}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run tests
@@ -2801,7 +2798,6 @@ tasks:
             - {key: VERSION, value: '7.0'}
             - {key: TOPOLOGY, value: sharded_cluster}
             - {key: AUTH, value: auth}
-            - {key: TEST_NPM_SCRIPT, value: check:csfle}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run tests
@@ -2817,7 +2813,6 @@ tasks:
             - {key: VERSION, value: '6.0'}
             - {key: TOPOLOGY, value: sharded_cluster}
             - {key: AUTH, value: auth}
-            - {key: TEST_NPM_SCRIPT, value: check:csfle}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run tests
@@ -2833,7 +2828,6 @@ tasks:
             - {key: VERSION, value: '5.0'}
             - {key: TOPOLOGY, value: sharded_cluster}
             - {key: AUTH, value: auth}
-            - {key: TEST_NPM_SCRIPT, value: check:csfle}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run tests
@@ -2849,7 +2843,6 @@ tasks:
             - {key: VERSION, value: '4.4'}
             - {key: TOPOLOGY, value: sharded_cluster}
             - {key: AUTH, value: auth}
-            - {key: TEST_NPM_SCRIPT, value: check:csfle}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run tests
@@ -2865,7 +2858,6 @@ tasks:
             - {key: VERSION, value: '4.2'}
             - {key: TOPOLOGY, value: sharded_cluster}
             - {key: AUTH, value: auth}
-            - {key: TEST_NPM_SCRIPT, value: check:csfle}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run tests

.evergreen/generate_evergreen_tasks.js

@@ -464,8 +464,7 @@ const MONGOCRYPTD_CSFLE_TASKS = MONGODB_VERSIONS.filter(
       updateExpansions({
         VERSION: mongoVersion,
         TOPOLOGY: 'sharded_cluster',
-        AUTH: 'auth',
-        TEST_NPM_SCRIPT: 'check:csfle'
+        AUTH: 'auth'
       }),
       { func: 'install dependencies' },
       { func: 'bootstrap mongo-orchestration' },

.evergreen/run-tests.sh

@@ -1,19 +1,17 @@
 #!/bin/bash
 # set -o xtrace   # Write all commands first to stderr
-set -o errexit  # Exit the script with error if any of the commands fail
+set -o errexit # Exit the script with error if any of the commands fail
 
 # Supported/used environment variables:
 #       AUTH                    Set to enable authentication. Defaults to "noauth"
 #       SSL                     Set to enable SSL. Defaults to "nossl"
 #       MONGODB_URI             Set the suggested connection MONGODB_URI (including credentials and topology info)
 #       MARCH                   Machine Architecture. Defaults to lowercase uname -m
-#       TEST_NPM_SCRIPT         Script to npm run. Defaults to "integration-coverage"
 #       SKIP_DEPS               Skip installing dependencies
 #       TEST_CSFLE              Set to enforce running csfle tests
 
 AUTH=${AUTH:-noauth}
 MONGODB_URI=${MONGODB_URI:-}
-TEST_NPM_SCRIPT=${TEST_NPM_SCRIPT:-check:integration-coverage}
 COMPRESSOR=${COMPRESSOR:-}
 SKIP_DEPS=${SKIP_DEPS:-true}
 
@@ -28,8 +26,8 @@ fi
 # ssl setup
 SSL=${SSL:-nossl}
 if [ "$SSL" != "nossl" ]; then
-   export SSL_KEY_FILE="$DRIVERS_TOOLS/.evergreen/x509gen/client.pem"
-   export SSL_CA_FILE="$DRIVERS_TOOLS/.evergreen/x509gen/ca.pem"
+  export SSL_KEY_FILE="$DRIVERS_TOOLS/.evergreen/x509gen/client.pem"
+  export SSL_CA_FILE="$DRIVERS_TOOLS/.evergreen/x509gen/ca.pem"
 fi
 
 # run tests
@@ -60,4 +58,4 @@ export MONGODB_URI=${MONGODB_URI}
 export LOAD_BALANCER=${LOAD_BALANCER}
 export TEST_CSFLE=${TEST_CSFLE}
 export COMPRESSOR=${COMPRESSOR}
-npm run "${TEST_NPM_SCRIPT}"
+npm run check:integration-coverage

src/change_stream.ts

@@ -521,8 +521,12 @@ export interface UpdateDescription<TSchema extends Document = Document> {
    *   }
    * ```
    *
-   * This field is only present when there are ambiguous paths that are updated as a part of the update event and `showExpandedEvents`
+   * This field is only present when there are ambiguous paths that are updated as a part of the update event.
+   *
+   * On \<8.2.0 servers, this field is only present when `showExpandedEvents` is set to true.
    * is enabled for the change stream.
+   *
+   * On 8.2.0+ servers, this field is present for update events regardless of whether `showExpandedEvents` is enabled.
    * @sinceServerVersion 6.1.0
    */
   disambiguatedPaths?: Document;

src/client-side-encryption/auto_encrypter.ts

@@ -365,14 +365,10 @@ export class AutoEncrypter {
       const client = await this._mongocryptdClient.connect();
       return client;
     } catch (error) {
-      const { message } = error;
-      if (message && (message.match(/timed out after/) || message.match(/ENOTFOUND/))) {
-        throw new MongoRuntimeError(
-          'Unable to connect to `mongocryptd`, please make sure it is running or in your PATH for auto-spawn',
-          { cause: error }
-        );
-      }
-      throw error;
+      throw new MongoRuntimeError(
+        'Unable to connect to `mongocryptd`, please make sure it is running or in your PATH for auto-spawn',
+        { cause: error }
+      );
     }
   }
 

test/integration/client-side-encryption/client_side_encryption.prose.test.js

@@ -7,7 +7,7 @@ const path = require('path');
 const { dropCollection, APMEventCollector } = require('../shared');
 
 const { EJSON } = BSON;
-const { LEGACY_HELLO_COMMAND, MongoCryptError } = require('../../mongodb');
+const { LEGACY_HELLO_COMMAND, MongoCryptError, MongoRuntimeError } = require('../../mongodb');
 const { MongoServerError, MongoServerSelectionError, MongoClient } = require('../../mongodb');
 const { getEncryptExtraOptions } = require('../../tools/utils');
 
@@ -1177,9 +1177,16 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
           .insertOne({ encrypted: 'test' })
           .catch(e => e);
 
-        expect(insertError).to.be.instanceOf(MongoServerSelectionError);
+        expect(insertError)
+          .to.be.instanceOf(MongoRuntimeError)
+          .to.match(
+            /Unable to connect to `mongocryptd`, please make sure it is running or in your PATH for auto-spawn/
+          );
+
+        const { cause } = insertError;
 
-        expect(insertError, 'Error must contain ECONNREFUSED').to.satisfy(
+        expect(cause).to.be.instanceOf(MongoServerSelectionError);
+        expect(cause, 'Error must contain ECONNREFUSED').to.satisfy(
           error =>
             /ECONNREFUSED/.test(error.message) ||
             !!error.cause?.cause?.errors?.every(e => e.code === 'ECONNREFUSED')