Add an attach example. Fix the attach code. (#116)

Author: brendandburns

examples/attach/Attach.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Threading.Tasks;
+using k8s;
+using k8s.Models;
+using Microsoft.Rest;
+
+namespace attach
+{
+    internal class Attach
+    {
+        private static async Task Main(string[] args)
+        {
+            ServiceClientTracing.IsEnabled = true;
+
+            var config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
+            IKubernetes client = new Kubernetes(config);
+            Console.WriteLine("Starting Request!");
+
+            var list = client.ListNamespacedPod("default");
+            var pod = list.Items[0];
+            await AttachToPod(client, pod);
+        }
+
+        private async static Task AttachToPod(IKubernetes client, V1Pod pod) {
+            var webSocket = await client.WebSocketNamespacedPodAttachAsync(pod.Metadata.Name, "default", pod.Spec.Containers[0].Name);
+            
+            var demux = new StreamDemuxer(webSocket);
+            demux.Start();
+
+            var buff = new byte[4096];
+            var stream = demux.GetStream(1, 1);
+            while (true)
+            {
+                var read = stream.Read(buff, 0, 4096);
+                var str = System.Text.Encoding.Default.GetString(buff);
+                Console.WriteLine(str);
+            }
+        }
+    }
+}

examples/attach/attach.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\KubernetesClient.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <LangVersion>7.1</LangVersion>
+  </PropertyGroup>
+
+</Project>

examples/exec/Exec.cs

@@ -1,34 +1,34 @@
-using System;
-using System.Threading.Tasks;
-using k8s;
-using k8s.Models;
-
-namespace exec
-{
-    internal class Exec
-    {
-        private static async Task Main(string[] args)
-        {
-            var config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
-            IKubernetes client = new Kubernetes(config);
-            Console.WriteLine("Starting Request!");
-
-            var list = client.ListNamespacedPod("default");
-            var pod = list.Items[0];
-            await ExecInPod(client, pod);
-        }
-
-        private async static Task ExecInPod(IKubernetes client, V1Pod pod) {
-            var webSocket = await client.WebSocketNamespacedPodExecAsync(pod.Metadata.Name, "default", "ls", pod.Spec.Containers[0].Name);
-
-            var demux = new StreamDemuxer(webSocket);
-            demux.Start();
-
-            var buff = new byte[4096];
-            var stream = demux.GetStream(1, 1);
-            var read = stream.Read(buff, 0, 4096);
-            var str = System.Text.Encoding.Default.GetString(buff);
-            Console.WriteLine(str);
-        }
-    }
-}
+using System;
+using System.Threading.Tasks;
+using k8s;
+using k8s.Models;
+
+namespace exec
+{
+    internal class Exec
+    {
+        private static async Task Main(string[] args)
+        {
+            var config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
+            IKubernetes client = new Kubernetes(config);
+            Console.WriteLine("Starting Request!");
+
+            var list = client.ListNamespacedPod("default");
+            var pod = list.Items[0];
+            await ExecInPod(client, pod);
+        }
+
+        private async static Task ExecInPod(IKubernetes client, V1Pod pod) {
+            var webSocket = await client.WebSocketNamespacedPodExecAsync(pod.Metadata.Name, "default", "ls", pod.Spec.Containers[0].Name);
+
+            var demux = new StreamDemuxer(webSocket);
+            demux.Start();
+
+            var buff = new byte[4096];
+            var stream = demux.GetStream(1, 1);
+            var read = stream.Read(buff, 0, 4096);
+            var str = System.Text.Encoding.Default.GetString(buff);
+            Console.WriteLine(str);
+        }
+    }
+}

src/Kubernetes.WebSocket.cs

@@ -176,7 +176,7 @@ public partial class Kubernetes
                 uriBuilder.Path += "/";
             }
 
-            uriBuilder.Path += $"api/v1/namespaces/{@namespace}/pods/{name}/portforward";
+            uriBuilder.Path += $"api/v1/namespaces/{@namespace}/pods/{name}/attach";
 
             uriBuilder.Query = QueryHelpers.AddQueryString(string.Empty, new Dictionary<string, string>
             {

tests/Kubernetes.WebSockets.Tests.cs

@@ -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/portforward?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?container=my-container&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
         }