Update transport creation with new API surface

Author: Travis Nickels

src/ServiceControl.Transports.RabbitMQ/RabbitMQConventionalRoutingTransportCustomization.cs

@@ -27,20 +27,42 @@ protected override RabbitMQTransport CreateTransport(TransportSettings transport
                 throw new InvalidOperationException("Connection string not configured");
             }
 
+            var connectionConfiguration = ConnectionConfiguration.Create(transportSettings.ConnectionString, string.Empty);
             var connectionStringDictionary = ConnectionConfiguration.ParseNServiceBusConnectionString(transportSettings.ConnectionString, new StringBuilder());
-            var disableManagementApi = GetValue(connectionStringDictionary, "DisableManagementApi", "false");
-            if (!disableManagementApi.Equals("true", StringComparison.OrdinalIgnoreCase) && !disableManagementApi.Equals("false", StringComparison.OrdinalIgnoreCase))
+
+            var disableManagementApiString = GetValue(connectionStringDictionary, "DisableManagementApi", "false");
+            if (!bool.TryParse(disableManagementApiString, out var disableManagementApi))
             {
                 throw new ArgumentException("The value for 'DisableManagementApi' 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.ManagementApiUrl = GetValue(connectionStringDictionary, "ManagementApiUrl", string.Empty);
-            transport.UseManagementApi = disableManagementApi.Equals("false", StringComparison.OrdinalIgnoreCase);
+            transport.UseManagementApi = !disableManagementApi;
 
-            rabbitMQTransport = transport;
+            if (!transport.UseManagementApi)
+            {
+                rabbitMQTransport = transport;
+                return transport;
+            }
+
+            var url = GetValue(connectionStringDictionary, "ManagementApiUrl", string.Empty);
+            var username = GetValue(connectionStringDictionary, "ManagementApiUserName", connectionConfiguration.UserName);
+            var password = GetValue(connectionStringDictionary, "ManagementApiPassword", connectionConfiguration.Password);
 
+            if (!string.IsNullOrEmpty(url))
+            {
+                if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password))
+                {
+                    transport.ManagementApiConfiguration = new ManagementApiConfiguration(url, username, password);
+                }
+                else
+                {
+                    transport.ManagementApiConfiguration = new ManagementApiConfiguration(url);
+                }
+            }
+
+            rabbitMQTransport = transport;
             return transport;
         }
 

src/ServiceControl.Transports.RabbitMQ/RabbitMQDirectRoutingTransportCustomization.cs

@@ -25,20 +25,42 @@ protected override RabbitMQTransport CreateTransport(TransportSettings transport
                 throw new InvalidOperationException("Connection string not configured");
             }
 
+            var connectionConfiguration = ConnectionConfiguration.Create(transportSettings.ConnectionString, string.Empty);
             var connectionStringDictionary = ConnectionConfiguration.ParseNServiceBusConnectionString(transportSettings.ConnectionString, new StringBuilder());
-            var disableManagementApi = GetValue(connectionStringDictionary, "DisableManagementApi", "false");
-            if (!disableManagementApi.Equals("true", StringComparison.OrdinalIgnoreCase) && !disableManagementApi.Equals("false", StringComparison.OrdinalIgnoreCase))
+
+            var disableManagementApiString = GetValue(connectionStringDictionary, "DisableManagementApi", "false");
+            if (!bool.TryParse(disableManagementApiString, out var disableManagementApi))
             {
                 throw new ArgumentException("The value for 'DisableManagementApi' 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.ManagementApiUrl = GetValue(connectionStringDictionary, "ManagementApiUrl", string.Empty);
-            transport.UseManagementApi = disableManagementApi.Equals("false", StringComparison.OrdinalIgnoreCase);
+            transport.UseManagementApi = !disableManagementApi;
 
-            rabbitMQTransport = transport;
+            if (!transport.UseManagementApi)
+            {
+                rabbitMQTransport = transport;
+                return transport;
+            }
+
+            var url = GetValue(connectionStringDictionary, "ManagementApiUrl", string.Empty);
+            var username = GetValue(connectionStringDictionary, "ManagementApiUserName", connectionConfiguration.UserName);
+            var password = GetValue(connectionStringDictionary, "ManagementApiPassword", connectionConfiguration.Password);
 
+            if (!string.IsNullOrEmpty(url))
+            {
+                if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password))
+                {
+                    transport.ManagementApiConfiguration = new ManagementApiConfiguration(url, username, password);
+                }
+                else
+                {
+                    transport.ManagementApiConfiguration = new ManagementApiConfiguration(url);
+                }
+            }
+
+            rabbitMQTransport = transport;
             return transport;
         }