Merge pull request #426 from tariq1890/util_improve_code

minor code fixes and unit tests added to KubeConfig

Author: k8s-ci-robot

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

@@ -17,6 +17,7 @@
 import io.kubernetes.client.util.authenticators.GCPAuthenticator;
 import java.io.IOException;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -220,7 +221,7 @@ public String getAccessToken() {
       String tokenFile = (String) currentUser.get("tokenFile");
       try {
         byte[] data = Files.readAllBytes(FileSystems.getDefault().getPath(tokenFile));
-        return new String(data, "UTF-8");
+        return new String(data, StandardCharsets.UTF_8);
       } catch (IOException ex) {
         log.error("Failed to read token file", ex);
       }
@@ -264,7 +265,7 @@ private static Map<String, Object> findObject(ArrayList<Object> list, String nam
     }
     for (Object obj : list) {
       Map<String, Object> map = (Map<String, Object>) obj;
-      if (name.equals((String) map.get("name"))) {
+      if (name.equals(map.get("name"))) {
         return map;
       }
     }

util/src/main/java/io/kubernetes/client/util/authenticators/AzureActiveDirectoryAuthenticator.java

@@ -51,10 +51,7 @@ public String getToken(Map<String, Object> config) {
   public boolean isExpired(Map<String, Object> config) {
     String expiresOn = (String) config.get(EXPIRES_ON);
     Date expiry = new Date(Long.parseLong(expiresOn) * 1000);
-    if (expiry != null && expiry.compareTo(new Date()) <= 0) {
-      return true;
-    }
-    return false;
+    return expiry.compareTo(new Date()) <= 0;
   }
 
   @Override

util/src/main/java/io/kubernetes/client/util/authenticators/GCPAuthenticator.java

@@ -38,10 +38,7 @@ public String getToken(Map<String, Object> config) {
   @Override
   public boolean isExpired(Map<String, Object> config) {
     Date expiry = (Date) config.get("expiry");
-    if (expiry != null && expiry.compareTo(new Date()) <= 0) {
-      return true;
-    }
-    return false;
+    return (expiry != null && expiry.compareTo(new Date()) <= 0);
   }
 
   @Override

util/src/test/java/io/kubernetes/client/util/FilePersisterTest.java

@@ -32,7 +32,7 @@ public class FilePersisterTest {
   @Test
   public void testPersistence() throws IOException {
     File file = folder.newFile("testconfig");
-    FilePersister fp = new FilePersister(file);
+    FilePersister fp = new FilePersister(file.getPath());
 
     KubeConfig config = KubeConfig.loadKubeConfig(new FileReader(KUBECONFIG_FILE_PATH));
 

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

@@ -14,6 +14,7 @@
 
 import static org.junit.Assert.*;
 
+import io.kubernetes.client.util.authenticators.AzureActiveDirectoryAuthenticator;
 import io.kubernetes.client.util.authenticators.GCPAuthenticator;
 import java.io.File;
 import java.io.FileReader;
@@ -105,6 +106,67 @@ public void testGCPAuthProvider() {
     }
   }
 
+  @Test
+  public void testGCPAuthProviderExpiredToken() {
+    String gcpConfigExpiredToken =
+        "apiVersion: v1\n"
+            + "contexts:\n"
+            + "- context:\n"
+            + "    user: gke-cluster\n"
+            + "  name: foo-context\n"
+            + "current-context: foo-context\n"
+            + "users:\n"
+            + "- name: gke-cluster\n"
+            + "  user:\n"
+            + "    auth-provider:\n"
+            + "      config:\n"
+            + "        access-token: fake-token\n"
+            + "        cmd-args: config config-helper --format=json\n"
+            + "        cmd-path: /usr/lib/google-cloud-sdk/bin/gcloud\n"
+            + "        expiry: 1970-01-01T00:00:00Z\n"
+            + "        expiry-key: '{.credential.token_expiry}'\n"
+            + "        token-key: '{.credential.access_token}'\n"
+            + "      name: gcp";
+    KubeConfig.registerAuthenticator(new GCPAuthenticator());
+    try {
+      KubeConfig kc = KubeConfig.loadKubeConfig(new StringReader(gcpConfigExpiredToken));
+      kc.getAccessToken();
+    } catch (Exception ex) {
+      if (!(ex instanceof IllegalStateException)) {
+        fail("Unexpected exception: " + ex);
+      }
+    }
+  }
+
+  @Test
+  public void testAzureAuthProvider() {
+    KubeConfig.registerAuthenticator(new AzureActiveDirectoryAuthenticator());
+    String azureConfig =
+        "apiVersion: v1\n"
+            + "contexts:\n"
+            + "- context:\n"
+            + "    user: aks-cluster\n"
+            + "  name: foo-context\n"
+            + "current-context: foo-context\n"
+            + "users:\n"
+            + "- name: aks-cluster\n"
+            + "  user:\n"
+            + "    auth-provider:\n"
+            + "      config:\n"
+            + "        access-token: fake-azure-token\n"
+            + "        expires-on: \"1841569394\"\n"
+            + "        expiry-key: '{.credential.token_expiry}'\n"
+            + "        token-key: '{.credential.access_token}'\n"
+            + "      name: azure\n";
+    try {
+      KubeConfig kc = KubeConfig.loadKubeConfig(new StringReader(azureConfig));
+      assertEquals("fake-azure-token", kc.getAccessToken());
+    } catch (Exception ex) {
+      ex.printStackTrace();
+      fail("Unexpected exception: " + ex);
+    }
+  }
+
   @Test
   public void testNamespace() {
     KubeConfig config = KubeConfig.loadKubeConfig(new StringReader(KUBECONFIG_TOKEN));