Merge pull request #3 from ViniciusSouza/visouza/config-stream

checking if the stream can be seek

Author: allantargino

src/KubernetesClient.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <PackageVersion>0.2.0-beta</PackageVersion>
+    <PackageVersion>0.2.1-beta</PackageVersion>
     <Authors>The Kubernetes Project Authors</Authors>
     <Copyright>2017 The Kubernetes Project Authors</Copyright>
     <Description>Client library for the Kubernetes open source container orchestrator.</Description>
@@ -11,6 +11,10 @@
 
     <TargetFramework>netstandard1.4</TargetFramework>
     <RootNamespace>k8s</RootNamespace>
+    <Version>1.1.0</Version>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageId>KubernetesClientDXBrazil</PackageId>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="GlobalSuppressions.cs" />

src/KubernetesClientConfiguration.ConfigFile.cs

@@ -49,12 +49,12 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(FileInfo k
                 throw new NullReferenceException(nameof(kubeconfig));
             }
 
-            var k8SConfig = LoadKubeConfig(kubeconfig);
+            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>
@@ -68,12 +68,12 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(string kub
                 throw new NullReferenceException(nameof(kubeconfig));
             }
 
-            var k8SConfig = LoadKubeConfig(kubeconfig);
+            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>
@@ -82,19 +82,26 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(string kub
         public static KubernetesClientConfiguration BuildConfigFromConfigFile(Stream kubeconfig,
             string currentContext = null, string masterUrl = null)
         {
-            if (kubeconfig == null && kubeconfig.Length == 0)
+            if (kubeconfig == null)
             {
                 throw new NullReferenceException(nameof(kubeconfig));
-            }
+            }
+
+            if (!kubeconfig.CanSeek)
+            {
+                throw new Exception("Stream don't support seeking!");
+            }
+
+            kubeconfig.Position = 0;
 
             var k8SConfig = LoadKubeConfig(kubeconfig);
             var k8SConfiguration = GetKubernetesClientConfiguration(ref currentContext, masterUrl, k8SConfig);
 
             return k8SConfiguration;
-        }
-
-        private static KubernetesClientConfiguration GetKubernetesClientConfiguration(ref string currentContext, string masterUrl, K8SConfiguration k8SConfig)
-        {
+        }
+
+        private static KubernetesClientConfiguration GetKubernetesClientConfiguration(ref string currentContext, string masterUrl, K8SConfiguration k8SConfig)
+        {
             var k8SConfiguration = new KubernetesClientConfiguration();
 
             currentContext = currentContext ?? k8SConfig.CurrentContext;
@@ -111,11 +118,11 @@ private static KubernetesClientConfiguration GetKubernetesClientConfiguration(re
             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>
@@ -272,8 +279,8 @@ private static K8SConfiguration LoadKubeConfig(FileInfo kubeconfig)
             {
                 return deserializer.Deserialize<K8SConfiguration>(kubeConfigTextStream);
             }
-        }
-
+        }
+
         /// <summary>
         ///     Loads Kube Config from string
         /// </summary>
@@ -285,17 +292,17 @@ 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();
+            StreamReader sr = new StreamReader(kubeconfig);
+            string strKubeConfig = sr.ReadToEnd();
             return LoadKubeConfig(strKubeConfig);
         }
     }

src/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <TargetFramework>netstandard1.4</TargetFramework>
+    <PublishDir>bin\Release\PublishOutput</PublishDir>
+  </PropertyGroup>
+</Project>