From c2b4a735b3967f995333183a2f61d3e6b14cc888 Mon Sep 17 00:00:00 2001 From: Shikanime Deva Date: Wed, 15 Jul 2026 18:21:21 +0200 Subject: [PATCH] refactor(server-nestjs): migrate health modules from HealthIndicatorService to TerminusModule Replace per-module HealthIndicatorService provider registration with TerminusModule import, aligning health-check wiring across argocd, gitlab, database, keycloak, nexus, opencds, registry, sonarqube and vault modules. Signed-off-by: Shikanime Deva Change-Id: Ie6aa90c5f5bfe8108e5dbbc056f7f0b76a6a6964 --- .../src/modules/argocd/argocd.module.ts | 8 ++++---- .../src/modules/gitlab/gitlab.module.ts | 7 +++---- .../infrastructure/database/database.module.ts | 8 ++++---- .../src/modules/keycloak/keycloak.module.ts | 7 +++---- .../src/modules/nexus/nexus.module.ts | 15 +++++++++++---- .../src/modules/opencds/opencds.module.ts | 8 ++++---- .../src/modules/registry/registry.module.ts | 8 ++++---- .../src/modules/sonarqube/sonarqube.module.ts | 7 +++---- .../src/modules/vault/vault.module.ts | 7 +++---- 9 files changed, 39 insertions(+), 36 deletions(-) diff --git a/apps/server-nestjs/src/modules/argocd/argocd.module.ts b/apps/server-nestjs/src/modules/argocd/argocd.module.ts index 46a5e69222..efd8cdcd61 100644 --- a/apps/server-nestjs/src/modules/argocd/argocd.module.ts +++ b/apps/server-nestjs/src/modules/argocd/argocd.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common' -import { HealthIndicatorService } from '@nestjs/terminus' +import { TerminusModule } from '@nestjs/terminus' import { GitlabModule } from '../gitlab/gitlab.module' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { InfrastructureModule } from '../infrastructure/infrastructure.module' @@ -10,8 +10,8 @@ import { ArgoCDPluginService } from './argocd-plugin.service' import { ArgoCDService } from './argocd.service' @Module({ - imports: [ConfigurationModule, InfrastructureModule, GitlabModule, VaultModule], - providers: [HealthIndicatorService, ArgoCDHealthService, ArgoCDPluginService, ArgoCDService, ArgoCDDatastoreService], + imports: [ConfigurationModule, InfrastructureModule, TerminusModule, GitlabModule, VaultModule], + providers: [ArgoCDHealthService, ArgoCDPluginService, ArgoCDService, ArgoCDDatastoreService], exports: [ArgoCDHealthService, ArgoCDPluginService, ArgoCDService], }) -export class ArgoCDModule {} +export class ArgoCDModule {} \ No newline at end of file diff --git a/apps/server-nestjs/src/modules/gitlab/gitlab.module.ts b/apps/server-nestjs/src/modules/gitlab/gitlab.module.ts index a5c47613db..e24ac626b4 100644 --- a/apps/server-nestjs/src/modules/gitlab/gitlab.module.ts +++ b/apps/server-nestjs/src/modules/gitlab/gitlab.module.ts @@ -1,6 +1,6 @@ import { Gitlab } from '@gitbeaker/rest' import { Module } from '@nestjs/common' -import { HealthIndicatorService } from '@nestjs/terminus' +import { TerminusModule } from '@nestjs/terminus' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { InfrastructureModule } from '../infrastructure/infrastructure.module' @@ -12,7 +12,7 @@ import { GitlabPluginService } from './gitlab-plugin.service' import { GitlabService } from './gitlab.service' @Module({ - imports: [ConfigurationModule, InfrastructureModule, VaultModule], + imports: [ConfigurationModule, InfrastructureModule, TerminusModule, VaultModule], providers: [ { provide: GITLAB_REST_CLIENT, @@ -22,7 +22,6 @@ import { GitlabService } from './gitlab.service' host: config.getInternalOrPublicGitlabUrl(), }), }, - HealthIndicatorService, GitlabClientService, GitlabDatastoreService, GitlabHealthService, @@ -31,4 +30,4 @@ import { GitlabService } from './gitlab.service' ], exports: [GitlabClientService, GitlabHealthService, GitlabPluginService, GitlabService], }) -export class GitlabModule {} +export class GitlabModule {} \ No newline at end of file diff --git a/apps/server-nestjs/src/modules/infrastructure/database/database.module.ts b/apps/server-nestjs/src/modules/infrastructure/database/database.module.ts index 9545c2ddd2..af4dcea214 100644 --- a/apps/server-nestjs/src/modules/infrastructure/database/database.module.ts +++ b/apps/server-nestjs/src/modules/infrastructure/database/database.module.ts @@ -1,13 +1,13 @@ import { Module } from '@nestjs/common' -import { HealthIndicatorService } from '@nestjs/terminus' +import { TerminusModule } from '@nestjs/terminus' import { ConfigurationModule } from '../configuration/configuration.module' import { DatabaseHealthService } from './database-health.service' import { DatabaseService } from './database.service' import { PrismaService } from './prisma.service' @Module({ - imports: [ConfigurationModule], - providers: [HealthIndicatorService, DatabaseHealthService, DatabaseService, PrismaService], + imports: [ConfigurationModule, TerminusModule], + providers: [DatabaseHealthService, DatabaseService, PrismaService], exports: [DatabaseHealthService, DatabaseService, PrismaService], }) -export class DatabaseModule {} +export class DatabaseModule {} \ No newline at end of file diff --git a/apps/server-nestjs/src/modules/keycloak/keycloak.module.ts b/apps/server-nestjs/src/modules/keycloak/keycloak.module.ts index 6c510357ce..13198b2b27 100644 --- a/apps/server-nestjs/src/modules/keycloak/keycloak.module.ts +++ b/apps/server-nestjs/src/modules/keycloak/keycloak.module.ts @@ -1,6 +1,6 @@ import KcAdminClient from '@keycloak/keycloak-admin-client' import { Module } from '@nestjs/common' -import { HealthIndicatorService } from '@nestjs/terminus' +import { TerminusModule } from '@nestjs/terminus' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { ConfigurationService } from '../infrastructure/configuration/configuration.service' import { InfrastructureModule } from '../infrastructure/infrastructure.module' @@ -11,7 +11,7 @@ import { KeycloakPluginService } from './keycloak-plugin.service' import { KeycloakService } from './keycloak.service' @Module({ - imports: [ConfigurationModule, InfrastructureModule], + imports: [ConfigurationModule, InfrastructureModule, TerminusModule], providers: [ { provide: KEYCLOAK_ADMIN_CLIENT, @@ -20,7 +20,6 @@ import { KeycloakService } from './keycloak.service' baseUrl: config.getKeycloakUrl(), }), }, - HealthIndicatorService, KeycloakClientService, KeycloakDatastoreService, KeycloakHealthService, @@ -29,4 +28,4 @@ import { KeycloakService } from './keycloak.service' ], exports: [KeycloakClientService, KeycloakHealthService, KeycloakPluginService, KeycloakService], }) -export class KeycloakModule {} +export class KeycloakModule {} \ No newline at end of file diff --git a/apps/server-nestjs/src/modules/nexus/nexus.module.ts b/apps/server-nestjs/src/modules/nexus/nexus.module.ts index 6d423a6d7f..99106dffd4 100644 --- a/apps/server-nestjs/src/modules/nexus/nexus.module.ts +++ b/apps/server-nestjs/src/modules/nexus/nexus.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common' -import { HealthIndicatorService } from '@nestjs/terminus' +import { TerminusModule } from '@nestjs/terminus' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { InfrastructureModule } from '../infrastructure/infrastructure.module' import { VaultModule } from '../vault/vault.module' @@ -11,8 +11,15 @@ import { NexusPluginService } from './nexus-plugin.service' import { NexusService } from './nexus.service' @Module({ - imports: [ConfigurationModule, InfrastructureModule, VaultModule], - providers: [HealthIndicatorService, NexusHealthService, NexusPluginService, NexusService, NexusDatastoreService, NexusHttpClientService, NexusClientService], + imports: [ConfigurationModule, InfrastructureModule, TerminusModule, VaultModule], + providers: [ + NexusHealthService, + NexusPluginService, + NexusService, + NexusDatastoreService, + NexusHttpClientService, + NexusClientService, + ], exports: [NexusClientService, NexusHealthService, NexusPluginService, NexusService], }) -export class NexusModule {} +export class NexusModule {} \ No newline at end of file diff --git a/apps/server-nestjs/src/modules/opencds/opencds.module.ts b/apps/server-nestjs/src/modules/opencds/opencds.module.ts index 88f1de1de0..169a149d32 100644 --- a/apps/server-nestjs/src/modules/opencds/opencds.module.ts +++ b/apps/server-nestjs/src/modules/opencds/opencds.module.ts @@ -1,11 +1,11 @@ import { Module } from '@nestjs/common' -import { HealthIndicatorService } from '@nestjs/terminus' +import { TerminusModule } from '@nestjs/terminus' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { OpenCdsHealthService } from './opencds-health.service' @Module({ - imports: [ConfigurationModule], - providers: [HealthIndicatorService, OpenCdsHealthService], + imports: [ConfigurationModule, TerminusModule], + providers: [OpenCdsHealthService], exports: [OpenCdsHealthService], }) -export class OpenCdsModule {} +export class OpenCdsModule {} \ No newline at end of file diff --git a/apps/server-nestjs/src/modules/registry/registry.module.ts b/apps/server-nestjs/src/modules/registry/registry.module.ts index 488d2e2a6b..fe494a1cad 100644 --- a/apps/server-nestjs/src/modules/registry/registry.module.ts +++ b/apps/server-nestjs/src/modules/registry/registry.module.ts @@ -1,6 +1,6 @@ import { CacheModule } from '@nestjs/cache-manager' import { Module } from '@nestjs/common' -import { HealthIndicatorService } from '@nestjs/terminus' +import { TerminusModule } from '@nestjs/terminus' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { InfrastructureModule } from '../infrastructure/infrastructure.module' import { VaultModule } from '../vault/vault.module' @@ -12,8 +12,8 @@ import { RegistryPluginService } from './registry-plugin.service' import { RegistryService } from './registry.service' @Module({ - imports: [ConfigurationModule, InfrastructureModule, VaultModule, CacheModule.register()], - providers: [HealthIndicatorService, RegistryHealthService, RegistryPluginService, RegistryService, RegistryDatastoreService, RegistryHttpClientService, RegistryClientService], + imports: [ConfigurationModule, InfrastructureModule, TerminusModule, VaultModule, CacheModule.register()], + providers: [RegistryHealthService, RegistryPluginService, RegistryService, RegistryDatastoreService, RegistryHttpClientService, RegistryClientService], exports: [RegistryHealthService, RegistryPluginService, RegistryService], }) -export class RegistryModule {} +export class RegistryModule {} \ No newline at end of file diff --git a/apps/server-nestjs/src/modules/sonarqube/sonarqube.module.ts b/apps/server-nestjs/src/modules/sonarqube/sonarqube.module.ts index ee9e401918..1772a79319 100644 --- a/apps/server-nestjs/src/modules/sonarqube/sonarqube.module.ts +++ b/apps/server-nestjs/src/modules/sonarqube/sonarqube.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common' -import { HealthIndicatorService } from '@nestjs/terminus' +import { TerminusModule } from '@nestjs/terminus' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { InfrastructureModule } from '../infrastructure/infrastructure.module' import { VaultModule } from '../vault/vault.module' @@ -11,9 +11,8 @@ import { SonarqubePluginService } from './sonarqube-plugin.service' import { SonarqubeService } from './sonarqube.service' @Module({ - imports: [ConfigurationModule, InfrastructureModule, VaultModule], + imports: [ConfigurationModule, InfrastructureModule, TerminusModule, VaultModule], providers: [ - HealthIndicatorService, SonarqubeHttpClientService, SonarqubeClientService, SonarqubeDatastoreService, @@ -23,4 +22,4 @@ import { SonarqubeService } from './sonarqube.service' ], exports: [SonarqubeClientService, SonarqubeHealthService, SonarqubePluginService, SonarqubeService], }) -export class SonarqubeModule {} +export class SonarqubeModule {} \ No newline at end of file diff --git a/apps/server-nestjs/src/modules/vault/vault.module.ts b/apps/server-nestjs/src/modules/vault/vault.module.ts index 99bd187262..10cf3fb097 100644 --- a/apps/server-nestjs/src/modules/vault/vault.module.ts +++ b/apps/server-nestjs/src/modules/vault/vault.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common' -import { HealthIndicatorService } from '@nestjs/terminus' +import { TerminusModule } from '@nestjs/terminus' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { InfrastructureModule } from '../infrastructure/infrastructure.module' import { VaultClientService } from './vault-client.service' @@ -10,9 +10,8 @@ import { VaultPluginService } from './vault-plugin.service' import { VaultService } from './vault.service' @Module({ - imports: [ConfigurationModule, InfrastructureModule], + imports: [ConfigurationModule, InfrastructureModule, TerminusModule], providers: [ - HealthIndicatorService, VaultHealthService, VaultHttpClientService, VaultClientService, @@ -22,4 +21,4 @@ import { VaultService } from './vault.service' ], exports: [VaultClientService, VaultHealthService, VaultPluginService, VaultService], }) -export class VaultModule {} +export class VaultModule {} \ No newline at end of file