feat: Allow to continue template execution using "ignoreError" proper…

…ty (#1550) * feat: Allow to continue template execution using "ignoreError" property
AzBuilder · Nov 21, 2024 · 97e9832 · 97e9832
1 parent 6c2f3c2
commit 97e9832
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/api/src/main/java/org/terrakube/api/plugin/scheduler/job/tcl/executor/ExecutorContext.java b/api/src/main/java/org/terrakube/api/plugin/scheduler/job/tcl/executor/ExecutorContext.java
@@ -27,6 +27,7 @@ public class ExecutorContext {
     private boolean refresh;
     private boolean refreshOnly;
     private boolean showHeader;
+    private boolean ignoreError;
     private String accessToken;
     private String moduleSshKey;
     private String commitId;

diff --git a/api/src/main/java/org/terrakube/api/plugin/scheduler/job/tcl/executor/ExecutorService.java b/api/src/main/java/org/terrakube/api/plugin/scheduler/job/tcl/executor/ExecutorService.java
@@ -135,6 +135,7 @@ public ExecutorContext execute(Job job, String stepId, Flow flow) {
 
         executorContext.setCommandList(flow.getCommands());
         executorContext.setType(flow.getType());
+        executorContext.setIgnoreError(flow.isIgnoreError());
         executorContext.setTerraformVersion(job.getWorkspace().getTerraformVersion());
         if (job.getOverrideSource() == null) {
             executorContext.setSource(job.getWorkspace().getSource());

diff --git a/api/src/main/java/org/terrakube/api/plugin/scheduler/job/tcl/model/Flow.java b/api/src/main/java/org/terrakube/api/plugin/scheduler/job/tcl/model/Flow.java
@@ -14,7 +14,7 @@ public class Flow {
     private String type;
     private String team;
     private String name;
-
+    private boolean ignoreError = false;
     private String error;
     private int step;
     List<Command> commands;

diff --git a/executor/src/main/java/org/terrakube/executor/service/mode/TerraformJob.java b/executor/src/main/java/org/terrakube/executor/service/mode/TerraformJob.java
@@ -30,6 +30,7 @@ public class TerraformJob {
     private boolean showHeader;
     private boolean refresh;
     private boolean refreshOnly;
+    private boolean ignoreError;
     private String moduleSshKey;
     private String commitId;
     private boolean tofu;

diff --git a/.../src/main/java/org/terrakube/executor/service/terraform/TerraformExecutorServiceImpl.java b/.../src/main/java/org/terrakube/executor/service/terraform/TerraformExecutorServiceImpl.java
@@ -121,11 +121,11 @@ public ExecutorJobResult plan(TerraformJob terraformJob, File workingDirectory,
                             null).get();
                 }
 
-            if(exitCode != 1) {
+            if(exitCode != 1 || terraformJob.isIgnoreError()) {
                 executionPlan = true;
             }
 
-            log.warn("Terraform plan Executed Successfully: {} Exit Code: {}", executionPlan, exitCode);
+            log.warn("Terraform plan Executed: {} Exit Code: {}", executionPlan, exitCode);
 
             scriptAfterSuccessPlan = executePostOperationScripts(terraformJob, terraformWorkingDir, planOutput, executionPlan);
 
@@ -142,7 +142,6 @@ public ExecutorJobResult plan(TerraformJob terraformJob, File workingDirectory,
             result.setExitCode(1);
         }
         return result;
-
     }
 
     @Override