Don't run a taint/untaint command unless a resource is specified

manheim · Apr 27, 2021 · 9016811 · 9016811
1 parent 9ef75e1
commit 9016811
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/TerraformTaintPlugin.groovy b/src/TerraformTaintPlugin.groovy
@@ -60,7 +60,7 @@ class TerraformTaintPlugin implements TerraformEnvironmentStagePlugin, Terraform
     public Closure runTerraformTaintCommand(String environment) {
         def taintCommand = TerraformTaintCommand.instanceFor(environment)
         return { closure ->
-            if (shouldApply()) {
+            if (shouldApply() && Jenkinsfile.instance.getEnv().TAINT_RESOURCE) {
                 echo "Running '${taintCommand.toString()}'. TerraformTaintPlugin is enabled."
                 sh taintCommand.toString()
             }
@@ -71,7 +71,7 @@ class TerraformTaintPlugin implements TerraformEnvironmentStagePlugin, Terraform
     public Closure runTerraformUntaintCommand(String environment) {
         def untaintCommand = TerraformUntaintCommand.instanceFor(environment)
         return { closure ->
-            if (shouldApply()) {
+            if (shouldApply() && Jenkinsfile.instance.getEnv().UNTAINT_RESOURCE) {
                 echo "Running '${untaintCommand.toString()}'. TerraformTaintPlugin is enabled."
                 sh untaintCommand.toString()
             }