fix(json): look in older places for execution context too (#285)

spinnaker · Apr 10, 2018 · 2fe632b · 2fe632b
1 parent f704192
commit 2fe632b
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/ExecutionMapper.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/ExecutionMapper.java
@@ -203,6 +203,18 @@ public CanaryExecutionStatusResponse fromExecution(String unresolvedStorageAccou
     return canaryExecutionStatusResponseBuilder.build();
   }
 
+  // Some older (stored) results have the execution request only in the judge context.
+  public String getCanaryExectutionRequestFromJudgeContext(Execution pipeline) {
+    Stage contextStage = pipeline.getStages().stream()
+      .filter(stage -> stage.getRefId().equals(CanaryStageNames.REFID_JUDGE))
+      .findFirst()
+      .orElseThrow(() -> new IllegalArgumentException("Unable to find stage '" + CanaryStageNames.REFID_JUDGE + "' in pipeline ID '" + pipeline.getId() + "'"));
+    Map<String, Object> context = contextStage.getContext();
+
+    return (String) context.get("canaryExecutionRequest");
+  }
+
+
   public CanaryExecutionRequest getCanaryExecutionRequest(Execution pipeline) {
     Stage contextStage = pipeline.getStages().stream()
       .filter(stage -> stage.getRefId().equals(CanaryStageNames.REFID_SET_CONTEXT))
@@ -211,6 +223,9 @@ public CanaryExecutionRequest getCanaryExecutionRequest(Execution pipeline) {
     Map<String, Object> context = contextStage.getContext();
 
     String canaryExecutionRequestJSON = (String)context.get("canaryExecutionRequest");
+    if (canaryExecutionRequestJSON == null) {
+      canaryExecutionRequestJSON = getCanaryExectutionRequestFromJudgeContext(pipeline);
+    }
     if (canaryExecutionRequestJSON == null) {
       return null;
     }