Upgrade to NServiceBus.AmazonSQS 6.1.1

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
         with:
           dotnet-version: |
             7.0.x
-            3.1.x
+            6.0.x
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/AwsLambdaSQSEndpointTestBase.cs

@@ -2,21 +2,29 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Globalization;
     using System.IO;
     using System.Linq;
     using System.Threading.Tasks;
     using Amazon.Lambda.SQSEvents;
     using Amazon.Runtime;
     using Amazon.S3;
     using Amazon.S3.Model;
+    using Amazon.SimpleNotificationService;
     using Amazon.SQS;
     using Amazon.SQS.Model;
     using NUnit.Framework;
 
     [TestFixture]
     class AwsLambdaSQSEndpointTestBase
     {
+        protected const string DelayedDeliveryQueueSuffix = "-delay.fifo";
+        const int QueueDelayInSeconds = 900; // 15 * 60
+
         protected string QueueName { get; set; }
+
+        protected string DelayQueueName { get; set; }
+
         protected string ErrorQueueName { get; set; }
 
         protected string QueueNamePrefix { get; set; }
@@ -51,6 +59,17 @@ public async Task Setup()
                 }
             });
             RegisterQueueNameToCleanup(ErrorQueueName);
+            DelayQueueName = $"{QueueName}{DelayedDeliveryQueueSuffix}";
+            _ = await sqsClient.CreateQueueAsync(new CreateQueueRequest(DelayQueueName)
+            {
+                Attributes = new Dictionary<string, string>
+                {
+                    { "FifoQueue", "true" },
+                    { QueueAttributeName.DelaySeconds, QueueDelayInSeconds.ToString(CultureInfo.InvariantCulture)}
+                }
+            });
+            RegisterQueueNameToCleanup(DelayQueueName);
+
             s3Client = CreateS3Client();
             KeyPrefix = QueueNamePrefix;
         }
@@ -90,11 +109,13 @@ protected async Task<SQSEvent> GenerateAndReceiveSQSEvent<T>(int count) where T
         {
             var endpointConfiguration = new EndpointConfiguration($"{QueueNamePrefix}sender");
             endpointConfiguration.SendOnly();
-            endpointConfiguration.UsePersistence<InMemoryPersistence>();
-            var transport = endpointConfiguration.UseTransport<SqsTransport>();
-            transport.ClientFactory(CreateSQSClient);
-            var s3 = transport.S3(BucketName, KeyPrefix);
-            s3.ClientFactory(CreateS3Client);
+
+            var transport = new SqsTransport(CreateSQSClient(), CreateSNSClient())
+            {
+                S3 = new S3Settings(BucketName, KeyPrefix, CreateS3Client())
+            };
+
+            endpointConfiguration.UseTransport(transport);
 
             var endpointInstance = await Endpoint.Start(endpointConfiguration)
                 .ConfigureAwait(false);
@@ -133,6 +154,12 @@ public static IAmazonSQS CreateSQSClient()
             return new AmazonSQSClient(credentials);
         }
 
+        public static IAmazonSimpleNotificationService CreateSNSClient()
+        {
+            var credentials = new EnvironmentVariablesAWSCredentials();
+            return new AmazonSimpleNotificationServiceClient(credentials);
+        }
+
         public static IAmazonS3 CreateS3Client()
         {
             var credentials = new EnvironmentVariablesAWSCredentials();

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/NServiceBus.AwsLambda.SQS.AcceptanceTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RootNamespace>NServiceBus.AwsLambda.Tests</RootNamespace>
   </PropertyGroup>

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/When_a_SQSEvent_with_large_payloads_is_processed.cs

@@ -2,6 +2,7 @@
 {
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.Extensions.DependencyInjection;
     using NUnit.Framework;
 
     class When_a_SQSEvent_with_large_payloads_is_processed : AwsLambdaSQSEndpointTestBase
@@ -15,16 +16,16 @@ public async Task The_handlers_should_be_invoked_and_process_successfully()
 
             var endpoint = new AwsLambdaSQSEndpoint(ctx =>
             {
-                var configuration = new AwsLambdaSQSEndpointConfiguration(QueueName);
+                var configuration = new AwsLambdaSQSEndpointConfiguration(QueueName, CreateSQSClient(), CreateSNSClient());
                 var transport = configuration.Transport;
-                transport.ClientFactory(CreateSQSClient);
 
-                var s3 = transport.S3(BucketName, KeyPrefix);
-                s3.ClientFactory(CreateS3Client);
+
+                transport.S3 = new S3Settings(BucketName, KeyPrefix, CreateS3Client());
+
 
                 var advanced = configuration.AdvancedConfiguration;
                 advanced.SendFailedMessagesTo(ErrorQueueName);
-                advanced.RegisterComponents(c => c.RegisterSingleton(typeof(TestContext), context));
+                advanced.RegisterComponents(c => c.AddSingleton(typeof(TestContext), context));
                 return configuration;
             });
 

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/When_a_handler_sends_a_message.cs

@@ -1,6 +1,7 @@
 namespace NServiceBus.AwsLambda.Tests
 {
     using System.Threading.Tasks;
+    using Microsoft.Extensions.DependencyInjection;
     using NUnit.Framework;
 
     class When_a_handler_sends_a_message : AwsLambdaSQSEndpointTestBase
@@ -14,28 +15,28 @@ public async Task The_message_should_be_received()
 
             var destinationEndpointName = $"{QueueNamePrefix}DestinationEndpoint";
             RegisterQueueNameToCleanup(destinationEndpointName);
+            RegisterQueueNameToCleanup(destinationEndpointName + DelayedDeliveryQueueSuffix);
 
             var destinationConfiguration = new EndpointConfiguration(destinationEndpointName);
-            destinationConfiguration.UsePersistence<InMemoryPersistence>();
-            var destinationTransport = destinationConfiguration.UseTransport<SqsTransport>();
-            destinationTransport.ClientFactory(CreateSQSClient);
+
+            var destinationTransport = new SqsTransport(CreateSQSClient(), CreateSNSClient());
+
             destinationConfiguration.SendFailedMessagesTo(ErrorQueueName);
             destinationConfiguration.EnableInstallers();
-            destinationConfiguration.RegisterComponents(c => c.RegisterSingleton(typeof(TestContext), context));
+            destinationConfiguration.RegisterComponents(c => c.AddSingleton(typeof(TestContext), context));
+            destinationConfiguration.UseTransport(destinationTransport);
+
             var destinationEndpoint = await Endpoint.Start(destinationConfiguration);
 
             var endpoint = new AwsLambdaSQSEndpoint(ctx =>
             {
-                var configuration = new AwsLambdaSQSEndpointConfiguration(QueueName);
-                var transport = configuration.Transport;
-                transport.ClientFactory(CreateSQSClient);
+                var configuration = new AwsLambdaSQSEndpointConfiguration(QueueName, CreateSQSClient(), CreateSNSClient());
 
-                var routing = transport.Routing();
-                routing.RouteToEndpoint(typeof(SentMessage), destinationEndpointName);
+                configuration.RoutingSettings.RouteToEndpoint(typeof(SentMessage), destinationEndpointName);
 
                 var advanced = configuration.AdvancedConfiguration;
                 advanced.SendFailedMessagesTo(ErrorQueueName);
-                advanced.RegisterComponents(c => c.RegisterSingleton(typeof(TestContext), context));
+                advanced.RegisterComponents(c => c.AddSingleton(typeof(TestContext), context));
                 return configuration;
             });
 

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/When_a_message_handler_always_throws.cs

@@ -3,6 +3,7 @@
     using System;
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.Extensions.DependencyInjection;
     using NUnit.Framework;
 
     class When_a_message_handler_always_throws : AwsLambdaSQSEndpointTestBase
@@ -16,13 +17,11 @@ public async Task The_messages_should_forward_to_error_queue_by_default()
 
             var endpoint = new AwsLambdaSQSEndpoint(ctx =>
             {
-                var configuration = new AwsLambdaSQSEndpointConfiguration(QueueName);
-                var transport = configuration.Transport;
-                transport.ClientFactory(CreateSQSClient);
+                var configuration = new AwsLambdaSQSEndpointConfiguration(QueueName, CreateSQSClient(), CreateSNSClient());
 
                 var advanced = configuration.AdvancedConfiguration;
                 advanced.SendFailedMessagesTo(ErrorQueueName);
-                advanced.RegisterComponents(c => c.RegisterSingleton(typeof(TestContext), context));
+                advanced.RegisterComponents(c => c.AddSingleton(typeof(TestContext), context));
                 return configuration;
             });
 

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/When_the_SQS_trigger_is_activated.cs

@@ -2,6 +2,7 @@
 {
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.Extensions.DependencyInjection;
     using NUnit.Framework;
 
     class When_a_SQSEvent_is_processed : AwsLambdaSQSEndpointTestBase
@@ -15,13 +16,11 @@ public async Task The_handlers_should_be_invoked_and_process_successfully()
 
             var endpoint = new AwsLambdaSQSEndpoint(ctx =>
             {
-                var configuration = new AwsLambdaSQSEndpointConfiguration(QueueName);
-                var transport = configuration.Transport;
-                transport.ClientFactory(CreateSQSClient);
+                var configuration = new AwsLambdaSQSEndpointConfiguration(QueueName, CreateSQSClient(), CreateSNSClient());
 
                 var advanced = configuration.AdvancedConfiguration;
                 advanced.SendFailedMessagesTo(ErrorQueueName);
-                advanced.RegisterComponents(c => c.RegisterSingleton(typeof(TestContext), context));
+                advanced.RegisterComponents(c => c.AddSingleton(typeof(TestContext), context));
                 return configuration;
             });
 

src/NServiceBus.AwsLambda.SQS.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt

@@ -20,13 +20,13 @@ namespace NServiceBus
     public class AwsLambdaSQSEndpointConfiguration
     {
         public AwsLambdaSQSEndpointConfiguration(string endpointName) { }
+        public AwsLambdaSQSEndpointConfiguration(string endpointName, Amazon.SQS.IAmazonSQS sqsClient, Amazon.SimpleNotificationService.IAmazonSimpleNotificationService snsClient) { }
         public NServiceBus.EndpointConfiguration AdvancedConfiguration { get; }
-        public NServiceBus.TransportExtensions<NServiceBus.SqsTransport> Transport { get; }
+        public NServiceBus.RoutingSettings<NServiceBus.SqsTransport> RoutingSettings { get; }
+        public NServiceBus.SqsTransport Transport { get; }
         public void DoNotSendMessagesToErrorQueue() { }
         public NServiceBus.Serialization.SerializationExtensions<T> UseSerialization<T>()
             where T : NServiceBus.Serialization.SerializationDefinition, new () { }
-        protected NServiceBus.TransportExtensions<TTransport> UseTransport<TTransport>()
-            where TTransport : NServiceBus.Transport.TransportDefinition, new () { }
     }
     public interface IAwsLambdaSQSEndpoint
     {

src/NServiceBus.AwsLambda.SQS.Tests/NServiceBus.AwsLambda.SQS.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RootNamespace>NServiceBus.AwsLambda.Tests</RootNamespace>
   </PropertyGroup>