Merge pull request #13912 from DefectDojo/master-into-dev/2.53.3-2.54.0-dev

Release: Merge back 2.53.3 into dev from: master-into-dev/2.53.3-2.54.0-dev

Author: rossops

dojo/utils.py

@@ -2016,20 +2016,20 @@ class async_delete:
     def __init__(self, *args, **kwargs):
         self.mapping = {
             "Product_Type": [
-                (Endpoint, "product__prod_type"),
-                (Finding, "test__engagement__product__prod_type"),
-                (Test, "engagement__product__prod_type"),
-                (Engagement, "product__prod_type"),
-                (Product, "prod_type")],
+                (Endpoint, "product__prod_type__id"),
+                (Finding, "test__engagement__product__prod_type__id"),
+                (Test, "engagement__product__prod_type__id"),
+                (Engagement, "product__prod_type__id"),
+                (Product, "prod_type__id")],
             "Product": [
-                (Endpoint, "product"),
-                (Finding, "test__engagement__product"),
-                (Test, "engagement__product"),
-                (Engagement, "product")],
+                (Endpoint, "product__id"),
+                (Finding, "test__engagement__product__id"),
+                (Test, "engagement__product__id"),
+                (Engagement, "product__id")],
             "Engagement": [
-                (Finding, "test__engagement"),
-                (Test, "engagement")],
-            "Test": [(Finding, "test")],
+                (Finding, "test__engagement__id"),
+                (Test, "engagement__id")],
+            "Test": [(Finding, "test__id")],
         }
 
     @dojo_async_task
@@ -2098,11 +2098,11 @@ def delete(self, obj, **kwargs):
     @app.task
     def crawl(self, obj, model_list, **kwargs):
         logger.debug("ASYNC_DELETE: Crawling " + self.get_object_name(obj) + ": " + str(obj))
-        task_results = []
         for model_info in model_list:
+            task_results = []
             model = model_info[0]
             model_query = model_info[1]
-            filter_dict = {model_query: obj}
+            filter_dict = {model_query: obj.id}
             # Only fetch the IDs since we will make a list of IDs in the following function call
             objects_to_delete = model.objects.only("id").filter(**filter_dict).distinct().order_by("id")
             logger.debug("ASYNC_DELETE: Deleting " + str(len(objects_to_delete)) + " " + self.get_object_name(model) + "s in chunks")
@@ -2116,11 +2116,11 @@ def crawl(self, obj, model_list, **kwargs):
             # Wait for all chunk deletions to complete (they run in parallel)
             for task_result in task_results:
                 task_result.get(timeout=300)  # 5 minute timeout per chunk
-            # Now delete the main object after all chunks are done
-            result = self.delete_chunk([obj])
-            # Wait for final deletion to complete
-            if hasattr(result, "get"):
-                result.get(timeout=300)  # 5 minute timeout
+        # Now delete the main object after all chunks are done
+        result = self.delete_chunk([obj])
+        # Wait for final deletion to complete
+        if hasattr(result, "get"):
+            result.get(timeout=300)  # 5 minute timeout
         logger.debug("ASYNC_DELETE: Successfully deleted " + self.get_object_name(obj) + ": " + str(obj))
 
     def chunk_list(self, model, full_list):

helm/defectdojo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.54.0-dev"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.9.3-dev
+version: 1.9.4-dev
 icon: https://defectdojo.com/hubfs/DefectDojo_favicon.png
 maintainers:
   - name: madchap
@@ -34,6 +34,4 @@ dependencies:
 #     description: Critical bug
 annotations:
   artifacthub.io/prerelease: "true"
-  artifacthub.io/changes: |
-    - kind: changed
-      description: chore(deps)_ update gcr.io/cloudsql_docker/gce_proxy docker tag from 1.37.10 to v1.37.11 (helm/defectdojo/values.yaml)
+  artifacthub.io/changes: ""

helm/defectdojo/README.md

@@ -511,7 +511,7 @@ The HELM schema will be generated for you.
 
 # General information about chart values
 
-![Version: 1.9.3-dev](https://img.shields.io/badge/Version-1.9.3--dev-informational?style=flat-square) ![AppVersion: 2.54.0-dev](https://img.shields.io/badge/AppVersion-2.54.0--dev-informational?style=flat-square)
+![Version: 1.9.4-dev](https://img.shields.io/badge/Version-1.9.4--dev-informational?style=flat-square) ![AppVersion: 2.54.0-dev](https://img.shields.io/badge/AppVersion-2.54.0--dev-informational?style=flat-square)
 
 A Helm chart for Kubernetes to install DefectDojo