Added test case to verify UTF8 encoded file parsing

sarveshkaushal · sarveshkaushal · commit d312a3158306 · 2019-10-18T10:17:59.000-07:00
diff --git a/util/src/main/java/io/kubernetes/client/util/ClientBuilder.java b/util/src/main/java/io/kubernetes/client/util/ClientBuilder.java
@@ -27,7 +27,12 @@
 import io.kubernetes.client.util.credentials.AccessTokenAuthentication;
 import io.kubernetes.client.util.credentials.Authentication;
 import io.kubernetes.client.util.credentials.KubeconfigAuthentication;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
diff --git a/util/src/test/java/io/kubernetes/client/util/ClientBuilderTest.java b/util/src/test/java/io/kubernetes/client/util/ClientBuilderTest.java
@@ -36,6 +36,8 @@
 public class ClientBuilderTest {
   private static final String HOME_PATH = Resources.getResource("").getPath();
   private static final String KUBECONFIG_FILE_PATH = Resources.getResource("kubeconfig").getPath();
+  private static final String KUBECONFIG_UTF8_FILE_PATH =
+      Resources.getResource("kubeconfig-utf8").getPath();
   private static final String KUBECONFIG_HTTP_FILE_PATH =
       Resources.getResource("kubeconfig-http").getPath();
   private static final String KUBECONFIG_HTTPS_FILE_PATH =
@@ -81,6 +83,13 @@ public void testDefaultClientReadsKubeConfig() throws Exception {
     assertEquals("http://kubeconfig.dir.com", client.getBasePath());
   }
 
+  @Test
+  public void testDefaultClientUTF8EncodedConfig() throws Exception {
+    environmentVariables.set("KUBECONFIG", KUBECONFIG_UTF8_FILE_PATH);
+    final ApiClient client = ClientBuilder.defaultClient();
+    assertEquals("http://kubeconfig.dir.com", client.getBasePath());
+  }
+
   @Test
   public void testDefaultClientReadsKubeConfigMultiple() throws Exception {
     final String kubeConfigEnv = KUBECONFIG_FILE_PATH + File.pathSeparator + "/non-existent";
diff --git a/util/src/test/resources/kubeconfig-utf8 b/util/src/test/resources/kubeconfig-utf8
@@ -0,0 +1,10 @@
+apiVersion: v1
+clusters:
+  - cluster:
+      server: http://kubeconfig.dir.com
+    name: fa&ccedil;ade
+contexts:
+  - context:
+      cluster: fa&ccedil;ade
+    name: foo-context
+current-context: foo-context
