Pass configuration account (#112)

* fix: pass configuration account into setup canary stage context * fix: properly retrieve accounts from context
spinnaker · Oct 26, 2017 · befbac7 · befbac7
1 parent a8e3dc8
commit befbac7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/orca/AtlasFetchTask.java b/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/orca/AtlasFetchTask.java
@@ -84,7 +84,7 @@ public long getDynamicBackoffPeriod(Duration taskDuration) {
 
   @Override
   public TaskResult execute(Stage stage) {
-    StageContext context = new StageContext(stage);
+    Map<String, Object> context = stage.getContext();
     String metricsAccountName = (String)context.get("metricsAccountName");
     String storageAccountName = (String)context.get("storageAccountName");
     Map<String, Object> canaryConfigMap = (Map<String, Object>)context.get("canaryConfig");

diff --git a/...nta-prometheus/src/main/java/com/netflix/kayenta/prometheus/orca/PrometheusFetchTask.java b/...nta-prometheus/src/main/java/com/netflix/kayenta/prometheus/orca/PrometheusFetchTask.java
@@ -73,7 +73,7 @@ public long getTimeout() {
 
   @Override
   public TaskResult execute(Stage stage) {
-    StageContext context = new StageContext(stage);
+    Map<String, Object> context = stage.getContext();
     String metricsAccountName = (String)context.get("metricsAccountName");
     String storageAccountName = (String)context.get("storageAccountName");
     Map<String, Object> canaryConfigMap = (Map<String, Object>)context.get("canaryConfig");

diff --git a/...-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/orca/StackdriverFetchTask.java b/...-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/orca/StackdriverFetchTask.java
@@ -71,7 +71,7 @@ public long getTimeout() {
 
   @Override
   public TaskResult execute(Stage stage) {
-    StageContext context = new StageContext(stage);
+    Map<String, Object> context = stage.getContext();
     String metricsAccountName = (String)context.get("metricsAccountName");
     String storageAccountName = (String)context.get("storageAccountName");
     Map<String, Object> canaryConfigMap = (Map<String, Object>)context.get("canaryConfig");

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
@@ -157,6 +157,7 @@ public String initiateCanary(@RequestParam(required = false) final String metric
           .put("refId", "1")
           .put("user", "[anonymous]")
           .put("canaryConfigId", canaryConfigId)
+          .put("configurationAccountName", resolvedConfigurationAccountName)
           .build());
 
     Map<String, Object> fetchControlContext =