Merge pull request #4412 from Particular/john/slashes2

Ensuring Azure ManagementUrl setting accepts urls without the last slash

Author: johnsimons

src/ServiceControl.Transports.ASBS.Tests/ApprovalFiles/AzureQueryTests.TestConnectionWithMissingLastSlashInManagementUrl.approved.txt

@@ -0,0 +1,9 @@
+Connection test to AzureServiceBus was successful
+
+Connection settings used:
+ServiceBus name not set, defaulted to "xxxxx"
+SubscriptionId set
+TenantId set
+ClientId set
+Client secret set
+Management Url set to "https://management.azure.com"

src/ServiceControl.Transports.ASBS.Tests/AzureQueryTests.cs

@@ -14,7 +14,7 @@ namespace ServiceControl.Transport.Tests;
 using Particular.Approvals;
 using Transports;
 using Transports.ASBS;
-using ServiceControl.Transports.BrokerThroughput;
+using Transports.BrokerThroughput;
 
 [TestFixture]
 class AzureQueryTests : TransportTestFixture
@@ -81,6 +81,28 @@ public async Task TestConnectionWithValidSettings()
         });
     }
 
+    [Test]
+    public async Task TestConnectionWithMissingLastSlashInManagementUrl()
+    {
+        using var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
+
+        string serviceBusName = query.ExtractServiceBusName();
+        Dictionary<string, string> dictionary = GetSettings();
+        dictionary[AzureQuery.AzureServiceBusSettings.ManagementUrl] = "https://management.azure.com";
+        query.Initialize(new ReadOnlyDictionary<string, string>(dictionary));
+        (bool success, _, string diagnostics) = await query.TestConnection(cancellationTokenSource.Token);
+
+        Assert.That(success, Is.True);
+        Approver.Verify(diagnostics, s =>
+        {
+            s = s.Replace(dictionary[AzureQuery.AzureServiceBusSettings.TenantId], "xxxxx");
+            s = s.Replace(dictionary[AzureQuery.AzureServiceBusSettings.SubscriptionId], "xxxxx");
+            s = s.Replace(dictionary[AzureQuery.AzureServiceBusSettings.ClientId], "xxxxx");
+            s = s.Replace(serviceBusName, "xxxxx");
+            return s;
+        });
+    }
+
     [Test]
     public async Task TestConnectionWithInvalidTenantIdSetting()
     {

src/ServiceControl.Transports.ASBS/AzureQuery.cs

@@ -17,8 +17,8 @@ namespace ServiceControl.Transports.ASBS;
 using Azure.ResourceManager;
 using Azure.ResourceManager.Resources;
 using Azure.ResourceManager.ServiceBus;
+using BrokerThroughput;
 using Microsoft.Extensions.Logging;
-using ServiceControl.Transports.BrokerThroughput;
 
 public class AzureQuery(ILogger<AzureQuery> logger, TimeProvider timeProvider, TransportSettings transportSettings)
     : BrokerThroughputQuery(logger, "AzureServiceBus")
@@ -33,9 +33,10 @@ protected override void InitializeCore(ReadOnlyDictionary<string, string> settin
         ConnectionSettings? connectionSettings = ConnectionStringParser.Parse(transportSettings.ConnectionString);
         bool usingManagedIdentity =
             connectionSettings.AuthenticationMethod is TokenCredentialAuthentication;
+        Uri? managementUrlParsed = null;
         if (settings.TryGetValue(AzureServiceBusSettings.ManagementUrl, out string? managementUrl))
         {
-            if (!Uri.TryCreate(managementUrl, UriKind.Absolute, out _))
+            if (!Uri.TryCreate(managementUrl, UriKind.Absolute, out managementUrlParsed))
             {
                 InitialiseErrors.Add("Management url configuration is invalid");
             }
@@ -149,31 +150,27 @@ protected override void InitializeCore(ReadOnlyDictionary<string, string> settin
 
         ArmEnvironment GetEnvironment()
         {
-            if (managementUrl == null)
+            if (managementUrlParsed == null)
             {
                 return ArmEnvironment.AzurePublicCloud;
             }
 
-            if (managementUrl.Equals(ArmEnvironment.AzurePublicCloud.Endpoint.ToString(),
-                    StringComparison.CurrentCultureIgnoreCase))
+            if (managementUrlParsed == ArmEnvironment.AzurePublicCloud.Endpoint)
             {
                 return ArmEnvironment.AzurePublicCloud;
             }
 
-            if (managementUrl.Equals(ArmEnvironment.AzureChina.Endpoint.ToString(),
-                    StringComparison.CurrentCultureIgnoreCase))
+            if (managementUrlParsed == ArmEnvironment.AzureChina.Endpoint)
             {
                 return ArmEnvironment.AzureChina;
             }
 
-            if (managementUrl.Equals(ArmEnvironment.AzureGermany.Endpoint.ToString(),
-                    StringComparison.CurrentCultureIgnoreCase))
+            if (managementUrlParsed == ArmEnvironment.AzureGermany.Endpoint)
             {
                 return ArmEnvironment.AzureGermany;
             }
 
-            if (managementUrl.Equals(ArmEnvironment.AzureGovernment.Endpoint.ToString(),
-                    StringComparison.CurrentCultureIgnoreCase))
+            if (managementUrlParsed == ArmEnvironment.AzureGovernment.Endpoint)
             {
                 return ArmEnvironment.AzureGovernment;
             }