refactor: remove legacy health checks

adonisjs · Jun 11, 2024 · 32f377e · 32f377e
1 parent 44da18c
commit 32f377e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 140 deletions.
diff --git a/src/connection/index.ts b/src/connection/index.ts
@@ -389,26 +389,4 @@ export class Connection extends EventEmitter implements ConnectionContract {
       }
     }
   }
-
-  /**
-   * Returns the healthcheck report for the connection
-   */
-  async getReport(): Promise<HealthCheckResult> {
-    const error = await this.checkWriteHost()
-    let readError: Error | undefined
-
-    if (!error && this.hasReadWriteReplicas) {
-      readError = await this.checkReadHosts()
-    }
-
-    return {
-      connection: this.name,
-      message: readError
-        ? 'Unable to reach one of the read hosts'
-        : error
-          ? 'Unable to reach the database server'
-          : 'Connection is healthy',
-      error: error || readError || null,
-    }
-  }
 }
diff --git a/test/connection/connection.spec.ts b/test/connection/connection.spec.ts
@@ -187,52 +187,4 @@ test.group('Health Checks', (group) => {
 
     await connection.disconnect()
   })
-
-  if (!['sqlite', 'better_sqlite'].includes(process.env.DB!)) {
-    test('get healthcheck report for un-healthy connection', async ({ assert }) => {
-      const connection = new Connection(
-        'primary',
-        Object.assign({}, getConfig(), {
-          connection: {
-            host: 'bad-host',
-          },
-        }),
-        logger
-      )
-      connection.connect()
-
-      const report = await connection.getReport()
-      assert.equal(report.message, 'Unable to reach the database server')
-      assert.exists(report.error)
-
-      await connection.disconnect()
-    }).timeout(0)
-
-    test('get healthcheck report for un-healthy read host', async ({ assert }) => {
-      const connection = new Connection(
-        'primary',
-        Object.assign({}, getConfig(), {
-          replicas: {
-            write: {
-              connection: getConfig().connection,
-            },
-            read: {
-              connection: [
-                getConfig().connection,
-                Object.assign({}, getConfig().connection, { host: 'bad-host', port: 8000 }),
-              ],
-            },
-          },
-        }),
-        logger
-      )
-      connection.connect()
-
-      const report = await connection.getReport()
-      assert.equal(report.message, 'Unable to reach one of the read hosts')
-      assert.exists(report.error)
-
-      await connection.disconnect()
-    }).timeout(0)
-  }
 })
diff --git a/test/connection/connection_manager.spec.ts b/test/connection/connection_manager.spec.ts
@@ -7,7 +7,6 @@
  * file that was distributed with this source code.
  */
 
-import { join } from 'node:path'
 import { test } from '@japa/runner'
 
 import { Connection } from '../../src/connection/index.js'
@@ -19,7 +18,6 @@ import {
   mapToObj,
   logger,
   createEmitter,
-  SQLITE_BASE_PATH,
 } from '../../test-helpers/index.js'
 
 test.group('ConnectionManager', (group) => {
@@ -188,53 +186,4 @@ test.group('ConnectionManager', (group) => {
     manager.patch('primary', getConfig())
     manager.connect('primary')
   }).waitForDone()
-
-  test('get health check report for connections that has enabled health checks', async ({
-    assert,
-  }) => {
-    const manager = new ConnectionManager(logger, createEmitter())
-    manager.add('primary', Object.assign({}, getConfig(), { healthCheck: true }))
-    manager.add('secondary', Object.assign({}, getConfig(), { healthCheck: true }))
-    manager.add('secondary-copy', Object.assign({}, getConfig(), { healthCheck: false }))
-
-    const report = await manager.report()
-    assert.equal(report.health.healthy, true)
-    assert.equal(report.health.message, 'All connections are healthy')
-    assert.lengthOf(report.meta, 2)
-    assert.deepEqual(
-      report.meta.map((node: any) => node.connection),
-      ['primary', 'secondary']
-    )
-
-    await manager.closeAll()
-  })
-
-  test('get health check report when one of the connection is unhealthy', async ({ assert }) => {
-    const manager = new ConnectionManager(logger, createEmitter())
-    manager.add('primary', Object.assign({}, getConfig(), { healthCheck: true }))
-    manager.add(
-      'secondary',
-      Object.assign({}, getConfig(), {
-        healthCheck: true,
-        connection: ['sqlite', 'better_sqlite'].includes(process.env.DB!)
-          ? {
-              filename: join(SQLITE_BASE_PATH, 'nested', 'db.sqlite'),
-            }
-          : {
-              host: 'bad-host',
-            },
-      })
-    )
-    manager.add('secondary-copy', Object.assign({}, getConfig(), { healthCheck: false }))
-
-    const report = await manager.report()
-    assert.equal(report.health.healthy, false)
-    assert.equal(report.health.message, 'One or more connections are not healthy')
-    assert.lengthOf(report.meta, 2)
-    assert.deepEqual(
-      report.meta.map((node: any) => node.connection),
-      ['primary', 'secondary']
-    )
-    await manager.closeAll()
-  }).timeout(0)
 })
diff --git a/test/database/database.spec.ts b/test/database/database.spec.ts
@@ -153,19 +153,6 @@ test.group('Database', (group) => {
     assert.isDefined(result)
     await db.manager.closeAll()
   })
-
-  test('set hasHealthChecks enabled flag to true, when one ore more connections are using health checks', async ({
-    assert,
-  }) => {
-    const config = {
-      connection: 'primary',
-      connections: { primary: Object.assign({}, getConfig(), { healthCheck: true }) },
-    }
-
-    const db = new Database(config, logger, createEmitter())
-    assert.isTrue(db.hasHealthChecksEnabled)
-    await db.manager.closeAll()
-  })
 })
 
 test.group('Database | global transaction', (group) => {

diff --git a/test/orm/model_many_to_many.spec.ts b/test/orm/model_many_to_many.spec.ts
@@ -775,8 +775,8 @@ test.group('Model | ManyToMany | bulk operations', (group) => {
     assert.equal(skills[0].name, 'Programming')
     assert.equal(skills[0].$extras.pivot_user_id, 1)
     assert.equal(skills[0].$extras.pivot_skill_id, 1)
-    assert.instanceOf(skills[0].$extras.pivot_created_at, DateTime)
-    assert.instanceOf(skills[0].$extras.pivot_updated_at, DateTime)
+    assert.instanceOf(skills[0].$extras.pivot_created_at, DateTime as any)
+    assert.instanceOf(skills[0].$extras.pivot_updated_at, DateTime as any)
   })
 })
 
@@ -1337,8 +1337,8 @@ test.group('Model | ManyToMany | preload', (group) => {
     assert.equal(users[0].skills[0].name, 'Programming')
     assert.equal(users[0].skills[0].$extras.pivot_user_id, 1)
     assert.equal(users[0].skills[0].$extras.pivot_skill_id, 1)
-    assert.instanceOf(users[0].skills[0].$extras.pivot_created_at, DateTime)
-    assert.instanceOf(users[0].skills[0].$extras.pivot_updated_at, DateTime)
+    assert.instanceOf(users[0].skills[0].$extras.pivot_created_at, DateTime as any)
+    assert.instanceOf(users[0].skills[0].$extras.pivot_updated_at, DateTime as any)
   })
 
   test('preload relation for many', async ({ fs, assert }) => {
@@ -1540,8 +1540,8 @@ test.group('Model | ManyToMany | preload', (group) => {
     assert.equal(users[0].skills[0].name, 'Programming')
     assert.equal(users[0].skills[0].$extras.pivot_user_id, 1)
     assert.equal(users[0].skills[0].$extras.pivot_skill_id, 1)
-    assert.instanceOf(users[0].skills[0].$extras.pivot_created_at, DateTime)
-    assert.instanceOf(users[0].skills[0].$extras.pivot_updated_at, DateTime)
+    assert.instanceOf(users[0].skills[0].$extras.pivot_created_at, DateTime as any)
+    assert.instanceOf(users[0].skills[0].$extras.pivot_updated_at, DateTime as any)
   })
 
   test('select extra pivot columns', async ({ fs, assert }) => {