fix: ORV2-2698 Vault Audit - Refactor env variables for scheduler (#1555

)
bcgov · Aug 27, 2024 · 28f105e · 28f105e
1 parent 1104ef8
commit 28f105e
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 19 deletions.
diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
@@ -457,7 +457,7 @@ scheduler:
       command:
         - "sh"
         - "-c"
-        - "source /vault/secrets/keycloak-{{.Values.global.vault.zone}} && source /vault/secrets/mssql-{{.Values.global.vault.zone}} && source /vault/secrets/s3-{{.Values.global.vault.zone}} && source /vault/secrets/scheduler-{{.Values.global.vault.zone}} && npm run start:prod"
+        - "source /vault/secrets/keycloak-{{.Values.global.vault.zone}} && source /vault/secrets/mssql-{{.Values.global.vault.zone}} && source /vault/secrets/s3-{{.Values.global.vault.zone}} && source /vault/secrets/scheduler-{{.Values.global.vault.zone}} && source /vault/secrets/cfs-{{.Values.global.vault.zone}} && source /vault/secrets/tps-{{.Values.global.vault.zone}} && npm run start:prod"
       registry: '{{ .Values.global.registry }}'
       repository: '{{ .Values.global.repository }}' # example, it includes registry and repository
       image: scheduler
@@ -541,6 +541,8 @@ scheduler:
       - "mssql-{{tpl $.Values.vault.zone $}}"      
       - "scheduler-{{tpl $.Values.vault.zone $}}"
       - "s3-{{tpl $.Values.vault.zone $}}"
+      - "cfs-{{tpl $.Values.vault.zone $}}"
+      - "tps-{{tpl $.Values.vault.zone $}}"
     zone: "{{.Values.global.vault.zone}}"
 
 policy:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -228,9 +228,9 @@ services:
       dockerfile: Dockerfile
     environment:
       NODE_ENV: development
-      TPS_API_LOG_LEVEL: ${TPS_API_LOG_LEVEL}
-      TPS_API_TYPEORM_LOG_LEVEL: ${TPS_API_TYPEORM_LOG_LEVEL}
-      TPS_API_MAX_QUERY_EXECUTION_TIME_MS: ${TPS_API_MAX_QUERY_EXECUTION_TIME_MS}
+      SCHEDULER_API_LOG_LEVEL: ${SCHEDULER_API_LOG_LEVEL}
+      SCHEDULER_API_TYPEORM_LOG_LEVEL: ${SCHEDULER_API_TYPEORM_LOG_LEVEL}
+      SCHEDULER_API_MAX_QUERY_EXECUTION_TIME_MS: ${SCHEDULER_API_MAX_QUERY_EXECUTION_TIME_MS}
       DB_TYPE: ${DB_TYPE}
       MSSQL_HOST: sql-server-db
       MSSQL_PORT: ${MSSQL_PORT}

diff --git a/scheduler/Dockerfile b/scheduler/Dockerfile
@@ -32,9 +32,9 @@ ENV NODE_ENV ${NODE_ENV}
 
 # Set environment variables
 ENV DB_TYPE ${DB_TYPE}
-ENV TPS_API_LOG_LEVEL ${TPS_API_LOG_LEVEL}
-ENV TPS_API_TYPEORM_LOG_LEVEL ${TPS_API_TYPEORM_LOG_LEVEL}
-ENV TPS_API_MAX_QUERY_EXECUTION_TIME_MS ${TPS_API_MAX_QUERY_EXECUTION_TIME_MS}
+ENV SCHEDULER_API_LOG_LEVEL ${SCHEDULER_API_LOG_LEVEL}
+ENV SCHEDULER_API_TYPEORM_LOG_LEVEL ${SCHEDULER_API_TYPEORM_LOG_LEVEL}
+ENV SCHEDULER_API_MAX_QUERY_EXECUTION_TIME_MS ${SCHEDULER_API_MAX_QUERY_EXECUTION_TIME_MS}
 ENV MSSQL_HOST ${MSSQL_HOST}
 ENV MSSQL_PORT ${MSSQL_PORT}
 ENV MSSQL_DB ${MSSQL_DB}

diff --git a/scheduler/README.md b/scheduler/README.md
@@ -22,9 +22,9 @@ TPS_POLL_LIMIT = 50
 TPS_PENDING_POLLING_INTERVAL = '0 */1 * * * *'
 TPS_ERROR_POLLING_INTERVAL = '0 0 */3 * * *'
 TPS_MONITORING_POLLING_INTERVAL = '0 0 1 * * *'
-TPS_API_LOG_LEVEL= debug
-TPS_API_TYPEORM_LOG_LEVEL= query,error,warn,info,log,schema
-TPS_API_MAX_QUERY_EXECUTION_TIME_MS= 5000
+SCHEDULER_API_LOG_LEVEL= debug
+SCHEDULER_API_TYPEORM_LOG_LEVEL= query,error,warn,info,log,schema
+SCHEDULER_API_MAX_QUERY_EXECUTION_TIME_MS= 5000
 NODE_ENV=local
 DB_TYPE=mssql
 MSSQL_HOST= localhost

diff --git a/scheduler/src/app.module.ts b/scheduler/src/app.module.ts
@@ -29,9 +29,9 @@ const envPath = path.resolve(process.cwd() + '/../');
       autoLoadEntities: true, // Auto load all entities regiestered by typeorm forFeature method.
       synchronize: false, // This changes the DB schema to match changes to entities, which we might not want.
       maxQueryExecutionTime:
-        +process.env.TPS_API_MAX_QUERY_EXECUTION_TIME_MS || 5000, //5 seconds by default
+        +process.env.SCHEDULER_API_MAX_QUERY_EXECUTION_TIME_MS || 5000, //5 seconds by default
       logger: new TypeormCustomLogger(
-        getTypeormLogLevel(process.env.TPS_API_TYPEORM_LOG_LEVEL),
+        getTypeormLogLevel(process.env.SCHEDULER_API_TYPEORM_LOG_LEVEL),
       ),
     }),
     CacheModule.register({

diff --git a/scheduler/src/app.service.ts b/scheduler/src/app.service.ts
@@ -15,15 +15,15 @@ export class AppService {
     private featureFlagsService: FeatureFlagsService,
   ) {}
 
-  getHealthCheck(): string {    
+  getHealthCheck(): string {
     return 'TPS Migration Healthcheck!';
   }
 
   @LogAsyncMethodExecution({ printMemoryStats: true })
   async initializeCache() {
     const startDateTime = new Date();
     const featureFlags = await this.featureFlagsService.findAll();
-    
+
     await addToCache(
       this.cacheManager,
       CacheKey.FEATURE_FLAG_TYPE,

diff --git a/scheduler/src/common/decorator/log-async-method-execution.decorator.ts b/scheduler/src/common/decorator/log-async-method-execution.decorator.ts
@@ -15,7 +15,7 @@ export function LogAsyncMethodExecution(logMethodOptions?: {
     descriptor.value = async function (...args: any[]) {
       if (
         logMethodOptions?.printMemoryStats &&
-        process.env.TPS_API_LOG_LEVEL === 'debug'
+        process.env.SCHEDULER_API_LOG_LEVEL === 'debug'
       ) {
         const memoryStats = process.memoryUsage();
         memoryUsage = `, Memory usage: ${JSON.stringify(memoryStats)}`;
@@ -30,7 +30,7 @@ export function LogAsyncMethodExecution(logMethodOptions?: {
       const executionTime = end - start;
       if (
         logMethodOptions?.printMemoryStats &&
-        process.env.TPS_API_LOG_LEVEL === 'debug'
+        process.env.SCHEDULER_API_LOG_LEVEL === 'debug'
       ) {
         const memoryStats = process.memoryUsage();
         memoryUsage = `, Memory usage: ${JSON.stringify(memoryStats)}`;

diff --git a/scheduler/src/common/decorator/log-method-execution.decorator.ts b/scheduler/src/common/decorator/log-method-execution.decorator.ts
@@ -15,7 +15,7 @@ export function LogMethodExecution(logMethodOptions?: {
     descriptor.value = function (...args: any[]) {
       if (
         logMethodOptions?.printMemoryStats &&
-        process.env.TPS_API_LOG_LEVEL === 'debug'
+        process.env.SCHEDULER_API_LOG_LEVEL === 'debug'
       ) {
         const memoryStats = process.memoryUsage();
         memoryUsage = `, Memory usage: ${JSON.stringify(memoryStats)}`;
@@ -30,7 +30,7 @@ export function LogMethodExecution(logMethodOptions?: {
       const executionTime = end - start;
       if (
         logMethodOptions?.printMemoryStats &&
-        process.env.TPS_API_LOG_LEVEL === 'debug'
+        process.env.SCHEDULER_API_LOG_LEVEL === 'debug'
       ) {
         const memoryStats = process.memoryUsage();
         memoryUsage = `, Memory usage: ${JSON.stringify(memoryStats)}`;

diff --git a/scheduler/src/common/logger/logger.config.ts b/scheduler/src/common/logger/logger.config.ts
@@ -26,7 +26,7 @@ const errorStack: winston.Logform.Format = winston.format.combine(
 export const customLogger: LoggerService = WinstonModule.createLogger({
   transports: [
     new winston.transports.Console({
-      level: process.env.TPS_API_LOG_LEVEL || 'silly',
+      level: process.env.SCHEDULER_API_LOG_LEVEL || 'silly',
       format: winston.format.combine(
         globalLoggerFormat,
         localLoggerFormat,