fix: Handle null AttributeValues when serializing DynamoDBEvent to JSON (#1689)

Author: ashovlin

Libraries/src/Amazon.Lambda.DynamoDBEvents/Amazon.Lambda.DynamoDBEvents.csproj

@@ -6,7 +6,7 @@
     <TargetFrameworks>netcoreapp3.1;net8.0</TargetFrameworks>
     <Description>Amazon Lambda .NET Core support - DynamoDBEvents package.</Description>
     <AssemblyTitle>Amazon.Lambda.DynamoDBEvents</AssemblyTitle>
-    <VersionPrefix>3.1.0</VersionPrefix>
+    <VersionPrefix>3.1.1</VersionPrefix>
     <AssemblyName>Amazon.Lambda.DynamoDBEvents</AssemblyName>
     <PackageId>Amazon.Lambda.DynamoDBEvents</PackageId>
     <PackageTags>AWS;Amazon;Lambda</PackageTags>

Libraries/src/Amazon.Lambda.DynamoDBEvents/ExtensionMethods.cs

@@ -152,6 +152,10 @@ private static void WriteJsonValue(Utf8JsonWriter writer, AttributeValue attribu
                 }
                 writer.WriteEndArray();
             }
+            else
+            {
+                writer.WriteNullValue();
+            }
         }
     }
 }

Libraries/test/EventsTests.Shared/DynamoDBEventJsonTests.cs

@@ -441,5 +441,58 @@ public void BinarySet_ToDocument()
             Assert.Equal("hello world", Encoding.UTF8.GetString(list[0].AsByteArray()));
             Assert.Equal("hello world!", Encoding.UTF8.GetString(list[1].AsByteArray()));
         }
+
+        [Fact]
+        public void NullAttributes_ToJson()
+        {
+            var evnt = PrepareEvent(new Dictionary<string, AttributeValue>()
+            {
+                { "Null", new AttributeValue {NULL = null } },
+                { "Empty", new AttributeValue() }
+            });
+
+            var json = evnt.Records[0].Dynamodb.NewImage.ToJson();
+
+            Assert.Equal("{\"Null\":null,\"Empty\":null}", json);
+        }
+
+        [Fact]
+        public void NullAttributes_ToDocument()
+        {
+            var evnt = PrepareEvent(new Dictionary<string, AttributeValue>()
+            {
+                { "Null", new AttributeValue {NULL = null } },
+                { "Empty", new AttributeValue() }
+            });
+
+            // Convert the event from the Lambda package to the SDK type
+            var json = evnt.Records[0].Dynamodb.NewImage.ToJson();
+            var document = Document.FromJson(json);
+
+            Assert.Equal(DynamoDBNull.Null, document["Null"].AsDynamoDBNull());
+            Assert.Equal(DynamoDBNull.Null, document["Empty"].AsDynamoDBNull());
+        }
+
+        [Fact]
+        public void NoAttributes_ToJson()
+        {
+            var evnt = PrepareEvent(new Dictionary<string, AttributeValue>());
+
+            var json = evnt.Records[0].Dynamodb.NewImage.ToJson();
+
+            Assert.Equal("{}", json);
+        }
+
+        [Fact]
+        public void NoAttributes_ToDocument()
+        {
+            var evnt = PrepareEvent(new Dictionary<string, AttributeValue>());
+
+            // Convert the event from the Lambda package to the SDK type
+            var json = evnt.Records[0].Dynamodb.NewImage.ToJson();
+            var document = Document.FromJson(json);
+
+            Assert.Equal(0, document.Count);
+        }
     }
 }