Fix issue where the watcher URLs would be prefixed with a '/'. This would lead to URLs such as https://localhost:8443//api/..., and the double // after the port number would case a 404 NOT FOUND response. (#164)

Author: qmfrederik

gen/KubernetesWatchGenerator/Program.cs

@@ -314,6 +314,12 @@ static void GetPathExpression(RenderContext context, IList<object> arguments, ID
         private static string GetPathExpression(SwaggerOperationDescription operation)
         {
             string pathExpression = operation.Path;
+
+            if(pathExpression.StartsWith("/"))
+            {
+                pathExpression = pathExpression.Substring(1);
+            }
+
             pathExpression = pathExpression.Replace("{namespace}", "{@namespace}");
             return pathExpression;
         }

src/KubernetesClient/Watcher.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using k8s.Exceptions;
-using k8s.Models;
+using k8s.Models;
 using Microsoft.Rest;
 using Microsoft.Rest.Serialization;
 
@@ -57,19 +57,19 @@ public Watcher(StreamReader streamReader, Action<WatchEventType, T> onEvent, Act
                         var line = await streamReader.ReadLineAsync();
 
                         try
-                        {
-                            var genericEvent = SafeJsonConvert.DeserializeObject<k8s.Watcher<KubernetesObject>.WatchEvent>(line);
-
-                            if (genericEvent.Object.Kind == "Status")
-                            {
-                                var statusEvent = SafeJsonConvert.DeserializeObject<k8s.Watcher<V1Status>.WatchEvent>(line);
-                                var exception = new KubernetesException(statusEvent.Object);
-                                this.OnError?.Invoke(exception);
-                            }
-                            else
-                            {
-                                var @event = SafeJsonConvert.DeserializeObject<k8s.Watcher<T>.WatchEvent>(line);
-                                this.OnEvent?.Invoke(@event.Type, @event.Object);
+                        {
+                            var genericEvent = SafeJsonConvert.DeserializeObject<k8s.Watcher<KubernetesObject>.WatchEvent>(line);
+
+                            if (genericEvent.Object.Kind == "Status")
+                            {
+                                var statusEvent = SafeJsonConvert.DeserializeObject<k8s.Watcher<V1Status>.WatchEvent>(line);
+                                var exception = new KubernetesException(statusEvent.Object);
+                                this.OnError?.Invoke(exception);
+                            }
+                            else
+                            {
+                                var @event = SafeJsonConvert.DeserializeObject<k8s.Watcher<T>.WatchEvent>(line);
+                                this.OnEvent?.Invoke(@event.Type, @event.Object);
                             }
                         }
                         catch (Exception e)
@@ -152,4 +152,4 @@ public static Watcher<T> Watch<T>(this HttpOperationResponse<T> response,
             return Watch((HttpOperationResponse) response, onEvent, onError);
         }
     }
-}
+}