Merge pull request #2876 from shreddedbacon/deploytarget-cleanup-v2

uselagoon · Oct 18, 2021 · 89cb142 · 89cb142
2 parents ea9ccc1 + 5e83ffa
commit 89cb142
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/services/api/src/resources/project/helpers.ts b/services/api/src/resources/project/helpers.ts
@@ -115,6 +115,12 @@ export const Helpers = (sqlClientPool: Pool) => {
         'DELETE FROM `project_notification` WHERE `pid` = :id',
         { id }
       );
+      // clean up deploytarget configurations
+      await query(
+        sqlClientPool,
+        'DELETE FROM `deploy_target_config` WHERE `project` = :id',
+        { id }
+      );
       await query(sqlClientPool, 'DELETE FROM `project` WHERE `id` = :id', {
         id
       });

diff --git a/services/api/src/resources/project/resolvers.ts b/services/api/src/resources/project/resolvers.ts
@@ -540,15 +540,6 @@ export const deleteProject: ResolverFn = async (
     );
   }
 
-  // clean up deploytarget configurations for this project
-  try {
-    await query(sqlClientPool, 'DELETE FROM deploy_target_config WHERE project = :pid', {
-      pid
-    });
-  } catch (err) {
-     // Not allowed to stop execution.
-  }
-
   // @TODO discuss if we want to delete projects in harbor or not
   //const harborOperations = createHarborOperations(sqlClientPool);