Merge pull request #47 from tg123/objorstatus

better way to #46

Author: brendandburns

examples/namespace/Namespace.cs

@@ -1,17 +1,15 @@
-namespace simple
-{
-    using System;
-    using System.IO;
-    using System.Net;
-    using System.Threading.Tasks;
-    using k8s;
-    using k8s.Models;
+using System;
+using System.Net;
+using System.Threading.Tasks;
+using k8s;
+using k8s.Models;
 
+namespace @namespace
+{
     class NamespaceExample
     {
         static void ListNamespaces(IKubernetes client) {
-            var listTask = client.ListNamespaceWithHttpMessagesAsync().Result;
-            var list = listTask.Body;
+            var list = client.ListNamespace();
             foreach (var item in list.Items) {
                 Console.WriteLine(item.Metadata.Name);
             }
@@ -20,13 +18,12 @@ static void ListNamespaces(IKubernetes client) {
             }
         }
 
-        static async Task asyncAwaitDelete(IKubernetes client, string name, int delayMillis) {
+        static async Task DeleteAsync(IKubernetes client, string name, int delayMillis) {
             while (true) {
                 await Task.Delay(delayMillis);
-                try {
-                    var result = await client.ReadNamespaceWithHttpMessagesAsync(name);
-                    var ns = result.Body;
-                    Console.WriteLine(ns);
+                try
+                {
+                    await client.ReadNamespaceAsync(name);
                 } catch (AggregateException ex) {
                     foreach (var innerEx in ex.InnerExceptions) {
                         if (innerEx is Microsoft.Rest.HttpOperationException) {
@@ -46,34 +43,44 @@ static async Task asyncAwaitDelete(IKubernetes client, string name, int delayMil
             }
         }
 
-        static void awaitDelete(IKubernetes client, string name, int delayMillis) {
-            asyncAwaitDelete(client, name, delayMillis).Wait();
+        static void Delete(IKubernetes client, string name, int delayMillis) {
+            DeleteAsync(client, name, delayMillis).Wait();
         }
 
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
-            var k8sClientConfig = KubernetesClientConfiguration.BuildConfigFromConfigFile();
-            IKubernetes client = new Kubernetes(k8sClientConfig);
+            var k8SClientConfig = KubernetesClientConfiguration.BuildConfigFromConfigFile();
+            IKubernetes client = new Kubernetes(k8SClientConfig);
 
             ListNamespaces(client);
 
-            var ns = new Corev1Namespace();
-            ns.Metadata = new V1ObjectMeta();
-            ns.Metadata.Name = "test";
+            var ns = new Corev1Namespace
+            {
+                Metadata = new V1ObjectMeta
+                {
+                    Name = "test"
+                }
+            };
 
-            var result = client.CreateNamespaceWithHttpMessagesAsync(ns).Result;
+            var result = client.CreateNamespace(ns);
             Console.WriteLine(result);
 
             ListNamespaces(client);
 
-            var task = client.DeleteNamespaceWithHttpMessagesAsync(new V1DeleteOptions(), ns.Metadata.Name);
-            var obj = ObjectOrStatus<Corev1Namespace>.ReadObjectOrStatus(task);
-            
-            if (obj.Status != null) {
-                Console.WriteLine(obj.Status);
-            } else {
-                awaitDelete(client, ns.Metadata.Name, 3 * 1000);
+            var status = client.DeleteNamespace(new V1DeleteOptions(), ns.Metadata.Name);
+
+            if (status.HasObject)
+            {
+                var obj = status.ObjectView<Corev1Namespace>();
+                Console.WriteLine(obj.Status.Phase);
+
+                Delete(client, ns.Metadata.Name, 3 * 1000);
             }
+            else
+            {
+                Console.WriteLine(status.Message);
+            }
+
             ListNamespaces(client);
         }
     }

src/Kubernetes.Auth.cs

@@ -1,3 +1,5 @@
+using k8s.Models;
+
 namespace k8s
 {
     using System;
@@ -46,6 +48,8 @@ public Kubernetes(KubernetesClientConfiguration config)
             // set credentails for the kubernernet client
             this.SetCredentials(config, handler);
             this.InitializeHttpClient(handler, new DelegatingHandler[]{new WatcherDelegatingHandler()});
+
+            DeserializationSettings.Converters.Add(new V1Status.V1StatusObjectViewConverter());
         }
 
         private X509Certificate2 CaCert { get; set; }

src/V1Status.ObjectView.cs

@@ -0,0 +1,52 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace k8s.Models
+{
+    public partial class V1Status
+    {
+        internal class V1StatusObjectViewConverter : JsonConverter
+        {
+            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+            {
+                serializer.Serialize(writer, value);
+            }
+
+            public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+                JsonSerializer serializer)
+            {
+                var obj = JToken.Load(reader);
+
+                try
+                {
+                    return obj.ToObject(objectType);
+                }
+                catch (JsonException)
+                {
+                    // should be an object
+                }
+
+                return new V1Status
+                {
+                    _original = obj,
+                    HasObject = true
+                };
+            }
+
+            public override bool CanConvert(Type objectType)
+            {
+                return typeof(V1Status) == objectType;
+            }
+        }
+
+        private JToken _original;
+
+        public bool HasObject { get; private set; }
+
+        public T ObjectView<T>()
+        {
+            return _original.ToObject<T>();
+        }
+    }
+}

tests/V1StatusObjectViewTests.cs

@@ -0,0 +1,68 @@
+using k8s.Models;
+using k8s.Tests.Mock;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace k8s.Tests
+{
+    public class V1StatusObjectViewTests
+    {
+        [Fact]
+        public void TestReturnStatus()
+        {
+            var v1Status = new V1Status
+            {
+                Message = "test message",
+                Status = "test status"
+            };
+
+            using (var server = new MockKubeApiServer(resp: JsonConvert.SerializeObject(v1Status)))
+            {
+                var client = new Kubernetes(new KubernetesClientConfiguration
+                {
+                    Host = server.Uri.ToString()
+                });
+
+                var status = client.DeleteNamespace(new V1DeleteOptions(), "test");
+
+                Assert.False(status.HasObject);
+                Assert.Equal(v1Status.Message, status.Message);
+                Assert.Equal(v1Status.Status, status.Status);
+            }
+        }
+
+        [Fact]
+        public void TestReturnObject()
+        {
+            var corev1Namespace = new Corev1Namespace()
+            {
+                Metadata = new V1ObjectMeta()
+                {
+                    Name = "test name"
+                },
+                Status = new Corev1NamespaceStatus()
+                {
+                    Phase = "test termating"
+                }
+            };
+
+            using (var server = new MockKubeApiServer(resp: JsonConvert.SerializeObject(corev1Namespace)))
+            {
+                var client = new Kubernetes(new KubernetesClientConfiguration
+                {
+                    Host = server.Uri.ToString()
+                });
+
+                var status = client.DeleteNamespace(new V1DeleteOptions(), "test");
+
+                Assert.True(status.HasObject);
+
+                var obj = status.ObjectView<Corev1Namespace>();
+
+                Assert.Equal(obj.Metadata.Name, corev1Namespace.Metadata.Name);
+                Assert.Equal(obj.Status.Phase, corev1Namespace.Status.Phase);
+            }
+
+        }
+    }
+    }