Adding KubeConfig form stream and removed code duplication

Author: ViniciusSouza

src/KubernetesClientConfiguration.ConfigFile.cs

@@ -49,24 +49,27 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(FileInfo k
                 throw new NullReferenceException(nameof(kubeconfig));
             }
 
-            var k8SConfig = LoadKubeConfig(kubeconfig);
-            var k8SConfiguration = new KubernetesClientConfiguration();
-
-            currentContext = currentContext ?? k8SConfig.CurrentContext;
-            // only init context if context if set
-            if (currentContext != null)
-            {
-                k8SConfiguration.InitializeContext(k8SConfig, currentContext);
-            }
-            if (!string.IsNullOrWhiteSpace(masterUrl))
+            var k8SConfig = LoadKubeConfig(kubeconfig);
+            var k8SConfiguration = GetKubernetesClientConfiguration(ref currentContext, masterUrl, k8SConfig);
+
+            return k8SConfiguration;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="kubeconfig">Fileinfo of the kubeconfig, cannot be null, whitespaced or empty</param>
+        /// <param name="currentContext">override the context in config file, set null if do not want to override</param>
+        /// <param name="masterUrl">overrider kube api server endpoint, set null if do not want to override</param>
+        public static KubernetesClientConfiguration BuildConfigFromConfigFile(string kubeconfig,
+            string currentContext = null, string masterUrl = null)
+        {
+            if (string.IsNullOrWhiteSpace(kubeconfig))
             {
-                k8SConfiguration.Host = masterUrl;
+                throw new NullReferenceException(nameof(kubeconfig));
             }
 
-            if (string.IsNullOrWhiteSpace(k8SConfiguration.Host))
-            {
-                throw new KubeConfigException("Cannot infer server host url either from context or masterUrl");
-            }
+            var k8SConfig = LoadKubeConfig(kubeconfig);
+            var k8SConfiguration = GetKubernetesClientConfiguration(ref currentContext, masterUrl, k8SConfig);
 
             return k8SConfiguration;
         }
@@ -76,15 +79,22 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(FileInfo k
         /// <param name="kubeconfig">Fileinfo of the kubeconfig, cannot be null, whitespaced or empty</param>
         /// <param name="currentContext">override the context in config file, set null if do not want to override</param>
         /// <param name="masterUrl">overrider kube api server endpoint, set null if do not want to override</param>
-        public static KubernetesClientConfiguration BuildConfigFromConfigFileString(string kubeconfig,
+        public static KubernetesClientConfiguration BuildConfigFromConfigFile(Stream kubeconfig,
             string currentContext = null, string masterUrl = null)
         {
-            if (string.IsNullOrWhiteSpace(kubeconfig))
+            if (kubeconfig == null && kubeconfig.Length == 0)
             {
                 throw new NullReferenceException(nameof(kubeconfig));
             }
 
             var k8SConfig = LoadKubeConfig(kubeconfig);
+            var k8SConfiguration = GetKubernetesClientConfiguration(ref currentContext, masterUrl, k8SConfig);
+
+            return k8SConfiguration;
+        }
+
+        private static KubernetesClientConfiguration GetKubernetesClientConfiguration(ref string currentContext, string masterUrl, K8SConfiguration k8SConfig)
+        {
             var k8SConfiguration = new KubernetesClientConfiguration();
 
             currentContext = currentContext ?? k8SConfig.CurrentContext;
@@ -101,11 +111,11 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFileString(stri
             if (string.IsNullOrWhiteSpace(k8SConfiguration.Host))
             {
                 throw new KubeConfigException("Cannot infer server host url either from context or masterUrl");
-            }
-
-            return k8SConfiguration;
-        }
-
+            }
+
+            return k8SConfiguration;
+        }
+
         /// <summary>
         ///     Validates and Intializes Client Configuration
         /// </summary>
@@ -275,6 +285,18 @@ private static K8SConfiguration LoadKubeConfig(string kubeconfig)
             var deserializeBuilder = new DeserializerBuilder();
             var deserializer = deserializeBuilder.Build();
             return deserializer.Deserialize<K8SConfiguration>(kubeconfig);
+        }
+
+        /// <summary>
+        ///     Loads Kube Config from stream.
+        /// </summary>
+        /// <param name="kubeconfig">Kube config file contents</param>
+        /// <returns>Instance of the <see cref="K8SConfiguration"/> class</returns>
+        private static K8SConfiguration LoadKubeConfig(Stream kubeconfig)
+        {
+            StreamReader sr = new StreamReader(kubeconfig);
+            string strKubeConfig = sr.ReadToEnd();
+            return LoadKubeConfig(strKubeConfig);
         }
     }
 }

tests/KubernetesClientConfigurationTests.cs

@@ -284,17 +284,32 @@ public void DeletedConfigurationFile()
             {
                 File.Delete(tempFileInfo.FullName);
             }
-        }
-
+        }
+
         /// <summary>
         ///     Checks Host is loaded from the default configuration file as a string
         /// </summary>
         [Fact]
         public void DefaultConfigurationAsStringLoaded()
-        {
+        {
             var txt = File.ReadAllText("assets/kubeconfig.yml");
-            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFileString(txt);
+
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(txt, null, null);
             Assert.NotNull(cfg.Host);
+        }
+
+
+        /// <summary>
+        ///     Checks Host is loaded from the default configuration file as a stream
+        /// </summary>
+        [Fact]
+        public void DefaultConfigurationAsStreamLoaded()
+        {
+            using (var stream = File.OpenRead("assets/kubeconfig.yml"))
+            {
+                var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(stream);
+                Assert.NotNull(cfg.Host);
+            }
         }
     }
 }