fix(moniker): Use the correct moniker when applying source server group

spinnaker · Nov 15, 2017 · 1d97528 · 1d97528
1 parent 3e953ac
commit 1d97528
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/...innaker/orca/clouddriver/pipeline/providers/aws/ApplySourceServerGroupCapacityTask.groovy b/...innaker/orca/clouddriver/pipeline/providers/aws/ApplySourceServerGroupCapacityTask.groovy
@@ -20,8 +20,10 @@ package com.netflix.spinnaker.orca.clouddriver.pipeline.providers.aws
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.netflix.spinnaker.moniker.Moniker
 import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.ResizeServerGroupStage
 import com.netflix.spinnaker.orca.clouddriver.tasks.servergroup.AbstractServerGroupTask
+import com.netflix.spinnaker.orca.clouddriver.utils.MonikerHelper
 import com.netflix.spinnaker.orca.clouddriver.utils.OortHelper
 import com.netflix.spinnaker.orca.kato.pipeline.support.StageData
 import com.netflix.spinnaker.orca.pipeline.model.Stage
@@ -80,6 +82,26 @@ class ApplySourceServerGroupCapacityTask extends AbstractServerGroupTask {
     }
   }
 
+  @Override
+  Moniker convertMoniker(Stage stage) {
+    try {
+      TargetServerGroupContext context = getTargetServerGroupContext(stage)
+      return MonikerHelper.friggaToMoniker(context.serverGroupName)
+
+      def targetServerGroup = oortHelper.getTargetServerGroup(
+        context.credentials as String,
+        context.serverGroupName as String,
+        context.region as String,
+        context.cloudProvider as String
+      ).get()
+
+      return targetServerGroup.getMoniker()
+    } catch (Exception e) {
+      log.error("Unable to apply source server group capacity (executionId: ${stage.execution.id})", e)
+      return null
+    }
+  }
+
   /**
    * Fetch target server group coordinates and source server group capacity snapshot.
    *