From 51ebf9b4e49ad665e158774f2d75e4e2aeb872c8 Mon Sep 17 00:00:00 2001 From: UsamaEquinorAFK Date: Wed, 6 Dec 2023 15:27:33 +0100 Subject: [PATCH] Remove project path dependency for fetching secret --- .../InspectionFindingEventHandler.cs | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/backend/api/EventHandlers/InspectionFindingEventHandler.cs b/backend/api/EventHandlers/InspectionFindingEventHandler.cs index 523d0d5ce..772b6e425 100644 --- a/backend/api/EventHandlers/InspectionFindingEventHandler.cs +++ b/backend/api/EventHandlers/InspectionFindingEventHandler.cs @@ -38,7 +38,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) string adaptiveCardJson = GenerateAdaptiveCard(messageString); - string url = GetWebhookURL("TeamsInspectionFindingsWebhook"); + string url = GetWebhookURL(configuration, "TeamsInspectionFindingsWebhook"); var client = new HttpClient(); client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); @@ -138,23 +138,10 @@ public static string GenerateAdaptiveCard(string messageContent) return adaptiveCardJson; } - public static string GetWebhookURL(string secretName) + public static string GetWebhookURL(IConfiguration configuration, string secretName) { - string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")!; - string projectPath = Path.Combine( - Directory.GetParent(Directory.GetCurrentDirectory())!.FullName, - "api" - ); - - var config = new ConfigurationBuilder() - .SetBasePath(projectPath) - .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) - .AddJsonFile($"appsettings.{environment}.json", optional: true) - .AddEnvironmentVariables() - .Build(); - - string? keyVaultUri = config.GetSection("KeyVault")["VaultUri"] ?? throw new KeyNotFoundException("No key vault in config"); + string? keyVaultUri = configuration.GetSection("KeyVault")["VaultUri"] ?? throw new KeyNotFoundException("No key vault in config"); var keyVault = new SecretClient( new Uri(keyVaultUri),