Allowing trailing commas in config json file

microsoft · Oct 31, 2024 · 08cd571 · 08cd571
1 parent 9ebabe8
commit 08cd571
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/libs/host/Configuration/ConfigProviders.cs b/libs/host/Configuration/ConfigProviders.cs
@@ -87,11 +87,17 @@ public bool TryImportOptions(string path, IStreamProvider streamProvider, Option
                 var jsonSerializerOptions = new JsonSerializerOptions
                 {
                     Converters = { new PopulateObjectJsonConverter<Options>(options), new JsonStringEnumConverter() },
-                    NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString
+                    NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString,
                 };
 
                 var json = streamReader.ReadToEnd();
-                var jsonReaderOptions = new JsonReaderOptions { CommentHandling = JsonCommentHandling.Skip };
+
+                var jsonReaderOptions = new JsonReaderOptions
+                {
+                    CommentHandling = JsonCommentHandling.Skip, 
+                    AllowTrailingCommas = true
+                };
+
                 var jsonReader = new Utf8JsonReader(new ReadOnlySpan<byte>(Encoding.UTF8.GetBytes(json)), jsonReaderOptions);
 
                 // No need fot the return value, as the deserializer populates the existing options instance

diff --git a/test/Garnet.test/GarnetServerConfigTests.cs b/test/Garnet.test/GarnetServerConfigTests.cs
@@ -48,7 +48,8 @@ public void DefaultConfigurationOptionsCoverage()
             var jsonSerializerOptions = new JsonSerializerOptions
             {
                 ReadCommentHandling = JsonCommentHandling.Skip,
-                NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString
+                NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString,
+                AllowTrailingCommas = true,
             };
 
             try