Merge pull request #123 from Drawaes/SingleKey

Single key

Author: Drawaes

releasenotes/5.1.0.props

@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <PackageReleaseNotes>
+* Added ability to request a single key
+</PackageReleaseNotes>
+  </PropertyGroup>
+</Project>

src/CondenserDotNet.Configuration/Consul/ConsulConfigSource.cs

@@ -44,9 +44,9 @@ private class WatchConsul
             ConsulIndex = "0"
         };
 
-        public string FormValidKey(string keyPath)
+        public string FormValidKey(string keyPath, bool dontPreifxStart)
         {
-            if (!keyPath.EndsWith(ConsulPath))
+            if (!keyPath.EndsWith(ConsulPath) && !dontPreifxStart)
             {
                 keyPath += ConsulPath;
             }

src/CondenserDotNet.Configuration/Consul/ConsulRegistry.cs

@@ -57,14 +57,25 @@ public IEnumerable<string> AllKeys
         /// </summary>
         /// <param name="keyPath"></param>
         /// <returns></returns>
-        public async Task<bool> AddStaticKeyPathAsync(string keyPath)
+        public Task<bool> AddStaticKeyPathAsync(string keyPath) => AddStaticKeyPathAsync(keyPath, singleKey: false);
+
+        public async Task<bool> AddStaticKeyPathAsync(string keyPath, bool singleKey)
         {
-            keyPath = _source.FormValidKey(keyPath);
-            return (await AddInitialKeyPathAsync(keyPath)) > -1;
+            keyPath = _source.FormValidKey(keyPath, dontPreifxStart: singleKey);
+            return (await AddInitialKeyPathAsync(keyPath, singleKey)) > -1;
         }
 
-        private async Task<int> AddInitialKeyPathAsync(string keyPath)
+        private async Task<int> AddInitialKeyPathAsync(string keyPath, bool singleKey)
         {
+            if (singleKey)
+            {
+                var key = await _source.GetKeyAsync(keyPath);
+                var keyNameSplit = keyPath.Split('/');
+                var keyName = keyNameSplit[keyNameSplit.Length - 1];
+                var keyValue = System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(key.value));
+                AddNewDictionaryToList(new Dictionary<string, string>() { [keyName] =  keyValue });
+            }
+
             var response = await _source.GetKeysAsync(keyPath);
 
             if (!response.Success)
@@ -83,7 +94,7 @@ private async Task<int> AddInitialKeyPathAsync(string keyPath)
         public async Task AddUpdatingPathAsync(string keyPath)
         {
             keyPath = _source.FormValidKey(keyPath);
-            var initialDictionary = await AddInitialKeyPathAsync(keyPath);
+            var initialDictionary = await AddInitialKeyPathAsync(keyPath, singleKey: false);
             if (initialDictionary == -1)
             {
                 var newDictionary = new Dictionary<string, string>();

src/CondenserDotNet.Configuration/Consul/IConfigSource.cs

@@ -6,7 +6,7 @@ namespace CondenserDotNet.Configuration.Consul
     public interface IConfigSource
     {
         object CreateWatchState();
-        string FormValidKey(string keyPath);
+        string FormValidKey(string keyPath, bool dontPreifxStart = false);
         Task<KeyOperationResult> GetKeysAsync(string keyPath);
         Task<KeyOperationResult> TryWatchKeysAsync(string keyPath, object state);
         Task<(bool found, string value)> GetKeyAsync(string keyPath);

src/CondenserDotNet.Configuration/IConfigurationRegistry.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,6 +10,9 @@ public interface IConfigurationRegistry : IDisposable
     {
         string this[string key] { get; }
         Task<bool> AddStaticKeyPathAsync(string keyPath);
+
+        Task<bool> AddStaticKeyPathAsync(string keyPath, bool singleKey = false);
+
         Task AddUpdatingPathAsync(string keyPath);
         void AddWatchOnEntireConfig(Action callback);
         void AddWatchOnSingleKey(string keyToWatch, Action<string> callback);

test/Condenser.Tests.Integration/ConfigFacts.cs

@@ -36,6 +36,23 @@ public async Task TestRegister()
             }
         }
 
+        [Fact]
+        public async Task TestSingleKey()
+        {
+            var keyname = Guid.NewGuid().ToString();
+            using(var configRegistry = new ConsulRegistry())
+            {
+                await configRegistry.SetKeyAsync($"org/{keyname}/test1", _value1);
+
+                var result = await configRegistry.AddStaticKeyPathAsync($"org/{keyname}/test1", true);
+                Assert.True(result);
+
+                var value = configRegistry["test1"];
+
+                Assert.Equal(_value1, value);
+            }
+        }
+
         [Fact]
         public async Task TestKeyHandlesFrontSlash()
         {

test/CondenserTests/Fakes/FakeConfigurationRegistry.cs

@@ -50,5 +50,7 @@ public void Dispose()
         {
 
         }
+
+        public Task<bool> AddStaticKeyPathAsync(string keyPath, bool singleKey = false) => throw new NotImplementedException();
     }
 }

version.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>5.0.0</VersionPrefix>
+        <VersionPrefix>5.1.0</VersionPrefix>
         <VersionSuffix>beta</VersionSuffix>
     </PropertyGroup>
 </Project>