From b15610e23be5ceb7149ddd51429478e89bf31107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Thu, 3 Aug 2023 01:45:17 +0200
Subject: [PATCH] Config => Use function to complete string with env var calls

---
 ExerciceChecker/src/config/Config.ts | 11 +++++------
 ExerciceChecker/src/shared           |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ExerciceChecker/src/config/Config.ts b/ExerciceChecker/src/config/Config.ts
index 249315b..e50b50a 100644
--- a/ExerciceChecker/src/config/Config.ts
+++ b/ExerciceChecker/src/config/Config.ts
@@ -4,7 +4,7 @@ import path from 'path';
 
 class Config {
     public readonly folders: {
-        project: string; resultsVolume: string; resultsDojo: string; resultsExercice: string; artifacts: string;
+        project: string; resultsVolume: string; resultsDojo: string; resultsExercice: string;
     };
 
     public readonly exercice: {
@@ -17,11 +17,10 @@ class Config {
 
     constructor() {
         this.folders = {
-            project        : process.env.FILES_FOLDER || './',
-            resultsVolume  : process.env.RESULTS_VOLUME || '',
-            resultsDojo    : path.join(process.env.RESULTS_VOLUME || '', 'Dojo/'),
-            resultsExercice: path.join(process.env.RESULTS_VOLUME || '', 'Exercice/'),
-            artifacts      : process.env.ARTIFACTS_FOLDER || ''
+            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/')
         };
         this.resetResultsVolume();
 
diff --git a/ExerciceChecker/src/shared b/ExerciceChecker/src/shared
index bfca2c4..a026c4a 160000
--- a/ExerciceChecker/src/shared
+++ b/ExerciceChecker/src/shared
@@ -1 +1 @@
-Subproject commit bfca2c401e4b5ff69b0a515fd9dcab49d36ee212
+Subproject commit a026c4af16be3ae962b3031546ffac328e19fe50
-- 
GitLab