Integrated KeyVault (#58)

Author: dan-hulmston-hra

src/Functions/Rsp.RtsImport/Startup/Configuration/AzureAppConfiguration.cs

@@ -27,10 +27,11 @@ public static IServiceCollection AddAzureAppConfiguration(this IServiceCollectio
         (
             options =>
             {
+                var credentials = new ManagedIdentityCredential(azureAppSettings.AzureAppConfiguration.IdentityClientId);
                 options.Connect
                     (
                         new Uri(azureAppSettings!.AzureAppConfiguration.Endpoint),
-                        new ManagedIdentityCredential(azureAppSettings.AzureAppConfiguration.IdentityClientId)
+                        credentials
                     )
                     .Select(KeyFilter.Any) // select all the settings without any label
                     .Select(KeyFilter.Any,
@@ -61,7 +62,7 @@ public static IServiceCollection AddAzureAppConfiguration(this IServiceCollectio
                                 AppSettings.ServiceLabel) // select all flags using the service name as label
                             .SetRefreshInterval(TimeSpan.FromSeconds(15));
                     }
-                );
+                ).ConfigureKeyVault(options=>options.SetCredential(credentials));
             }
         );
 

src/Startup/Rsp.RtsService/Program.cs

@@ -32,30 +32,33 @@
 var services = builder.Services;
 var configuration = builder.Configuration;
 
+var appSettingsSection = configuration.GetSection(nameof(AppSettings));
+var appSettings = appSettingsSection.Get<AppSettings>();
+
 if (!builder.Environment.IsDevelopment())
 {
     services.AddLogging(builder => builder.AddConsole());
 }
 
 if (!builder.Environment.IsDevelopment())
 {
-    var azureAppConfigSection = configuration.GetSection(nameof(AppSettings));
-    var azureAppConfiguration = azureAppConfigSection.Get<AppSettings>();
-
     // Load configuration from Azure App Configuration
     builder.Configuration.AddAzureAppConfiguration(
         options =>
-        {
-            options.Connect
+    {
+            var credentials = new ManagedIdentityCredential(appSettings!.AzureAppConfiguration.IdentityClientID);
+
+        options.Connect
             (
-                new Uri(azureAppConfiguration!.AzureAppConfiguration.Endpoint),
-                new ManagedIdentityCredential(azureAppConfiguration.AzureAppConfiguration.IdentityClientID)
+                new Uri(appSettings.AzureAppConfiguration.Endpoint),
+                credentials
             )
             .Select(KeyFilter.Any)
             .Select(KeyFilter.Any, AppSettings.ServiceLabel)
+            .ConfigureKeyVault(kv => kv.SetCredential(credentials))
             .ConfigureRefresh(refreshOptions =>
                 refreshOptions
-                .Register("AppSettings:Sentinel", AppSettings.ServiceLabel, refreshAll: true)
+                    .Register("AppSettings:Sentinel", AppSettings.ServiceLabel, refreshAll: true)
                 .SetRefreshInterval(new TimeSpan(0, 0, 15))
             );
         }
@@ -81,8 +84,6 @@
 // uncomment the following line
 // builder.AddServiceDefaults()
 
-var appSettingsSection = configuration.GetSection(nameof(AppSettings));
-var appSettings = appSettingsSection.Get<AppSettings>();
 
 // adds sql server database context
 services.AddDatabase(configuration);