moved ConfigurationSectionArgumentValue functionality into ObjectArgumentValue, removed hint hack

MV10 · MV10 · commit 400b1de5068e · 2018-04-20T07:36:51.000-04:00
diff --git a/README.md b/README.md
@@ -94,15 +94,13 @@ dotnet run
 
 ### Nested configuration sections
 
-Some Serilog packages require a reference to a logger configuration object. These must be "hinted" by appending a `>` character to the end of the argument name. The sample program in this project illustrates this with the following entry configuring the _Serilog.Sinks.Async_ package to wrap the _Serilog.Sinks.File_ package.
-
-Note the `configure>` parameter name with the trailing hint character:
+Some Serilog packages require a reference to a logger configuration object. The sample program in this project illustrates this with the following entry configuring the _Serilog.Sinks.Async_ package to wrap the _Serilog.Sinks.File_ package. The `configure` parameter references the File sink configuration:
 
 ```json
 "WriteTo:Async": {
   "Name": "Async",
   "Args": {
-    "configure>": [
+    "configure": [
       {
         "Name": "File",
         "Args": {
diff --git a/sample/Sample/appsettings.json b/sample/Sample/appsettings.json
@@ -11,7 +11,7 @@
     "WriteTo:Sublogger": {
       "Name": "Logger",
       "Args": {
-        "configureLogger>": {
+        "configureLogger": {
           "WriteTo": [
             {
               "Name": "Console",
@@ -28,7 +28,7 @@
     "WriteTo:Async": {
       "Name": "Async",
       "Args": {
-        "configure>": [
+        "configure": [
           {
             "Name": "File",
             "Args": {
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs
@@ -19,16 +19,13 @@ namespace Serilog.Settings.Configuration
     class ConfigurationReader : IConfigurationReader
     {
         const string LevelSwitchNameRegex = @"^\$[A-Za-z]+[A-Za-z0-9]*$";
-        const string NestedConfigHintChar = ">";
 
         static IConfiguration _configuration;
 
         readonly IConfigurationSection _section;
         readonly DependencyContext _dependencyContext;
         readonly IReadOnlyCollection<Assembly> _configurationAssemblies;
 
-        #region Constructors
-
         public ConfigurationReader(IConfiguration configuration, DependencyContext dependencyContext)
         {
             _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
@@ -47,17 +44,13 @@ public ConfigurationReader(IConfiguration configuration, DependencyContext depen
         }
 
         // Used internally for processing nested configuration sections -- see GetMethodCalls below.
-        ConfigurationReader(IConfigurationSection configSection, IReadOnlyCollection<Assembly> configurationAssemblies, DependencyContext dependencyContext)
+        internal ConfigurationReader(IConfigurationSection configSection, IReadOnlyCollection<Assembly> configurationAssemblies, DependencyContext dependencyContext)
         {
             _section = configSection ?? throw new ArgumentNullException(nameof(configSection));
             _dependencyContext = dependencyContext;
             _configurationAssemblies = configurationAssemblies ?? throw new ArgumentNullException(nameof(configurationAssemblies));
         }
 
-        #endregion
-
-        #region Configure and related Apply methods
-
         public void Configure(LoggerConfiguration loggerConfiguration)
         {
             var declaredLevelSwitches = ProcessLevelSwitchDeclarations();
@@ -204,10 +197,6 @@ void ApplyEnrichment(LoggerConfiguration loggerConfiguration, IReadOnlyDictionar
             }
         }
 
-        #endregion
-
-        #region Internal implementation
-
         internal ILookup<string, Dictionary<string, IConfigurationArgumentValue>> GetMethodCalls(IConfigurationSection directive)
         {
             var children = directive.GetChildren().ToList();
@@ -222,7 +211,7 @@ internal ILookup<string, Dictionary<string, IConfigurationArgumentValue>> GetMet
                  let name = GetSectionName(child)
                  let callArgs = (from argument in child.GetSection("Args").GetChildren()
                                  select new {
-                                     Name = argument.Key.Replace(NestedConfigHintChar, string.Empty),
+                                     Name = argument.Key,
                                      Value = GetArgumentValue(argument) }).ToDictionary(p => p.Name, p => p.Value)
                  select new { Name = name, Args = callArgs }))
                      .ToLookup(p => p.Name, p => p.Args);
@@ -238,14 +227,7 @@ IConfigurationArgumentValue GetArgumentValue(IConfigurationSection argumentSecti
                 }
                 else
                 {
-                    if(argumentSection.Key.EndsWith(NestedConfigHintChar))
-                    {
-                        argumentValue = new ConfigurationSectionArgumentValue(new ConfigurationReader(argumentSection, _configurationAssemblies, _dependencyContext));
-                    }
-                    else
-                    {
-                        argumentValue = new ObjectArgumentValue(argumentSection);
-                    }
+                    argumentValue = new ObjectArgumentValue(argumentSection, _configurationAssemblies, _dependencyContext);
                 }
 
                 return argumentValue;
@@ -391,10 +373,6 @@ internal static IList<MethodInfo> FindConfigurationMethods(IReadOnlyCollection<A
                 .ToList();
         }
 
-        #endregion
-
-        #region Internal helpers
-
         // don't support (yet?) arrays in the parameter list (ILogEventEnricher[])
         internal static LoggerConfiguration With(LoggerFilterConfiguration loggerFilterConfiguration, ILogEventFilter filter)
             => loggerFilterConfiguration.With(filter);
@@ -426,6 +404,5 @@ internal static LogEventLevel ParseLogEventLevel(string value)
             return parsedLevel;
         }
 
-        #endregion
     }
 }
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationSectionArgumentValue.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationSectionArgumentValue.cs
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ObjectArgumentValue.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ObjectArgumentValue.cs
@@ -1,22 +1,56 @@
 ﻿using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyModel;
+using Serilog.Configuration;
 using Serilog.Core;
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 
 namespace Serilog.Settings.Configuration
 {
     class ObjectArgumentValue : IConfigurationArgumentValue
     {
         readonly IConfigurationSection section;
+        readonly IReadOnlyCollection<Assembly> configurationAssemblies;
+        readonly DependencyContext dependencyContext;
 
-        public ObjectArgumentValue(IConfigurationSection section)
+        public ObjectArgumentValue(IConfigurationSection section, IReadOnlyCollection<Assembly> configurationAssemblies, DependencyContext dependencyContext)
         {
             this.section = section;
+
+            // used by nested logger configurations to feed a new pass by ConfigurationReader
+            this.configurationAssemblies = configurationAssemblies;
+            this.dependencyContext = dependencyContext;
         }
 
         public object ConvertTo(Type toType, IReadOnlyDictionary<string, LoggingLevelSwitch> declaredLevelSwitches)
         {
+            // return the entire section for internal processing
             if(toType == typeof(IConfigurationSection)) return section;
+
+            // process a nested configuration to populate an Action<> logger/sink config parameter?
+            var typeInfo = toType.GetTypeInfo();
+            if(typeInfo.IsGenericType &&
+                typeInfo.GetGenericTypeDefinition() is Type genericType && genericType == typeof(Action<>))
+            {
+                var configType = typeInfo.GenericTypeArguments[0];
+                if(configType != typeof(LoggerConfiguration) && configType != typeof(LoggerSinkConfiguration))
+                    throw new ArgumentException($"Configuration for Action<{configType}> is not implemented.");
+
+                IConfigurationReader configReader = new ConfigurationReader(section, configurationAssemblies, dependencyContext);
+
+                if(configType == typeof(LoggerConfiguration))
+                {
+                    return new Action<LoggerConfiguration>(configReader.Configure);
+                }
+
+                if(configType == typeof(LoggerSinkConfiguration))
+                {
+                    return new Action<LoggerSinkConfiguration>(loggerSinkConfig => configReader.ApplySinks(loggerSinkConfig, declaredLevelSwitches));
+                }
+            }
+
+            // MS Config binding
             return section.Get(toType);
         }
     }
diff --git a/test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs b/test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs
@@ -402,7 +402,7 @@ public void WriteToLoggerWithRestrictedToMinimumLevelIsSupported()
                 ""WriteTo"": [{
                     ""Name"": ""Logger"",
                     ""Args"": {
-                        ""configureLogger>"" : {
+                        ""configureLogger"" : {
                             ""WriteTo"": [{
                                 ""Name"": ""DummyRollingFile"",
                                 ""Args"": {""pathFormat"" : ""C:\\""}
@@ -438,7 +438,7 @@ public void WriteToSubLoggerWithLevelSwitchIsSupported()
                 ""WriteTo"": [{
                     ""Name"": ""Logger"",
                     ""Args"": {
-                        ""configureLogger>"" : {
+                        ""configureLogger"" : {
                             ""WriteTo"": [{
                                 ""Name"": ""DummyRollingFile"",
                                 ""Args"": {""pathFormat"" : ""C:\\""}

Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,13 @@ namespace Serilog.Settings.Configuration`
`19`	`19`	`class ConfigurationReader : IConfigurationReader`
`20`	`20`	`{`
`21`	`21`	`const string LevelSwitchNameRegex = @"^\$[A-Za-z]+[A-Za-z0-9]*$";`
`22`		`- const string NestedConfigHintChar = ">";`
`23`	`22`
`24`	`23`	`static IConfiguration _configuration;`
`25`	`24`
`26`	`25`	`readonly IConfigurationSection _section;`
`27`	`26`	`readonly DependencyContext _dependencyContext;`
`28`	`27`	`readonly IReadOnlyCollection<Assembly> _configurationAssemblies;`
`29`	`28`
`30`		`- #region Constructors`
`31`		`-`
`32`	`29`	`public ConfigurationReader(IConfiguration configuration, DependencyContext dependencyContext)`
`33`	`30`	`{`
`34`	`31`	`_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));`
`@@ -47,17 +44,13 @@ public ConfigurationReader(IConfiguration configuration, DependencyContext depen`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`// Used internally for processing nested configuration sections -- see GetMethodCalls below.`
`50`		`- ConfigurationReader(IConfigurationSection configSection, IReadOnlyCollection<Assembly> configurationAssemblies, DependencyContext dependencyContext)`
	`47`	`+ internal ConfigurationReader(IConfigurationSection configSection, IReadOnlyCollection<Assembly> configurationAssemblies, DependencyContext dependencyContext)`
`51`	`48`	`{`
`52`	`49`	`_section = configSection ?? throw new ArgumentNullException(nameof(configSection));`
`53`	`50`	`_dependencyContext = dependencyContext;`
`54`	`51`	`_configurationAssemblies = configurationAssemblies ?? throw new ArgumentNullException(nameof(configurationAssemblies));`
`55`	`52`	`}`
`56`	`53`
`57`		`- #endregion`
`58`		`-`
`59`		`- #region Configure and related Apply methods`
`60`		`-`
`61`	`54`	`public void Configure(LoggerConfiguration loggerConfiguration)`
`62`	`55`	`{`
`63`	`56`	`var declaredLevelSwitches = ProcessLevelSwitchDeclarations();`
`@@ -204,10 +197,6 @@ void ApplyEnrichment(LoggerConfiguration loggerConfiguration, IReadOnlyDictionar`
`204`	`197`	`}`
`205`	`198`	`}`
`206`	`199`
`207`		`- #endregion`
`208`		`-`
`209`		`- #region Internal implementation`
`210`		`-`
`211`	`200`	`internal ILookup<string, Dictionary<string, IConfigurationArgumentValue>> GetMethodCalls(IConfigurationSection directive)`
`212`	`201`	`{`
`213`	`202`	`var children = directive.GetChildren().ToList();`
`@@ -222,7 +211,7 @@ internal ILookup<string, Dictionary<string, IConfigurationArgumentValue>> GetMet`
`222`	`211`	`let name = GetSectionName(child)`
`223`	`212`	`let callArgs = (from argument in child.GetSection("Args").GetChildren()`
`224`	`213`	`select new {`
`225`		`- Name = argument.Key.Replace(NestedConfigHintChar, string.Empty),`
	`214`	`+ Name = argument.Key,`
`226`	`215`	`Value = GetArgumentValue(argument) }).ToDictionary(p => p.Name, p => p.Value)`
`227`	`216`	`select new { Name = name, Args = callArgs }))`
`228`	`217`	`.ToLookup(p => p.Name, p => p.Args);`
`@@ -238,14 +227,7 @@ IConfigurationArgumentValue GetArgumentValue(IConfigurationSection argumentSecti`
`238`	`227`	`}`
`239`	`228`	`else`
`240`	`229`	`{`
`241`		`- if(argumentSection.Key.EndsWith(NestedConfigHintChar))`
`242`		`- {`
`243`		`- argumentValue = new ConfigurationSectionArgumentValue(new ConfigurationReader(argumentSection, _configurationAssemblies, _dependencyContext));`
`244`		`- }`
`245`		`- else`
`246`		`- {`
`247`		`- argumentValue = new ObjectArgumentValue(argumentSection);`
`248`		`- }`
	`230`	`+ argumentValue = new ObjectArgumentValue(argumentSection, _configurationAssemblies, _dependencyContext);`
`249`	`231`	`}`
`250`	`232`
`251`	`233`	`return argumentValue;`
`@@ -391,10 +373,6 @@ internal static IList<MethodInfo> FindConfigurationMethods(IReadOnlyCollection<A`
`391`	`373`	`.ToList();`
`392`	`374`	`}`
`393`	`375`
`394`		`- #endregion`
`395`		`-`
`396`		`- #region Internal helpers`
`397`		`-`
`398`	`376`	`// don't support (yet?) arrays in the parameter list (ILogEventEnricher[])`
`399`	`377`	`internal static LoggerConfiguration With(LoggerFilterConfiguration loggerFilterConfiguration, ILogEventFilter filter)`
`400`	`378`	`=> loggerFilterConfiguration.With(filter);`
`@@ -426,6 +404,5 @@ internal static LogEventLevel ParseLogEventLevel(string value)`
`426`	`404`	`return parsedLevel;`
`427`	`405`	`}`
`428`	`406`
`429`		`- #endregion`
`430`	`407`	`}`
`431`	`408`	`}`