Update Amazon.Lambda.DynamoDBEvents.SDK.Convertor and Amazon.Lambda.KinesisEvents packages that have an SDK dependency to use V4. (#2056)

normj · web-flow · commit 489a01e5ef8d · 2025-04-28T18:19:12.000-07:00
diff --git a/.autover/changes/be8e0154-524e-402e-bb5d-ab1a0c3dea95.json b/.autover/changes/be8e0154-524e-402e-bb5d-ab1a0c3dea95.json
@@ -0,0 +1,18 @@
+{
+  "Projects": [
+    {
+      "Name": "Amazon.Lambda.DynamoDBEvents.SDK.Convertor",
+      "Type": "Major",
+      "ChangelogMessages": [
+        "Update to AWS SDK for .NET V4"
+      ]
+    },
+    {
+      "Name": "Amazon.Lambda.KinesisEvents",
+      "Type": "Major",
+      "ChangelogMessages": [
+        "Update to AWS SDK for .NET V4"
+      ]
+    }	
+  ]
+}
diff --git a/Libraries/src/Amazon.Lambda.DynamoDBEvents.SDK.Convertor/Amazon.Lambda.DynamoDBEvents.SDK.Convertor.csproj b/Libraries/src/Amazon.Lambda.DynamoDBEvents.SDK.Convertor/Amazon.Lambda.DynamoDBEvents.SDK.Convertor.csproj
@@ -16,7 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.405.23" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.0" />
+    <PackageReference Include="AWSSDK.DynamoDBStreams" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Libraries/src/Amazon.Lambda.DynamoDBEvents.SDK.Convertor/DynamodbAttributeValueConvertor.cs b/Libraries/src/Amazon.Lambda.DynamoDBEvents.SDK.Convertor/DynamodbAttributeValueConvertor.cs
@@ -97,5 +97,96 @@ public static Amazon.DynamoDBv2.Model.AttributeValue ConvertToSdkAttribute(this
 
             return sdkDictionary;
         }
+
+        /// <summary>
+        /// Convert Lambda AttributeValue to SDK AttributeValue
+        /// </summary>
+        /// <param name="lambdaAttribute">The Lambda AttributeValue to convert.</param>
+        /// <returns>The converted SDK AttributeValue.</returns>
+        public static Amazon.DynamoDBStreams.Model.AttributeValue ConvertToSdkStreamAttribute(this
+            DynamoDBEvent.AttributeValue lambdaAttribute)
+        {
+            if (lambdaAttribute == null)
+                return null;
+
+            var sdkAttribute = new Amazon.DynamoDBStreams.Model.AttributeValue();
+
+            // String
+            if (!string.IsNullOrEmpty(lambdaAttribute.S))
+                sdkAttribute.S = lambdaAttribute.S;
+
+            // Number
+            else if (!string.IsNullOrEmpty(lambdaAttribute.N))
+                sdkAttribute.N = lambdaAttribute.N;
+
+            // Boolean
+            else if (lambdaAttribute.BOOL.HasValue)
+            {
+                sdkAttribute.BOOL = lambdaAttribute.BOOL.Value;
+            }
+
+            // Null
+            else if (lambdaAttribute.NULL.HasValue)
+                sdkAttribute.NULL = lambdaAttribute.NULL.Value;
+
+            // Binary
+            else if (lambdaAttribute.B != null)
+                sdkAttribute.B = lambdaAttribute.B;
+
+            // String Set
+            else if (lambdaAttribute.SS != null)
+                sdkAttribute.SS = new List<string>(lambdaAttribute.SS);
+
+            // Number Set
+            else if (lambdaAttribute.NS != null)
+                sdkAttribute.NS = new List<string>(lambdaAttribute.NS);
+
+            // Binary Set
+            else if (lambdaAttribute.BS != null)
+                sdkAttribute.BS = lambdaAttribute.BS;
+
+            // List
+            else if (lambdaAttribute.L != null)
+            {
+                sdkAttribute.L = new List<Amazon.DynamoDBStreams.Model.AttributeValue>();
+                foreach (var item in lambdaAttribute.L)
+                {
+                    sdkAttribute.L.Add(item.ConvertToSdkStreamAttribute());
+                }
+            }
+
+            // Map
+            else if (lambdaAttribute.M != null)
+            {
+                sdkAttribute.M = new Dictionary<string, Amazon.DynamoDBStreams.Model.AttributeValue>();
+                foreach (var kvp in lambdaAttribute.M)
+                {
+                    sdkAttribute.M[kvp.Key] = kvp.Value.ConvertToSdkStreamAttribute();
+                }
+            }
+
+            return sdkAttribute;
+        }
+
+        /// <summary>
+        /// Convert Dictionary of Lambda AttributeValue to SDK Dictionary of AttributeValue
+        /// </summary>
+        /// <param name="lambdaAttributes">The dictionary of Lambda AttributeValue to convert.</param>
+        /// <returns>The converted dictionary of SDK AttributeValue.</returns>
+        public static Dictionary<string, Amazon.DynamoDBStreams.Model.AttributeValue> ConvertToSdkStreamAttributeValueDictionary(
+           this Dictionary<string, DynamoDBEvent.AttributeValue> lambdaAttributes)
+        {
+            var sdkDictionary = new Dictionary<string, Amazon.DynamoDBStreams.Model.AttributeValue>();
+
+            if (lambdaAttributes == null)
+                return sdkDictionary;
+
+            foreach (var kvp in lambdaAttributes)
+            {
+                sdkDictionary[kvp.Key] = ConvertToSdkStreamAttribute(kvp.Value);
+            }
+
+            return sdkDictionary;
+        }
     }
 }
diff --git a/Libraries/src/Amazon.Lambda.DynamoDBEvents.SDK.Convertor/DynamodbIdentityConvertor.cs b/Libraries/src/Amazon.Lambda.DynamoDBEvents.SDK.Convertor/DynamodbIdentityConvertor.cs
@@ -11,12 +11,12 @@ public static class DynamodbIdentityConvertor
         /// </summary>
         /// <param name="lambdaIdentity">The Lambda Identity to convert.</param>
         /// <returns>The converted SDK Identity.</returns>
-        public static Amazon.DynamoDBv2.Model.Identity ConvertToSdkIdentity(this DynamoDBEvent.Identity lambdaIdentity)
+        public static Amazon.DynamoDBStreams.Model.Identity ConvertToSdkIdentity(this DynamoDBEvent.Identity lambdaIdentity)
         {
             if (lambdaIdentity == null)
                 return null;
 
-            var sdkIdentity = new Amazon.DynamoDBv2.Model.Identity
+            var sdkIdentity = new Amazon.DynamoDBStreams.Model.Identity
             {
                 PrincipalId = lambdaIdentity.PrincipalId,
                 Type = lambdaIdentity.Type
diff --git a/Libraries/src/Amazon.Lambda.DynamoDBEvents.SDK.Convertor/DynamodbStreamRecordConvertor.cs b/Libraries/src/Amazon.Lambda.DynamoDBEvents.SDK.Convertor/DynamodbStreamRecordConvertor.cs
@@ -11,17 +11,17 @@ public static class DynamodbStreamRecordConvertor
         /// </summary>
         /// <param name="lambdaStreamRecord">The Lambda StreamRecord to convert.</param>
         /// <returns>The converted SDK StreamRecord.</returns>
-        public static Amazon.DynamoDBv2.Model.StreamRecord ConvertToSdkStreamRecord(this DynamoDBEvent.StreamRecord lambdaStreamRecord)
+        public static Amazon.DynamoDBStreams.Model.StreamRecord ConvertToSdkStreamRecord(this DynamoDBEvent.StreamRecord lambdaStreamRecord)
         {
             if (lambdaStreamRecord == null)
                 return null;
 
-            var sdkStreamRecord = new Amazon.DynamoDBv2.Model.StreamRecord
+            var sdkStreamRecord = new Amazon.DynamoDBStreams.Model.StreamRecord
             {
                 ApproximateCreationDateTime = lambdaStreamRecord.ApproximateCreationDateTime,
-                Keys = lambdaStreamRecord.Keys?.ConvertToSdkAttributeValueDictionary(),
-                NewImage = lambdaStreamRecord.NewImage?.ConvertToSdkAttributeValueDictionary(),
-                OldImage = lambdaStreamRecord.OldImage?.ConvertToSdkAttributeValueDictionary(),
+                Keys = lambdaStreamRecord.Keys?.ConvertToSdkStreamAttributeValueDictionary(),
+                NewImage = lambdaStreamRecord.NewImage?.ConvertToSdkStreamAttributeValueDictionary(),
+                OldImage = lambdaStreamRecord.OldImage?.ConvertToSdkStreamAttributeValueDictionary(),
                 SequenceNumber = lambdaStreamRecord.SequenceNumber,
                 SizeBytes = lambdaStreamRecord.SizeBytes,
                 StreamViewType = lambdaStreamRecord.StreamViewType
diff --git a/Libraries/src/Amazon.Lambda.KinesisEvents/Amazon.Lambda.KinesisEvents.csproj b/Libraries/src/Amazon.Lambda.KinesisEvents/Amazon.Lambda.KinesisEvents.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Kinesis" Version="3.7.0" />
+    <PackageReference Include="AWSSDK.Kinesis" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Libraries/test/EventsTests.NET6/EventsTests.NET6.csproj b/Libraries/test/EventsTests.NET6/EventsTests.NET6.csproj
@@ -55,14 +55,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.301.14" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="AWSSDK.Core" Version="3.7.302.13" />
+    <PackageReference Include="AWSSDK.Core" Version="4.0.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Libraries/test/EventsTests.NET8/EventsTests.NET8.csproj b/Libraries/test/EventsTests.NET8/EventsTests.NET8.csproj
@@ -47,14 +47,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.301.14" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="AWSSDK.Core" Version="3.7.302.13" />
+    <PackageReference Include="AWSSDK.Core" Version="4.0.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Libraries/test/EventsTests.NETCore31/EventsTests.NETCore31.csproj b/Libraries/test/EventsTests.NETCore31/EventsTests.NETCore31.csproj
@@ -55,11 +55,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.301.14" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="AWSSDK.Core" Version="3.7.302.13" />
+    <PackageReference Include="AWSSDK.Core" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Libraries/test/EventsTests.Shared/EventTests.cs b/Libraries/test/EventsTests.Shared/EventTests.cs
@@ -319,9 +319,9 @@ public void KinesisTest(Type serializerType)
 #if NET8_0_OR_GREATER
                 // Starting with .NET 7 the precision of the underlying AddSeconds method was changed.
                 // https://learn.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/7.0/datetime-add-precision
-                Assert.Equal(636162383234769999, record.Kinesis.ApproximateArrivalTimestamp.ToUniversalTime().Ticks);
+                Assert.Equal(636162383234769999, record.Kinesis.ApproximateArrivalTimestamp.Value.ToUniversalTime().Ticks);
 #else
-                Assert.Equal(636162383234770000, record.Kinesis.ApproximateArrivalTimestamp.ToUniversalTime().Ticks);
+                Assert.Equal(636162383234770000, record.Kinesis.ApproximateArrivalTimestamp.Value.ToUniversalTime().Ticks);
 #endif
 
                 Handle(kinesisEvent);
@@ -409,7 +409,7 @@ public void KinesisTimeWindowTest(Type serializerType)
                 var dataBytes = record.Kinesis.Data.ToArray();
                 Assert.Equal(Convert.ToBase64String(dataBytes), "SGVsbG8sIHRoaXMgaXMgYSB0ZXN0Lg==");
                 Assert.Equal(Encoding.UTF8.GetString(dataBytes), "Hello, this is a test.");
-                Assert.Equal(637430942750000000, record.Kinesis.ApproximateArrivalTimestamp.ToUniversalTime().Ticks);
+                Assert.Equal(637430942750000000, record.Kinesis.ApproximateArrivalTimestamp.Value.ToUniversalTime().Ticks);
 
                 Handle(kinesisTimeWindowEvent);
             }
@@ -3915,4 +3915,4 @@ class ClassUsingPascalCase
         }
     }
 }
-#pragma warning restore 618
+#pragma warning restore 618

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ public static class DynamodbIdentityConvertor`
`11`	`11`	`/// </summary>`
`12`	`12`	`/// <param name="lambdaIdentity">The Lambda Identity to convert.</param>`
`13`	`13`	`/// <returns>The converted SDK Identity.</returns>`
`14`		`- public static Amazon.DynamoDBv2.Model.Identity ConvertToSdkIdentity(this DynamoDBEvent.Identity lambdaIdentity)`
	`14`	`+ public static Amazon.DynamoDBStreams.Model.Identity ConvertToSdkIdentity(this DynamoDBEvent.Identity lambdaIdentity)`
`15`	`15`	`{`
`16`	`16`	`if (lambdaIdentity == null)`
`17`	`17`	`return null;`
`18`	`18`
`19`		`- var sdkIdentity = new Amazon.DynamoDBv2.Model.Identity`
	`19`	`+ var sdkIdentity = new Amazon.DynamoDBStreams.Model.Identity`
`20`	`20`	`{`
`21`	`21`	`PrincipalId = lambdaIdentity.PrincipalId,`
`22`	`22`	`Type = lambdaIdentity.Type`
Original file line number	Diff line number	Diff line change
`@@ -319,9 +319,9 @@ public void KinesisTest(Type serializerType)`
`319`	`319`	`#if NET8_0_OR_GREATER`
`320`	`320`	`// Starting with .NET 7 the precision of the underlying AddSeconds method was changed.`
`321`	`321`	`// https://learn.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/7.0/datetime-add-precision`
`322`		`- Assert.Equal(636162383234769999, record.Kinesis.ApproximateArrivalTimestamp.ToUniversalTime().Ticks);`
	`322`	`+ Assert.Equal(636162383234769999, record.Kinesis.ApproximateArrivalTimestamp.Value.ToUniversalTime().Ticks);`
`323`	`323`	`#else`
`324`		`- Assert.Equal(636162383234770000, record.Kinesis.ApproximateArrivalTimestamp.ToUniversalTime().Ticks);`
	`324`	`+ Assert.Equal(636162383234770000, record.Kinesis.ApproximateArrivalTimestamp.Value.ToUniversalTime().Ticks);`
`325`	`325`	`#endif`
`326`	`326`
`327`	`327`	`Handle(kinesisEvent);`
`@@ -409,7 +409,7 @@ public void KinesisTimeWindowTest(Type serializerType)`
`409`	`409`	`var dataBytes = record.Kinesis.Data.ToArray();`
`410`	`410`	`Assert.Equal(Convert.ToBase64String(dataBytes), "SGVsbG8sIHRoaXMgaXMgYSB0ZXN0Lg==");`
`411`	`411`	`Assert.Equal(Encoding.UTF8.GetString(dataBytes), "Hello, this is a test.");`
`412`		`- Assert.Equal(637430942750000000, record.Kinesis.ApproximateArrivalTimestamp.ToUniversalTime().Ticks);`
	`412`	`+ Assert.Equal(637430942750000000, record.Kinesis.ApproximateArrivalTimestamp.Value.ToUniversalTime().Ticks);`
`413`	`413`
`414`	`414`	`Handle(kinesisTimeWindowEvent);`
`415`	`415`	`}`
`@@ -3915,4 +3915,4 @@ class ClassUsingPascalCase`
`3915`	`3915`	`}`
`3916`	`3916`	`}`
`3917`	`3917`	`}`
`3918`		`-#pragma warning restore 618`
	`3918`	`+#pragma warning restore 618`