Merge pull request #260 from kmanning/issue_88

Issue 88: hold off on DESTROY decoration and Strategies
manheim · Jul 31, 2020 · 9bac14b · 9bac14b
2 parents baeaea4 + 024b9f5
commit 9bac14b
Show file tree

Hide file tree

Showing 22 changed files with 294 additions and 168 deletions.
diff --git a/src/AnsiColorPlugin.groovy b/src/AnsiColorPlugin.groovy
@@ -1,6 +1,5 @@
 import static TerraformEnvironmentStage.PLAN
 import static TerraformEnvironmentStage.APPLY
-import static TerraformEnvironmentStage.DESTROY
 
 class AnsiColorPlugin implements TerraformEnvironmentStagePlugin {
 
@@ -12,7 +11,6 @@ class AnsiColorPlugin implements TerraformEnvironmentStagePlugin {
     public void apply(TerraformEnvironmentStage stage) {
         stage.decorate(PLAN, addColor())
         stage.decorate(APPLY, addColor())
-        stage.decorate(DESTROY, addColor())
     }
 
     public static Closure addColor() {

diff --git a/src/ConditionalApplyPlugin.groovy b/src/ConditionalApplyPlugin.groovy
@@ -1,6 +1,5 @@
 import static TerraformEnvironmentStage.CONFIRM
 import static TerraformEnvironmentStage.APPLY
-import static TerraformEnvironmentStage.DESTROY
 
 public class ConditionalApplyPlugin implements TerraformEnvironmentStagePlugin {
 
@@ -14,7 +13,6 @@ public class ConditionalApplyPlugin implements TerraformEnvironmentStagePlugin {
     public void apply(TerraformEnvironmentStage stage) {
         stage.decorateAround(CONFIRM, onlyOnExpectedBranch())
         stage.decorateAround(APPLY, onlyOnExpectedBranch())
-        stage.decorateAround(DESTROY, onlyOnExpectedBranch())
     }
 
     public Closure onlyOnExpectedBranch() {

diff --git a/src/CrqPlugin.groovy b/src/CrqPlugin.groovy
@@ -13,7 +13,6 @@ class CrqPlugin implements TerraformEnvironmentStagePlugin {
         def environment = stage.getEnvironment()
 
         stage.decorate(TerraformEnvironmentStage.APPLY, addCrq(environment))
-        stage.decorate(TerraformEnvironmentStage.DESTROY, addCrq(environment))
     }
 
     public String getCrqEnvironment(String environment) {

diff --git a/src/DefaultStrategy.groovy b/src/DefaultStrategy.groovy
diff --git a/src/DestroyPlugin.groovy b/src/DestroyPlugin.groovy
@@ -1,24 +1,38 @@
-class DestroyPlugin implements TerraformEnvironmentStagePlugin {
+class DestroyPlugin implements TerraformPlanCommandPlugin,
+                               TerraformApplyCommandPlugin {
 
     private static arguments = []
+    public static DESTROY_CONFIRM_MESSAGE = 'WARNING! Are you absolutely sure the plan above is correct? Your environment will be IMMEDIATELY DESTROYED via "terraform destroy"'
+    public static DESTROY_OK_MESSAGE = "Run terraform DESTROY now"
 
     public static void init() {
         DestroyPlugin plugin = new DestroyPlugin()
 
-        ConfirmApplyPlugin.withConfirmMessage('WARNING! Are you absolutely sure the plan above is correct? Your environment will be IMMEDIATELY DESTROYED via "terraform destroy"')
-        ConfirmApplyPlugin.withOkMessage("Run terraform DESTROY now")
+        ConfirmApplyPlugin.withConfirmMessage(DESTROY_CONFIRM_MESSAGE)
+        ConfirmApplyPlugin.withOkMessage(DESTROY_OK_MESSAGE)
+        TerraformEnvironmentStage.withStageNamePattern { options -> "${options['command']}-DESTROY-${options['environment']}" }
 
-        TerraformEnvironmentStage.addPlugin(plugin)
+        TerraformPlanCommand.addPlugin(plugin)
+        TerraformApplyCommand.addPlugin(plugin)
+    }
+
+    public void apply(TerraformPlanCommand command) {
+        command.withArgument('-destroy')
+    }
+
+    public void apply(TerraformApplyCommand command) {
+        command.withCommand('destroy')
+        for (arg in arguments) {
+            command.withArgument(arg)
+        }
     }
 
     public static withArgument(String arg) {
         arguments << arg
         return this
     }
 
-    @Override
-    public void apply(TerraformEnvironmentStage stage) {
-        stage.withStrategy(new DestroyStrategy(arguments))
+    public static reset() {
+        arguments = []
     }
-
 }
diff --git a/src/DestroyStrategy.groovy b/src/DestroyStrategy.groovy
diff --git a/src/Jenkinsfile.groovy b/src/Jenkinsfile.groovy
@@ -119,5 +119,6 @@ class Jenkinsfile {
     public static reset() {
         instance = new Jenkinsfile()
         original = null
+        defaultNodeName = null
     }
 }
diff --git a/src/TerraformEnvironmentStage.groovy b/src/TerraformEnvironmentStage.groovy
@@ -3,10 +3,10 @@ class TerraformEnvironmentStage implements Stage {
     private String environment
     private StageDecorations decorations
     private localPlugins
-    private static strategy = new DefaultStrategy()
 
     private static final DEFAULT_PLUGINS = [ new ConditionalApplyPlugin(), new ConfirmApplyPlugin(), new DefaultEnvironmentPlugin() ]
     private static globalPlugins = DEFAULT_PLUGINS.clone()
+    private static Closure stageNamePattern
 
     public static final String ALL = 'all'
     public static final String PLAN = 'plan'
@@ -45,13 +45,55 @@ class TerraformEnvironmentStage implements Stage {
         Jenkinsfile.build(pipelineConfiguration())
     }
 
-    public void withStrategy(newStrategy) {
-        this.strategy = newStrategy
-    }
+    public Closure pipelineConfiguration() {
+        def initCommand = TerraformInitCommand.instanceFor(environment)
+        def planCommand = TerraformPlanCommand.instanceFor(environment)
+        def applyCommand = TerraformApplyCommand.instanceFor(environment)
 
-    private Closure pipelineConfiguration() {
         applyPlugins()
-        return strategy.createPipelineClosure(environment, decorations)
+
+        def String environment = this.environment
+        return { ->
+            node(jenkinsfile.getNodeName()) {
+                deleteDir()
+                checkout(scm)
+
+                decorations.apply(ALL) {
+                    stage(getStageNameFor(PLAN)) {
+                        decorations.apply(PLAN) {
+                            sh initCommand.toString()
+                            sh planCommand.toString()
+                        }
+                    }
+
+                    decorations.apply("Around-${CONFIRM}") {
+                        // The stage name needs to be editable
+                        stage(getStageNameFor(CONFIRM)) {
+                            decorations.apply(CONFIRM) {
+                                echo "Approved"
+                            }
+                        }
+                    }
+
+                    decorations.apply("Around-${APPLY}") {
+                        // The stage name needs to be editable
+                        stage(getStageNameFor(APPLY)) {
+                            decorations.apply(APPLY) {
+                                sh initCommand.toString()
+                                sh applyCommand.toString()
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public String getStageNameFor(String command) {
+        def pattern = stageNamePattern ?: { options -> "${options['command']}-${options['environment']}" }
+        def options = [ command: command, environment: environment ]
+
+        return pattern.call(options)
     }
 
     public void decorate(Closure decoration) {
@@ -137,8 +179,13 @@ class TerraformEnvironmentStage implements Stage {
         return globalPlugins
     }
 
-    public static void resetPlugins() {
-        this.globalPlugins = DEFAULT_PLUGINS.clone()
+    public static withStageNamePattern(Closure stageNamePattern) {
+        this.stageNamePattern = stageNamePattern
+    }
+
+    public static void reset() {
         // This totally jacks with localPlugins
+        this.globalPlugins = DEFAULT_PLUGINS.clone()
+        this.stageNamePattern = null
     }
 }
diff --git a/test/AgentNodePluginTest.groovy b/test/AgentNodePluginTest.groovy
@@ -29,7 +29,7 @@ class AgentNodePluginTest {
         @After
         void resetPlugins() {
             TerraformValidateStage.resetPlugins()
-            TerraformEnvironmentStage.resetPlugins()
+            TerraformEnvironmentStage.reset()
         }
 
         @Test

diff --git a/test/AnsiColorPluginTest.groovy b/test/AnsiColorPluginTest.groovy
@@ -12,7 +12,7 @@ class AnsiColorPluginTest {
     public class Init {
         @After
         void resetPlugins() {
-            TerraformEnvironmentStage.resetPlugins()
+            TerraformEnvironmentStage.reset()
         }
 
         @Test

diff --git a/test/CredentialsPluginTest.groovy b/test/CredentialsPluginTest.groovy
@@ -22,7 +22,7 @@ class CredentialsPluginTest {
         void resetPlugins() {
             BuildStage.resetPlugins()
             RegressionStage.resetPlugins()
-            TerraformEnvironmentStage.resetPlugins()
+            TerraformEnvironmentStage.reset()
             TerraformValidateStage.resetPlugins()
             CredentialsPlugin.reset()
         }

diff --git a/test/CrqPluginTest.groovy b/test/CrqPluginTest.groovy
@@ -17,7 +17,7 @@ class CrqPluginTest {
     public class Init {
         @After
         void resetPlugins() {
-            TerraformEnvironmentStage.resetPlugins()
+            TerraformEnvironmentStage.reset()
         }
 
         @Test