UTF-8 support for config class

sarveshkaushal · sarveshkaushal · commit 0eb0b141bf13 · 2019-10-23T15:15:56.000-07:00
diff --git a/util/src/main/java/io/kubernetes/client/util/Config.java b/util/src/main/java/io/kubernetes/client/util/Config.java
@@ -15,12 +15,14 @@
 import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.util.credentials.AccessTokenAuthentication;
 import io.kubernetes.client.util.credentials.UsernamePasswordAuthentication;
+import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,13 +76,17 @@ public static ApiClient fromToken(String url, String token, boolean validateSSL)
   }
 
   public static ApiClient fromConfig(String fileName) throws IOException {
-    KubeConfig config = KubeConfig.loadKubeConfig(new FileReader(fileName)); // TODO UTF-8
-    config.setFile(new File(fileName));
-    return fromConfig(config);
+    try (BufferedReader bufferedReader =
+        new BufferedReader(
+            new InputStreamReader(new FileInputStream(fileName), StandardCharsets.UTF_8.name()))) {
+      KubeConfig config = KubeConfig.loadKubeConfig(bufferedReader);
+      config.setFile(new File(fileName));
+      return fromConfig(config);
+    }
   }
 
   public static ApiClient fromConfig(InputStream stream) throws IOException {
-    return fromConfig(new InputStreamReader(stream)); // TODO UTF-8
+    return fromConfig(new InputStreamReader(stream, StandardCharsets.UTF_8.name()));
   }
 
   public static ApiClient fromConfig(Reader input) throws IOException {
