Merge pull request #265 from Jonathan-hickey-cko/main

Upgrading AWS Package versions and Fixing SqsBatchedDispatcher delay
Im5tu · Apr 8, 2021 · 378560c · 378560c
2 parents 65dd6eb + e296897
commit 378560c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/OpenMessage.AWS.SNS/OpenMessage.AWS.SNS.csproj b/src/OpenMessage.AWS.SNS/OpenMessage.AWS.SNS.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.5.0.29" />
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.0.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.9" />
   </ItemGroup>
 

diff --git a/src/OpenMessage.AWS.SQS/OpenMessage.AWS.SQS.csproj b/src/OpenMessage.AWS.SQS/OpenMessage.AWS.SQS.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SQS" Version="3.5.0.28" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.0.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.9" />
   </ItemGroup>
 

diff --git a/src/OpenMessage.AWS.SQS/SqsBatchedDispatcher.cs b/src/OpenMessage.AWS.SQS/SqsBatchedDispatcher.cs
@@ -56,10 +56,13 @@ public override async Task DispatchAsync(Message<T> message, CancellationToken c
             {
                 Id = Guid.NewGuid().ToString("N"),
                 MessageAttributes = GetMessageProperties(message),
-                DelaySeconds = DelaySeconds(message),
                 MessageBody = json
             };
 
+            var delay = DelaySeconds(message);
+            if (delay.HasValue)
+                request.DelaySeconds = delay.Value;
+
             var msg = new SendSqsMessageCommand
             {
                 Message = request,
@@ -81,14 +84,14 @@ public override async Task DispatchAsync(Message<T> message, CancellationToken c
             }
         }
 
-        private static int DelaySeconds(Message<T> message)
+        private static int? DelaySeconds(Message<T> message)
         {
             if (message is ISupportSendDelay delay && delay.SendDelay > TimeSpan.Zero)
             {
                 return Math.Min(MaximumSqsDelaySeconds, (int) delay.SendDelay.TotalSeconds);
             }
 
-            return 0;
+            return null;
         }
 
         private Dictionary<string, MessageAttributeValue> GetMessageProperties(Message<T> message)