Merge pull request #389 from Particular/backport-4.2.1

* Force transaction mode to receive only to allow outbox to be used * Add acceptance test
Particular · Sep 21, 2023 · 92ace54 · 92ace54
2 parents 179a9e3 + 40c135b
commit 92ace54
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 3 deletions.
diff --git a/src/ManualTests.HostV4/ManualTests.HostV4.csproj b/src/ManualTests.HostV4/ManualTests.HostV4.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.14.1" OutputItemType="Analyzer" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.14.1" />
-    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="3.2.1" />    
+    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="3.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ManualTests.HostV4/Program.cs b/src/ManualTests.HostV4/Program.cs
@@ -11,7 +11,6 @@ public static void Main()
             .ConfigureFunctionsWorkerDefaults()
             .UseNServiceBus(c =>
             {
-                //c.AdvancedConfiguration.SendOnly();
                 c.Routing.RouteToEndpoint(typeof(TriggerMessage), "some-queue");
                 c.AdvancedConfiguration.EnableInstallers();
             })

diff --git a/src/NServiceBus.AzureFunctions.Worker.ServiceBus.Tests/When_outbox_is_enabled.cs b/src/NServiceBus.AzureFunctions.Worker.ServiceBus.Tests/When_outbox_is_enabled.cs
@@ -0,0 +1,59 @@
+namespace ServiceBus.Tests
+{
+    using System.Threading.Tasks;
+    using NServiceBus;
+    using NServiceBus.AcceptanceTesting;
+    using NUnit.Framework;
+
+    public class When_outbox_is_enabled
+    {
+        [Test]
+        public async Task Should_work()
+        {
+            var context = await Scenario.Define<Context>()
+                .WithComponent(new OutboxEnabledFunction(new SomeMessage()))
+                .Done(c => c.GotTheMessage)
+                .Run();
+
+            Assert.True(context.GotTheMessage);
+        }
+
+        public class Context : ScenarioContext
+        {
+            public bool GotTheMessage { get; set; }
+        }
+
+        class OutboxEnabledFunction : FunctionEndpointComponent
+        {
+            public OutboxEnabledFunction(object triggerMessage)
+            {
+                CustomizeConfiguration = configuration =>
+                {
+                    configuration.AdvancedConfiguration.UsePersistence<AcceptanceTestingPersistence>();
+                    configuration.AdvancedConfiguration.EnableOutbox();
+                };
+                AddTestMessage(triggerMessage);
+            }
+
+            public class SomeMessageHandler : IHandleMessages<SomeMessage>
+            {
+                Context testContext;
+
+                public SomeMessageHandler(Context testContext)
+                {
+                    this.testContext = testContext;
+                }
+
+                public Task Handle(SomeMessage message, IMessageHandlerContext context)
+                {
+                    testContext.GotTheMessage = true;
+                    return Task.CompletedTask;
+                }
+            }
+        }
+
+        class SomeMessage : IMessage
+        {
+        }
+    }
+}
diff --git a/...ceBus.AzureFunctions.Worker.ServiceBus/Serverless/TransportWrapper/ServerlessTransport.cs b/...ceBus.AzureFunctions.Worker.ServiceBus/Serverless/TransportWrapper/ServerlessTransport.cs
@@ -14,7 +14,7 @@ class ServerlessTransport : TransportDefinition
         public IMessageProcessor MessageProcessor { get; private set; }
 
         public ServerlessTransport(TransportDefinition baseTransport) : base(
-            baseTransport.TransportTransactionMode,
+            TransportTransactionMode.ReceiveOnly,
             baseTransport.SupportsDelayedDelivery,
             baseTransport.SupportsPublishSubscribe,
             baseTransport.SupportsTTBR)