remove leftover signature methods

Author: valentijnscholten

dojo/finding/helper.py

@@ -454,14 +454,6 @@ def post_process_finding_save_internal(finding, dedupe_option=True, rules_option
             jira_helper.push_to_jira(finding.finding_group)
 
 
-@dojo_async_task(signature=True)
-@app.task
-def post_process_findings_batch_signature(finding_ids, *args, dedupe_option=True, rules_option=True, product_grading_option=True,
-             issue_updater_option=True, push_to_jira=False, user=None, **kwargs):
-    return post_process_findings_batch(finding_ids, *args, dedupe_option=dedupe_option, rules_option=rules_option, product_grading_option=product_grading_option, issue_updater_option=issue_updater_option, push_to_jira=push_to_jira, user=user, **kwargs)
-    # Pass arguments as keyword arguments to ensure Celery properly serializes them
-
-
 @dojo_async_task
 @app.task
 def post_process_findings_batch(finding_ids, *args, dedupe_option=True, rules_option=True, product_grading_option=True,

dojo/importers/base_importer.py

@@ -608,7 +608,7 @@ def maybe_launch_post_processing_chord(
             product = self.test.engagement.product
             system_settings = System_Settings.objects.get()
             if system_settings.enable_product_grade:
-                calculate_grade_signature = utils.calculate_grade_signature(product)
+                calculate_grade_signature = utils.calculate_grade.si(product.id)
                 chord(post_processing_task_signatures)(calculate_grade_signature)
             else:
                 group(post_processing_task_signatures).apply_async()

dojo/importers/default_importer.py

@@ -7,7 +7,6 @@
 from django.urls import reverse
 
 import dojo.jira_link.helper as jira_helper
-from dojo.decorators import we_want_async
 from dojo.finding import helper as finding_helper
 from dojo.importers.base_importer import BaseImporter, Parser
 from dojo.importers.options import ImporterOptions
@@ -250,27 +249,14 @@ def process_findings(
                 batch_finding_ids.clear()
                 logger.debug("process_findings: dispatching batch with push_to_jira=%s (batch_size=%d, is_final=%s)",
                              push_to_jira, len(finding_ids_batch), is_final_finding)
-                if we_want_async(async_user=self.user):
-                    signature = finding_helper.post_process_findings_batch_signature(
-                        finding_ids_batch,
-                        dedupe_option=True,
-                        rules_option=True,
-                        product_grading_option=True,
-                        issue_updater_option=True,
-                        push_to_jira=push_to_jira,
-                    )
-                    logger.debug("process_findings: signature created with push_to_jira=%s, signature.kwargs=%s",
-                                 push_to_jira, signature.kwargs)
-                    signature()
-                else:
-                    finding_helper.post_process_findings_batch(
-                        finding_ids_batch,
-                        dedupe_option=True,
-                        rules_option=True,
-                        product_grading_option=True,
-                        issue_updater_option=True,
-                        push_to_jira=push_to_jira,
-                    )
+                finding_helper.post_process_findings_batch(
+                    finding_ids_batch,
+                    dedupe_option=True,
+                    rules_option=True,
+                    product_grading_option=True,
+                    issue_updater_option=True,
+                    push_to_jira=push_to_jira,
+                )
 
             # No chord: tasks are dispatched immediately above per batch
 

dojo/importers/default_reimporter.py

@@ -7,7 +7,6 @@
 
 import dojo.finding.helper as finding_helper
 import dojo.jira_link.helper as jira_helper
-from dojo.decorators import we_want_async
 from dojo.finding.deduplication import (
     find_candidates_for_deduplication_hash,
     find_candidates_for_deduplication_uid_or_hash,
@@ -406,24 +405,14 @@ def process_findings(
                     if len(batch_finding_ids) >= dedupe_batch_max_size or is_final:
                         finding_ids_batch = list(batch_finding_ids)
                         batch_finding_ids.clear()
-                        if we_want_async(async_user=self.user):
-                            finding_helper.post_process_findings_batch_signature(
-                                finding_ids_batch,
-                                dedupe_option=True,
-                                rules_option=True,
-                                product_grading_option=True,
-                                issue_updater_option=True,
-                                push_to_jira=push_to_jira,
-                            )()
-                        else:
-                            finding_helper.post_process_findings_batch(
-                                finding_ids_batch,
-                                dedupe_option=True,
-                                rules_option=True,
-                                product_grading_option=True,
-                                issue_updater_option=True,
-                                push_to_jira=push_to_jira,
-                            )
+                        finding_helper.post_process_findings_batch(
+                            finding_ids_batch,
+                            dedupe_option=True,
+                            rules_option=True,
+                            product_grading_option=True,
+                            issue_updater_option=True,
+                            push_to_jira=push_to_jira,
+                        )
 
         # No chord: tasks are dispatched immediately above per batch
 

dojo/utils.py

@@ -1236,17 +1236,6 @@ def get_setting(setting):
     return getattr(settings, setting)
 
 
-@dojo_async_task(signature=True)
-@app.task
-def calculate_grade_signature(product_id, *args, **kwargs):
-    """Returns a signature for calculating product grade that can be used in chords or groups."""
-    product = get_object_or_none(Product, id=product_id)
-    if not product:
-        logger.warning("Product with id %s does not exist, skipping calculate_grade_signature", product_id)
-        return None
-    return calculate_grade_internal(product, *args, **kwargs)
-
-
 @dojo_async_task
 @app.task
 def calculate_grade(product_id, *args, **kwargs):