fix: Preserve client options endpoint (#86)

Author: HofmeisterAn

src/Docker.DotNet.Handler.Abstractions/IDockerHandlerFactory.cs

@@ -10,6 +10,6 @@ public interface IDockerHandlerFactory : IStreamHijacker
     /// </summary>
     /// <param name="clientOptions">The client options.</param>
     /// <param name="logger">The logger instance.</param>
-    /// <returns>A tuple containing the configured handler and normalized endpoint URI.</returns>
-    Tuple<HttpMessageHandler, Uri> CreateHandler(ClientOptions clientOptions, ILogger logger);
+    /// <returns>The resolved transport.</returns>
+    ResolvedTransport CreateHandler(ClientOptions clientOptions, ILogger logger);
 }

src/Docker.DotNet.Handler.Abstractions/IDockerHandlerFactory`1.cs

@@ -12,6 +12,6 @@ public interface IDockerHandlerFactory<in TTransportOptions> : IDockerHandlerFac
     /// <param name="transportOptions">The transport-specific options.</param>
     /// <param name="clientOptions">The client options.</param>
     /// <param name="logger">The logger instance.</param>
-    /// <returns>A tuple containing the configured handler and normalized endpoint URI.</returns>
-    Tuple<HttpMessageHandler, Uri> CreateHandler(TTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger);
+    /// <returns>The resolved transport.</returns>
+    ResolvedTransport CreateHandler(TTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger);
 }

src/Docker.DotNet.Handler.Abstractions/ResolvedTransport.cs

@@ -0,0 +1,8 @@
+namespace Docker.DotNet.Handler.Abstractions;
+
+/// <summary>
+/// Represents a transport-specific HTTP handler and the effective endpoint used for requests.
+/// </summary>
+/// <param name="Handler">The configured HTTP message handler.</param>
+/// <param name="EffectiveEndpoint">The normalized endpoint URI used for requests.</param>
+public sealed record ResolvedTransport(HttpMessageHandler Handler, Uri EffectiveEndpoint);

src/Docker.DotNet.LegacyHttp/DockerHandlerFactory.cs

@@ -9,14 +9,14 @@ private DockerHandlerFactory()
     public static IDockerHandlerFactory<LegacyHttpTransportOptions> Instance { get; }
         = new DockerHandlerFactory();
 
-    public Tuple<HttpMessageHandler, Uri> CreateHandler(ClientOptions clientOptions, ILogger logger)
+    public ResolvedTransport CreateHandler(ClientOptions clientOptions, ILogger logger)
     {
         var transportOptions = new LegacyHttpTransportOptions();
         Validate(transportOptions, clientOptions);
         return CreateHandler(transportOptions, clientOptions, logger);
     }
 
-    public Tuple<HttpMessageHandler, Uri> CreateHandler(LegacyHttpTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger)
+    public ResolvedTransport CreateHandler(LegacyHttpTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger)
     {
         Validate(transportOptions, clientOptions);
 
@@ -25,7 +25,7 @@ public Tuple<HttpMessageHandler, Uri> CreateHandler(LegacyHttpTransportOptions t
         var handler = new ManagedHandler(logger);
         transportOptions.ConfigureHandler(handler);
 
-        return new Tuple<HttpMessageHandler, Uri>(handler, uri);
+        return new ResolvedTransport(handler, uri);
     }
 
     public Task<WriteClosableStream> HijackStreamAsync(HttpContent content)

src/Docker.DotNet.NPipe/DockerHandlerFactory.cs

@@ -9,14 +9,14 @@ private DockerHandlerFactory()
     public static IDockerHandlerFactory<NPipeTransportOptions> Instance { get; }
         = new DockerHandlerFactory();
 
-    public Tuple<HttpMessageHandler, Uri> CreateHandler(ClientOptions clientOptions, ILogger logger)
+    public ResolvedTransport CreateHandler(ClientOptions clientOptions, ILogger logger)
     {
         var transportOptions = new NPipeTransportOptions();
         Validate(transportOptions, clientOptions);
         return CreateHandler(transportOptions, clientOptions, logger);
     }
 
-    public Tuple<HttpMessageHandler, Uri> CreateHandler(NPipeTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger)
+    public ResolvedTransport CreateHandler(NPipeTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger)
     {
         Validate(transportOptions, clientOptions);
 
@@ -60,7 +60,7 @@ await clientStream.ConnectAsync(namedPipeConnectTimeout, cancellationToken)
         var handler = new ManagedHandler(streamOpener, logger);
         transportOptions.ConfigureHandler(handler);
 
-        return new Tuple<HttpMessageHandler, Uri>(handler, uri);
+        return new ResolvedTransport(handler, uri);
     }
 
     public Task<WriteClosableStream> HijackStreamAsync(HttpContent content)

src/Docker.DotNet.NativeHttp/DockerHandlerFactory.cs

@@ -15,14 +15,14 @@ private DockerHandlerFactory()
     public static IDockerHandlerFactory<NativeHttpTransportOptions> Instance { get; }
         = new DockerHandlerFactory();
 
-    public Tuple<HttpMessageHandler, Uri> CreateHandler(ClientOptions clientOptions, ILogger logger)
+    public ResolvedTransport CreateHandler(ClientOptions clientOptions, ILogger logger)
     {
         var transportOptions = new NativeHttpTransportOptions();
         Validate(transportOptions, clientOptions);
         return CreateHandler(transportOptions, clientOptions, logger);
     }
 
-    public Tuple<HttpMessageHandler, Uri> CreateHandler(NativeHttpTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger)
+    public ResolvedTransport CreateHandler(NativeHttpTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger)
     {
         Validate(transportOptions, clientOptions);
 
@@ -43,7 +43,7 @@ public Tuple<HttpMessageHandler, Uri> CreateHandler(NativeHttpTransportOptions t
         transportOptions.ConfigureHandler(handler);
 #endif
 
-        return new Tuple<HttpMessageHandler, Uri>(handler, uri);
+        return new ResolvedTransport(handler, uri);
     }
 
     public async Task<WriteClosableStream> HijackStreamAsync(HttpContent content)

src/Docker.DotNet.Unix/DockerHandlerFactory.cs

@@ -9,14 +9,14 @@ private DockerHandlerFactory()
     public static IDockerHandlerFactory<UnixSocketTransportOptions> Instance { get; }
         = new DockerHandlerFactory();
 
-    public Tuple<HttpMessageHandler, Uri> CreateHandler(ClientOptions clientOptions, ILogger logger)
+    public ResolvedTransport CreateHandler(ClientOptions clientOptions, ILogger logger)
     {
         var transportOptions = new UnixSocketTransportOptions();
         Validate(transportOptions, clientOptions);
         return CreateHandler(transportOptions, clientOptions, logger);
     }
 
-    public Tuple<HttpMessageHandler, Uri> CreateHandler(UnixSocketTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger)
+    public ResolvedTransport CreateHandler(UnixSocketTransportOptions transportOptions, ClientOptions clientOptions, ILogger logger)
     {
         Validate(transportOptions, clientOptions);
 
@@ -41,7 +41,7 @@ await socket.ConnectAsync(endpoint)
         var handler = new ManagedHandler(socketOpener, logger);
         transportOptions.ConfigureHandler(handler);
 
-        return new Tuple<HttpMessageHandler, Uri>(handler, uri);
+        return new ResolvedTransport(handler, uri);
     }
 
     public Task<WriteClosableStream> HijackStreamAsync(HttpContent content)

src/Docker.DotNet/DockerClient.cs

@@ -12,18 +12,22 @@ public sealed class DockerClient : IDockerClient
 
     private readonly ClientOptions _clientOptions;
 
+    private readonly Uri _effectiveEndpoint;
+
     private readonly IStreamHijacker _hijack;
 
     internal DockerClient(
         HttpMessageHandler handler,
         ClientOptions clientOptions,
+        Uri effectiveEndpoint,
         IStreamHijacker hijack,
         ILogger logger)
     {
         _client = new HttpClient(handler, true);
         _client.Timeout = Timeout.InfiniteTimeSpan;
 
         _clientOptions = clientOptions;
+        _effectiveEndpoint = effectiveEndpoint;
         _hijack = hijack;
 
         Options = clientOptions;
@@ -398,7 +402,7 @@ private HttpRequestMessage PrepareRequest(HttpMethod method, string path, IQuery
             throw new ArgumentNullException(nameof(path));
         }
 
-        var request = new HttpRequestMessage(method, HttpUtility.BuildUri(_clientOptions.Endpoint, _clientOptions.ApiVersion, path, queryString));
+        var request = new HttpRequestMessage(method, HttpUtility.BuildUri(_effectiveEndpoint, _clientOptions.ApiVersion, path, queryString));
         request.Version = HttpVersion.Version11;
         request.Headers.Add("User-Agent", UserAgent);
 

src/Docker.DotNet/DockerClientBuilder.cs

@@ -196,13 +196,11 @@ public virtual DockerClient Build()
     {
         var transportFactory = ResolveTransportFactory(ClientOptions.Endpoint.Scheme);
 
-        var (handler, endpoint) = transportFactory.CreateHandler(ClientOptions, Logger);
+        var resolvedTransport = transportFactory.CreateHandler(ClientOptions, Logger);
 
-        var clientOptions = ClientOptions with { Endpoint = endpoint };
+        var authenticatedHandler = ClientOptions.AuthProvider.ConfigureHandler(resolvedTransport.Handler);
 
-        var authenticatedHandler = clientOptions.AuthProvider.ConfigureHandler(handler);
-
-        return new DockerClient(authenticatedHandler, clientOptions, transportFactory, Logger);
+        return new DockerClient(authenticatedHandler, ClientOptions, resolvedTransport.EffectiveEndpoint, transportFactory, Logger);
     }
 
     /// <summary>

src/Docker.DotNet/DockerClientBuilder`1.cs

@@ -29,12 +29,10 @@ public DockerClientBuilder(
     /// <returns>A configured <see cref="DockerClient"/> instance.</returns>
     public override DockerClient Build()
     {
-        var (handler, endpoint) = _transportFactory.CreateHandler(_transportOptions, ClientOptions, Logger);
+        var resolvedTransport = _transportFactory.CreateHandler(_transportOptions, ClientOptions, Logger);
 
-        var clientOptions = ClientOptions with { Endpoint = endpoint };
+        var authenticatedHandler = ClientOptions.AuthProvider.ConfigureHandler(resolvedTransport.Handler);
 
-        var authenticatedHandler = clientOptions.AuthProvider.ConfigureHandler(handler);
-
-        return new DockerClient(authenticatedHandler, clientOptions, _transportFactory, Logger);
+        return new DockerClient(authenticatedHandler, ClientOptions, resolvedTransport.EffectiveEndpoint, _transportFactory, Logger);
     }
 }