PR request for ProcessParameters code

Author: KenHundley

src/Amazon.Extensions.Configuration.SystemsManager/Internal/SystemsManagerProcessor.cs

@@ -35,9 +35,11 @@ public class SystemsManagerProcessor : ISystemsManagerProcessor
         private const string SecretsManagerPath = "/aws/reference/secretsmanager/";
 
         private SystemsManagerConfigurationSource Source { get; }
+        private Func<IEnumerable<Parameter>, string, IParameterProcessor, IDictionary<string, string>> ProcessParameters { get; }
 
-        public SystemsManagerProcessor(SystemsManagerConfigurationSource source)
+        public SystemsManagerProcessor(SystemsManagerConfigurationSource source, Func<IEnumerable<Parameter>, string, IParameterProcessor, IDictionary<string, string>> processParameters)
         {
+            ProcessParameters = processParameters;
             Source = source;
             Source.ParameterProcessor = Source.ParameterProcessor ?? new DefaultParameterProcessor();
         }
@@ -86,7 +88,6 @@ private async Task<IDictionary<string, string>> GetParameterAsync()
 
                 var prefix = Source.Prefix ?? Source.ParameterProcessor.GetKey(response.Parameter, SecretsManagerPath);
                 return AddPrefix(JsonConfigurationParser.Parse(Source.ParameterProcessor.GetValue(response.Parameter, SecretsManagerPath)), prefix);
-
             }
         }
 
@@ -99,18 +100,6 @@ public static IDictionary<string, string> AddPrefix(IDictionary<string, string>
                 : input.ToDictionary(pair => $"{prefix}{ConfigurationPath.KeyDelimiter}{pair.Key}", pair => pair.Value, StringComparer.OrdinalIgnoreCase);
         }
 
-        public static IDictionary<string, string> ProcessParameters(IEnumerable<Parameter> parameters, string path, IParameterProcessor parameterProcessor)
-        {
-            return parameters
-                .Where(parameter => parameterProcessor.IncludeParameter(parameter, path))
-                .Select(parameter => new
-                {
-                    Key = parameterProcessor.GetKey(parameter, path),
-                    Value = parameterProcessor.GetValue(parameter, path)
-                })
-                .ToDictionary(parameter => parameter.Key, parameter => parameter.Value, StringComparer.OrdinalIgnoreCase);
-        }
-
         private const string UserAgentHeader = "User-Agent";
         private static readonly string AssemblyVersion = typeof(SystemsManagerProcessor).GetTypeInfo().Assembly.GetName().Version.ToString();
 

src/Amazon.Extensions.Configuration.SystemsManager/SystemsManagerConfigurationProvider.cs

@@ -15,9 +15,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Amazon.Extensions.Configuration.SystemsManager.Internal;
+using Amazon.SimpleSystemsManagement.Model;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Primitives;
 
@@ -39,7 +41,7 @@ public class SystemsManagerConfigurationProvider : ConfigurationProvider
         /// Initializes a new instance with the specified source.
         /// </summary>
         /// <param name="source">The <see cref="IConfigurationSource"/> used to retrieve values from AWS Systems Manager Parameter Store</param>
-        public SystemsManagerConfigurationProvider(SystemsManagerConfigurationSource source) : this(source, new SystemsManagerProcessor(source))
+        public SystemsManagerConfigurationProvider(SystemsManagerConfigurationSource source) : this(source, new SystemsManagerProcessor(source, ProcessParameters))
         {
         }
 
@@ -134,5 +136,17 @@ private async Task LoadAsync(bool reload)
                     throw;
             }
         }
+
+        public static IDictionary<string, string> ProcessParameters(IEnumerable<Parameter> parameters, string path, IParameterProcessor parameterProcessor)
+        {
+            return parameters
+                .Where(parameter => parameterProcessor.IncludeParameter(parameter, path))
+                .Select(parameter => new
+                {
+                    Key = parameterProcessor.GetKey(parameter, path),
+                    Value = parameterProcessor.GetValue(parameter, path)
+                })
+                .ToDictionary(parameter => parameter.Key, parameter => parameter.Value, StringComparer.OrdinalIgnoreCase);
+        }
     }
 }

test/Amazon.Extensions.Configuration.SystemsManager.Tests/SystemsManagerConfigurationProviderTests.cs

@@ -60,7 +60,7 @@ public void LoadTest()
                 _parameterProcessorMock.Setup(processor => processor.GetKey(parameter, Path)).Returns(parameter.Value);
             }
 
-            var getData = SystemsManagerProcessor.ProcessParameters(_parameters, Path, _parameterProcessorMock.Object);
+            var getData = SystemsManagerConfigurationProvider.ProcessParameters(_parameters, Path, _parameterProcessorMock.Object);
 
             _systemsManagerProcessorMock.Setup(p => p.GetDataAsync()).ReturnsAsync(() => getData);
 

test/Amazon.Extensions.Configuration.SystemsManager.Tests/SystemsManagerProcessorTests.cs

@@ -36,7 +36,7 @@ public void ProcessParametersTest()
                 _parameterProcessorMock.Setup(processor => processor.GetValue(parameter, Path)).Returns(parameter.Value);
             }
 
-            var data = SystemsManagerProcessor.ProcessParameters(_parameters, Path, _parameterProcessorMock.Object);
+            var data = SystemsManagerConfigurationProvider.ProcessParameters(_parameters, Path, _parameterProcessorMock.Object);
 
             Assert.All(data, item => Assert.Equal(item.Value, item.Key));