OP-22308: Adding VerifyApplicationHasNoDependenciesTask class to dele…

…teApplication task. (#228)
OpsMx · Jul 31, 2024 · 409a5de · 409a5de
1 parent 5e383b6
commit 409a5de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...custom-stage-orca/src/main/java/com/opsmx/plugin/stage/custom/DeleteApplicationStage.java b/...custom-stage-orca/src/main/java/com/opsmx/plugin/stage/custom/DeleteApplicationStage.java
@@ -2,6 +2,7 @@
 
 import javax.validation.constraints.NotNull;
 
+import com.netflix.spinnaker.orca.applications.tasks.VerifyApplicationHasNoDependenciesTask;
 import org.pf4j.Extension;
 import org.springframework.stereotype.Component;
 
@@ -21,6 +22,7 @@ public class DeleteApplicationStage implements StageDefinitionBuilder {
     public void taskGraph(@NotNull StageExecution stage, @NotNull TaskNode.Builder builder) {
 
         builder.withTask("validateApplication", RBACValidationTask.class)
+                .withTask("verifyNoDependencies", VerifyApplicationHasNoDependenciesTask.class)
                 .withTask("deleteTask", DeleteApplicationTask.class);
     }
 }
diff --git a/rbac/custom-stage-orca/src/main/java/com/opsmx/plugin/stage/custom/RBACValidationTask.java b/rbac/custom-stage-orca/src/main/java/com/opsmx/plugin/stage/custom/RBACValidationTask.java
@@ -110,8 +110,10 @@ public TaskResult execute(StageExecution stage) {
 
 			if (stage.getType().equalsIgnoreCase("CreateApplication")) {
 				finalInput = getOpaInput(application, "createApp", groupList, stage.getExecution().getAuthentication().getUser());
-			} else {
+			} else if (stage.getType().equalsIgnoreCase("UpdateApplication")){
 				finalInput = getOpaInput(application, "updateApp", groupList, stage.getExecution().getAuthentication().getUser());
+			} else {
+				finalInput = getOpaInput(application, "deleteApp", groupList, stage.getExecution().getAuthentication().getUser());
 			}