fix: config order

lidofinance · Apr 20, 2023 · ac364d5 · ac364d5
1 parent c92f6d4
commit ac364d5
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/src/common/config/config.module.ts b/src/common/config/config.module.ts
@@ -12,18 +12,11 @@ dotenv.config({ path: resolve(appRoot.path, '.env') });
 
 @Module({})
 export class ConfigModule {
-  static async loadEnvOrFile(
+  static async readFile(
+    filePath: string,
+    envVarFile: string,
     config: InMemoryConfiguration,
-    envName: string,
-  ): Promise<string> {
-    // ENV should be non empty string
-    if (config[envName]) {
-      return config[envName];
-    }
-
-    const envVarFile = envName + '_FILE';
-    const filePath = config[envVarFile];
-
+  ) {
     try {
       const fileContent = (await readFile(filePath, 'utf-8'))
         .toString()
@@ -50,6 +43,19 @@ export class ConfigModule {
       }
     }
   }
+  static async loadEnvOrFile(
+    config: InMemoryConfiguration,
+    envName: string,
+  ): Promise<string> {
+    const envVarFile = envName + '_FILE';
+    const filePath = config[envVarFile];
+
+    if (filePath) {
+      return await this.readFile(filePath, envVarFile, config);
+    }
+
+    return config[envName];
+  }
 
   static async loadSecrets(
     config: InMemoryConfiguration,