fix(provider/kubernetes): fix application key parsing (#2109)

spinnaker · Nov 13, 2017 · 02e4f15 · 02e4f15
1 parent 3910832
commit 02e4f15
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/...ernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/Keys.java b/...ernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/Keys.java
@@ -149,9 +149,7 @@ private static CacheKey parseLogicalKey(String[] parts) {
   public static abstract class CacheKey {
     private Kind kind;
     private String provider = KubernetesCloudProvider.getID();
-    public String getType() {
-      return getGroup();
-    }
+    private String type;
     public abstract String getGroup();
     public abstract String getName();
   }

diff --git a/.../groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2Provider.java b/.../groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2Provider.java
@@ -75,7 +75,18 @@ public Map<SearchableProvider.SearchableResource, SearchableProvider.SearchResul
   @Override
   public Map<String, String> parseKey(String key) {
     return (Map<String, String>) Keys.parseKey(key)
+        .map(k -> {
+          String group = k.getGroup();
+          try {
+            KubernetesKind kind = KubernetesKind.fromString(group);
+            k.setType(kindMap.translateKubernetesKind(kind).toString());
+          } catch (Exception _ignored) {
+            k.setType(group);
+          }
+
+          return k;
+        })
         .map(k -> mapper.convertValue(k, new TypeReference<Map<String, String>>() {}))
-        .orElse(new HashMap<>());
+        .orElse(null);
   }
 }