fix(resize): Support both 'asgName' and 'serverGroupName' (#2071)

Noticed the inconsistency when investigating a recent `orca` issue. It would be nice to standardize on `serverGroupName` but we still have operations (like this one!) expecting `asgName`.
spinnaker · Mar 22, 2018 · 50710ea · 50710ea
1 parent 18a9b26
commit 50710ea
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/...com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/ResizeServerGroupStage.groovy b/...com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/ResizeServerGroupStage.groovy
@@ -56,7 +56,7 @@ class ResizeServerGroupStage extends TargetServerGroupLinearStageSupport {
         it.name = "resumeScalingProcesses"
         it.type = ModifyAwsScalingProcessStage.TYPE
         it.context = [
-          serverGroupName: descriptor.asgName,
+          serverGroupName: getServerGroupName(descriptor),
           cloudProvider  : descriptor.cloudProvider,
           credentials    : descriptor.credentials,
           region         : descriptor.region,
@@ -74,7 +74,7 @@ class ResizeServerGroupStage extends TargetServerGroupLinearStageSupport {
         it.name = "suspendScalingProcesses"
         it.type = ModifyAwsScalingProcessStage.TYPE
         it.context = [
-          serverGroupName: descriptor.asgName,
+          serverGroupName: getServerGroupName(descriptor),
           cloudProvider  : descriptor.cloudProvider,
           credentials    : descriptor.credentials,
           region         : descriptor.region,
@@ -87,7 +87,7 @@ class ResizeServerGroupStage extends TargetServerGroupLinearStageSupport {
   @Override
   protected void preDynamic(Map<String, Object> context, StageGraphBuilder graph) {
     if (context.cloudProvider == "aws") {
-      context.remove("asgName")
+      context = removeServerGroupName(context)
       graph.add {
         it.name = "resumeScalingProcesses"
         it.type = ModifyAwsScalingProcessStage.TYPE
@@ -101,7 +101,7 @@ class ResizeServerGroupStage extends TargetServerGroupLinearStageSupport {
   @Override
   protected void postDynamic(Map<String, Object> context, StageGraphBuilder graph) {
     if (context.cloudProvider == "aws") {
-      context.remove("asgName")
+      context = removeServerGroupName(context)
       graph.add {
         it.name = "suspendScalingProcesses"
         it.type = ModifyAwsScalingProcessStage.TYPE

diff --git a/.../orca/clouddriver/pipeline/servergroup/support/TargetServerGroupLinearStageSupport.groovy b/.../orca/clouddriver/pipeline/servergroup/support/TargetServerGroupLinearStageSupport.groovy
@@ -74,6 +74,19 @@ abstract class TargetServerGroupLinearStageSupport implements StageDefinitionBui
     return type
   }
 
+  protected String getServerGroupName(Map<String, Object> context) {
+    return context.serverGroupName ?: context.asgName
+  }
+
+  public Map<String, Object> removeServerGroupName(Map<String, Object> context) {
+    def copyOfContext = new HashMap(context)
+
+    copyOfContext.remove("serverGroupName")
+    copyOfContext.remove("asgName")
+
+    return copyOfContext
+  }
+
   @Override
   final void taskGraph(Stage stage, TaskNode.Builder builder) {
     if (!isTopLevel(stage)) {

diff --git a/...a/clouddriver/pipeline/servergroup/support/TargetServerGroupLinearStageSupportSpec.groovy b/...a/clouddriver/pipeline/servergroup/support/TargetServerGroupLinearStageSupportSpec.groovy
@@ -159,6 +159,23 @@ class TargetServerGroupLinearStageSupportSpec extends Specification {
     "current_asg_dynamic" | ["preDynamic"] | ["postDynamic"]
   }
 
+  def "should support 'asgName' and 'serverGroupName' when extracting server group name from context"() {
+    expect:
+    supportStage.getServerGroupName([:]) == null
+    supportStage.getServerGroupName([asgName: "asgName"]) == "asgName"
+    supportStage.getServerGroupName([serverGroupName: "serverGroupName"]) == "serverGroupName"
+
+    supportStage.getServerGroupName([asgName: "asgName", serverGroupName: "serverGroupName"]) == "serverGroupName"
+  }
+
+  def "should remove 'asgName' and 'serverGroupName' when removing server group name from context"() {
+    expect:
+    supportStage.removeServerGroupName([:]) == [:]
+    supportStage.removeServerGroupName([foo: "bar", asgName: "asgName"]) == [foo: "bar"]
+    supportStage.removeServerGroupName([foo: "bar", serverGroupName: "serverGroupName"]) == [foo: "bar"]
+    supportStage.removeServerGroupName([foo: "bar", asgName: "asgName", serverGroupName: "serverGroupName"]) == [foo: "bar"]
+  }
+
   class TestSupport extends TargetServerGroupLinearStageSupport {
     @Override
     void preStatic(Map<String, Object> descriptor, StageGraphBuilder graph) {