refactor(strategies): clean up some strategies from my past refactor (#…

…3213) also, remove a deprecated class
spinnaker · Oct 7, 2019 · 72b08f2 · 72b08f2
1 parent 967ed79
commit 72b08f2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 56 deletions.
diff --git a/.../netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/CustomStrategy.groovy b/.../netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/CustomStrategy.groovy
@@ -33,17 +33,11 @@ class CustomStrategy implements Strategy {
 
   @Override
   List<Stage> composeBeforeStages(Stage parent) {
-    return composeFlow(parent)
-      .findAll({ it.syntheticStageOwner == SyntheticStageOwner.STAGE_BEFORE })
+    return Collections.emptyList()
   }
 
   @Override
-  List<Stage> composeAfterStages(Stage parent) {
-    return composeFlow(parent)
-      .findAll({ it.syntheticStageOwner == SyntheticStageOwner.STAGE_AFTER })
-  }
-
-  List<Stage> composeFlow(Stage stage) {
+  List<Stage> composeAfterStages(Stage stage) {
     def cleanupConfig = AbstractDeployStrategyStage.CleanupConfig.fromStage(stage)
 
     Map parameters = [

diff --git a/...flix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/HighlanderStrategy.groovy b/...flix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/HighlanderStrategy.groovy
@@ -39,17 +39,11 @@ class HighlanderStrategy implements Strategy, ApplicationContextAware {
 
   @Override
   List<Stage> composeBeforeStages(Stage parent) {
-    return composeFlow(parent)
-      .findAll({ it.syntheticStageOwner == SyntheticStageOwner.STAGE_BEFORE })
+    return Collections.emptyList()
   }
 
   @Override
-  List<Stage> composeAfterStages(Stage parent) {
-    return composeFlow(parent)
-      .findAll({ it.syntheticStageOwner == SyntheticStageOwner.STAGE_AFTER })
-  }
-
-  List<Stage> composeFlow(Stage stage) {
+  List<Stage> composeAfterStages(Stage stage) {
     def cleanupConfig = AbstractDeployStrategyStage.CleanupConfig.fromStage(stage)
     Map shrinkContext = [
         (cleanupConfig.location.singularType()): cleanupConfig.location.value,

diff --git a/...lix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingPushStrategy.groovy b/...lix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingPushStrategy.groovy
@@ -16,6 +16,7 @@
 
 package com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.strategies
 
+import com.netflix.spinnaker.kork.exceptions.UserException
 import com.netflix.spinnaker.orca.kato.pipeline.ModifyAsgLaunchConfigurationStage
 import com.netflix.spinnaker.orca.kato.pipeline.RollingPushStage
 import com.netflix.spinnaker.orca.kato.pipeline.support.SourceResolver
@@ -43,22 +44,22 @@ class RollingPushStrategy implements Strategy {
 
   @Override
   List<Stage> composeBeforeStages(Stage parent) {
-    return composeFlow(parent)
-      .findAll({ it.syntheticStageOwner == SyntheticStageOwner.STAGE_BEFORE })
-  }
+    def source = sourceResolver.getSource(parent)
 
-  @Override
-  List<Stage> composeAfterStages(Stage parent) {
-    return composeFlow(parent)
-      .findAll({ it.syntheticStageOwner == SyntheticStageOwner.STAGE_AFTER })
+    if (!source) {
+      throw new UserException("Could not find source server group for rolling push. Does the specified cluster exist?")
+    }
+
+    return Collections.emptyList()
   }
 
-  List<Stage> composeFlow(Stage stage) {
+  @Override
+  List<Stage> composeAfterStages(Stage stage) {
     def stages = []
     def source = sourceResolver.getSource(stage)
 
     if (!source) {
-      throw new IllegalArgumentException("Could not find source server group for rolling push. Does the specified cluster exist?")
+      throw new UserException("Could not find source server group for rolling push. Does the specified cluster exist?")
     }
 
     def modifyCtx = stage.context + [

diff --git a/...om/netflix/spinnaker/orca/clouddriver/tasks/servergroup/ServerGroupMetadataTagTask.groovy b/...om/netflix/spinnaker/orca/clouddriver/tasks/servergroup/ServerGroupMetadataTagTask.groovy
diff --git a/.../spinnaker/orca/clouddriver/pipeline/servergroup/strategies/HighlanderStrategySpec.groovy b/.../spinnaker/orca/clouddriver/pipeline/servergroup/strategies/HighlanderStrategySpec.groovy
@@ -60,9 +60,8 @@ class HighlanderStrategySpec extends Specification {
       def strat = new HighlanderStrategy(shrinkClusterStage: shrinkClusterStage)
 
     when:
-      def syntheticStages = strat.composeFlow(stage)
-      def beforeStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_BEFORE }
-      def afterStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_AFTER }
+      def beforeStages = strat.composeBeforeStages(stage)
+      def afterStages = strat.composeAfterStages(stage)
 
     then:
       beforeStages.isEmpty()