Add support for tokenFile in KubeConfig, fix up/add some tests.

Author: brendanburns

.gitignore

@@ -4,6 +4,7 @@
 .classpath
 .settings/
 .project
+.vscode/
 
 # Maven builds
 */target/

util/src/main/java/io/kubernetes/client/util/KubeConfig.java

@@ -12,10 +12,14 @@
 */
 package io.kubernetes.client.util;
 
+import com.google.common.io.CharStreams;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.IOException;
 import java.io.Reader;
+import java.nio.file.Files;
+import java.nio.file.FileSystems;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Map;
@@ -168,6 +172,16 @@ public String getAccessToken() {
         if (currentUser.containsKey("token")) {
             return (String) currentUser.get("token");
         }
+        if (currentUser.containsKey("tokenFile")) {
+            String tokenFile = (String) currentUser.get("tokenFile");
+            try {
+                byte[] data = Files.readAllBytes(FileSystems.getDefault().getPath(tokenFile));
+                return new String(data, "UTF-8");
+            } catch (IOException ex) {
+                // TODO use logger here
+                ex.printStackTrace();
+            }
+        }
         return null;
     }
 

util/src/test/java/io/kuberentes/client/util/ConfigTest.java

@@ -24,6 +24,7 @@
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
 
 /**
@@ -33,7 +34,11 @@ public class ConfigTest {
     @Rule
     public final EnvironmentVariables environmentVariables
         = new EnvironmentVariables();
-        
+
+    @Rule
+    public TemporaryFolder folder= new TemporaryFolder();
+
+
     @Test
     public void testDefaultClientNothingPresent() {
         environmentVariables.set("HOME", "/non-existent");
@@ -76,8 +81,7 @@ public void testDefaultClientNothingPresent() {
 
     @Before
     public void setUp() throws IOException {
-        dir = new File("/tmp/tester");
-        dir.mkdir();
+        dir = folder.newFolder();
         kubedir = new File(dir, ".kube");
         kubedir.mkdir();
         config = new File(kubedir, "config");
@@ -86,29 +90,13 @@ public void setUp() throws IOException {
         writer.flush();
         writer.close();
 
-        configFile = File.createTempFile("config", "");
+        configFile = folder.newFile("config");
         writer = new FileWriter(configFile);
         writer.write(KUBECONFIG);
         writer.flush();
         writer.close();
     }
 
-    @After
-    public void tearDown() throws IOException {
-        if (config != null) {
-            config.delete();
-        }
-        if (kubedir != null) {
-            kubedir.delete();
-        }
-        if (dir != null) {
-            dir.delete();
-        }
-        if (configFile != null) {
-            configFile.delete();
-        }
-    }
-
     @Test
     public void testDefaultClientHomeDir() {
         try {

util/src/test/java/io/kuberentes/client/util/KubeConfigTest.java

@@ -0,0 +1,75 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client.util;
+
+import com.google.common.io.ByteStreams;
+import io.kubernetes.client.ApiClient;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.file.Files;
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.contrib.java.lang.system.EnvironmentVariables;
+
+/**
+ * Tests for the KubeConfigConfig helper class
+ */
+public class KubeConfigTest {
+
+    @Rule
+    public TemporaryFolder folder= new TemporaryFolder();
+
+    public static String KUBECONFIG_TOKEN = 
+        "apiVersion: v1\n" +
+        "clusters:\n" +
+        "- cluster:\n" +
+        "    server: http://kubeconfig.dir.com\n" +
+        "  name: foo\n" +
+        "users:\n" +
+        "- user:\n" +
+        "   token: foobaz\n" +
+        "  name: foo\n" + 
+        "contexts:\n" + 
+        "- context:\n" +
+        "    cluster: foo\n" + 
+        "    user: foo\n" +
+        "  name: foo-context\n" +
+        "current-context: foo-context\n";
+
+    @Test
+    public void testToken() {
+        KubeConfig config = KubeConfig.loadKubeConfig(new StringReader(KUBECONFIG_TOKEN));
+        assertEquals(config.getAccessToken(), "foobaz");
+    }
+
+    @Test
+    public void testTokenFile() throws IOException {
+        String token = "flubble";
+        File tokenFile = folder.newFile("token-file.txt");
+        Files.write(tokenFile.toPath(), token.getBytes("UTF-8"));
+
+        String replace = KUBECONFIG_TOKEN.replace("foobaz", tokenFile.getCanonicalPath());
+        replace = replace.replace("token:", "tokenFile:");
+        KubeConfig config = KubeConfig.loadKubeConfig(new StringReader(replace));
+        assertEquals(config.getAccessToken(), token);
+    }
+}