AWS Lambda v2 docs and snippets

Snippets/SQSLambda/SQSLambda.sln

@@ -1,21 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29806.167
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34601.278
 MinimumVisualStudioVersion = 15.0.26730.12
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQSLambda", "SQSLambda_0\SQSLambda_0.csproj", "{EE9BFF4F-158A-4DFE-ABAC-60959DD8DCC5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQSLambda_1", "SQSLambda_1\SQSLambda_1.csproj", "{CB0C031E-9860-4ABA-BE91-AE962FDE22D7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQSLambda_1", "SQSLambda_1\SQSLambda_1.csproj", "{CB0C031E-9860-4ABA-BE91-AE962FDE22D7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQSLambda_2", "SQSLambda_2\SQSLambda_2.csproj", "{46B65C7D-35FF-44F8-A6FD-F75296235461}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EE9BFF4F-158A-4DFE-ABAC-60959DD8DCC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE9BFF4F-158A-4DFE-ABAC-60959DD8DCC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB0C031E-9860-4ABA-BE91-AE962FDE22D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB0C031E-9860-4ABA-BE91-AE962FDE22D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB0C031E-9860-4ABA-BE91-AE962FDE22D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB0C031E-9860-4ABA-BE91-AE962FDE22D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46B65C7D-35FF-44F8-A6FD-F75296235461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46B65C7D-35FF-44F8-A6FD-F75296235461}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46B65C7D-35FF-44F8-A6FD-F75296235461}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46B65C7D-35FF-44F8-A6FD-F75296235461}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Snippets/SQSLambda/SQSLambda_1/AccessToLambdaNativeMessageInHandler.cs

@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-
 using Amazon.Lambda.SQSEvents;
-
 using NServiceBus;
 
 #region native-lambda-sqs-message
@@ -20,5 +18,4 @@ public Task Handle(TestMessage message, IMessageHandlerContext context)
 
 public class TestMessage
 {
-}
-
+}

Snippets/SQSLambda/SQSLambda_1/SQSLambda_1.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <AWSProjectType>Lambda</AWSProjectType>
-    <RootNamespace />
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="NServiceBus.AwsLambda.SQS" Version="1.*" />
-    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.*" />
+    <PackageReference Include="NServiceBus" Version="8.*" />
   </ItemGroup>
+
 </Project>

Snippets/SQSLambda/SQSLambda_1/Usage.cs

@@ -1,105 +1,93 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Amazon.Lambda.Core;
 using Amazon.Lambda.SQSEvents;
-
 using NServiceBus;
 
 class Usage
 {
-  #region aws-endpoint-creation
-
-  static readonly AwsLambdaSQSEndpoint endpoint = new AwsLambdaSQSEndpoint(context =>
-  {
-    var endpointConfiguration = new AwsLambdaSQSEndpointConfiguration("AwsLambdaSQSTrigger");
+    #region aws-endpoint-creation
 
-    //customize configuration here
-
-    return endpointConfiguration;
-  });
+    static readonly AwsLambdaSQSEndpoint endpoint = new AwsLambdaSQSEndpoint(context =>
+    {
+        var endpointConfiguration = new AwsLambdaSQSEndpointConfiguration("AwsLambdaSQSTrigger");
 
-  #endregion
+        //customize configuration here
 
-  #region aws-function-definition
+        return endpointConfiguration;
+    });
 
-  public async Task FunctionHandler(SQSEvent evnt, ILambdaContext context)
-  {
-    var cancellationDelay = context.RemainingTime.Subtract(TimeSpan.FromSeconds(10));
-    using var cancellationTokenSource = new CancellationTokenSource(cancellationDelay);
+    #endregion
 
-    await endpoint.Process(evnt, context, cancellationTokenSource.Token);
-  }
+    #region aws-function-definition
 
-  #endregion
+    public async Task FunctionHandler(SQSEvent evnt, ILambdaContext context)
+    {
+        var cancellationDelay = context.RemainingTime.Subtract(TimeSpan.FromSeconds(10));
+        using var cancellationTokenSource = new CancellationTokenSource(cancellationDelay);
 
-  static void CustomDiagnostics(AwsLambdaSQSEndpointConfiguration endpointConfiguration, ILambdaContext context)
-  {
-    #region aws-custom-diagnostics
+        await endpoint.Process(evnt, context, cancellationTokenSource.Token);
+    }
 
-    var advanced = endpointConfiguration.AdvancedConfiguration;
+    #endregion
 
-    advanced.CustomDiagnosticsWriter((diagnostics, token) =>
+    static void CustomDiagnostics(AwsLambdaSQSEndpointConfiguration endpointConfiguration, ILambdaContext context)
     {
-      context.Logger.LogLine(diagnostics);
-      return Task.CompletedTask;
-    });
+        #region aws-custom-diagnostics
 
-    #endregion
-  }
+        var advanced = endpointConfiguration.AdvancedConfiguration;
 
-  static void Recoverability(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
-  {
-    #region aws-delayed-retries
+        advanced.CustomDiagnosticsWriter((diagnostics, token) =>
+        {
+            context.Logger.LogLine(diagnostics);
+            return Task.CompletedTask;
+        });
 
-    var recoverability = endpointConfiguration.AdvancedConfiguration.Recoverability();
-    recoverability.Delayed(customization =>
-    {
-      customization.NumberOfRetries(5);
-      customization.TimeIncrease(TimeSpan.FromSeconds(15));
-    });
-
-    #endregion
-  }
+        #endregion
+    }
 
-  static void ConfigureErrorQueue(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
-  {
-    #region aws-configure-error-queue
+    static void Recoverability(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
+    {
+        #region aws-delayed-retries
 
-    var advanced = endpointConfiguration.AdvancedConfiguration;
+        var recoverability = endpointConfiguration.AdvancedConfiguration.Recoverability();
+        recoverability.Delayed(customization =>
+        {
+            customization.NumberOfRetries(5);
+            customization.TimeIncrease(TimeSpan.FromSeconds(15));
+        });
 
-    advanced.SendFailedMessagesTo("<error-queue>");
+        #endregion
+    }
 
-    #endregion
-  }
+    static void ConfigureDontMoveToErrors(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
+    {
+        #region aws-configure-dont-move-to-error
 
-  static void ConfigureDontMoveToErrors(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
-  {
-    #region aws-configure-dont-move-to-error
+        endpointConfiguration.DoNotSendMessagesToErrorQueue();
 
-    endpointConfiguration.DoNotSendMessagesToErrorQueue();
+        #endregion
+    }
 
-    #endregion
-  }
-  static void ConfigureSerializer(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
-  {
-    #region aws-custom-serializer
+    static void ConfigureSerializer(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
+    {
+        #region aws-custom-serializer
 
-    endpointConfiguration.UseSerialization<NewtonsoftJsonSerializer>();
+        endpointConfiguration.UseSerialization<SystemJsonSerializer>();
 
-    #endregion
-  }
+        #endregion
+    }
 
-  static void RoutingConfiguration(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
-  {
-    #region aws-configure-routing
+    static void RoutingConfiguration(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
+    {
+        #region aws-configure-routing
 
-    var routing = endpointConfiguration.RoutingSettings;
-    routing.RouteToEndpoint(typeof(ACommand), "<destination>");
+        var routing = endpointConfiguration.RoutingSettings;
+        routing.RouteToEndpoint(typeof(ACommand), "<destination>");
 
-    #endregion
-  }
+        #endregion
+    }
 
-  class ACommand { }
+    class ACommand { }
 }

Snippets/SQSLambda/SQSLambda_0/AccessToLambdaNativeMessageInHandler.cs → Snippets/SQSLambda/SQSLambda_2/AccessToLambdaNativeMessageInHandler.cs

@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-
 using Amazon.Lambda.SQSEvents;
-
 using NServiceBus;
 
 #region native-lambda-sqs-message
@@ -20,5 +18,4 @@ public Task Handle(TestMessage message, IMessageHandlerContext context)
 
 public class TestMessage
 {
-}
-
+}

Snippets/SQSLambda/SQSLambda_2/SQSLambda_2.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NServiceBus.AwsLambda.SQS" Version="2.0.0-alpha.1" />
+  </ItemGroup>
+
+</Project>

Snippets/SQSLambda/SQSLambda_0/Usage.cs → Snippets/SQSLambda/SQSLambda_2/Usage.cs

@@ -25,10 +25,9 @@ class Usage
     public async Task FunctionHandler(SQSEvent evnt, ILambdaContext context)
     {
         var cancellationDelay = context.RemainingTime.Subtract(TimeSpan.FromSeconds(10));
-        using (var cancellationTokenSource = new CancellationTokenSource(cancellationDelay))
-        {
-            await endpoint.Process(evnt, context, cancellationTokenSource.Token);
-        }
+        using var cancellationTokenSource = new CancellationTokenSource(cancellationDelay);
+
+        await endpoint.Process(evnt, context, cancellationTokenSource.Token);
     }
 
     #endregion
@@ -39,7 +38,7 @@ static void CustomDiagnostics(AwsLambdaSQSEndpointConfiguration endpointConfigur
 
         var advanced = endpointConfiguration.AdvancedConfiguration;
 
-        advanced.CustomDiagnosticsWriter(diagnostics =>
+        advanced.CustomDiagnosticsWriter((diagnostics, token) =>
         {
             context.Logger.LogLine(diagnostics);
             return Task.CompletedTask;
@@ -60,23 +59,6 @@ static void Recoverability(AwsLambdaSQSEndpointConfiguration endpointConfigurati
         });
 
         #endregion
-
-        #region aws-unrestricted-delayed-delivery
-
-        endpointConfiguration.Transport.UnrestrictedDurationDelayedDelivery();
-
-        #endregion
-    }
-
-    static void ConfigureErrorQueue(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
-    {
-        #region aws-configure-error-queue
-
-        var advanced = endpointConfiguration.AdvancedConfiguration;
-
-        advanced.SendFailedMessagesTo("<error-queue>");
-
-        #endregion
     }
 
     static void ConfigureDontMoveToErrors(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
@@ -87,11 +69,12 @@ static void ConfigureDontMoveToErrors(AwsLambdaSQSEndpointConfiguration endpoint
 
         #endregion
     }
+
     static void ConfigureSerializer(AwsLambdaSQSEndpointConfiguration endpointConfiguration)
     {
         #region aws-custom-serializer
 
-        endpointConfiguration.UseSerialization<NewtonsoftSerializer>();
+        endpointConfiguration.UseSerialization<SystemJsonSerializer>();
 
         #endregion
     }
@@ -100,8 +83,7 @@ static void RoutingConfiguration(AwsLambdaSQSEndpointConfiguration endpointConfi
     {
         #region aws-configure-routing
 
-        var transport = endpointConfiguration.Transport;
-        var routing = transport.Routing();
+        var routing = endpointConfiguration.RoutingSettings;
         routing.RouteToEndpoint(typeof(ACommand), "<destination>");
 
         #endregion

menu/menu.yaml

@@ -166,6 +166,8 @@
         Title: 2016-07-05
     - Url: nservicebus/upgrades/callbacks-1to2
       Title: Callbacks 1 to 2
+    - Url: nservicebus/upgrades/sqs-lambda-1to2
+      Title: AwsLambda SQS 1 to 2
     - Url: nservicebus/upgrades/bridge-2to3
       Title: Messaging Bridge 2 to 3
     - Url: nservicebus/upgrades/8to9