Resolve read config bug on linux

ITfoxtec · May 22, 2024 · a430e13 · a430e13
1 parent f785c16
commit a430e13
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 37 deletions.
diff --git a/azuredeploy.json b/azuredeploy.json
@@ -528,7 +528,7 @@
         "[resourceId('Microsoft.Web/sites/config', variables('foxidsDefaultName'), 'appsettings')]"
       ],
       "properties": {
-        "appSettingNames": [ "WEBSITES_ENABLE_APP_SERVICE_STORAGE", "DOCKER_REGISTRY_SERVER_URL", "WEBSITES_PORT", "Settings__UseHttp", "Settings__TrustProxyHeaders", "Settings__TrustProxySchemeHeader", "ApplicationInsights__ConnectionString", "Settings__FoxIDsEndpoint", "Settings__Options__Log", "Settings__Options__DataStorage", "Settings__Options__KeyStorage", "Settings__Options__Cache", "Settings__Options__DataCache", "Settings__CosmosDb__EndpointUri", "Settings__KeyVault__EndpointUri", "Settings__Sendgrid__FromEmail" ]
+        "appSettingNames": [ "WEBSITES_ENABLE_APP_SERVICE_STORAGE", "DOCKER_REGISTRY_SERVER_URL", "WEBSITES_PORT", "ASPNETCORE_URLS", "Settings__UseHttp", "Settings__TrustProxyHeaders", "Settings__TrustProxySchemeHeader", "ApplicationInsights__ConnectionString", "Settings__FoxIDsEndpoint", "Settings__Options__Log", "Settings__Options__DataStorage", "Settings__Options__KeyStorage", "Settings__Options__Cache", "Settings__Options__DataCache", "Settings__CosmosDb__EndpointUri", "Settings__KeyVault__EndpointUri", "Settings__Sendgrid__FromEmail" ]
       }
     },
     {
@@ -540,13 +540,13 @@
         "[resourceId('Microsoft.Web/sites/config', variables('foxidsControlSiteName'), 'appsettings')]"
       ],
       "properties": {
-        "appSettingNames": [ "WEBSITES_ENABLE_APP_SERVICE_STORAGE", "DOCKER_REGISTRY_SERVER_URL", "WEBSITES_PORT", "Settings__UseHttp", "ApplicationInsights__ConnectionString", "Settings__FoxIDsEndpoint", "Settings__FoxIDsControlEndpoint", "Settings__Options__Log", "Settings__Options__DataStorage", "Settings__Options__KeyStorage", "Settings__Options__Cache", "Settings__Options__DataCache", "MasterSeedEnabled", "Settings__CosmosDb__EndpointUri", "Settings__KeyVault__EndpointUri", "Settings__ApplicationInsights__WorkspaceId", "Settings__MasterSeedEnabled" ]
+        "appSettingNames": [ "WEBSITES_ENABLE_APP_SERVICE_STORAGE", "DOCKER_REGISTRY_SERVER_URL", "WEBSITES_PORT", "ASPNETCORE_URLS", "Settings__UseHttp", "ApplicationInsights__ConnectionString", "Settings__FoxIDsEndpoint", "Settings__FoxIDsControlEndpoint", "Settings__Options__Log", "Settings__Options__DataStorage", "Settings__Options__KeyStorage", "Settings__Options__Cache", "Settings__Options__DataCache", "MasterSeedEnabled", "Settings__CosmosDb__EndpointUri", "Settings__KeyVault__EndpointUri", "Settings__ApplicationInsights__WorkspaceId", "Settings__MasterSeedEnabled" ]
       }
     },
     {
       "type": "Microsoft.KeyVault/vaults/secrets",
       "apiVersion": "2016-10-01",
-      "name": "[concat(variables('foxidsDefaultName'), '/Settings--RedisCache--ConnectionString')]",
+      "name": "[concat(variables('foxidsDefaultName'), '/Settings__RedisCache__ConnectionString')]",
       "dependsOn": [
         "[concat('Microsoft.KeyVault/vaults/', variables('foxidsDefaultName'))]",
         "[concat('Microsoft.Cache/Redis/', variables('foxidsDefaultName'))]"
@@ -558,7 +558,7 @@
     {
       "type": "Microsoft.KeyVault/vaults/secrets",
       "apiVersion": "2016-10-01",
-      "name": "[concat(variables('foxidsDefaultName'), '/Settings--CosmosDb--PrimaryKey')]",
+      "name": "[concat(variables('foxidsDefaultName'), '/Settings__CosmosDb__PrimaryKey')]",
       "dependsOn": [
         "[concat('Microsoft.KeyVault/vaults/', variables('foxidsDefaultName'))]",
         "[concat('Microsoft.DocumentDB/databaseAccounts/', variables('foxidsDefaultName'))]"
@@ -570,7 +570,7 @@
     {
       "type": "Microsoft.KeyVault/vaults/secrets",
       "apiVersion": "2016-10-01",
-      "name": "[concat(variables('foxidsDefaultName'), '/Settings--Sendgrid--ApiKey')]",
+      "name": "[concat(variables('foxidsDefaultName'), '/Settings__Sendgrid__ApiKey')]",
       "dependsOn": [
         "[concat('Microsoft.KeyVault/vaults/', variables('foxidsDefaultName'))]"
       ],

diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/src/FoxIDs.Control/FoxIDs.Control.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.4.6</Version>
+		<Version>1.4.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Control/Program.cs b/src/FoxIDs.Control/Program.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 
 namespace FoxIDs
@@ -21,13 +22,12 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
                 .ConfigureKestrel(options => options.AddServerHeader = false)
                 .ConfigureAppConfiguration((context, config) =>
                 {
-                    var builtConfig = config.Build();
                     if (!context.HostingEnvironment.IsDevelopment())
                     {
-                        var keyStorageOption = builtConfig["Settings:Options:KeyStorage"];
-                        if (string.IsNullOrWhiteSpace(keyStorageOption) || keyStorageOption.Equals(KeyStorageOptions.KeyVault.ToString(), StringComparison.Ordinal))
+                        var settings = config.Build().BindConfig<Settings>(nameof(Settings));
+                        if (settings.Options.KeyStorage == KeyStorageOptions.KeyVault)
                         {
-                            config.AddAzureKeyVault(new Uri(builtConfig["Settings:KeyVault:EndpointUri"]), new DefaultAzureCredential());
+                            config.AddAzureKeyVault(new Uri(settings.KeyVault.EndpointUri), new DefaultAzureCredential());
                         }
                     }
                 })
@@ -37,15 +37,11 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
                     // Remove all loggers like console, debug, event source etc.
                     logging.ClearProviders();
 
-                    var logOption = context.Configuration["Settings:Options:Log"];
-                    if (string.IsNullOrWhiteSpace(logOption) || logOption.Equals(LogOptions.ApplicationInsights.ToString(), StringComparison.Ordinal))
+                    var settings = context.Configuration.BindConfig<Settings>(nameof(Settings));
+                    if (settings.Options.Log == LogOptions.ApplicationInsights)
                     {
-                        var connectionString = context.Configuration.GetSection("ApplicationInsights:ConnectionString")?.Value;
-                        if (!string.IsNullOrWhiteSpace(connectionString))
-                        {
-                            logging.AddApplicationInsights(configuration => configuration.ConnectionString = connectionString, options => { });
-                            return;
-                        }
+                        logging.AddApplicationInsights(configuration => configuration.ConnectionString = settings.ApplicationInsights.ConnectionString, options => { });
+                        return;
                     }
                 });
     }

diff --git a/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj b/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.4.6</Version>
+		<Version>1.4.8</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.4.6</Version>
+		<Version>1.4.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/Extensions/ServiceCollectionExtensions.cs b/src/FoxIDs.Shared/Extensions/ServiceCollectionExtensions.cs
@@ -9,6 +9,13 @@ namespace Microsoft.Extensions.DependencyInjection
     public static class ServiceCollectionExtensions
     {
         public static T BindConfig<T>(this IServiceCollection services, IConfiguration configuration, string key) where T : class, new()
+        {
+            var settings = configuration.BindConfig<T>(key);
+            services.AddSingleton(settings);
+            return settings;
+        }
+
+        public static T BindConfig<T>(this IConfiguration configuration, string key) where T : class, new()
         {
             var settings = new T();
             configuration.Bind(key, settings);
@@ -18,10 +25,9 @@ public static class ServiceCollectionExtensions
             }
             catch (Exception ex)
             {
-                throw new InvalidConfigException(typeof(T).Name, ex); 
+                throw new InvalidConfigException(typeof(T).Name, ex);
             }
 
-            services.AddSingleton(settings);
             return settings;
         }
     }

diff --git a/src/FoxIDs.Shared/FoxIDs.Shared.csproj b/src/FoxIDs.Shared/FoxIDs.Shared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.4.6</Version>
+		<Version>1.4.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/Models/Config/ApplicationInsightsSettings.cs b/src/FoxIDs.Shared/Models/Config/ApplicationInsightsSettings.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace FoxIDs.Models.Config
+{
+    public class ApplicationInsightsSettings
+    {
+        [Required]
+        public string ConnectionString { get; set; }
+    }
+}
diff --git a/src/FoxIDs.Shared/Models/Config/Settings.cs b/src/FoxIDs.Shared/Models/Config/Settings.cs
@@ -15,6 +15,12 @@ public class Settings : IValidatableObject
         /// </summary>
         public string FoxIDsControlEndpoint { get; set; }
 
+        /// <summary>
+        /// Application insights settings
+        /// </summary>
+        [ValidateComplexType]
+        public ApplicationInsightsSettings ApplicationInsights { get; set; }
+
         /// <summary>
         /// Optionally accept to use HTTP.
         /// </summary>
@@ -127,6 +133,14 @@ public virtual IEnumerable<ValidationResult> Validate(ValidationContext validati
                 }
             }
 
+            if (Options.Log == LogOptions.ApplicationInsights)
+            {
+                if (ApplicationInsights == null)
+                {
+                    results.Add(new ValidationResult($"The field {nameof(ApplicationInsights)} is required if {nameof(Options.Log)} is {Options.Log}.", new[] { nameof(ApplicationInsights) }));
+                }
+            }
+
             return results;
         }
     }

diff --git a/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj b/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.4.6</Version>
+		<Version>1.4.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/FoxIDs.csproj b/src/FoxIDs/FoxIDs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.4.6</Version>
+		<Version>1.4.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/Program.cs b/src/FoxIDs/Program.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 
 namespace FoxIDs
@@ -21,13 +22,12 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
                 .ConfigureKestrel(options => options.AddServerHeader = false)
                 .ConfigureAppConfiguration((context, config) =>
                 {
-                    var builtConfig = config.Build();
                     if (!context.HostingEnvironment.IsDevelopment())
                     {
-                        var keyStorageOption = builtConfig["Settings:Options:KeyStorage"];
-                        if (string.IsNullOrWhiteSpace(keyStorageOption) || keyStorageOption.Equals(KeyStorageOptions.KeyVault.ToString(), StringComparison.Ordinal))
+                        var settings = config.Build().BindConfig<Settings>(nameof(Settings));
+                        if (settings.Options.KeyStorage == KeyStorageOptions.KeyVault)
                         {
-                            config.AddAzureKeyVault(new Uri(builtConfig["Settings:KeyVault:EndpointUri"]), new DefaultAzureCredential());
+                            config.AddAzureKeyVault(new Uri(settings.KeyVault.EndpointUri), new DefaultAzureCredential());
                         }
                     }
                 })
@@ -37,15 +37,11 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
                     // Remove all loggers like console, debug, event source etc.
                     logging.ClearProviders();
 
-                    var logOption = context.Configuration["Settings:Options:Log"];
-                    if (string.IsNullOrWhiteSpace(logOption) || logOption.Equals(LogOptions.ApplicationInsights.ToString(), StringComparison.Ordinal))
+                    var settings = context.Configuration.BindConfig<Settings>(nameof(Settings));
+                    if (settings.Options.Log == LogOptions.ApplicationInsights)
                     {
-                        var connectionString = context.Configuration.GetSection("ApplicationInsights:ConnectionString")?.Value;
-                        if (!string.IsNullOrWhiteSpace(connectionString))
-                        {
-                            logging.AddApplicationInsights(configuration => configuration.ConnectionString = connectionString, options => { });
-                            return;
-                        }
+                        logging.AddApplicationInsights(configuration => configuration.ConnectionString = settings.ApplicationInsights.ConnectionString, options => { });
+                        return;
                     }
                 });
     }