fix(monitored deploy): make reason singular (#3195)

there is no point having an array of reasons from deployment monitor, making it a single object
spinnaker · Sep 25, 2019 · 8520197 · 8520197
1 parent d89159b
commit 8520197
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/...com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/MonitoredDeployBaseTask.java b/...com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/MonitoredDeployBaseTask.java
@@ -27,7 +27,6 @@
 import com.netflix.spinnaker.orca.deploymentmonitor.models.DeploymentStep;
 import com.netflix.spinnaker.orca.deploymentmonitor.models.EvaluateHealthResponse;
 import com.netflix.spinnaker.orca.deploymentmonitor.models.StatusExplanation;
-import com.netflix.spinnaker.orca.deploymentmonitor.models.StatusReason;
 import com.netflix.spinnaker.orca.pipeline.model.Stage;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
@@ -218,13 +217,11 @@ private TaskResult handleError(
 
   TaskResult buildTaskResult(
       TaskResult.TaskResultBuilder taskResultBuilder, EvaluateHealthResponse response) {
-    List<StatusReason> statusReasons =
-        Optional.ofNullable(response.getStatusReasons()).orElse(Collections.emptyList());
 
     String summary =
         summaryMapping.getOrDefault(
             response.getNextStep().getDirective(), "Health evaluation results are unknown");
-    StatusExplanation explanation = new StatusExplanation(summary, statusReasons);
+    StatusExplanation explanation = new StatusExplanation(summary, response.getStatusReason());
 
     return taskResultBuilder.context("deploymentMonitorReasons", explanation).build();
   }

diff --git a/...main/java/com/netflix/spinnaker/orca/deploymentmonitor/models/EvaluateHealthResponse.java b/...main/java/com/netflix/spinnaker/orca/deploymentmonitor/models/EvaluateHealthResponse.java
@@ -18,7 +18,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
 import lombok.Data;
 
 @Data
@@ -58,5 +57,5 @@ public enum NextStepDirective {
   }
 
   private DeploymentStep nextStep;
-  private List<StatusReason> statusReasons;
+  private StatusReason statusReason;
 }
diff --git a/.../src/main/java/com/netflix/spinnaker/orca/deploymentmonitor/models/StatusExplanation.java b/.../src/main/java/com/netflix/spinnaker/orca/deploymentmonitor/models/StatusExplanation.java
@@ -16,21 +16,19 @@
 
 package com.netflix.spinnaker.orca.deploymentmonitor.models;
 
-import java.util.Collections;
-import java.util.List;
 import lombok.Data;
 
 @Data
 public class StatusExplanation {
   private String summary;
-  private List<StatusReason> reasons;
+  private StatusReason reason;
 
   public StatusExplanation(String summary) {
-    this(summary, Collections.emptyList());
+    this(summary, null);
   }
 
-  public StatusExplanation(String summary, List<StatusReason> reasons) {
+  public StatusExplanation(String summary, StatusReason reason) {
     this.summary = summary;
-    this.reasons = reasons;
+    this.reason = reason;
   }
 }