feat(NODE-4243): drop collection checks ns not found (#4742)

Co-authored-by: bailey <[email protected]>

Author: durran

src/operations/drop.ts

@@ -1,4 +1,4 @@
-import { type Connection, MongoServerError } from '..';
+import { type Connection, type MongoError, MongoServerError } from '..';
 import type { Document } from '../bson';
 import { MongoDBResponse } from '../cmap/wire_protocol/responses';
 import { CursorTimeoutContext } from '../cursor/abstract_cursor';
@@ -40,6 +40,13 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
   override handleOk(_response: InstanceType<typeof this.SERVER_COMMAND_RESPONSE_TYPE>): boolean {
     return true;
   }
+
+  override handleError(error: MongoError): boolean {
+    if (!(error instanceof MongoServerError)) throw error;
+    if (Number(error.code) !== MONGODB_ERROR_CODES.NamespaceNotFound) throw error;
+
+    return false;
+  }
 }
 
 export async function dropCollections(
@@ -83,16 +90,7 @@ export async function dropCollections(
     for (const collectionName of [escCollection, ecocCollection]) {
       // Drop auxilliary collections, ignoring potential NamespaceNotFound errors.
       const dropOp = new DropCollectionOperation(db, collectionName, options);
-      try {
-        await executeOperation(db.client, dropOp, timeoutContext);
-      } catch (err) {
-        if (
-          !(err instanceof MongoServerError) ||
-          err.code !== MONGODB_ERROR_CODES.NamespaceNotFound
-        ) {
-          throw err;
-        }
-      }
+      await executeOperation(db.client, dropOp, timeoutContext);
     }
   }
 

test/benchmarks/driver_bench/src/driver.mts

@@ -202,7 +202,7 @@ export class DriverTester {
     const utilClient = new MongoClient(MONGODB_URI, MONGODB_CLIENT_OPTIONS);
     const db = utilClient.db(DB_NAME);
     const collection = db.collection(COLLECTION_NAME);
-    await collection.drop().catch(() => null);
+    await collection.drop();
     await db.dropDatabase().catch(() => null);
     await utilClient.close();
   }

test/benchmarks/driver_bench/src/suites/multi_bench/grid_fs_download.mts

@@ -20,7 +20,7 @@ export async function before() {
 
   bucket = driver.bucket(driver.client.db(driver.DB_NAME));
 
-  await bucket.drop().catch(() => null);
+  await bucket.drop();
 
   // Create the bucket.
   const stream = bucket.openUploadStream('gridfstest');

test/benchmarks/driver_bench/src/suites/multi_bench/grid_fs_upload.mts

@@ -18,7 +18,7 @@ export async function before() {
 
   bucket = driver.bucket(driver.client.db(driver.DB_NAME));
 
-  await bucket.drop().catch(() => null);
+  await bucket.drop();
 }
 
 export async function beforeEach() {

test/benchmarks/driver_bench/src/suites/parallel_bench/gridfs_multi_file_download.mts

@@ -15,7 +15,7 @@ export async function before() {
   await driver.resetTmpDir();
 
   bucket = driver.bucket(driver.client.db(driver.DB_NAME));
-  await bucket.drop().catch(() => null);
+  await bucket.drop();
 
   const gridfs_multi = path.resolve(PARALLEL_DIRECTORY, 'gridfs_multi');
 

test/benchmarks/driver_bench/src/suites/parallel_bench/gridfs_multi_file_upload.mts

@@ -18,7 +18,7 @@ export async function before() {
 
   bucket = driver.bucket(driver.client.db(driver.DB_NAME));
 
-  await bucket.drop().catch(() => null);
+  await bucket.drop();
 }
 
 export async function beforeEach() {

test/integration/change-streams/change_stream.test.ts

@@ -563,7 +563,7 @@ describe('Change Streams', function () {
     async test() {
       const collection = db.collection('resumeAfterTest2');
 
-      await collection.drop().catch(() => null);
+      await collection.drop();
 
       let resumeToken;
       const docs = [{ a: 0 }, { a: 1 }, { a: 2 }];

test/integration/client-side-encryption/client_side_encryption.prose.06.corpus.test.ts

@@ -143,13 +143,7 @@ describe('Client Side Encryption Prose Corpus Test', function () {
     await client.connect();
     // 3. Using ``client``, drop the collection ``keyvault.datakeys``. Insert the documents `corpus/corpus-key-local.json <../corpus/corpus-key-local.json>`_ and `corpus/corpus-key-aws.json <../corpus/corpus-key-aws.json>`_.
     const keyDb = client.db(keyVaultDbName);
-    await keyDb
-      .dropCollection(keyVaultCollName, { writeConcern: new WriteConcern('majority') })
-      .catch((e: Error) => {
-        if (!/ns/i.test(e.message)) {
-          throw e;
-        }
-      });
+    await keyDb.dropCollection(keyVaultCollName, { writeConcern: new WriteConcern('majority') });
     const keyColl = keyDb.collection(keyVaultCollName);
     await keyColl.insertMany(
       [corpusKeyLocal, corpusKeyAws, corpusKeyAzure, corpusKeyGcp, corpusKeyKmip],
@@ -164,13 +158,7 @@ describe('Client Side Encryption Prose Corpus Test', function () {
     beforeEach(async function () {
       // 2. Using ``client``, drop and create the collection ``db.coll`` configured with the included JSON schema `corpus/corpus-schema.json <../corpus/corpus-schema.json>`_.
       const dataDb = client.db(dataDbName);
-      await dataDb
-        .dropCollection(dataCollName, { writeConcern: new WriteConcern('majority') })
-        .catch((e: Error) => {
-          if (!/ns/i.test(e.message)) {
-            throw e;
-          }
-        });
+      await dataDb.dropCollection(dataCollName, { writeConcern: new WriteConcern('majority') });
       await dataDb.createCollection(dataCollName, {
         validator: { $jsonSchema: corpusSchema },
         writeConcern: new WriteConcern('majority')

test/integration/client-side-encryption/client_side_encryption.prose.14.decryption_events.test.ts

@@ -43,7 +43,7 @@ describe('14. Decryption Events', metadata, function () {
       .collection('decryption_events')
       .deleteMany({})
       .catch(() => null);
-    await db.dropCollection('decryption_events').catch(() => null);
+    await db.dropCollection('decryption_events');
     await db.createCollection('decryption_events');
     // Create a ClientEncryption object named ``clientEncryption`` with these options:
     //   ClientEncryptionOpts {

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

@@ -171,26 +171,12 @@ describe('Range Explicit Encryption', function () {
 
         await utilClient.db('db').dropDatabase();
 
-        await utilClient
-          .db('db')
-          .dropCollection('explicit_encryption')
-          .catch(e => {
-            if (!/ns not found/.test(e.message)) {
-              throw e;
-            }
-          });
+        await utilClient.db('db').dropCollection('explicit_encryption');
         await utilClient.db('db').createCollection('explicit_encryption', {
           encryptedFields
         });
 
-        await utilClient
-          .db('keyvault')
-          .dropCollection('datakeys')
-          .catch(e => {
-            if (!/ns not found/.test(e.message)) {
-              throw e;
-            }
-          });
+        await utilClient.db('keyvault').dropCollection('datakeys');
 
         await utilClient.db('keyvault').createCollection('datakeys');