diff --git a/ExerciceChecker/src/config/Config.ts b/ExerciceChecker/src/config/Config.ts index 6782c1447cc3451953505896560565b424fda141..5d7d609c432d1574fb879903c9b735e21b07074e 100644 --- a/ExerciceChecker/src/config/Config.ts +++ b/ExerciceChecker/src/config/Config.ts @@ -5,49 +5,29 @@ import path from 'path'; class Config { public readonly appName: string; - public readonly resultsFolderMaxSizeInBytes: number; - public readonly folders: { project: string; resultsVolume: string; resultsDojo: string; resultsExercice: string; }; - public readonly filenames: { - results: string; - }; - public readonly exercice: { id: string; secret: string; }; - public readonly dockerCompose: { - projectName: string - }; - constructor() { this.appName = process.env.APP_NAME || ''; - this.resultsFolderMaxSizeInBytes = Number(process.env.RESULTS_FOLDER_MAX_SIZE_IN_BYTES || 0); - this.folders = { - project : process.env.FILES_FOLDER?.convertWithEnvVars() ?? './', - resultsVolume : process.env.RESULTS_VOLUME?.convertWithEnvVars() ?? '', - resultsDojo : path.join(process.env.RESULTS_VOLUME?.convertWithEnvVars() ?? '', 'Dojo/'), - resultsExercice: path.join(process.env.RESULTS_VOLUME?.convertWithEnvVars() ?? '', 'Exercice/') + project : process.env.PROJECT_FOLDER?.convertWithEnvVars() ?? './', + resultsVolume : process.env.EXERCICE_RESULTS_VOLUME?.convertWithEnvVars() ?? '', + resultsDojo : path.join(process.env.EXERCICE_RESULTS_VOLUME?.convertWithEnvVars() ?? '', 'Dojo/'), + resultsExercice: path.join(process.env.EXERCICE_RESULTS_VOLUME?.convertWithEnvVars() ?? '', 'Exercice/') }; this.resetResultsVolume(); - this.filenames = { - results: process.env.RESULTS_FILENAME || '' - }; - this.exercice = { id : process.env.DOJO_EXERCICE_ID || '', secret: process.env.DOJO_SECRET || '' }; - - this.dockerCompose = { - projectName: process.env.DOCKER_COMPOSE_PROJECT_NAME || '' - }; } private resetResultsVolume(): void {