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

Im5tu · web-flow · commit 378560c7fc3f · 2021-04-08T15:51:08.000+01:00
Upgrading AWS Package versions and Fixing SqsBatchedDispatcher delay
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)

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,13 @@ public override async Task DispatchAsync(Message<T> message, CancellationToken c`
`56`	`56`	`{`
`57`	`57`	`Id = Guid.NewGuid().ToString("N"),`
`58`	`58`	`MessageAttributes = GetMessageProperties(message),`
`59`		`- DelaySeconds = DelaySeconds(message),`
`60`	`59`	`MessageBody = json`
`61`	`60`	`};`
`62`	`61`
	`62`	`+ var delay = DelaySeconds(message);`
	`63`	`+ if (delay.HasValue)`
	`64`	`+ request.DelaySeconds = delay.Value;`
	`65`	`+`
`63`	`66`	`var msg = new SendSqsMessageCommand`
`64`	`67`	`{`
`65`	`68`	`Message = request,`
`@@ -81,14 +84,14 @@ public override async Task DispatchAsync(Message<T> message, CancellationToken c`
`81`	`84`	`}`
`82`	`85`	`}`
`83`	`86`
`84`		`- private static int DelaySeconds(Message<T> message)`
	`87`	`+ private static int? DelaySeconds(Message<T> message)`
`85`	`88`	`{`
`86`	`89`	`if (message is ISupportSendDelay delay && delay.SendDelay > TimeSpan.Zero)`
`87`	`90`	`{`
`88`	`91`	`return Math.Min(MaximumSqsDelaySeconds, (int) delay.SendDelay.TotalSeconds);`
`89`	`92`	`}`
`90`	`93`
`91`		`- return 0;`
	`94`	`+ return null;`
`92`	`95`	`}`
`93`	`96`
`94`	`97`	`private Dictionary<string, MessageAttributeValue> GetMessageProperties(Message<T> message)`