Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion apps/server-nestjs/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
import eslintConfigBase from '@cpn-console/eslint-config'
import nestjsTyped from '@darraghor/eslint-plugin-nestjs-typed'

export default eslintConfigBase
export default eslintConfigBase.append({
plugins: {
'@darraghor/nestjs-typed': nestjsTyped,
},
rules: {
'@darraghor/nestjs-typed/sort-module-metadata-arrays': 'error',
},
}).append(nestjsTyped.configs.flatNoSwagger)
1 change: 1 addition & 0 deletions apps/server-nestjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/test-utils": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@darraghor/eslint-plugin-nestjs-typed": "catalog:tools",
"@eslint/eslintrc": "catalog:tools",
"@eslint/js": "catalog:tools",
"@faker-js/faker": "catalog:test",
Expand Down
2 changes: 1 addition & 1 deletion apps/server-nestjs/src/modules/argocd/argocd.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { ArgoCDService } from './argocd.service'

@Module({
imports: [ConfigurationModule, DatabaseModule, GitlabModule, TerminusModule, VaultModule],
providers: [ArgoCDHealthService, ArgoCDPluginService, ArgoCDService, ArgoCDDatastoreService],
providers: [ArgoCDDatastoreService, ArgoCDHealthService, ArgoCDPluginService, ArgoCDService],
exports: [ArgoCDHealthService, ArgoCDPluginService, ArgoCDService],
})
export class ArgoCDModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { EnvironmentService } from './environment.service'
controllers: [EnvironmentController],
providers: [
EnvironmentDatastoreService,
EnvironmentValidationService,
EnvironmentService,
EnvironmentValidationService,
],
})
export class EnvironmentModule {}
6 changes: 3 additions & 3 deletions apps/server-nestjs/src/modules/healthz/healthz.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ import { HealthzService } from './healthz.service'

@Module({
imports: [
TerminusModule,
DatabaseModule,
KeycloakModule,
ConditionalModule.registerWhen(ArgoCDModule, 'USE_ARGOCD'),
ConditionalModule.registerWhen(GitlabModule, 'USE_GITLAB'),
ConditionalModule.registerWhen(NexusModule, 'USE_NEXUS'),
ConditionalModule.registerWhen(RegistryModule, 'USE_HARBOR'),
ConditionalModule.registerWhen(ServiceChainModule, optIn('USE_SERVICE_CHAIN')),
ConditionalModule.registerWhen(VaultModule, 'USE_VAULT'),
DatabaseModule,
KeycloakModule,
TerminusModule,
],
controllers: [HealthzController],
providers: [HealthzService],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ import { KeycloakJwtService } from './keycloak-jwt.service'
}),
],
providers: [KeycloakJwtService],
exports: [KeycloakJwtService, JwtModule],
exports: [JwtModule, KeycloakJwtService],
})
export class KeycloakJwtModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ConfigurationModule } from '../../configuration/configuration.module'
import { KeycloakSecretProviderService } from './keycloak-secret-provider.service'

@Module({
imports: [ConfigurationModule, CacheModule.register()],
imports: [CacheModule.register(), ConfigurationModule],
providers: [KeycloakSecretProviderService],
exports: [KeycloakSecretProviderService],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { PermissionModule } from './permission/permission.module'

@Module({
providers: [],
imports: [AuthModule, DatabaseModule, ConfigurationModule, EventsModule, LoggerModule, PermissionModule],
exports: [AuthModule, DatabaseModule, ConfigurationModule, EventsModule, LoggerModule, PermissionModule],
imports: [AuthModule, ConfigurationModule, DatabaseModule, EventsModule, LoggerModule, PermissionModule],
exports: [AuthModule, ConfigurationModule, DatabaseModule, EventsModule, LoggerModule, PermissionModule],
})
export class InfrastructureModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ProjectPermissionModule } from './project/project.module'
import { UserPermissionModule } from './user/user.module'

@Module({
imports: [UserPermissionModule, ProjectPermissionModule],
exports: [UserPermissionModule, ProjectPermissionModule],
imports: [ProjectPermissionModule, UserPermissionModule],
exports: [ProjectPermissionModule, UserPermissionModule],
})
export class PermissionModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ import { ProjectPermissionService } from './project.service'
providers: [
ProjectGuard,
ProjectPermissionLoaderService,
ProjectPermissionService,
ProjectPermissionPolicy,
ProjectPermissionService,
],
exports: [
ProjectGuard,
ProjectPermissionLoaderService,
ProjectPermissionService,
ProjectPermissionPolicy,
ProjectPermissionService,
],
})
export class ProjectPermissionModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import { UserPermissionService } from './user.service'
],
providers: [
UserGuard,
UserPermissionService,
UserPermissionPolicy,
UserPermissionService,
],
exports: [
UserGuard,
UserPermissionService,
UserPermissionPolicy,
UserPermissionService,
],
})
export class UserPermissionModule {}
6 changes: 3 additions & 3 deletions apps/server-nestjs/src/modules/nexus/nexus.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import { NexusService } from './nexus.service'
@Module({
imports: [ConfigurationModule, DatabaseModule, TerminusModule, VaultModule],
providers: [
NexusClientService,
NexusDatastoreService,
NexusHealthService,
NexusHttpClientService,
NexusPluginService,
NexusService,
NexusDatastoreService,
NexusHttpClientService,
NexusClientService,
],
exports: [NexusClientService, NexusHealthService, NexusPluginService, NexusService],
})
Expand Down
2 changes: 1 addition & 1 deletion apps/server-nestjs/src/modules/plugin/plugin.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import { PluginService } from './plugin.service'
imports: [
ConditionalModule.registerWhen(ArgoCDModule, 'USE_ARGOCD'),
ConditionalModule.registerWhen(GitlabModule, 'USE_GITLAB'),
KeycloakModule,
ConditionalModule.registerWhen(NexusModule, 'USE_NEXUS'),
ConditionalModule.registerWhen(RegistryModule, 'USE_HARBOR'),
ConditionalModule.registerWhen(ServiceChainModule, optIn('USE_SERVICE_CHAIN')),
ConditionalModule.registerWhen(SonarqubeModule, 'USE_SONARQUBE'),
ConditionalModule.registerWhen(VaultModule, 'USE_VAULT'),
KeycloakModule,
],
providers: [PluginService],
exports: [PluginService],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import { ProjectBulkService } from './project-bulk.service'
AuthModule,
DatabaseModule,
EventsModule,
UserPermissionModule,
ProjectModule,
ProjectHooksModule,
ProjectModule,
UserPermissionModule,
],
controllers: [ProjectBulkController],
providers: [ProjectBulkService],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ProjectSecretsController } from './project-secrets.controller'
import { ProjectSecretsService } from './project-secrets.service'

@Module({
imports: [AuthModule, ConfigurationModule, DatabaseModule, ProjectPermissionModule, ConditionalModule.registerWhen(VaultModule, 'USE_VAULT')],
imports: [AuthModule, ConditionalModule.registerWhen(VaultModule, 'USE_VAULT'), ConfigurationModule, DatabaseModule, ProjectPermissionModule],
controllers: [ProjectSecretsController],
providers: [ProjectSecretsService],
exports: [ProjectSecretsService],
Expand Down
2 changes: 1 addition & 1 deletion apps/server-nestjs/src/modules/project/project.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import { ProjectService } from './project.service'
ConfigurationModule,
DatabaseModule,
EventsModule,
LogModule,
ProjectPermissionModule,
UserPermissionModule,
LogModule,
],
controllers: [ProjectController],
providers: [ProjectService],
Expand Down
4 changes: 2 additions & 2 deletions apps/server-nestjs/src/modules/registry/registry.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { RegistryPluginService } from './registry-plugin.service'
import { RegistryService } from './registry.service'

@Module({
imports: [ConfigurationModule, DatabaseModule, TerminusModule, VaultModule, CacheModule.register()],
providers: [RegistryHealthService, RegistryPluginService, RegistryService, RegistryDatastoreService, RegistryHttpClientService, RegistryClientService],
imports: [CacheModule.register(), ConfigurationModule, DatabaseModule, TerminusModule, VaultModule],
providers: [RegistryClientService, RegistryDatastoreService, RegistryHealthService, RegistryHttpClientService, RegistryPluginService, RegistryService],
exports: [RegistryHealthService, RegistryPluginService, RegistryService],
})
export class RegistryModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ import { ServiceChainService } from './service-chain.service'
],
controllers: [ServiceChainController],
providers: [OpenCdsClientService, ServiceChainHealthService, ServiceChainService],
exports: [ServiceChainService, ServiceChainHealthService],
exports: [ServiceChainHealthService, ServiceChainService],
})
export class ServiceChainModule {}
4 changes: 2 additions & 2 deletions apps/server-nestjs/src/modules/sonarqube/sonarqube.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import { SonarqubeService } from './sonarqube.service'
@Module({
imports: [ConfigurationModule, DatabaseModule, TerminusModule, VaultModule],
providers: [
SonarqubeHealthService,
SonarqubeHttpClientService,
SonarqubeClientService,
SonarqubeDatastoreService,
SonarqubeHealthService,
SonarqubeHttpClientService,
SonarqubePluginService,
SonarqubeService,
],
Expand Down
4 changes: 2 additions & 2 deletions apps/server-nestjs/src/modules/vault/vault.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import { VaultService } from './vault.service'
@Module({
imports: [ConfigurationModule, DatabaseModule, TerminusModule],
providers: [
VaultClientService,
VaultDatastoreService,
VaultHealthService,
VaultHttpClientService,
VaultClientService,
VaultPluginService,
VaultService,
VaultDatastoreService,
],
exports: [VaultClientService, VaultHealthService, VaultPluginService, VaultService],
})
Expand Down
Loading