fix(provider/kubernetes): v2 Avoid NPE for unsupported k8s kinds (#2456)

spinnaker · Mar 28, 2018 · 12a0b90 · 12a0b90
1 parent 15e015e
commit 12a0b90
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...ix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java b/...ix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java
@@ -109,7 +109,13 @@ public OperationResult operate(List _unused) {
       }
 
       KubernetesResourceProperties properties = findResourceProperties(manifest);
+      if (properties == null) {
+        throw new IllegalArgumentException("Unsupported Kubernetes object kind '" + manifest.getKind().toString() + "', unable to continue.");
+      }
       KubernetesHandler deployer = properties.getHandler();
+      if (deployer == null) {
+        throw new IllegalArgumentException("No deployer available for Kubernetes object kind '" + manifest.getKind().toString() + "', unable to continue.");
+      }
 
       getTask().updateStatus(OP_NAME, "Swapping out artifacts in " + manifest.getFullResourceName() + " from context...");
       ReplaceResult replaceResult = deployer.replaceArtifacts(manifest, artifacts);