more strict error type checking in most packages and backend plugins

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

packages/backend-common/src/database/connectors/postgres.ts

@@ -17,6 +17,7 @@
 import knexFactory, { Knex } from 'knex';
 
 import { Config } from '@backstage/config';
+import { ForwardedError } from '@backstage/errors';
 import { mergeDatabaseConfig } from '../config';
 import { DatabaseConnector } from '../types';
 import defaultNameOverride from './defaultNameOverride';
@@ -94,8 +95,7 @@ function requirePgConnectionString() {
   try {
     return require('pg-connection-string').parse;
   } catch (e) {
-    const message = `Postgres: Install 'pg-connection-string'`;
-    throw new Error(`${message}\n${e.message}`);
+    throw new ForwardedError("Postgres: Install 'pg-connection-string'", e);
   }
 }
 

packages/backend-common/src/reading/AwsS3UrlReader.test.ts

@@ -167,7 +167,7 @@ describe('AwsS3UrlReader', () => {
         ),
       ).rejects.toThrow(
         Error(
-          `Could not retrieve file from S3: not a valid AWS S3 URL: https://test-bucket.s3.us-east-2.NOTamazonaws.com/file.yaml`,
+          `Could not retrieve file from S3; caused by Error: not a valid AWS S3 URL: https://test-bucket.s3.us-east-2.NOTamazonaws.com/file.yaml`,
         ),
       );
     });
@@ -216,7 +216,7 @@ describe('AwsS3UrlReader', () => {
         ),
       ).rejects.toThrow(
         Error(
-          `Could not retrieve file from S3: not a valid AWS S3 URL: https://test-bucket.s3.us-east-2.NOTamazonaws.com/file.yaml`,
+          `Could not retrieve file from S3; caused by Error: not a valid AWS S3 URL: https://test-bucket.s3.us-east-2.NOTamazonaws.com/file.yaml`,
         ),
       );
     });

packages/backend-common/src/reading/AwsS3UrlReader.ts

@@ -27,6 +27,7 @@ import {
 } from './types';
 import getRawBody from 'raw-body';
 import { AwsS3Integration, ScmIntegrations } from '@backstage/integration';
+import { ForwardedError } from '@backstage/errors';
 import { ListObjectsV2Output, ObjectList } from 'aws-sdk/clients/s3';
 
 const parseURL = (
@@ -162,7 +163,7 @@ export class AwsS3UrlReader implements UrlReader {
         etag: etag,
       };
     } catch (e) {
-      throw new Error(`Could not retrieve file from S3: ${e.message}`);
+      throw new ForwardedError('Could not retrieve file from S3', e);
     }
   }
 
@@ -203,7 +204,7 @@ export class AwsS3UrlReader implements UrlReader {
 
       return await this.deps.treeResponseFactory.fromReadableArray(responses);
     } catch (e) {
-      throw new Error(`Could not retrieve file tree from S3: ${e.message}`);
+      throw new ForwardedError('Could not retrieve file tree from S3', e);
     }
   }
 

packages/backend-common/src/reading/integration.test.ts

@@ -15,6 +15,7 @@
  */
 
 import { ConfigReader } from '@backstage/config';
+import { isError } from '@backstage/errors';
 import { getVoidLogger } from '../logging';
 import { UrlReaders } from './UrlReaders';
 
@@ -71,7 +72,10 @@ function withRetries(count: number, fn: () => Promise<void>) {
         error = err;
       }
     }
-    if (!error.message.match(/rate limit|Too Many Requests/)) {
+    if (
+      isError(error) &&
+      !error.message.match(/rate limit|Too Many Requests/)
+    ) {
       throw error;
     } else {
       console.warn('Request was rate limited', error);

packages/backend-common/src/util/DockerContainerRunner.ts

@@ -16,6 +16,7 @@
 
 import Docker from 'dockerode';
 import fs from 'fs-extra';
+import { ForwardedError } from '@backstage/errors';
 import { PassThrough } from 'stream';
 import { ContainerRunner, RunContainerOptions } from './ContainerRunner';
 
@@ -45,8 +46,9 @@ export class DockerContainerRunner implements ContainerRunner {
     try {
       await this.dockerClient.ping();
     } catch (e) {
-      throw new Error(
-        `This operation requires Docker. Docker does not appear to be available. Docker.ping() failed with: ${e.message}`,
+      throw new ForwardedError(
+        'This operation requires Docker. Docker does not appear to be available. Docker.ping() failed with',
+        e,
       );
     }