From 0cbd7b24e8f9ff552fc78beeae7d8aaa8ef8df00 Mon Sep 17 00:00:00 2001 From: Reuben Bond Date: Thu, 23 Feb 2023 14:59:14 -0800 Subject: [PATCH] FIX: add Key Vault configuration --- src/Services/Identity/Identity.API/Program.cs | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index 5a2fd3976..2dafe5cbe 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -1,6 +1,15 @@ var appName = "Identity.API"; var builder = WebApplication.CreateBuilder(); +if (builder.Configuration.GetValue("UseVault", false)) +{ + TokenCredential credential = new ClientSecretCredential( + builder.Configuration["Vault:TenantId"], + builder.Configuration["Vault:ClientId"], + builder.Configuration["Vault:ClientSecret"]); + builder.Configuration.AddAzureKeyVault(new Uri($"https://{builder.Configuration["Vault:Name"]}.vault.azure.net/"), credential); +} + builder.AddCustomConfiguration(); builder.AddCustomSerilog(); builder.AddCustomMvc(); @@ -70,25 +79,4 @@ catch (Exception ex) finally { Serilog.Log.CloseAndFlush(); -} - -IConfiguration GetConfiguration() -{ - var builder = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) - .AddEnvironmentVariables(); - - var config = builder.Build(); - - if (config.GetValue("UseVault", false)) - { - TokenCredential credential = new ClientSecretCredential( - config["Vault:TenantId"], - config["Vault:ClientId"], - config["Vault:ClientSecret"]); - builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), credential); - } - - return builder.Build(); } \ No newline at end of file