From c5fb08f600ff41a85e2b26c23eee7474523f3f9d Mon Sep 17 00:00:00 2001
From: Ben Hesseldieck <b.hesseldieck@gmail.com>
Date: Mon, 5 Apr 2021 14:46:02 +0200
Subject: [PATCH] :bug: :wrench: fix and adjust helpers

---
 packages/cli/src/GenericHelpers.ts  | 69 ++++++++++++++++-------------
 packages/cli/src/databases/utils.ts |  6 +--
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index e278df41cb..9b3404c9e5 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -83,36 +83,25 @@ export async function getVersions(): Promise<IPackageVersions> {
 }
 
 /**
- * Retrieves configuration values from env
+ * Extracts configuration schema for key
  *
  * @param {string} configKey
- * @param {IDataObject} currentSchema
- * @returns {string | boolean | number | undefined | void}
+ * @param {IDataObject} configSchema
+ * @returns {IDataObject} schema of the configKey
  */
-function getConfigFromEnv(configKey: string, currentSchema: IDataObject): string | boolean | number | undefined | void {
+function extractSchemaForKey(configKey: string, configSchema: IDataObject): IDataObject {
 	const configKeyParts = configKey.split('.');
 
 	for (const key of configKeyParts) {
-		if (currentSchema[key] === undefined) {
+		if (configSchema[key] === undefined) {
 			throw new Error(`Key "${key}" of ConfigKey "${configKey}" does not exist`);
-		} else if ((currentSchema[key]! as IDataObject).properties === undefined) {
-			currentSchema = currentSchema[key] as IDataObject;
+		} else if ((configSchema[key]! as IDataObject).properties === undefined) {
+			configSchema = configSchema[key] as IDataObject;
 		} else {
-			currentSchema = (currentSchema[key] as IDataObject).properties as IDataObject;
+			configSchema = (configSchema[key] as IDataObject).properties as IDataObject;
 		}
 	}
-
-	// Check if environment variable is defined for config key
-	if (currentSchema.env === undefined) {
-		// No environment variable defined, so return value from config
-		return config.get(configKey);
-	}
-
-	// Check if special file enviroment variable exists
-	if (process.env[currentSchema.env + '_FILE'] === undefined) {
-		// Does not exist, so return value from config
-		return config.get(configKey);
-	}
+	return configSchema;
 }
 
 /**
@@ -125,18 +114,26 @@ function getConfigFromEnv(configKey: string, currentSchema: IDataObject): string
 export async function getConfigValue(configKey: string): Promise<string | boolean | number | undefined> {
 	// Get the environment variable
 	const configSchema = config.getSchema();
-	const currentSchema = configSchema.properties as IDataObject;
-	const envConfig = getConfigFromEnv(configKey, currentSchema);
-	if (envConfig) {
-		return envConfig;
+	const currentSchema = extractSchemaForKey(configKey, configSchema.properties as IDataObject);
+	// Check if environment variable is defined for config key
+	if (currentSchema.env === undefined) {
+		// No environment variable defined, so return value from config
+		return config.get(configKey);
+	}
+
+	// Check if special file enviroment variable exists
+	const fileEnvironmentVariable = process.env[currentSchema.env + '_FILE'];
+	if (fileEnvironmentVariable === undefined) {
+		// Does not exist, so return value from config
+		return config.get(configKey);
 	}
 
 	let data;
 	try {
-		data = await fsReadFileAsync(process.env[currentSchema.env + '_FILE']!, 'utf8') as string;
+		data = await fsReadFileAsync(fileEnvironmentVariable, 'utf8') as string;
 	} catch (error) {
 		if (error.code === 'ENOENT') {
-			throw new Error(`The file "${process.env[currentSchema.env + '_FILE']}" could not be found.`);
+			throw new Error(`The file "${fileEnvironmentVariable}" could not be found.`);
 		}
 
 		throw error;
@@ -155,18 +152,26 @@ export async function getConfigValue(configKey: string): Promise<string | boolea
 export function getConfigValueSync(configKey: string): string | boolean | number | undefined {
 	// Get the environment variable
 	const configSchema = config.getSchema();
-	const currentSchema = configSchema.properties as IDataObject;
-	const envConfig = getConfigFromEnv(configKey, currentSchema);
-	if (envConfig) {
-		return envConfig;
+	const currentSchema = extractSchemaForKey(configKey, configSchema.properties as IDataObject);
+	// Check if environment variable is defined for config key
+	if (currentSchema.env === undefined) {
+		// No environment variable defined, so return value from config
+		return config.get(configKey);
+	}
+
+	// Check if special file enviroment variable exists
+	const fileEnvironmentVariable = process.env[currentSchema.env + '_FILE'];
+	if (fileEnvironmentVariable === undefined) {
+		// Does not exist, so return value from config
+		return config.get(configKey);
 	}
 
 	let data;
 	try {
-		data = fsReadFileSync(process.env[currentSchema.env + '_FILE']!, 'utf8') as string;
+		data = fsReadFileSync(fileEnvironmentVariable, 'utf8') as string;
 	} catch (error) {
 		if (error.code === 'ENOENT') {
-			throw new Error(`The file "${process.env[currentSchema.env + '_FILE']}" could not be found.`);
+			throw new Error(`The file "${fileEnvironmentVariable}" could not be found.`);
 		}
 
 		throw error;
diff --git a/packages/cli/src/databases/utils.ts b/packages/cli/src/databases/utils.ts
index 9905b9895f..447c4eb21c 100644
--- a/packages/cli/src/databases/utils.ts
+++ b/packages/cli/src/databases/utils.ts
@@ -1,7 +1,7 @@
 import {
 	DatabaseType,
-	GenericHelpers,
-} from '../';
+} from '../index';
+import { getConfigValueSync } from '../../src/GenericHelpers'
 
 /**
  * Resolves the data type for the used database type
@@ -11,7 +11,7 @@ import {
  * @returns {string}
  */
 export function resolveDataType(dataType: string) {
-	const dbType = GenericHelpers.getConfigValueSync('database.type') as DatabaseType;
+	const dbType = getConfigValueSync('database.type') as DatabaseType;
 
 	const typeMap: { [key in DatabaseType]: { [key: string]: string } } = {
 		sqlite: {