[Service Bus] Preserve custom port for AdminClient (Azure#49514)

* [Service Bus] Preserve custom port for AdminClient

The focus of these changes is to preserve a custom
port associated with the local development emulator
when creating the admin client.  Previously, this
was incorrectly reset to the default.

* Fixing non-URI case

Author: jsquire

sdk/servicebus/Azure.Messaging.ServiceBus/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- Fixed a bug where the custom port associated with a local emulator endpoint was reset by the `ServiceBusAdministrationClient`.
+
 ### Other Changes
 
 ## 7.19.0 (2025-04-08)

sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/HttpRequestAndResponse.cs

@@ -1,16 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Azure.Core;
 using System;
+using System.Collections.Generic;
+using System.Globalization;
 using System.Net;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Azure.Messaging.ServiceBus.Authorization;
+using Azure.Core;
 using Azure.Core.Pipeline;
-using System.Collections.Generic;
-using System.Globalization;
+using Azure.Messaging.ServiceBus.Authorization;
 
 namespace Azure.Messaging.ServiceBus.Administration
 {
@@ -33,14 +33,15 @@ public HttpRequestAndResponse(
             TokenCredential tokenCredential,
             string fullyQualifiedNamespace,
             ServiceBusAdministrationClientOptions.ServiceVersion version,
+            int port,
             bool useTls)
         {
             _pipeline = pipeline;
             _diagnostics = diagnostics;
             _versionQuery = $"api-version={version.ToVersionString()}";
             _tokenCredential = tokenCredential;
             _fullyQualifiedNamespace = fullyQualifiedNamespace;
-            _port = GetPort(_fullyQualifiedNamespace);
+            _port = GetPort(_fullyQualifiedNamespace, port);
             _scheme = useTls ? Uri.UriSchemeHttps : Uri.UriSchemeHttp;
         }
 
@@ -264,6 +265,15 @@ public async Task<Response> DeleteEntityAsync(
             return response;
         }
 
+        internal Uri BuildDefaultUri(string entityPath) =>
+            new UriBuilder(_fullyQualifiedNamespace)
+            {
+                Path = entityPath,
+                Port = _port,
+                Scheme = _scheme,
+                Query = _versionQuery
+            }.Uri;
+
         private async Task<Response> SendHttpRequestAsync(
             Request request,
             CancellationToken cancellationToken)
@@ -281,15 +291,15 @@ private async Task<Response> SendHttpRequestAsync(
             return response;
         }
 
-        private static int GetPort(string endpoint)
+        private static int GetPort(string endpoint, int port)
         {
             // used for internal testing
             if (endpoint.EndsWith("onebox.windows-int.net", StringComparison.InvariantCultureIgnoreCase))
             {
                 return 4446;
             }
 
-            return -1;
+            return (port > 0) ? port : -1;
         }
     }
 }

sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceBusAdministrationClient.cs

@@ -114,6 +114,7 @@ public ServiceBusAdministrationClient(
                 tokenCredential,
                 _fullyQualifiedNamespace,
                 options.Version,
+                connectionStringProperties.Endpoint.Port,
                 useTls);
         }
 
@@ -190,9 +191,12 @@ private ServiceBusAdministrationClient(
             Argument.AssertNotNull(credential, nameof(credential));
             Argument.AssertNotNullOrEmpty(fullyQualifiedNamespace, nameof(fullyQualifiedNamespace));
 
+            var port = -1;
+
             if (Uri.TryCreate(fullyQualifiedNamespace, UriKind.Absolute, out var uri))
             {
                 fullyQualifiedNamespace = uri.Host;
+                port = uri.Port;
             }
 
             Argument.AssertWellFormedServiceBusNamespace(fullyQualifiedNamespace, nameof(fullyQualifiedNamespace));
@@ -216,6 +220,7 @@ private ServiceBusAdministrationClient(
                 credential,
                 _fullyQualifiedNamespace,
                 options.Version,
+                port,
                 true);
         }
 

sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RequestResponseTests.cs

@@ -13,14 +13,15 @@
 
 namespace Azure.Messaging.ServiceBus.Tests.Management
 {
+    [TestFixture]
     public class RequestResponseTests
     {
         private readonly HttpRequestAndResponse _requestResponse;
         public RequestResponseTests()
         {
             var options = new ServiceBusAdministrationClientOptions();
             var pipeline = HttpPipelineBuilder.Build(options);
-            _requestResponse = new HttpRequestAndResponse(pipeline, new ClientDiagnostics(options), null, "fakeNamespace", ServiceBusAdministrationClientOptions.ServiceVersion.V2017_04, true);
+            _requestResponse = new HttpRequestAndResponse(pipeline, new ClientDiagnostics(options), null, "fakeNamespace", ServiceBusAdministrationClientOptions.ServiceVersion.V2017_04, -1, true);
         }
 
         [Test]
@@ -217,5 +218,46 @@ public void ThrowsGeneralFailureOnOtherError()
             }
             Assert.Fail("No exception!");
         }
+
+        [Test]
+        [TestCase(1)]
+        [TestCase(80)]
+        [TestCase(8989)]
+        [TestCase(6335)]
+        public void CustomPortIsPreserved(int port)
+        {
+            var options = new ServiceBusAdministrationClientOptions();
+            var pipeline = HttpPipelineBuilder.Build(options);
+            var requestResponse = new HttpRequestAndResponse(pipeline, new ClientDiagnostics(options), null, "fakeNamespace", ServiceBusAdministrationClientOptions.ServiceVersion.V2017_04, port, true);
+
+            Assert.AreEqual(port, requestResponse.BuildDefaultUri("dummy").Port);
+        }
+
+        [Test]
+        [TestCase(0)]
+        [TestCase(-1)]
+        [TestCase(-200)]
+        public void DefaultPortIsPreserved(int port)
+        {
+            var options = new ServiceBusAdministrationClientOptions();
+            var pipeline = HttpPipelineBuilder.Build(options);
+            var requestResponse = new HttpRequestAndResponse(pipeline, new ClientDiagnostics(options), null, "fakeNamespace", ServiceBusAdministrationClientOptions.ServiceVersion.V2017_04, port, true);
+
+            var defaultPort = new UriBuilder("https://www.examplke.com").Uri.Port;
+            Assert.AreEqual(defaultPort, requestResponse.BuildDefaultUri("dummy").Port);
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void UseTlsIsHonored(bool useTls)
+        {
+            var options = new ServiceBusAdministrationClientOptions();
+            var pipeline = HttpPipelineBuilder.Build(options);
+            var requestResponse = new HttpRequestAndResponse(pipeline, new ClientDiagnostics(options), null, "fakeNamespace", ServiceBusAdministrationClientOptions.ServiceVersion.V2017_04, -1, useTls);
+
+            var expectedScheme = useTls ? "https" : "http";
+            Assert.AreEqual(expectedScheme, requestResponse.BuildDefaultUri("dummy").Scheme);
+        }
     }
 }