refactor: refactor dcc configuration (#215)

* refactor: refactor dcc configuration * refactor: refactor dcc configuration * chore: adjust dcc test * refactor: refactor dcc configuration * test: adjust dcc configuration test * fix: fix configuration test error * fix: adjust InitializeAppConfiguration function * refactor(ConfigurationApi.Dcc): Refactor Dcc * refactor: Optimize ConfigurationApi.Dcc And Perfect unit tests * refactor(Configuration): Simplified code * chore: Deal with code smells * chore: deal with code smells Co-authored-by: yanpengju <[email protected]> Co-authored-by: 阎鹏举 <阎鹏举@DESKTOP-28NV352> Co-authored-by: zhenlei520 <[email protected]>
masastack · Aug 23, 2022 · ee11ccd · ee11ccd
1 parent 4714160
commit ee11ccd
Show file tree

Hide file tree

Showing 26 changed files with 931 additions and 842 deletions.
diff --git a/...BuildingBlocks/Configuration/Masa.BuildingBlocks.Configuration/IConfigurationApiClient.cs b/...BuildingBlocks/Configuration/Masa.BuildingBlocks.Configuration/IConfigurationApiClient.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 namespace Masa.BuildingBlocks.Configuration;
+
 public interface IConfigurationApiClient
 {
     Task<(string Raw, ConfigurationTypes ConfigurationType)> GetRawAsync(string configObject, Action<string>? valueChanged = null);

diff --git a/...Blocks/Configuration/Masa.BuildingBlocks.Configuration/Options/MasaAppConfigureOptions.cs b/...Blocks/Configuration/Masa.BuildingBlocks.Configuration/Options/MasaAppConfigureOptions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) MASA Stack All rights reserved.
+// Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 namespace Masa.BuildingBlocks.Configuration.Options;
@@ -11,12 +11,18 @@ public class MasaAppConfigureOptions
 
     public string Cluster { get => GetValue(nameof(Cluster)); set => Data[nameof(Cluster)] = value; }
 
-    public Dictionary<string, string> Data { get; set; } = new();
+    private Dictionary<string, string> Data { get; set; } = new(StringComparer.OrdinalIgnoreCase);
 
-    private string GetValue(string key)
+    public int Length => Data.Count;
+
+    public string GetValue(string key) => GetValue(key, () => string.Empty);
+
+    public string GetValue(string key, Func<string> defaultFunc)
     {
         if (Data.ContainsKey(key)) return Data[key];
 
-        return string.Empty;
+        return defaultFunc.Invoke();
     }
+
+    public void TryAdd(string key, string value) => Data.TryAdd(key, value);
 }
diff --git a/...on/ConfigurationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/Internal/Constants.cs b/...on/ConfigurationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/Internal/Constants.cs
@@ -9,7 +9,7 @@ internal static class Constants
 
     internal const string DEFAULT_SUBSCRIBE_KEY_PREFIX = "masa.dcc:";
 
-    internal const string DEFAULT_ENVIRONMENT_NAME = "ASPNETCORE_ENVIRONMENT";
-
     internal const string DATA_DICTIONARY_SECTION_NAME = "DataDictionary";
+
+    internal const string DEFAULT_PUBLIC_ID = "public-$Config";
 }
diff --git a/...pi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/Internal/DccConfigurationRepository.cs b/...pi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/Internal/DccConfigurationRepository.cs
@@ -20,6 +20,7 @@ public DccConfigurationRepository(
         : base(loggerFactory)
     {
         _client = client;
+
         foreach (var sectionOption in sectionOptions)
         {
             Initialize(sectionOption).ConfigureAwait(false).GetAwaiter().GetResult();
@@ -30,8 +31,8 @@ private async Task Initialize(DccSectionOptions sectionOption)
     {
         foreach (var configObject in sectionOption.ConfigObjects)
         {
-            string key = $"{sectionOption.Environment!}-{sectionOption.Cluster!}-{sectionOption.AppId}-{configObject}".ToLower();
-            var result = await _client.GetRawAsync(sectionOption.Environment!, sectionOption.Cluster!, sectionOption.AppId, configObject, (val) =>
+            string key = $"{sectionOption.Environment}-{sectionOption.Cluster}-{sectionOption.AppId}-{configObject}".ToLower();
+            var result = await _client.GetRawAsync(sectionOption.Environment, sectionOption.Cluster, sectionOption.AppId, configObject, (val) =>
             {
                 if (_configObjectConfigurationTypeRelations.TryGetValue(key, out var configurationType))
                 {
@@ -45,28 +46,26 @@ private async Task Initialize(DccSectionOptions sectionOption)
         }
     }
 
-    private IDictionary<string, string> FormatRaw(string appId, string configObject, string? raw, ConfigurationTypes configurationType)
+    private static IDictionary<string, string> FormatRaw(string appId, string configObject, string? raw, ConfigurationTypes configurationType)
     {
         if (raw == null)
             return new Dictionary<string, string>();
 
-        switch (configurationType)
+        return configurationType switch
         {
-            case ConfigurationTypes.Json:
-                return SecondaryFormat(appId, configObject, JsonConfigurationParser.Parse(raw));
-            case ConfigurationTypes.Properties:
-                return SecondaryFormat(appId, configObject, JsonSerializer.Deserialize<Dictionary<string, string>>(raw)!);
-            case ConfigurationTypes.Text:
-                return new Dictionary<string, string>()
-                {
-                    { $"{appId}{ConfigurationPath.KeyDelimiter}{configObject}" , raw ?? "" }
-                };
-            default:
-                throw new NotSupportedException(nameof(configurationType));
-        }
+            ConfigurationTypes.Json => SecondaryFormat(appId, configObject, JsonConfigurationParser.Parse(raw)),
+            ConfigurationTypes.Properties => SecondaryFormat(appId, configObject, JsonSerializer.Deserialize<Dictionary<string, string>>(raw)!),
+            ConfigurationTypes.Text => new Dictionary<string, string>
+            {
+                    { $"{appId}{ConfigurationPath.KeyDelimiter}{configObject}" , raw }
+                },
+            ConfigurationTypes.Xml => SecondaryFormat(appId, configObject, JsonConfigurationParser.Parse(raw)),
+            ConfigurationTypes.Yaml => SecondaryFormat(appId, configObject, JsonConfigurationParser.Parse(raw)),
+            _ => throw new NotSupportedException(nameof(configurationType)),
+        };
     }
 
-    private IDictionary<string, string> SecondaryFormat(
+    private static IDictionary<string, string> SecondaryFormat(
         string appId,
         string configObject,
         IDictionary<string, string> data)

diff --git a/...onfiguration.ConfigurationApi.Dcc/Internal/Extensions/DistributedCacheClientExtensions.cs b/...onfiguration.ConfigurationApi.Dcc/Internal/Extensions/DistributedCacheClientExtensions.cs
@@ -0,0 +1,29 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.Utils.Caching.Core.Interfaces;
+
+internal static class DistributedCacheClientExtensions
+{
+    public static List<string> GetAllConfigObjects(
+        this IDistributedCacheClient distributedCacheClient,
+        string appId,
+        string environment,
+        string cluster)
+    {
+        var defaultConfigObjects = new List<string>();
+
+        string partialKey =
+            $"{environment}-{cluster}-{appId}".ToLower();
+        List<string> keys = distributedCacheClient.GetKeys($"{partialKey}*");
+        foreach (var key in keys)
+        {
+            var configObject = key.Split($"{partialKey}-", StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
+            if (configObject == null) continue;
+
+            defaultConfigObjects.Add(configObject);
+        }
+
+        return defaultConfigObjects;
+    }
+}
diff --git a/...urationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/Internal/Model/StaticConfig.cs b/...urationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/Internal/Model/StaticConfig.cs
@@ -7,5 +7,5 @@ internal static class StaticConfig
 {
     public static string AppId { get; set; }
 
-    public static string PublicId => "public-$Config";
+    public static string PublicId { get; set; }
 }
diff --git a/...urationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/Internal/Options/DccOptions.cs b/...urationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/Internal/Options/DccOptions.cs