fix: use lower case values during json serialization (#704)

Signed-off-by: Roman Dmytrenko <[email protected]>
flipt-io · Feb 8, 2025 · 51cdfa4 · 51cdfa4
1 parent 50065c1
commit 51cdfa4
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/flipt-client-csharp/src/FliptClient/Models/ClientOptions.cs b/flipt-client-csharp/src/FliptClient/Models/ClientOptions.cs
@@ -28,12 +28,10 @@ public class ClientOptions
         public ErrorStrategy ErrorStrategy { get; set; } = ErrorStrategy.Fail;
     }
 
-    [JsonConverter(typeof(JsonStringEnumConverter))]
+    [JsonConverter(typeof(LowercaseEnumConverter<ErrorStrategy>))]
     public enum ErrorStrategy
     {
-        [JsonPropertyName("fail")]
         Fail,
-        [JsonPropertyName("fallback")]
         Fallback,
     }
 
@@ -56,4 +54,23 @@ public class Authentication
         [JsonPropertyName("jwt_token")]
         public string JwtToken { get; set; }
     }
+
+
+    public class LowercaseEnumConverter<T> : JsonConverter<T> where T : struct, Enum
+    {
+        public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var enumString = reader.GetString();
+            if (Enum.TryParse<T>(enumString, true, out var value))
+            {
+                return value;
+            }
+            throw new JsonException($"Unable to convert \"{enumString}\" to {typeof(T)}.");
+        }
+
+        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value.ToString().ToLower()); // Convert enum name to lowercase
+        }
+    }
 }
diff --git a/flipt-client-csharp/tests/FliptClient.Tests/EvaluationClientTests.cs b/flipt-client-csharp/tests/FliptClient.Tests/EvaluationClientTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json;
 using Xunit;
 using Xunit.Abstractions;
 using FliptClient;
@@ -164,5 +165,14 @@ public void TestListFlags()
             Assert.NotEmpty(flags);
             Assert.Equal(2, flags.Length);
         }
+
+        [Fact]
+        public void TestClientOptions()
+        {
+            var options = new ClientOptions{ErrorStrategy=ErrorStrategy.Fallback};
+            string optsJson = JsonSerializer.Serialize(options);
+            string expectedJson = """{"url":"http://localhost:8080","update_interval":120,"authentication":null,"error_strategy":"fallback"}""";
+            Assert.Equal(expectedJson, optsJson);
+        }
     }
 }
diff --git a/flipt-engine-ffi/src/lib.rs b/flipt-engine-ffi/src/lib.rs
@@ -399,3 +399,14 @@ pub unsafe extern "C" fn destroy_engine(engine_ptr: *mut c_void) {
 pub unsafe extern "C" fn destroy_string(ptr: *mut c_char) {
     let _ = CString::from_raw(ptr);
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::{http::ErrorStrategy, EngineOpts};
+    #[test]
+    fn test_engine_ops_with_error_strategy() {
+        let input = r#"{"url":"http://localhost:8080","update_interval":120,"authentication":null,"error_strategy":"fallback"}"#;
+        let engine_opts: EngineOpts = serde_json::from_str(input).unwrap_or_default();
+        assert_eq!(ErrorStrategy::Fallback, engine_opts.error_strategy.unwrap());
+    }
+}