Improve how custom connection string settings are set

Author: bording

src/ServiceControl.Transports.RabbitMQ/RabbitMQConventionalRoutingTransportCustomization.cs

@@ -1,17 +1,13 @@
 namespace ServiceControl.Transports.RabbitMQ
 {
     using System;
-    using System.Collections.Generic;
     using System.Linq;
-    using System.Text;
     using BrokerThroughput;
     using Microsoft.Extensions.DependencyInjection;
     using NServiceBus;
 
-    public abstract class RabbitMQConventionalRoutingTransportCustomization(QueueType queueType)
-        : TransportCustomization<RabbitMQTransport>, IRabbitMQTransportExtensions
+    public abstract class RabbitMQConventionalRoutingTransportCustomization(QueueType queueType) : TransportCustomization<RabbitMQTransport>, IRabbitMQTransportExtensions
     {
-
         RabbitMQTransport rabbitMQTransport;
 
         protected override void CustomizeTransportForPrimaryEndpoint(EndpointConfiguration endpointConfiguration, RabbitMQTransport transportDefinition, TransportSettings transportSettings) { }
@@ -22,33 +18,14 @@ protected override void CustomizeTransportForMonitoringEndpoint(EndpointConfigur
 
         protected override RabbitMQTransport CreateTransport(TransportSettings transportSettings, TransportTransactionMode preferredTransactionMode = TransportTransactionMode.ReceiveOnly)
         {
-            if (transportSettings.ConnectionString == null)
+            if (transportSettings.ConnectionString is null)
             {
                 throw new InvalidOperationException("Connection string not configured");
             }
 
-            var connectionConfiguration = ConnectionConfiguration.Create(transportSettings.ConnectionString, string.Empty);
-            var connectionStringDictionary = ConnectionConfiguration.ParseNServiceBusConnectionString(transportSettings.ConnectionString, new StringBuilder());
-
-            var ValidateDeliveryLimitsString = GetValue(connectionStringDictionary, "ValidateDeliveryLimits", "false");
-            if (!bool.TryParse(ValidateDeliveryLimitsString, out var validateDeliveryLimits))
-            {
-                throw new ArgumentException("The value for 'ValidateDeliveryLimits' must be either 'true' or 'false'");
-            }
-
             var transport = new RabbitMQTransport(RoutingTopology.Conventional(queueType), transportSettings.ConnectionString, enableDelayedDelivery: false);
             transport.TransportTransactionMode = transport.GetSupportedTransactionModes().Contains(preferredTransactionMode) ? preferredTransactionMode : TransportTransactionMode.ReceiveOnly;
-            transport.ValidateDeliveryLimits = validateDeliveryLimits;
-
-            var url = GetValue(connectionStringDictionary, "ManagementApiUrl", string.Empty);
-
-            if (!string.IsNullOrEmpty(url))
-            {
-                var username = GetValue(connectionStringDictionary, "ManagementApiUserName", connectionConfiguration.UserName);
-                var password = GetValue(connectionStringDictionary, "ManagementApiPassword", connectionConfiguration.Password);
-                transport.ManagementApiConfiguration = !string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password)
-                    ? new ManagementApiConfiguration(url, username, password) : new ManagementApiConfiguration(url);
-            }
+            transport.SetCustomSettingsFromConnectionString(transportSettings.ConnectionString);
 
             rabbitMQTransport = transport;
             return transport;
@@ -63,9 +40,6 @@ protected sealed override void AddTransportForMonitoringCore(IServiceCollection
             services.AddHostedService(provider => provider.GetRequiredService<IProvideQueueLength>());
         }
 
-        static string GetValue(Dictionary<string, string> dictionary, string key, string defaultValue)
-            => dictionary.TryGetValue(key, out var value) ? value : defaultValue;
-
         RabbitMQTransport IRabbitMQTransportExtensions.GetTransport()
         {
             if (rabbitMQTransport == null)

src/ServiceControl.Transports.RabbitMQ/RabbitMQDirectRoutingTransportCustomization.cs

@@ -1,9 +1,7 @@
 namespace ServiceControl.Transports.RabbitMQ
 {
     using System;
-    using System.Collections.Generic;
     using System.Linq;
-    using System.Text;
     using BrokerThroughput;
     using Microsoft.Extensions.DependencyInjection;
     using NServiceBus;
@@ -18,35 +16,17 @@ protected override void CustomizeTransportForPrimaryEndpoint(EndpointConfigurati
         protected override void CustomizeTransportForAuditEndpoint(EndpointConfiguration endpointConfiguration, RabbitMQTransport transportDefinition, TransportSettings transportSettings) { }
 
         protected override void CustomizeTransportForMonitoringEndpoint(EndpointConfiguration endpointConfiguration, RabbitMQTransport transportDefinition, TransportSettings transportSettings) { }
+
         protected override RabbitMQTransport CreateTransport(TransportSettings transportSettings, TransportTransactionMode preferredTransactionMode = TransportTransactionMode.ReceiveOnly)
         {
-            if (transportSettings.ConnectionString == null)
+            if (transportSettings.ConnectionString is null)
             {
                 throw new InvalidOperationException("Connection string not configured");
             }
 
-            var connectionConfiguration = ConnectionConfiguration.Create(transportSettings.ConnectionString, string.Empty);
-            var connectionStringDictionary = ConnectionConfiguration.ParseNServiceBusConnectionString(transportSettings.ConnectionString, new StringBuilder());
-
-            var ValidateDeliveryLimitsString = GetValue(connectionStringDictionary, "ValidateDeliveryLimits", "true");
-            if (!bool.TryParse(ValidateDeliveryLimitsString, out var validateDeliveryLimits))
-            {
-                throw new ArgumentException("The value for 'ValidateDeliveryLimits' must be either 'true' or 'false'");
-            }
-
             var transport = new RabbitMQTransport(RoutingTopology.Direct(queueType, routingKeyConvention: type => type.FullName.Replace(".", "-")), transportSettings.ConnectionString, enableDelayedDelivery: false);
             transport.TransportTransactionMode = transport.GetSupportedTransactionModes().Contains(preferredTransactionMode) ? preferredTransactionMode : TransportTransactionMode.ReceiveOnly;
-            transport.ValidateDeliveryLimits = validateDeliveryLimits;
-
-            var url = GetValue(connectionStringDictionary, "ManagementApiUrl", string.Empty);
-
-            if (!string.IsNullOrEmpty(url))
-            {
-                var username = GetValue(connectionStringDictionary, "ManagementApiUserName", connectionConfiguration.UserName);
-                var password = GetValue(connectionStringDictionary, "ManagementApiPassword", connectionConfiguration.Password);
-                transport.ManagementApiConfiguration = !string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password)
-                    ? new ManagementApiConfiguration(url, username, password) : new ManagementApiConfiguration(url);
-            }
+            transport.SetCustomSettingsFromConnectionString(transportSettings.ConnectionString);
 
             rabbitMQTransport = transport;
             return transport;
@@ -61,9 +41,6 @@ protected sealed override void AddTransportForMonitoringCore(IServiceCollection
             services.AddHostedService(provider => provider.GetRequiredService<IProvideQueueLength>());
         }
 
-        static string GetValue(Dictionary<string, string> dictionary, string key, string defaultValue)
-            => dictionary.TryGetValue(key, out var value) ? value : defaultValue;
-
         RabbitMQTransport IRabbitMQTransportExtensions.GetTransport()
         {
             if (rabbitMQTransport == null)

src/ServiceControl.Transports.RabbitMQ/RabbitMQTransportExtensions.cs

@@ -0,0 +1,40 @@
+namespace ServiceControl.Transports.RabbitMQ;
+
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Linq;
+using NServiceBus;
+
+static class RabbitMQTransportExtensions
+{
+    public static void SetCustomSettingsFromConnectionString(this RabbitMQTransport transport, string connectionString)
+    {
+        if (connectionString.StartsWith("amqp", StringComparison.OrdinalIgnoreCase))
+        {
+            return;
+        }
+
+        var dictionary = new DbConnectionStringBuilder { ConnectionString = connectionString }
+            .OfType<KeyValuePair<string, object>>()
+            .ToDictionary(pair => pair.Key, pair => pair.Value.ToString(), StringComparer.OrdinalIgnoreCase);
+
+        if (dictionary.TryGetValue("ValidateDeliveryLimits", out var validateString))
+        {
+            _ = bool.TryParse(validateString, out var validate);
+            transport.ValidateDeliveryLimits = validate;
+        }
+
+        if (dictionary.TryGetValue("ManagementApiUrl", out var url))
+        {
+            if (dictionary.TryGetValue("ManagementApiUserName", out var userName) && dictionary.TryGetValue("ManagementApiPassword", out var password))
+            {
+                transport.ManagementApiConfiguration = new(url, userName, password);
+            }
+            else
+            {
+                transport.ManagementApiConfiguration = new(url);
+            }
+        }
+    }
+}