Merge branch 'mongodb:main' into NODE-7190

Author: PavelSafronov

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

@@ -12,6 +12,9 @@ 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
+
 node --version
 npm --version
 

.github/dependabot.yml

@@ -27,9 +27,6 @@ updates:
       # chai-subset requires @types/chai 4.x.
       - dependency-name: "@types/chai"
         versions: [">=4.0.0"]
-      # nyc is Node18+ only starting on [email protected].
-      - dependency-name: "nyc"
-        versions: [">=16.0.0"]
       # mocha-plugin-eslint breaks our lint configuration
       - dependency-name: "mocha-plugin-eslint"
         versions: [">=10.0.0"]

src/cmap/errors.ts

@@ -56,7 +56,7 @@ export class PoolClearedError extends MongoNetworkError {
     super(errorMessage, pool.serverError ? { cause: pool.serverError } : undefined);
     this.address = pool.address;
 
-    this.addErrorLabel(MongoErrorLabel.PoolRequstedRetry);
+    this.addErrorLabel(MongoErrorLabel.PoolRequestedRetry);
   }
 
   override get name(): string {

src/error.ts

@@ -97,7 +97,7 @@ export const MongoErrorLabel = Object.freeze({
   ResumableChangeStreamError: 'ResumableChangeStreamError',
   HandshakeError: 'HandshakeError',
   ResetPool: 'ResetPool',
-  PoolRequstedRetry: 'PoolRequstedRetry',
+  PoolRequestedRetry: 'PoolRequestedRetry',
   InterruptInUseConnections: 'InterruptInUseConnections',
   NoWritesPerformed: 'NoWritesPerformed'
 } as const);
@@ -1444,7 +1444,7 @@ export function needsRetryableWriteLabel(
 export function isRetryableWriteError(error: MongoError): boolean {
   return (
     error.hasErrorLabel(MongoErrorLabel.RetryableWriteError) ||
-    error.hasErrorLabel(MongoErrorLabel.PoolRequstedRetry)
+    error.hasErrorLabel(MongoErrorLabel.PoolRequestedRetry)
   );
 }