Merge pull request #94 from TransactionProcessing/task/logconfigvaluesextension

Minor adjustments to config logging

Author: StuartFerguson

Shared.Tests/ConfigurationRootExtensionsTests.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using Extensions;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Hosting;
@@ -25,6 +26,8 @@ public class ConfigurationRootExtensionsTests
         /// </value>
         public static IReadOnlyDictionary<String, String> DefaultAppSettings { get; } = new Dictionary<String, String>
                                                                                         {
+                                                                                            ["AppSettings:Test"] = "",
+                                                                                            ["AppSettings:Test1"] = null,
                                                                                             ["AppSettings:ClientId"] = "clientId",
                                                                                             ["AppSettings:ClientSecret"] = "Secret1",
                                                                                             ["EventStoreSettings:ConnectionString"] = "https://192.168.1.133:2113",
@@ -42,7 +45,7 @@ public class ConfigurationRootExtensionsTests
         [Fact]
         public void ConfigurationRootExtensions_LogConfiguration_ConfigurationIsLogged()
         {
-            IConfigurationBuilder builder = new ConfigurationBuilder().AddInMemoryCollection(ConfigurationRootExtensionsTests.DefaultAppSettings);
+            IConfigurationBuilder builder = new ConfigurationBuilder().AddInMemoryCollection(ConfigurationRootExtensionsTests.DefaultAppSettings).AddEnvironmentVariables();
 
             IConfigurationRoot configuration = builder.Build();
 
@@ -54,6 +57,7 @@ public void ConfigurationRootExtensions_LogConfiguration_ConfigurationIsLogged()
             String[] loggedEntries = testLogger.GetLogEntries();
             Int32 expectedCount = ConfigurationRootExtensionsTests.DefaultAppSettings.Count + 6; // 3 blank lines & 3 headers
             loggedEntries.Length.ShouldBe(expectedCount);
+            loggedEntries.Where(l => l.Contains("No Value")).Count().ShouldBe(2);
         }
 
         /// <summary>
@@ -81,7 +85,7 @@ public void ConfigurationRootExtensions_LogConfiguration_NoConfiguration_NoConfi
         [Fact]
         public void ConfigurationRootExtensions_LogConfiguration_NullAction_ErrorIsThrown()
         {
-            IConfigurationBuilder builder = new ConfigurationBuilder().AddInMemoryCollection(ConfigurationRootExtensionsTests.DefaultAppSettings);
+            IConfigurationBuilder builder = new ConfigurationBuilder().AddInMemoryCollection(ConfigurationRootExtensionsTests.DefaultAppSettings).AddEnvironmentVariables();
 
             IConfigurationRoot configuration = builder.Build();
 

Shared/Extensions/ConfigurationRootExtensions.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using General;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Hosting.Internal;
@@ -37,11 +38,22 @@ private static void LogConfigurationSettings(IConfigurationSection configSection
         {
             IEnumerable<IConfigurationSection> children = configSection.GetChildren();
 
-            loggerAction(string.Empty);
-            loggerAction($"Configuration Section: {configSection.Key}");
-            foreach (IConfigurationSection c in children)
+            if (children.Any())
             {
-                loggerAction($"Key: {c.Key}  Value: {c.Value}");
+                loggerAction(string.Empty);
+                loggerAction($"Configuration Section: {configSection.Key}");
+                foreach (IConfigurationSection c in children)
+                {
+                    if (String.IsNullOrEmpty(c.Value))
+                    {
+                        loggerAction($"Key: {c.Key}  Value: No Value");
+                    }
+                    else
+                    {
+                        loggerAction($"Key: {c.Key}  Value: {c.Value}");
+                    }
+                    
+                }
             }
         }
     }