Fix InvalidOperationException when logging relative Uris.

#163

Author: tintoy

src/KubeClient.Extensions.WebSockets/K8sWebSocket.cs

@@ -25,6 +25,8 @@
 
 namespace KubeClient.Extensions.WebSockets
 {
+    using KubeClient.Utilities;
+
     /// <summary>
     ///     Connection factory for Kubernetes web sockets.
     /// </summary>
@@ -173,7 +175,7 @@ private static byte[] BuildRequestHeader(Uri uri, K8sWebSocketOptions options, s
         {
             StringBuilder builder = new StringBuilder()
                 .Append("GET ")
-                .Append(uri.PathAndQuery)
+                .Append(uri.SafeGetPathAndQuery())
                 .Append(" HTTP/1.1\r\n");
 
             // Add all of the required headers, honoring Host header if set.

src/KubeClient/ResourceClients/KubeResourceClient.cs

@@ -19,9 +19,10 @@
 
 namespace KubeClient.ResourceClients
 {
-    using KubeClient.Models.ContractResolvers;
     using Models;
+    using Models.ContractResolvers;
     using Models.Converters;
+    using Utilities;
 
     /// <summary>
     ///     The base class for Kubernetes resource API clients.
@@ -595,7 +596,7 @@ protected IObservable<string> ObserveLines(Func<HttpRequest> requestFactory, str
                 {
                     HttpRequest request = requestFactory();
 
-                    logger.LogDebug("Start streaming {RequestMethod} request for {RequestUri}...", HttpMethod.Get.Method, request.Uri.PathAndQuery);
+                    logger.LogDebug("Start streaming {RequestMethod} request for {RequestUri}...", HttpMethod.Get.Method, request.Uri.SafeGetPathAndQuery());
 
                     using (HttpResponseMessage responseMessage = await Http.GetStreamedAsync(request, subscriptionCancellationToken).ConfigureAwait(false))
                     {

src/KubeClient/Utilities/UriHelper.cs

@@ -0,0 +1,36 @@
+using System;
+
+namespace KubeClient.Utilities
+{
+    /// <summary>
+    ///     Helper methods for working with <see cref="Uri"/>s.
+    /// </summary>
+    public static class UriHelper
+    {
+        /// <summary>
+        ///     Get the path (and, if present, the query) of a URI.
+        /// </summary>
+        /// <param name="uri">
+        ///     The target <see cref="Uri"/>.
+        /// </param>
+        /// <returns>
+        ///     The URI's path and query.
+        /// </returns>
+        /// <remarks>
+        ///     Unlike <see cref="Uri.PathAndQuery"/>, also handles relative URIs.
+        /// </remarks>
+        public static string SafeGetPathAndQuery(this Uri uri)
+        {
+            if (uri == null)
+                throw new ArgumentNullException(nameof(uri));
+
+            if (uri.IsAbsoluteUri)
+                return uri.PathAndQuery;
+
+            // Slightly ugly, but System.Uri doesn't attempt to parse relative URIs so we have to resort to System.UriBuilder.
+            UriBuilder uriComponents = new UriBuilder(uri);
+
+            return $"{uriComponents.Path}{uriComponents.Query}";
+        }
+    }
+}