From bbdd383ebe89d0e30253fc7d629fd16b21782a9d Mon Sep 17 00:00:00 2001
From: Nikita Nek Dudnik <nikdudnik@gmail.com>
Date: Tue, 26 May 2020 11:31:23 +0200
Subject: [PATCH] fix: PR review clean up

---
 .../src/catalog/DatabaseLocationsCatalog.test.ts     | 12 ++++--------
 .../src/catalog/DatabaseLocationsCatalog.ts          |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts
index e04d0ad5c0..0181b7fc28 100644
--- a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts
+++ b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 import { DatabaseLocationsCatalog } from './DatabaseLocationsCatalog';
-jest.mock('../ingestion/LocationReaders');
-
 import knex from 'knex';
 import path from 'path';
 
 import { Database } from '../database';
-import { getVoidLogger } from '../../../../packages/backend-common/src/logging/voidLogger';
 import { ReaderOutput } from '../ingestion/types';
+import { getVoidLogger } from '@backstage/backend-common';
 
 describe('DatabaseLocationsCatalog', () => {
   const database = knex({
@@ -71,16 +69,14 @@ describe('DatabaseLocationsCatalog', () => {
     const type = 'invalid_type';
     return expect(
       catalog.addLocation({ type, target: 'valid_target' }),
-    ).rejects.toEqual(new Error(`Unknown location type ${type}`));
+    ).rejects.toThrow(/Unknown location type/);
   });
   it('rejects for unreadable target ', async () => {
     const target = 'invalid_target';
     return expect(
       catalog.addLocation({ type: 'valid_type', target }),
-    ).rejects.toEqual(
-      new Error(
-        `Can't read location at ${target} with error: Something is broken`,
-      ),
+    ).rejects.toThrow(
+      `Can't read location at ${target} with error: Something is broken`,
     );
   });
 });
diff --git a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts
index 14d8cf7dec..3f5739eed0 100644
--- a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts
+++ b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts
@@ -29,7 +29,7 @@ export class DatabaseLocationsCatalog implements LocationsCatalog {
     outputs.forEach(output => {
       if (output.type === 'error') {
         throw new Error(
-          `Can't read location at ${location.target} with error: ${output.error.message}`,
+          `Can't read location at ${location.target}, ${output.error}`,
         );
       }
     });