Fix more query-string handling

Author: admilazz

src/KubernetesClient/Kubernetes.Watch.cs

@@ -87,7 +87,7 @@ public partial class Kubernetes
                 Utilities.AddQueryParameter(query, "resourceVersion", resourceVersion);
             }
 
-            uriBuilder.Query = query.ToString(1, query.Length-1); // UriBuilder.Query doesn't like leading '?' chars, so trim it
+            uriBuilder.Query = query.Length == 0 ? "" : query.ToString(1, query.Length-1); // UriBuilder.Query doesn't like leading '?' chars, so trim it
 
             // Create HTTP transport objects
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, uriBuilder.ToString());

src/KubernetesClient/Kubernetes.WebSocket.cs

@@ -14,6 +14,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Text;
+using System.Globalization;
 
 namespace k8s
 {
@@ -167,14 +168,13 @@ public partial class Kubernetes
 
             uriBuilder.Path += $"api/v1/namespaces/{@namespace}/pods/{name}/portforward";
 
-            var q = "";
+            var q = new StringBuilder();
             foreach (var port in ports)
             {
-                q = QueryHelpers.AddQueryString(q, "ports", $"{port}");
+                if (q.Length != 0) q.Append('&');
+                q.Append("ports=").Append(port.ToString(CultureInfo.InvariantCulture));
             }
-            uriBuilder.Query = q.TrimStart('?');
-
-
+            uriBuilder.Query = q.ToString();
 
             return StreamConnectAsync(uriBuilder.Uri, _invocationId, webSocketSubProtocol, customHeaders, cancellationToken);
         }
@@ -222,14 +222,13 @@ public partial class Kubernetes
 
             uriBuilder.Path += $"api/v1/namespaces/{@namespace}/pods/{name}/attach";
 
-            uriBuilder.Query = QueryHelpers.AddQueryString(string.Empty, new Dictionary<string, string>
-            {
-                { "container", container},
-                { "stderr", stderr ? "1": "0"},
-                { "stdin", stdin ? "1": "0"},
-                { "stdout", stdout ? "1": "0"},
-                { "tty", tty ? "1": "0"}
-            }).TrimStart('?');
+            var query = new StringBuilder();
+            query.Append("?stderr=").Append(stderr ? '1' : '0');
+            query.Append("&stdin=").Append(stdin ? '1' : '0');
+            query.Append("&stdout=").Append(stdout ? '1' : '0');
+            query.Append("&tty=").Append(tty ? '1' : '0');
+            Utilities.AddQueryParameter(query, "container", container);
+            uriBuilder.Query = query.ToString(1, query.Length-1); // UriBuilder.Query doesn't like leading '?' chars, so trim it
 
             return StreamConnectAsync(uriBuilder.Uri, _invocationId, webSocketSubProtol, customHeaders, cancellationToken);
         }

tests/KubernetesClient.Tests/Kubernetes.WebSockets.Tests.cs

@@ -58,7 +58,7 @@ public async Task WebSocketNamespacedPodExecAsync()
             };
 
             Assert.Equal(mockWebSocketBuilder.PublicWebSocket, webSocket); // Did the method return the correct web socket?
-            Assert.Equal(new Uri("ws://localhost/api/v1/namespaces/mynamespace/pods/mypod/exec?command=%2Fbin%2Fbash&command=-c&command=echo%20Hello,%20World%0Aexit%200%0A&container=mycontainer&stderr=1&stdin=1&stdout=1&tty=1"), mockWebSocketBuilder.Uri); // Did we connect to the correct URL?
+            Assert.Equal(new Uri("ws://localhost/api/v1/namespaces/mynamespace/pods/mypod/exec?command=%2Fbin%2Fbash&command=-c&command=echo%20Hello%2C%20World%0Aexit%200%0A&container=mycontainer&stderr=1&stdin=1&stdout=1&tty=1"), mockWebSocketBuilder.Uri); // Did we connect to the correct URL?
             Assert.Empty(mockWebSocketBuilder.Certificates); // No certificates were used in this test
             Assert.Equal(expectedHeaders, mockWebSocketBuilder.RequestHeaders); // Did we use the expected headers
         }
@@ -136,7 +136,7 @@ public async Task WebSocketNamespacedPodAttachAsync()
             };
 
             Assert.Equal(mockWebSocketBuilder.PublicWebSocket, webSocket); // Did the method return the correct web socket?
-            Assert.Equal(new Uri("ws://localhost:80/api/v1/namespaces/mynamespace/pods/mypod/attach?container=my-container&stderr=1&stdin=1&stdout=1&tty=1"), mockWebSocketBuilder.Uri); // Did we connect to the correct URL?
+            Assert.Equal(new Uri("ws://localhost:80/api/v1/namespaces/mynamespace/pods/mypod/attach?stderr=1&stdin=1&stdout=1&tty=1&container=my-container"), mockWebSocketBuilder.Uri); // Did we connect to the correct URL?
             Assert.Empty(mockWebSocketBuilder.Certificates); // No certificates were used in this test
             Assert.Equal(expectedHeaders, mockWebSocketBuilder.RequestHeaders); // Did we use the expected headers
         }