clear triggers and skip loading when repo is disabled

walmartlabs · Feb 9, 2024 · f95f279 · f95f279
1 parent 8e0e21b
commit f95f279
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/...pl/src/main/java/com/walmartlabs/concord/server/org/project/ProjectRepositoryManager.java b/...pl/src/main/java/com/walmartlabs/concord/server/org/project/ProjectRepositoryManager.java
@@ -28,6 +28,7 @@
 import com.walmartlabs.concord.server.org.ResourceAccessLevel;
 import com.walmartlabs.concord.server.org.secret.SecretEntry;
 import com.walmartlabs.concord.server.org.secret.SecretManager;
+import com.walmartlabs.concord.server.org.triggers.TriggerManager;
 import com.walmartlabs.concord.server.policy.EntityAction;
 import com.walmartlabs.concord.server.policy.EntityType;
 import com.walmartlabs.concord.server.policy.PolicyManager;
@@ -52,21 +53,24 @@ public class ProjectRepositoryManager {
     private final AuditLog auditLog;
     private final PolicyManager policyManager;
     private final RepositoryRefresher repositoryRefresher;
+    private final TriggerManager triggerManager;
 
     @Inject
     public ProjectRepositoryManager(ProjectAccessManager projectAccessManager,
                                     SecretManager secretManager,
                                     RepositoryDao repositoryDao,
                                     AuditLog auditLog,
                                     PolicyManager policyManager,
-                                    RepositoryRefresher repositoryRefresher) {
+                                    RepositoryRefresher repositoryRefresher,
+                                    TriggerManager triggerManager) {
 
         this.projectAccessManager = projectAccessManager;
         this.secretManager = secretManager;
         this.repositoryDao = repositoryDao;
         this.auditLog = auditLog;
         this.policyManager = policyManager;
         this.repositoryRefresher = repositoryRefresher;
+        this.triggerManager = triggerManager;
     }
 
     public RepositoryEntry get(UUID projectId, String repositoryName) {
@@ -103,7 +107,9 @@ public void createOrUpdate(UUID projectId, RepositoryEntry entry) {
         policyManager.checkEntity(project.getOrgId(), project.getId(), EntityType.REPOSITORY, repoId == null ? EntityAction.CREATE : EntityAction.UPDATE,
                 null, PolicyUtils.repositoryToMap(project, entry, secret));
 
-        ProcessDefinition processDefinition = processDefinition(project.getOrgId(), projectId, entry);
+        ProcessDefinition processDefinition = entry.isDisabled()
+                ? null
+                : processDefinition(project.getOrgId(), projectId, entry);
 
         InsertUpdateResult result = repositoryDao.txResult(tx -> insertOrUpdate(tx, projectId, repoId, entry, secret, processDefinition));
         addAuditLog(project, result.prevEntry(), result.newEntry());
@@ -153,6 +159,12 @@ interface InsertUpdateResult {
     }
 
     private InsertUpdateResult insertOrUpdate(DSLContext tx, UUID projectId, UUID repoId, RepositoryEntry entry, SecretEntry secret, ProcessDefinition processDefinition) {
+        if (!entry.isDisabled() && processDefinition == null) {
+            // should have already thrown and exception by this point, but just in case
+            // something went wrong cloning/loading process definition
+            throw new ConcordApplicationException("Error while loading process definition", Response.Status.INTERNAL_SERVER_ERROR);
+        }
+
         RepositoryEntry prevEntry = null;
         if (repoId == null) {
             repoId = repositoryDao.insert(tx, projectId,
@@ -178,7 +190,9 @@ private InsertUpdateResult insertOrUpdate(DSLContext tx, UUID projectId, UUID re
                     entry.isTriggersDisabled());
         }
 
-        if (!entry.isDisabled()) {
+        if (entry.isDisabled()) {
+            triggerManager.clearTriggers(tx, projectId, repoId);
+        } else {
             repositoryRefresher.refresh(tx, projectId, entry.getName(), processDefinition);
         }