fix(database): Fix searching for default connection

nestjs · Apr 22, 2019 · 8e43ce2 · 8e43ce2
1 parent 7ddab11
commit 8e43ce2
Show file tree

Hide file tree

Showing 4 changed files with 162 additions and 120 deletions.
diff --git a/lib/health-indicators/database/mongoose.health.ts b/lib/health-indicators/database/mongoose.health.ts
@@ -10,7 +10,11 @@ import {
   TimeoutError as PromiseTimeoutError,
   checkPackages,
 } from '../../utils';
-import { HealthIndicatorResult, TimeoutError } from '../../';
+import {
+  HealthIndicatorResult,
+  TimeoutError,
+  ConnectionNotFoundError,
+} from '../../';
 import { HealthIndicator } from '../health-indicator';
 
 export interface MongoosePingCheckSettings {
@@ -58,7 +62,13 @@ export class MongooseHealthIndicator extends HealthIndicator {
       getConnectionToken,
     } = require('@nestjs/mongoose/dist/common/mongoose.utils') as typeof NestJSMongoose;
 
-    return this.moduleRef.get(getConnectionToken(null));
+    try {
+      return this.moduleRef.get(getConnectionToken() as string, {
+        strict: false,
+      });
+    } catch (err) {
+      return null;
+    }
   }
 
   /**
@@ -90,6 +100,14 @@ export class MongooseHealthIndicator extends HealthIndicator {
     const connection = options.connection || this.getContextConnection();
     const timeout = options.timeout || 1000;
 
+    if (!connection) {
+      throw new ConnectionNotFoundError(
+        this.getStatus(key, isHealthy, {
+          message: 'Connection provider not found in application context',
+        }),
+      );
+    }
+
     try {
       await this.pingDb(connection, timeout);
       isHealthy = true;

diff --git a/lib/health-indicators/database/typeorm.health.ts b/lib/health-indicators/database/typeorm.health.ts
@@ -6,7 +6,7 @@ import { HealthCheckError } from '@godaddy/terminus';
 import * as NestJSTypeOrm from '@nestjs/typeorm';
 
 import { HealthIndicatorResult } from '../../interfaces/health-indicator.interface';
-import { TimeoutError } from '../../errors';
+import { TimeoutError, ConnectionNotFoundError } from '../../errors';
 import {
   TimeoutError as PromiseTimeoutError,
   promiseTimeout,
@@ -54,12 +54,18 @@ export class TypeOrmHealthIndicator extends HealthIndicator {
   /**
    * Returns the connection of the current DI context
    */
-  private getContextConnection(): Connection {
+  private getContextConnection(): Connection | null {
     const {
       getConnectionToken,
     } = require('@nestjs/typeorm/dist/common/typeorm.utils') as typeof NestJSTypeOrm;
 
-    return this.moduleRef.get(getConnectionToken() as string);
+    try {
+      return this.moduleRef.get(getConnectionToken() as string, {
+        strict: false,
+      });
+    } catch (err) {
+      return null;
+    }
   }
 
   /**
@@ -93,6 +99,14 @@ export class TypeOrmHealthIndicator extends HealthIndicator {
       options.connection || this.getContextConnection();
     const timeout = options.timeout || 1000;
 
+    if (!connection) {
+      throw new ConnectionNotFoundError(
+        this.getStatus(key, isHealthy, {
+          message: 'Connection provider not found in application context',
+        }),
+      );
+    }
+
     try {
       await this.pingDb(connection, timeout);
       isHealthy = true;