fix(NNODE-3688): fix lint errors

Author: durran

src/cmap/connect.ts

@@ -10,6 +10,8 @@ import { LEGACY_HELLO_COMMAND } from '../constants';
 import {
   AnyError,
   MongoCompatibilityError,
+  MongoError,
+  MongoErrorLabel,
   MongoInvalidArgumentError,
   MongoNetworkError,
   MongoNetworkTimeoutError,
@@ -182,7 +184,12 @@ function performInitialHandshake(
           );
         }
         provider.auth(authContext, err => {
-          if (err) return callback(err);
+          if (err) {
+            if (err instanceof MongoError) {
+              err.addErrorLabel(MongoErrorLabel.RetryableWriteError);
+            }
+            return callback(err);
+          }
           callback(undefined, conn);
         });
 

test/integration/retryable-reads/retryable_reads.prose.spec.test.ts

@@ -1,13 +1,15 @@
 import { expect } from 'chai';
+import * as semver from 'semver';
 
-const metadata = {
-  requires: {
-    mongodb: '>=4.2.0',
-    topology: ['replicaset', 'sharded', 'load-balanced']
-  }
-};
+import { TopologyType } from '../../../src';
 
-describe.only('Retryable Reads (prose)', metadata, function () {
+const VALID_TOPOLOGIES = [
+  TopologyType.ReplicaSetWithPrimary,
+  TopologyType.Sharded,
+  TopologyType.LoadBalanced
+];
+
+describe('Retryable Reads (prose)', function () {
   const dbName = 'retryable-handshake-tests';
   const collName = 'coll';
   const docs = [
@@ -20,18 +22,26 @@ describe.only('Retryable Reads (prose)', metadata, function () {
   let coll;
 
   beforeEach(function () {
+    if (
+      semver.lt(this.configuration.buildInfo.version, '4.2.0') ||
+      !VALID_TOPOLOGIES.includes(this.configuration.topologyType)
+    ) {
+      this.currentTest.skipReason =
+        'Retryable reads tests require MongoDB 4.2 and higher and no standalone';
+      this.skip();
+    }
     client = this.configuration.newClient({});
     db = client.db(dbName);
     coll = db.collection(collName);
   });
 
   afterEach(async function () {
-    await db.admin().command({
+    await db?.admin().command({
       configureFailPoint: 'failCommand',
       mode: 'off'
     });
-    await coll.drop();
-    await client.close();
+    await coll?.drop();
+    await client?.close();
   });
 
   context('when the handshake fails with a network error', function () {

test/integration/retryable-writes/retryable_writes.spec.prose.test.ts

@@ -1,13 +1,13 @@
 import { expect } from 'chai';
+import * as semver from 'semver';
 
 import { MongoError, MongoServerError, TopologyType } from '../../../src';
 
-const metadata = {
-  requires: {
-    mongodb: '>=4.2.0',
-    topology: ['replicaset', 'sharded', 'load-balanced']
-  }
-};
+const VALID_TOPOLOGIES = [
+  TopologyType.ReplicaSetWithPrimary,
+  TopologyType.Sharded,
+  TopologyType.LoadBalanced
+];
 
 describe('Retryable Writes Spec Prose', () => {
   context('when checking against mmapv1', () => {
@@ -71,7 +71,7 @@ describe('Retryable Writes Spec Prose', () => {
     });
   });
 
-  context('when errors occur in the handshake', metadata, function () {
+  context('when errors occur in the handshake', function () {
     const dbName = 'retryable-handshake-tests';
     const collName = 'coll';
     const docs = [{ _id: 1, x: 11 }];
@@ -80,18 +80,26 @@ describe('Retryable Writes Spec Prose', () => {
     let coll;
 
     beforeEach(function () {
+      if (
+        semver.lt(this.configuration.buildInfo.version, '4.2.0') ||
+        !VALID_TOPOLOGIES.includes(this.configuration.topologyType)
+      ) {
+        this.currentTest.skipReason =
+          'Retryable writes tests require MongoDB 4.2 and higher and no standalone';
+        this.skip();
+      }
       client = this.configuration.newClient({});
       db = client.db(dbName);
       coll = db.collection(collName);
     });
 
     afterEach(async function () {
-      await db.admin().command({
+      await db?.admin().command({
         configureFailPoint: 'failCommand',
         mode: 'off'
       });
-      await coll.drop();
-      await client.close();
+      await coll?.drop();
+      await client?.close();
     });
 
     context('when the handshake fails with a network error', function () {

test/integration/transactions/transactions.prose.spec.test.ts

@@ -1,13 +1,15 @@
 import { expect } from 'chai';
+import * as semver from 'semver';
 
-const metadata = {
-  requires: {
-    mongodb: '>=4.2.0',
-    topology: ['replicaset', 'sharded', 'load-balanced']
-  }
-};
+import { TopologyType } from '../../../src';
 
-describe('Transactions (prose)', metadata, function () {
+const VALID_TOPOLOGIES = [
+  TopologyType.ReplicaSetWithPrimary,
+  TopologyType.Sharded,
+  TopologyType.LoadBalanced
+];
+
+describe('Transactions (prose)', function () {
   const dbName = 'retryable-handshake-tests';
   const collName = 'coll';
   const docs = [{ _id: 1, x: 11 }];
@@ -16,18 +18,26 @@ describe('Transactions (prose)', metadata, function () {
   let coll;
 
   beforeEach(function () {
+    if (
+      semver.lt(this.configuration.buildInfo.version, '4.2.0') ||
+      !VALID_TOPOLOGIES.includes(this.configuration.topologyType)
+    ) {
+      this.currentTest.skipReason =
+        'Transaction tests require MongoDB 4.2 and higher and no standalone';
+      this.skip();
+    }
     client = this.configuration.newClient({});
     db = client.db(dbName);
     coll = db.collection(collName);
   });
 
   afterEach(async function () {
-    await db.admin().command({
+    await db?.admin().command({
       configureFailPoint: 'failCommand',
       mode: 'off'
     });
-    await coll.drop();
-    await client.close();
+    await coll?.drop();
+    await client?.close();
   });
 
   context('when the handshake fails with a network error', function () {
@@ -42,7 +52,7 @@ describe('Transactions (prose)', metadata, function () {
         data: {
           failCommands: ['saslContinue', 'ping'],
           closeConnection: true
-        },
+        }
       });
       await coll.insertOne({ _id: 2, x: 22 }, { session });
       await session.abortTransaction();

test/tools/runner/config.ts

@@ -82,6 +82,7 @@ export class TestConfiguration {
     this.isServerless = !!process.env.SERVERLESS;
     this.topologyType = this.isLoadBalanced ? TopologyType.LoadBalanced : context.topologyType;
     this.buildInfo = context.buildInfo;
+    console.log(this.buildInfo);
     this.options = {
       hosts,
       hostAddresses,