fix: serverless, add return-await rule

Author: nbbeeken

.eslintrc.json

@@ -201,7 +201,9 @@
       ],
       "parser": "@typescript-eslint/parser",
       "parserOptions": {
-        "project": ["./tsconfig.json"]
+        "project": [
+          "./tsconfig.json"
+        ]
       },
       "extends": [
         "plugin:@typescript-eslint/recommended-requiring-type-checking"
@@ -212,9 +214,13 @@
         "@typescript-eslint/no-unsafe-assignment": "off",
         "@typescript-eslint/no-unsafe-return": "off",
         "@typescript-eslint/no-unsafe-call": "off",
-
         "@typescript-eslint/restrict-plus-operands": "off",
-        "@typescript-eslint/restrict-template-expressions": "off"
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "no-return-await": "off",
+        "@typescript-eslint/return-await": [
+          "error",
+          "in-try-catch"
+        ]
       }
     },
     {

src/bulk/common.ts

@@ -1305,7 +1305,7 @@ export abstract class BulkOperationBase {
       const finalOptions = { ...this.s.options, ...options };
       const operation = new BulkWriteShimOperation(this, finalOptions);
 
-      return await executeOperation(this.s.collection.s.db.s.client, operation);
+      return executeOperation(this.s.collection.s.db.s.client, operation);
     }, callback);
   }
 

src/mongo_client.ts

@@ -590,7 +590,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
     return maybeCallback(async () => {
       options = typeof options !== 'function' ? options : undefined;
       const client = new this(url, options);
-      return await client.connect();
+      return client.connect();
     }, callback);
   }
 

src/operations/drop.ts

@@ -72,7 +72,7 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
         }
       }
 
-      return await this.executeWithoutEncryptedFieldsCheck(server, session);
+      return this.executeWithoutEncryptedFieldsCheck(server, session);
     })().then(
       result => callback(undefined, result),
       err => callback(err)

src/operations/execute_operation.ts

@@ -272,5 +272,5 @@ async function retryOperation<
     );
   }
 
-  return await operation.executeAsync(server, session);
+  return operation.executeAsync(server, session);
 }

test/integration/sessions/sessions.test.ts

@@ -386,13 +386,6 @@ describe('Sessions Spec', function () {
     let testCollection;
 
     beforeEach(async function () {
-      if (this.configuration.isServerless) {
-        if (this.currentTest) {
-          this.currentTest.skipReason =
-            'Serverless actually tests parallel connect which is broken';
-        }
-        return this.skip();
-      }
       utilClient = await this.configuration
         .newClient({ maxPoolSize: 1, monitorCommands: true })
         .connect();
@@ -402,11 +395,12 @@ describe('Sessions Spec', function () {
       await utilClient.close();
 
       // Fresh unused client for the test
-      client = await this.configuration.newClient({ maxPoolSize: 1, monitorCommands: true });
+      client = await this.configuration.newClient({
+        maxPoolSize: 1,
+        monitorCommands: true
+      });
+      await client.connect(); // Parallel connect issue
       testCollection = client.db('test').collection('too.many.sessions');
-
-      utilClient.name = 'ann';
-      client.name = 'bob';
     });
 
     afterEach(async () => {