Get rid of error wrapping (#213)

pkosiec · Dec 8, 2023 · b9a1542 · b9a1542
1 parent 49ebbaf
commit b9a1542
Show file tree

Hide file tree

Showing 10 changed files with 2,020 additions and 1,838 deletions.
diff --git a/cli/package-lock.json b/cli/package-lock.json
diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/src/index.ts b/core/src/index.ts
@@ -60,19 +60,15 @@ export class Seeder {
   ): SeederCollection[] => {
     const config = mergeCollectionReadingOptions(partialConfig);
     let collections;
-    try {
-      const { CollectionPopulator } = require('./populator');
-      const populator = new CollectionPopulator(
-        config.extensions,
-        config.ejsonParseOptions,
-        this.log,
-      );
+    const { CollectionPopulator } = require('./populator');
+    const populator = new CollectionPopulator(
+      config.extensions,
+      config.ejsonParseOptions,
+      this.log,
+    );
 
-      this.log(`Reading collections from ${path}...`);
-      collections = populator.readFromPath(path);
-    } catch (err) {
-      throw wrapError(err as Error);
-    }
+    this.log(`Reading collections from ${path}...`);
+    collections = populator.readFromPath(path);
 
     if (config.transformers.length > 0) {
       this.log('Transforming collections...');
@@ -138,8 +134,6 @@ export class Seeder {
         config.bulkWriteOptions,
         this.log,
       ).import(collections);
-    } catch (err) {
-      throw wrapError(err as Error);
     } finally {
       if (database) {
         await database.closeConnection();
@@ -149,14 +143,3 @@ export class Seeder {
     this.log('Finishing...');
   };
 }
-
-/**
- * Wraps error with custom name
- *
- * @param err Original error
- */
-const wrapError = (err: Error) => {
-  err.name = 'MongoSeedingError';
-  err.message = `${err.name}: ${err.message}`;
-  return err;
-};
diff --git a/core/test/integration/index.ts b/core/test/integration/index.ts
@@ -222,21 +222,26 @@ describe('Mongo Seeding', () => {
 
   it('should throw error when wrong path given', async () => {
     const seeder = new Seeder();
-    await expect(() =>
+
+    expect(() =>
       seeder.readCollectionsFromPath('/this/path/surely/doesnt/exist'),
-    ).toThrowError('Error: ENOENT');
+    ).toThrow(
+      `ENOENT: no such file or directory, scandir '/this/path/surely/doesnt/exist'`,
+    );
   });
 
   it('should throw error when cannot connect to database', async () => {
     const config: DeepPartial<SeederConfig> = {
       database: 'mongodb://foo:bar@localhost:27017/name',
-      databaseReconnectTimeout: 1,
+      databaseReconnectTimeout: 1000,
     };
 
     const path = `${IMPORT_DATA_DIR}/index-import`;
     const seeder = new Seeder(config);
     const collections = seeder.readCollectionsFromPath(path);
 
-    await expect(seeder.import(collections)).rejects.toThrowError('Error');
+    await expect(() => seeder.import(collections)).rejects.toThrow(
+      `Error connecting to database: MongoServerError: Authentication failed.`,
+    );
   });
 });
diff --git a/docker-image/test/tester/package-lock.json b/docker-image/test/tester/package-lock.json
diff --git a/examples/custom-docker-image/sample-data/package-lock.json b/examples/custom-docker-image/sample-data/package-lock.json