Merge pull request #246 from archcosmo/fix-yaml-api-detection

Changes to the Yaml object auto-detection

Author: brendandburns

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

@@ -19,9 +19,13 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.apache.commons.lang3.tuple.MutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.constructor.Constructor;
@@ -32,52 +36,85 @@ public class Yaml {
   private static org.yaml.snakeyaml.Yaml yaml =
       new org.yaml.snakeyaml.Yaml(new CustomConstructor());
   private static Map<String, Class<?>> classes = new HashMap<>();
+  private static Map<String, String> apiGroups = new HashMap<>();
+  private static List<String> apiVersions = new ArrayList<>();
 
   static final Logger logger = LoggerFactory.getLogger(Yaml.class);
 
-  public static String getApiGroupVersion(String name) {
-    if (name.startsWith("AppsV1")) {
-      return "apps/v1";
-    }
-    if (name.startsWith("AppsV1beta1")) {
-      return "apps/v1beta1";
-    }
-    if (name.startsWith("ExtensionsV1beta1")) {
-      return "extensions/v1beta1";
-    }
-    if (name.startsWith("ExtensionsV1")) {
-      return "extensions/v1";
-    }
-    if (name.startsWith("V1beta1")) {
-      return "v1beta1";
-    }
-    if (name.startsWith("V1beta2")) {
-      return "v1beta2";
-    }
-    if (name.startsWith("V1alpha1")) {
-      return "v1alpha1";
-    }
-    if (name.startsWith("V2beta1")) {
-      return "v2beta1";
-    }
-    if (name.startsWith("V2alpha1")) {
-      return "v2alpha1";
+  private static void initApiGroupMap() {
+    apiGroups.put("Admissionregistration", "admissionregistration.k8s.io");
+    apiGroups.put("Apiextensions", "apiextensions.k8s.io");
+    apiGroups.put("Apiregistration", "apiregistration.k8s.io");
+    apiGroups.put("Apps", "apps");
+    apiGroups.put("Authentication", "authentication.k8s.io");
+    apiGroups.put("Authorization", "authorization.k8s.io");
+    apiGroups.put("Autoscaling", "autoscaling");
+    apiGroups.put("Extensions", "extensions");
+    apiGroups.put("Batch", "batch");
+    apiGroups.put("Certificates", "certificates.k8s.io");
+    apiGroups.put("Networking", "networking.k8s.io");
+    apiGroups.put("Policy", "policy");
+    apiGroups.put("RbacAuthorization", "rbac.authorization.k8s.io");
+    apiGroups.put("Scheduling", "scheduling.k8s.io");
+    apiGroups.put("Settings", "settings.k8s.io");
+    apiGroups.put("Storage", "storage.k8s.io");
+  }
+
+  private static void initApiVersionList() {
+    // Order important
+    apiVersions.add("V2beta1");
+    apiVersions.add("V2alpha1");
+    apiVersions.add("V1beta2");
+    apiVersions.add("V1beta1");
+    apiVersions.add("V1alpha1");
+    apiVersions.add("V1");
+  }
+
+  private static Pair<String, String> getApiGroup(String name) {
+    MutablePair<String, String> parts = new MutablePair<>();
+    for (String prefix : apiGroups.keySet()) {
+      if (name.startsWith(prefix)) {
+        parts.left = apiGroups.get(prefix);
+        parts.right = name.substring(prefix.length());
+        break;
+      }
     }
-    if (name.startsWith("V1")) {
-      return "v1";
+    if (parts.left == null) parts.right = name;
+
+    return parts;
+  }
+
+  private static Pair<String, String> getApiVersion(String name) {
+    MutablePair<String, String> parts = new MutablePair<>();
+    for (String version : apiVersions) {
+      if (name.startsWith(version)) {
+        parts.left = version.toLowerCase();
+        parts.right = name.substring(version.length());
+        break;
+      }
     }
-    return name;
+    if (parts.left == null) parts.right = name;
+
+    return parts;
   }
 
   private static void initModelMap() throws IOException {
+    initApiGroupMap();
+    initApiVersionList();
+
     ClassPath cp = ClassPath.from(ClassLoader.getSystemClassLoader());
     Set<ClassPath.ClassInfo> allClasses = cp.getTopLevelClasses("io.kubernetes.client.models");
 
     for (ClassPath.ClassInfo clazz : allClasses) {
-      String groupVersion = getApiGroupVersion(clazz.getSimpleName());
-      int len = groupVersion.replace("/", "").length();
-      String name = clazz.getSimpleName().substring(len);
-      classes.put(groupVersion + "/" + name, clazz.load());
+      String modelName = "";
+      Pair<String, String> nameParts = getApiGroup(clazz.getSimpleName());
+      modelName += nameParts.getLeft() == null ? "" : nameParts.getLeft() + "/";
+
+      nameParts = getApiVersion(nameParts.getRight());
+      modelName += nameParts.getLeft() == null ? "" : nameParts.getLeft() + "/";
+      modelName += nameParts.getRight();
+
+      classes.put(modelName, clazz.load());
     }
   }
 
@@ -141,6 +178,12 @@ public static Object load(Reader reader) throws IOException {
     }
 
     Class<?> clazz = (Class<?>) classes.get(apiVersion + "/" + kind);
+    if (clazz == null) {
+      // Attempt to detect class from version and kind alone
+      if (apiVersion.contains("/")) {
+        clazz = (Class<?>) classes.get(apiVersion.split("/")[1] + "/" + kind);
+      }
+    }
     if (clazz == null) {
       throw new IOException(
           "Unknown apiVersionKind: "

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

@@ -23,16 +23,38 @@
 public class YamlTest {
   @Test
   public void testLoad() {
-    String[] kinds = new String[] {"Pod", "Deployment", "ClusterRole", "APIService", "Scale"};
+    String[] kinds =
+        new String[] {
+          "Pod",
+          "CronJob",
+          "HorizontalPodAutoscaler",
+          "ClusterRole",
+          "Deployment",
+          "APIService",
+          "Scale",
+          "Deployment"
+        };
     String[] apiVersions =
-        new String[] {"v1", "v1beta2", "v1alpha1", "v1beta1", "extensions/v1beta1"};
+        new String[] {
+          "v1",
+          "batch/v2alpha1",
+          "autoscaling/v2beta1",
+          "rbac.authorization.k8s.io/v1alpha1",
+          "apps/v1beta2",
+          "apiregistration.k8s.io/v1beta1",
+          "extensions/v1beta1",
+          "apps/v1beta1"
+        };
     String[] classNames =
         new String[] {
           "V1Pod",
-          "V1beta2Deployment",
+          "V2alpha1CronJob",
+          "V2beta1HorizontalPodAutoscaler",
           "V1alpha1ClusterRole",
+          "V1beta2Deployment",
           "V1beta1APIService",
-          "ExtensionsV1beta1Scale"
+          "ExtensionsV1beta1Scale",
+          "AppsV1beta1Deployment"
         };
     for (int i = 0; i < kinds.length; i++) {
       String kind = kinds[i];