check for nulls (#188)

spinnaker · Jan 2, 2018 · 2c9754b · 2c9754b
1 parent 8f19dc2
commit 2c9754b
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java b/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java
@@ -146,7 +146,14 @@ public CanaryExecutionResponse initiateCanaryWithConfig(
                                                                                      AccountCredentials.Type.OBJECT_STORE,
                                                                                      accountCredentialsRepository);
 
-    return buildExecution("adhoc",
+    if (canaryAdhocExecutionRequest.getCanaryConfig() == null) {
+      throw new IllegalArgumentException("canaryConfig must be provided for ad-hoc requests");
+    }
+    if (canaryAdhocExecutionRequest.getExecutionRequest() == null) {
+      throw new IllegalArgumentException("executionRequest must be provided for ad-hoc requests");
+    }
+
+    return buildExecution("ad-hoc",
                           canaryAdhocExecutionRequest.getCanaryConfig(),
                           null,
                           resolvedMetricsAccountName,