From 409a5de97e59e251011081e98b2060a8b7445779 Mon Sep 17 00:00:00 2001 From: PravallikaEmani <97868699+emanipravallika@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:39:57 +0530 Subject: [PATCH] OP-22308: Adding VerifyApplicationHasNoDependenciesTask class to deleteApplication task. (#228) --- .../com/opsmx/plugin/stage/custom/DeleteApplicationStage.java | 2 ++ .../com/opsmx/plugin/stage/custom/RBACValidationTask.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rbac/custom-stage-orca/src/main/java/com/opsmx/plugin/stage/custom/DeleteApplicationStage.java b/rbac/custom-stage-orca/src/main/java/com/opsmx/plugin/stage/custom/DeleteApplicationStage.java index 2696dc3..4c38b79 100644 --- a/rbac/custom-stage-orca/src/main/java/com/opsmx/plugin/stage/custom/DeleteApplicationStage.java +++ b/rbac/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); } } \ No newline at end of file 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 index 77f69e6..80dfffd 100644 --- 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()); }