From 96719585cd7d6b6f9e1534c580cf4b1703d17821 Mon Sep 17 00:00:00 2001 From: Shikanime Deva Date: Thu, 25 Jun 2026 15:08:47 +0200 Subject: [PATCH] refactor: merge OpenCds healthcheck into ServiceChain module Signed-off-by: William Phetsinorath Change-Id: I6f501bd1633ceb14edaa9bf2a324ea026a6a6964 --- .../src/modules/healthz/healthz.controller.ts | 4 ++-- .../src/modules/healthz/healthz.module.ts | 4 ++-- .../src/modules/opencds/opencds.module.ts | 11 ----------- .../service-chain-health.service.ts} | 2 +- .../src/modules/service-chain/service-chain.module.ts | 7 +++++-- 5 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 apps/server-nestjs/src/modules/opencds/opencds.module.ts rename apps/server-nestjs/src/modules/{opencds/opencds-health.service.ts => service-chain/service-chain-health.service.ts} (96%) diff --git a/apps/server-nestjs/src/modules/healthz/healthz.controller.ts b/apps/server-nestjs/src/modules/healthz/healthz.controller.ts index b8d3e3a4ed..3b7abf9207 100644 --- a/apps/server-nestjs/src/modules/healthz/healthz.controller.ts +++ b/apps/server-nestjs/src/modules/healthz/healthz.controller.ts @@ -6,8 +6,8 @@ import { ConfigurationService } from '../infrastructure/configuration/configurat import { DatabaseHealthService } from '../infrastructure/database/database-health.service' import { KeycloakHealthService } from '../keycloak/keycloak-health.service' import { NexusHealthService } from '../nexus/nexus-health.service' -import { OpenCdsHealthService } from '../opencds/opencds-health.service' import { RegistryHealthService } from '../registry/registry-health.service' +import { ServiceChainHealthService } from '../service-chain/service-chain-health.service' import { VaultHealthService } from '../vault/vault-health.service' @Controller('api/v1/healthz') @@ -21,7 +21,7 @@ export class HealthzController { @Inject(NexusHealthService) private readonly nexus: NexusHealthService, @Inject(RegistryHealthService) private readonly registry: RegistryHealthService, @Inject(ArgoCDHealthService) private readonly argocd: ArgoCDHealthService, - @Inject(OpenCdsHealthService) private readonly opencds: OpenCdsHealthService, + @Inject(ServiceChainHealthService) private readonly opencds: ServiceChainHealthService, @Inject(ConfigurationService) private readonly config: ConfigurationService, ) {} diff --git a/apps/server-nestjs/src/modules/healthz/healthz.module.ts b/apps/server-nestjs/src/modules/healthz/healthz.module.ts index 94b4281941..729875eda3 100644 --- a/apps/server-nestjs/src/modules/healthz/healthz.module.ts +++ b/apps/server-nestjs/src/modules/healthz/healthz.module.ts @@ -6,8 +6,8 @@ import { ConfigurationModule } from '../infrastructure/configuration/configurati import { DatabaseModule } from '../infrastructure/database/database.module' import { KeycloakModule } from '../keycloak/keycloak.module' import { NexusModule } from '../nexus/nexus.module' -import { OpenCdsModule } from '../opencds/opencds.module' import { RegistryModule } from '../registry/registry.module' +import { ServiceChainModule } from '../service-chain/service-chain.module' import { VaultModule } from '../vault/vault.module' import { HealthzController } from './healthz.controller' @@ -22,7 +22,7 @@ import { HealthzController } from './healthz.controller' RegistryModule, ArgoCDModule, ConfigurationModule, - OpenCdsModule, + ServiceChainModule, ], controllers: [HealthzController], }) diff --git a/apps/server-nestjs/src/modules/opencds/opencds.module.ts b/apps/server-nestjs/src/modules/opencds/opencds.module.ts deleted file mode 100644 index 8b42ddee91..0000000000 --- a/apps/server-nestjs/src/modules/opencds/opencds.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Module } from '@nestjs/common' -import { TerminusModule } from '@nestjs/terminus' -import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' -import { OpenCdsHealthService } from './opencds-health.service' - -@Module({ - imports: [ConfigurationModule, TerminusModule], - providers: [OpenCdsHealthService], - exports: [OpenCdsHealthService], -}) -export class OpenCdsModule {} diff --git a/apps/server-nestjs/src/modules/opencds/opencds-health.service.ts b/apps/server-nestjs/src/modules/service-chain/service-chain-health.service.ts similarity index 96% rename from apps/server-nestjs/src/modules/opencds/opencds-health.service.ts rename to apps/server-nestjs/src/modules/service-chain/service-chain-health.service.ts index f91f493f5b..cb5a2af84d 100644 --- a/apps/server-nestjs/src/modules/opencds/opencds-health.service.ts +++ b/apps/server-nestjs/src/modules/service-chain/service-chain-health.service.ts @@ -3,7 +3,7 @@ import { HealthIndicatorService } from '@nestjs/terminus' import { ConfigurationService } from '../infrastructure/configuration/configuration.service' @Injectable() -export class OpenCdsHealthService { +export class ServiceChainHealthService { constructor( @Inject(ConfigurationService) private readonly config: ConfigurationService, @Inject(HealthIndicatorService) private readonly healthIndicator: HealthIndicatorService, diff --git a/apps/server-nestjs/src/modules/service-chain/service-chain.module.ts b/apps/server-nestjs/src/modules/service-chain/service-chain.module.ts index 537261b97a..58103a0409 100644 --- a/apps/server-nestjs/src/modules/service-chain/service-chain.module.ts +++ b/apps/server-nestjs/src/modules/service-chain/service-chain.module.ts @@ -1,10 +1,12 @@ import { Module } from '@nestjs/common' +import { TerminusModule } from '@nestjs/terminus' import { AuthModule } from '../infrastructure/auth/auth.module' import { ConfigurationModule } from '../infrastructure/configuration/configuration.module' import { DatabaseModule } from '../infrastructure/database/database.module' import { EventsModule } from '../infrastructure/events/events.module' import { UserPermissionModule } from '../infrastructure/permission/user/user.module' import { OpenCdsClientService } from './open-cds-client.service' +import { ServiceChainHealthService } from './service-chain-health.service' import { ServiceChainController } from './service-chain.controller' import { ServiceChainService } from './service-chain.service' @@ -14,10 +16,11 @@ import { ServiceChainService } from './service-chain.service' ConfigurationModule, DatabaseModule, EventsModule, + TerminusModule, UserPermissionModule, ], controllers: [ServiceChainController], - providers: [OpenCdsClientService, ServiceChainService], - exports: [ServiceChainService], + providers: [OpenCdsClientService, ServiceChainHealthService, ServiceChainService], + exports: [ServiceChainService, ServiceChainHealthService], }) export class ServiceChainModule {}