fix: vhost

ToxicToast · Aug 28, 2024 · 8e66457 · 8e66457
1 parent e59255e
commit 8e66457
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 109 deletions.
diff --git a/apps/apialerts-service/src/app/health/health.module.ts b/apps/apialerts-service/src/app/health/health.module.ts
@@ -4,39 +4,40 @@ import { HealthController } from './health.controller';
 import { ConfigService } from '@nestjs/config';
 
 @Module({
-    imports: [
-        TerminusModule.forRoot({
-            errorLogStyle: 'pretty',
-        }),
-    ],
-    controllers: [HealthController],
-    providers: [
-        {
-            provide: 'MEMORY_HEAP_TRESHOLD',
-            useFactory: (config: ConfigService) => {
-                return config.get('MEMORY_HEAP_TRESHOLD', 0);
-            },
-            inject: [ConfigService],
-        },
-        {
-            provide: 'MEMORY_RSS_TRESHOLD',
-            useFactory: (config: ConfigService) => {
-                return config.get('MEMORY_RSS_TRESHOLD', 0);
-            },
-            inject: [ConfigService],
-        },
-        {
-            provide: 'BROKER_CONNECTION_STRING',
-            useFactory: (config: ConfigService) => {
-                const username = config.get('BROKER_USERNAME', 'guest');
-                const password = config.get('BROKER_PASSWORD', 'guest');
-                const hostname = config.get('BROKER_HOST', 'localhost');
-                const port = config.get('BROKER_PORT', 5672);
-                //
-                return `amqp://${username}:${password}@${hostname}:${port}`;
-            },
-            inject: [ConfigService],
-        },
-    ],
+	imports: [
+		TerminusModule.forRoot({
+			errorLogStyle: 'pretty',
+		}),
+	],
+	controllers: [HealthController],
+	providers: [
+		{
+			provide: 'MEMORY_HEAP_TRESHOLD',
+			useFactory: (config: ConfigService) => {
+				return config.get('MEMORY_HEAP_TRESHOLD', 0);
+			},
+			inject: [ConfigService],
+		},
+		{
+			provide: 'MEMORY_RSS_TRESHOLD',
+			useFactory: (config: ConfigService) => {
+				return config.get('MEMORY_RSS_TRESHOLD', 0);
+			},
+			inject: [ConfigService],
+		},
+		{
+			provide: 'BROKER_CONNECTION_STRING',
+			useFactory: (config: ConfigService) => {
+				const username = config.get('BROKER_USERNAME', 'guest');
+				const password = config.get('BROKER_PASSWORD', 'guest');
+				const hostname = config.get('BROKER_HOST', 'localhost');
+				const port = config.get('BROKER_PORT', 5672);
+				const vhost = config.get('BROKER_VHOST', '/');
+				//
+				return `amqp://${username}:${password}@${hostname}:${port}${vhost}`;
+			},
+			inject: [ConfigService],
+		},
+	],
 })
 export class HealthModule {}
diff --git a/apps/auth-service/src/app/auth/auth.module.ts b/apps/auth-service/src/app/auth/auth.module.ts
@@ -7,43 +7,48 @@ import { JwtModule } from '@nestjs/jwt';
 import { NotifyService } from './notify.service';
 import { ClientsModule } from '@nestjs/microservices';
 import {
-    azkaban_notify,
-    clientProvider,
+	azkaban_notify,
+	clientProvider,
 } from '@toxictoast/azkaban-broker-rabbitmq';
 
+const brokerDefaultSettings = {
+	noAck: process.env.BROKER_ACK === 'yes' ? true : false,
+	brokerUsername: process.env.BROKER_USERNAME,
+	brokerPassword: process.env.BROKER_PASSWORD,
+	brokerHost: process.env.BROKER_HOST,
+	brokerPort: parseInt(process.env.BROKER_PORT),
+	brokerVHost: process.env.BROKER_VHOST,
+};
+
 @Module({
-    imports: [
-        JwtModule.registerAsync({
-            useFactory: (config: ConfigService) => {
-                return {
-                    global: true,
-                    secret: config.get('JWT_SECRET', 'secret'),
-                    signOptions: { expiresIn: '1h' },
-                };
-            },
-            inject: [ConfigService],
-        }),
-        ClientsModule.register([
-            {
-                name: 'NOTIFY_SERVICE',
-                ...clientProvider({
-                    queueName: azkaban_notify,
-                    noAck: process.env.BROKER_ACK === 'yes' ? true : false,
-                    brokerUsername: process.env.BROKER_USERNAME,
-                    brokerPassword: process.env.BROKER_PASSWORD,
-                    brokerHost: process.env.BROKER_HOST,
-                    brokerPort: parseInt(process.env.BROKER_PORT),
-                    consumerTag: 'auth-notify',
-                }),
-            },
-        ]),
-    ],
-    controllers: [AuthController],
-    providers: [
-        ...datasourceProvider,
-        ...authProvider,
-        AuthService,
-        NotifyService,
-    ],
+	imports: [
+		JwtModule.registerAsync({
+			useFactory: (config: ConfigService) => {
+				return {
+					global: true,
+					secret: config.get('JWT_SECRET', 'secret'),
+					signOptions: { expiresIn: '1h' },
+				};
+			},
+			inject: [ConfigService],
+		}),
+		ClientsModule.register([
+			{
+				name: 'NOTIFY_SERVICE',
+				...clientProvider({
+					queueName: azkaban_notify,
+					consumerTag: 'auth-notify',
+					...brokerDefaultSettings,
+				}),
+			},
+		]),
+	],
+	controllers: [AuthController],
+	providers: [
+		...datasourceProvider,
+		...authProvider,
+		AuthService,
+		NotifyService,
+	],
 })
 export class AuthModule {}
diff --git a/apps/auth-service/src/app/health/health.module.ts b/apps/auth-service/src/app/health/health.module.ts
@@ -4,39 +4,40 @@ import { HealthController } from './health.controller';
 import { ConfigService } from '@nestjs/config';
 
 @Module({
-    imports: [
-        TerminusModule.forRoot({
-            errorLogStyle: 'pretty',
-        }),
-    ],
-    controllers: [HealthController],
-    providers: [
-        {
-            provide: 'MEMORY_HEAP_TRESHOLD',
-            useFactory: (config: ConfigService) => {
-                return config.get('MEMORY_HEAP_TRESHOLD', 0);
-            },
-            inject: [ConfigService],
-        },
-        {
-            provide: 'MEMORY_RSS_TRESHOLD',
-            useFactory: (config: ConfigService) => {
-                return config.get('MEMORY_RSS_TRESHOLD', 0);
-            },
-            inject: [ConfigService],
-        },
-        {
-            provide: 'BROKER_CONNECTION_STRING',
-            useFactory: (config: ConfigService) => {
-                const username = config.get('BROKER_USERNAME', 'guest');
-                const password = config.get('BROKER_PASSWORD', 'guest');
-                const hostname = config.get('BROKER_HOST', 'localhost');
-                const port = config.get('BROKER_PORT', 5672);
-                //
-                return `amqp://${username}:${password}@${hostname}:${port}`;
-            },
-            inject: [ConfigService],
-        },
-    ],
+	imports: [
+		TerminusModule.forRoot({
+			errorLogStyle: 'pretty',
+		}),
+	],
+	controllers: [HealthController],
+	providers: [
+		{
+			provide: 'MEMORY_HEAP_TRESHOLD',
+			useFactory: (config: ConfigService) => {
+				return config.get('MEMORY_HEAP_TRESHOLD', 0);
+			},
+			inject: [ConfigService],
+		},
+		{
+			provide: 'MEMORY_RSS_TRESHOLD',
+			useFactory: (config: ConfigService) => {
+				return config.get('MEMORY_RSS_TRESHOLD', 0);
+			},
+			inject: [ConfigService],
+		},
+		{
+			provide: 'BROKER_CONNECTION_STRING',
+			useFactory: (config: ConfigService) => {
+				const username = config.get('BROKER_USERNAME', 'guest');
+				const password = config.get('BROKER_PASSWORD', 'guest');
+				const hostname = config.get('BROKER_HOST', 'localhost');
+				const port = config.get('BROKER_PORT', 5672);
+				const vhost = config.get('BROKER_VHOST', '/');
+				//
+				return `amqp://${username}:${password}@${hostname}:${port}${vhost}`;
+			},
+			inject: [ConfigService],
+		},
+	],
 })
 export class HealthModule {}
diff --git a/apps/azkaban-gateway/src/app/auth/auth.module.ts b/apps/azkaban-gateway/src/app/auth/auth.module.ts
@@ -9,6 +9,15 @@ import { AuthService } from './auth.service';
 import { AuthGuard } from '../../guards';
 import { JwtModule } from '@nestjs/jwt';
 
+const brokerDefaultSettings = {
+	noAck: process.env.BROKER_ACK === 'yes' ? true : false,
+	brokerUsername: process.env.BROKER_USERNAME,
+	brokerPassword: process.env.BROKER_PASSWORD,
+	brokerHost: process.env.BROKER_HOST,
+	brokerPort: parseInt(process.env.BROKER_PORT),
+	brokerVHost: process.env.BROKER_VHOST,
+};
+
 @Module({
 	imports: [
 		JwtModule,
@@ -17,13 +26,8 @@ import { JwtModule } from '@nestjs/jwt';
 				name: 'AUTH_SERVICE',
 				...clientProvider({
 					queueName: azkaban_auth,
-					noAck: process.env.BROKER_ACK === 'yes' ? true : false,
-					brokerUsername: process.env.BROKER_USERNAME,
-					brokerPassword: process.env.BROKER_PASSWORD,
-					brokerHost: process.env.BROKER_HOST,
-					brokerPort: parseInt(process.env.BROKER_PORT),
-					brokerVHost: process.env.BROKER_VHOST,
 					consumerTag: 'gateway-auth',
+					...brokerDefaultSettings,
 				}),
 			},
 		]),