fix(provider/kubernetes): guard against empty api & kind (#2472)

spinnaker · Mar 30, 2018 · b87021e · b87021e
1 parent e06601d
commit b87021e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...etflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiVersion.java b/...etflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiVersion.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -55,6 +56,10 @@ public String toString() {
 
   @JsonCreator
   public static KubernetesApiVersion fromString(String name) {
+    if (StringUtils.isEmpty(name)) {
+      return null;
+    }
+
     Optional<KubernetesApiVersion> versionOptional = values.stream()
         .filter(v -> v.name.equalsIgnoreCase(name))
         .findAny();

diff --git a/.../com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKind.java b/.../com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKind.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -91,6 +92,10 @@ public String toString() {
 
   @JsonCreator
   public static KubernetesKind fromString(String name) {
+    if (StringUtils.isEmpty(name)) {
+      return null;
+    }
+
     Optional<KubernetesKind> kindOptional = values.stream()
         .filter(v -> v.name.equalsIgnoreCase(name) || (v.alias != null && v.alias.equalsIgnoreCase(name)))
         .findAny();