RabbitMQ 4.0 support

.github/workflows/ci.yml

@@ -51,10 +51,11 @@ jobs:
           creds: ${{ secrets.AZURE_ACI_CREDENTIALS }}
           enable-AzPSSession: true
       - name: Setup RabbitMQ
-        uses: Particular/[email protected].0
+        uses: Particular/[email protected].1
         with:
           connection-string-name: RabbitMQTransport_ConnectionString
           tag: RabbitMQTransport
+          image-tag: 4-management
           registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
           registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Run tests

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/QuorumQueues/When_classic_endpoint_uses_quorum_error_queue.cs

@@ -24,7 +24,8 @@ public async Task Should_fail_to_start()
                 .Run());
 
             Assert.That(exception.Message, Does.Contain("PRECONDITION_FAILED - inequivalent arg 'x-queue-type' for queue 'rabbitmq.transport.tests.quorum-error'"));
-            Assert.That(exception.Message, Does.Contain("received none but current is the value 'quorum'"));
+            Assert.That(exception.Message, Does.Contain("received none but current is the value 'quorum'")  // RabbitMQ v3.x
+                                            .Or.Contain("received 'classic' but current is 'quorum'"));  // RabbitMQ v4.x
         }
 
         class ClassicQueueEndpoint : EndpointConfigurationBuilder

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/QuorumQueues/When_classic_endpoint_uses_quorum_queue.cs

@@ -25,7 +25,8 @@ public async Task Should_fail_to_start()
                 .Run());
 
             Assert.That(exception.Message, Does.Contain("PRECONDITION_FAILED - inequivalent arg 'x-queue-type' for queue 'ClassicEndpointUsesQuorumQueue.ClassicQueueEndpoint'"));
-            Assert.That(exception.Message, Does.Contain("received none but current is the value 'quorum'"));
+            Assert.That(exception.Message, Does.Contain("received none but current is the value 'quorum'")  // RabbitMQ v3.x
+                                            .Or.Contain("received 'classic' but current is 'quorum'"));  // RabbitMQ v4.x
         }
 
         class ClassicQueueEndpoint : EndpointConfigurationBuilder

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/QuorumQueues/When_quorum_endpoint_uses_classic_error_queue.cs

@@ -24,7 +24,8 @@ public async Task Should_fail_to_start()
                 .Run());
 
             Assert.That(exception.Message, Does.Contain("PRECONDITION_FAILED - inequivalent arg 'x-queue-type' for queue 'rabbitmq.transport.tests.classic-error'"));
-            Assert.That(exception.Message, Does.Contain("received the value 'quorum' of type 'longstr' but current is none'"));
+            Assert.That(exception.Message, Does.Contain("received the value 'quorum' of type 'longstr' but current is none'") // RabbitMQ v3.x
+                                            .Or.Contain("received 'quorum' but current is 'classic'")); // RabbitMQ v4.x
         }
 
         class QuorumQueueEndpoint : EndpointConfigurationBuilder

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/QuorumQueues/When_quorum_endpoint_uses_classic_queue.cs

@@ -24,7 +24,8 @@ public async Task Should_fail_to_start()
                 .Run());
 
             Assert.That(exception.Message, Does.Contain("PRECONDITION_FAILED - inequivalent arg 'x-queue-type' for queue 'QuorumEndpointUsesClassicQueue.QuorumQueueEndpoint'"));
-            Assert.That(exception.Message, Does.Contain("received the value 'quorum' of type 'longstr' but current is none"));
+            Assert.That(exception.Message, Does.Contain("received the value 'quorum' of type 'longstr' but current is none'") // RabbitMQ v3.x
+                                            .Or.Contain("received 'quorum' but current is 'classic'")); // RabbitMQ v4.x
         }
 
         class QuorumQueueEndpoint : EndpointConfigurationBuilder

src/NServiceBus.Transport.RabbitMQ.CommandLine/BrokerConnectionBinder.cs

@@ -42,7 +42,7 @@ protected override BrokerConnection GetBoundValue(BindingContext bindingContext)
             return brokerConnection;
         }
 
-        string GetConnectionString(string? connectionString, string? connectionStringEnv)
+        static string GetConnectionString(string? connectionString, string? connectionStringEnv)
         {
             if (string.IsNullOrWhiteSpace(connectionString))
             {

src/NServiceBus.Transport.RabbitMQ.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt

@@ -18,7 +18,10 @@ namespace NServiceBus
     {
         public RabbitMQTransport(NServiceBus.RoutingTopology routingTopology, string connectionString) { }
         public RabbitMQTransport(NServiceBus.RoutingTopology routingTopology, string connectionString, bool enableDelayedDelivery) { }
+        public RabbitMQTransport(NServiceBus.RoutingTopology routingTopology, string connectionString, string managementConnectionString) { }
+        public RabbitMQTransport(NServiceBus.RoutingTopology routingTopology, string connectionString, bool enableDelayedDelivery, string managementConnectionString) { }
         public System.Security.Cryptography.X509Certificates.X509Certificate2 ClientCertificate { get; set; }
+        public bool DoNotUseManagementClient { get; set; }
         public System.TimeSpan HeartbeatInterval { get; set; }
         public System.Func<RabbitMQ.Client.Events.BasicDeliverEventArgs, string> MessageIdStrategy { get; set; }
         public System.TimeSpan NetworkRecoveryInterval { get; set; }
@@ -41,6 +44,8 @@ namespace NServiceBus
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> CustomMessageIdStrategy(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions, System.Func<RabbitMQ.Client.Events.BasicDeliverEventArgs, string> customIdStrategy) { }
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> DisableDurableExchangesAndQueues(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions) { }
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> DisableRemoteCertificateValidation(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions) { }
+        public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> ManagementConnectionString(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions, System.Func<string> getConnectionString) { }
+        public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> ManagementConnectionString(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions, string connectionString) { }
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> PrefetchCount(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions, ushort prefetchCount) { }
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> PrefetchMultiplier(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions, int prefetchMultiplier) { }
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> SetClientCertificate(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions, System.Security.Cryptography.X509Certificates.X509Certificate2 clientCertificate) { }