put cleanupTempFiles in a finally block for all plugins

rundeck-plugins · Mar 19, 2024 · 28f42dc · 28f42dc
1 parent 3fc42c9
commit 28f42dc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleModuleWorkflowStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleModuleWorkflowStep.java
@@ -93,9 +93,10 @@ public void executeStep(PluginStepContext context, Map<String, Object> configura
             throw new StepException(e.getMessage(), e, e.getFailureReason());
         } catch (Exception e) {
             throw new StepException(e.getMessage(), e, AnsibleException.AnsibleFailureReason.AnsibleError);
+        }finally {
+            contextBuilder.cleanupTempFiles();
         }
 
-        contextBuilder.cleanupTempFiles();
     }
 
     @Override

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleNodeExecutor.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleNodeExecutor.java
@@ -178,10 +178,10 @@ public NodeExecutorResult executeCommand(ExecutionContext context, String[] comm
         runner.run();
     } catch (Exception e) {
         return NodeExecutorResultImpl.createFailure(AnsibleException.AnsibleFailureReason.AnsibleError, e.getMessage(), node);
+    }finally {
+        contextBuilder.cleanupTempFiles();
     }
 
-    contextBuilder.cleanupTempFiles();
-
     return NodeExecutorResultImpl.createSuccess(node);
   }
 

diff --git a/...main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowNodeStep.java b/...main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowNodeStep.java
@@ -102,9 +102,10 @@ public void executeNodeStep(
             failureData.put("message",e.getMessage());
             failureData.put("ansible-config", configuration);
             throw new NodeStepException(e.getMessage(),e, AnsibleException.AnsibleFailureReason.AnsibleError, failureData, e.getMessage());
+        }finally {
+            contextBuilder.cleanupTempFiles();
         }
 
-        contextBuilder.cleanupTempFiles();
 
     }
 

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowStep.java
@@ -107,9 +107,9 @@ public void executeStep(PluginStepContext context, Map<String, Object> configura
 
 
             throw new StepException(e.getMessage(), e, AnsibleException.AnsibleFailureReason.AnsibleError, failureData);
+        }finally {
+            contextBuilder.cleanupTempFiles();
         }
-
-        contextBuilder.cleanupTempFiles();
     }
 
 

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorflowNodeStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorflowNodeStep.java
@@ -94,9 +94,9 @@ public void executeNodeStep(
             throw new NodeStepException(e.getMessage(), e.getFailureReason(),e.getMessage());
         } catch (Exception e) {
             throw new NodeStepException(e.getMessage(),AnsibleException.AnsibleFailureReason.AnsibleError,e.getMessage());
+        }finally {
+            contextBuilder.cleanupTempFiles();
         }
-
-        contextBuilder.cleanupTempFiles();
     }
 
     @Override

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorkflowStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorkflowStep.java
@@ -105,9 +105,9 @@ public void executeStep(PluginStepContext context, Map<String, Object> configura
             failureData.put("ansible-config", contextBuilder.getConfigFile());
 
             throw new StepException(e.getMessage(), e, AnsibleException.AnsibleFailureReason.AnsibleError, failureData);
+        }finally {
+            contextBuilder.cleanupTempFiles();
         }
-
-        contextBuilder.cleanupTempFiles();
     }
 
     @Override