From cf9597de850de1ef721a35ad79ac67b9fdb9e1d4 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Sat, 4 Jun 2022 21:05:47 +0200 Subject: refactor: Use Vault to get configuration --- server/src/Utilities/ConfigurationExtensions.cs | 35 +++++++++++++++---------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'server/src/Utilities/ConfigurationExtensions.cs') diff --git a/server/src/Utilities/ConfigurationExtensions.cs b/server/src/Utilities/ConfigurationExtensions.cs index 772059a..41b6ab3 100644 --- a/server/src/Utilities/ConfigurationExtensions.cs +++ b/server/src/Utilities/ConfigurationExtensions.cs @@ -1,27 +1,34 @@ +using Microsoft.Extensions.Options; + namespace IOL.GreatOffice.Api.Utilities; public static class ConfigurationExtensions { - public static string GetAppDatabaseConnectionString(this IConfiguration configuration) { - var host = configuration.GetValue(AppEnvironmentVariables.DB_HOST); - var port = configuration.GetValue(AppEnvironmentVariables.DB_PORT); - var database = configuration.GetValue(AppEnvironmentVariables.DB_NAME); - var user = configuration.GetValue(AppEnvironmentVariables.DB_USER); - var password = configuration.GetValue(AppEnvironmentVariables.DB_PASSWORD); - - if (configuration.GetValue("ASPNETCORE_ENVIRONMENT") == "Development") { + public static string GetAppDatabaseConnectionString(this IConfiguration config, AppConfiguration configuration) { + var host = configuration.DB_HOST; + var port = configuration.DB_PORT; + var database = configuration.DB_NAME; + var user = configuration.DB_USER; + var password = configuration.DB_PASSWORD; + + if (config.GetValue("ASPNETCORE_ENVIRONMENT") == "Development") { return $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; } return $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; } - public static string GetQuartzDatabaseConnectionString(this IConfiguration Configuration) { - var host = Configuration.GetValue(AppEnvironmentVariables.QUARTZ_DB_HOST); - var port = Configuration.GetValue(AppEnvironmentVariables.QUARTZ_DB_PORT); - var database = Configuration.GetValue(AppEnvironmentVariables.QUARTZ_DB_NAME); - var user = Configuration.GetValue(AppEnvironmentVariables.QUARTZ_DB_USER); - var password = Configuration.GetValue(AppEnvironmentVariables.QUARTZ_DB_PASSWORD); + public static string GetQuartzDatabaseConnectionString(this IConfiguration config, AppConfiguration configuration) { + var host = configuration.QUARTZ_DB_HOST; + var port = configuration.QUARTZ_DB_PORT; + var database = configuration.QUARTZ_DB_NAME; + var user = configuration.QUARTZ_DB_USER; + var password = configuration.QUARTZ_DB_PASSWORD; + Log.Information(host); + if (config.GetValue("ASPNETCORE_ENVIRONMENT") == "Development") { + return $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; + } + return $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; } -- cgit v1.3