LAMBJ-146 Newline Not Allowed in Json String Error (#457)

Author: talenfisher

.github/releases/v0.9.0-beta5.md

@@ -0,0 +1,3 @@
+## Bug Fixes
+
+- Fixes an issue where deserializing an SnsMessage`CloudFormationStackEvent would result in an error about newlines are not allowed in JSON strings.

src/Core/Serialization/StringConverter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
 
 using SystemTextJsonSerializer = System.Text.Json.JsonSerializer;
 
@@ -43,7 +44,7 @@ public override bool CanConvert(Type typeToConvert)
             var isJsonLike = stringValue.StartsWith('{') || stringValue.StartsWith('[');
             var deserializable = isJsonLike
                 ? stringValue
-                : $@"""{reader.GetString()?.Replace(@"""", @"\""")}""";
+                : $@"""{JsonEncodedText.Encode(stringValue)}""";
 
             return SystemTextJsonSerializer.Deserialize(deserializable, typeToConvert, options);
         }
@@ -52,7 +53,7 @@ public override bool CanConvert(Type typeToConvert)
         public override void Write(Utf8JsonWriter writer, object? value, JsonSerializerOptions options)
         {
             var stringValue = SystemTextJsonSerializer.Serialize(value!, typeToConvert, options);
-            writer.WriteStringValue(stringValue);
+            writer.WriteStringValue(Regex.Unescape(stringValue));
         }
     }
 }

tests/Unit/Sns/Serialization/CloudFormationStackEventConverterTests.cs

@@ -162,13 +162,15 @@ string clientRequestToken
 
             [Test, Auto]
             public void ShouldDeserializeInsideSnsMessage(
+                string stackId,
                 string clientRequestToken
             )
             {
-                var source = $@"{{""Message"":""ClientRequestToken={clientRequestToken}""}}";
+                var source = $@"{{""Message"":""ClientRequestToken='{clientRequestToken}'\nStackId='{stackId}'\n""}}";
                 var result = JsonSerializer.Deserialize<SnsMessage<CloudFormationStackEvent>>(source);
 
                 result!.Message.ClientRequestToken.Should().Be(clientRequestToken);
+                result!.Message.StackId.Should().Be(stackId);
             }
         }
 
@@ -318,6 +320,19 @@ CloudFormationStackEvent stackEvent
 
                 lines.Should().Contain($"ClientRequestToken='{stackEvent.ClientRequestToken}'");
             }
+
+            [Test, Auto]
+            public void ShouldSerializeInsideSnsMessage(
+                string stackId,
+                string clientRequestToken,
+                SnsMessage<CloudFormationStackEvent> message
+            )
+            {
+                var serialized = JsonSerializer.Serialize(message);
+                var deserialized = JsonSerializer.Deserialize<SnsMessage<CloudFormationStackEvent>>(serialized);
+
+                deserialized!.Message.StackId.Should().Be(message.Message.StackId);
+            }
         }
     }
 }

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.9.0-beta4",
+  "version": "0.9.0-beta5",
   "publicReleaseRefSpec": [
     "^refs/tags/v\\d\\.\\d"
   ]