fix(API): don't allow running tasks to be deleted

spinnaker · Mar 14, 2018 · 9dd0d69 · 9dd0d69
1 parent f8b7dea
commit 9dd0d69
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/orca-web/src/main/groovy/com/netflix/spinnaker/orca/controllers/TaskController.groovy b/orca-web/src/main/groovy/com/netflix/spinnaker/orca/controllers/TaskController.groovy
@@ -129,7 +129,14 @@ class TaskController {
   @PreAuthorize("hasPermission(this.getOrchestration(#id)?.application, 'APPLICATION', 'WRITE')")
   @RequestMapping(value = "/tasks/{id}", method = RequestMethod.DELETE)
   void deleteTask(@PathVariable String id) {
-    executionRepository.delete(ORCHESTRATION, id)
+    executionRepository.retrieve(ORCHESTRATION, id).with {
+      if (it.status.complete) {
+        executionRepository.delete(ORCHESTRATION, id)
+      } else {
+        log.warn("Not deleting $ORCHESTRATION $id as it is $it.status")
+        throw new CannotDeleteRunningExecution(ORCHESTRATION, id)
+      }
+    }
   }
 
   @PreAuthorize("hasPermission(this.getOrchestration(#id)?.application, 'APPLICATION', 'WRITE')")