Fixing TLS connection test

src/NATS.Client.Core/Internal/NatsUri.cs

@@ -40,6 +40,17 @@ public NatsUri(string urlString, bool isSeed, string defaultScheme = DefaultSche
         Uri = uriBuilder.Uri;
     }
 
+    public NatsUri CloneWith(string host, int? port = default)
+    {
+        var newUri = new UriBuilder(Uri)
+        {
+            Host = host,
+            Port = port ?? Port,
+        }.Uri.ToString();
+
+        return new NatsUri(newUri, IsSeed);
+    }
+
     public Uri Uri { get; }
 
     public bool IsSeed { get; }

src/NATS.Client.Core/NatsConnection.cs

@@ -361,15 +361,15 @@ private async ValueTask SetupReaderWriterAsync(bool reconnect)
                     // do TLS upgrade
                     // if the current URI is not a seed URI and is not a DNS hostname, check the server cert against the
                     // last seed hostname if it was a DNS hostname
-                    var targetHost = _currentConnectUri.Host;
+                    var targetUri = _currentConnectUri;
                     if (!_currentConnectUri.IsSeed
-                        && Uri.CheckHostName(targetHost) != UriHostNameType.Dns
+                        && Uri.CheckHostName(targetUri.Host) != UriHostNameType.Dns
                         && Uri.CheckHostName(_lastSeedConnectUri!.Host) == UriHostNameType.Dns)
                     {
-                        targetHost = _lastSeedConnectUri.Host;
+                        targetUri = targetUri.CloneWith(_lastSeedConnectUri.Host);
                     }
 
-                    _logger.LogDebug("Perform TLS Upgrade to " + targetHost);
+                    _logger.LogDebug("Perform TLS Upgrade to " + targetUri);
 
                     // cancel INFO parsed signal and dispose current socket reader
                     infoParsedSignal.SetCanceled();
@@ -378,7 +378,7 @@ private async ValueTask SetupReaderWriterAsync(bool reconnect)
 
                     // upgrade TcpConnection to SslConnection
                     var sslConnection = tcpConnection.UpgradeToSslStreamConnection(Opts.TlsOpts, _tlsCerts);
-                    await sslConnection.AuthenticateAsClientAsync(_currentConnectUri).ConfigureAwait(false);
+                    await sslConnection.AuthenticateAsClientAsync(targetUri).ConfigureAwait(false);
                     _socket = sslConnection;
 
                     // create new socket reader
@@ -474,12 +474,7 @@ private async void ReconnectLoop()
 
                         if (newTarget.Host != target.Host || newTarget.Port != target.Port)
                         {
-                            var newUri = new UriBuilder(url.Uri)
-                            {
-                                Host = newTarget.Host,
-                                Port = newTarget.Port,
-                            }.Uri.ToString();
-                            url = new NatsUri(newUri, url.IsSeed);
+                            url = url.CloneWith(newTarget.Host, newTarget.Port);
                         }
                     }
 

tests/NATS.Client.TestUtilities/NatsServer.cs

@@ -457,21 +457,16 @@ public NatsCluster(ITestOutputHelper outputHelper, TransportType transportType)
         var opts1 = new NatsServerOptsBuilder()
             .UseTransport(transportType)
             .EnableClustering()
-            .Trace() // for debugging
             .Build();
 
-
         var opts2 = new NatsServerOptsBuilder()
             .UseTransport(transportType)
             .EnableClustering()
-            .Trace() // for debugging
             .Build();
 
-
         var opts3 = new NatsServerOptsBuilder()
             .UseTransport(transportType)
             .EnableClustering()
-            .Trace() // for debugging
             .Build();
 
         // By querying the ports we set the values lazily on all the opts.