Skip to content

Commit b6e729e

Browse files
Fix remaining dojo_dispatch_task call sites
- Avoid passing manager/task attributes via instance (use class task objects to ensure .si() is available) - Stop dispatching non-task jira_helper.push_to_jira through dojo_dispatch_task; call it directly and let it dispatch the underlying celery tasks
1 parent cf84c5b commit b6e729e

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

dojo/finding_group/views.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from dojo.authorization.authorization import user_has_permission_or_403
1717
from dojo.authorization.authorization_decorators import user_is_authorized
1818
from dojo.authorization.roles_permissions import Permissions
19-
from dojo.celery_dispatch import dojo_dispatch_task
2019
from dojo.filters import (
2120
FindingFilter,
2221
FindingFilterWithoutObjectLookups,
@@ -101,7 +100,7 @@ def view_finding_group(request, fgid):
101100
elif not finding_group.has_jira_issue:
102101
jira_helper.finding_group_link_jira(request, finding_group, jira_issue)
103102
elif push_to_jira:
104-
dojo_dispatch_task(jira_helper.push_to_jira, finding_group, sync=True)
103+
jira_helper.push_to_jira(finding_group, sync=True)
105104

106105
finding_group.save()
107106
return HttpResponseRedirect(reverse("view_test", args=(finding_group.test.id,)))
@@ -201,7 +200,7 @@ def push_to_jira(request, fgid):
201200

202201
# it may look like success here, but the push_to_jira are swallowing exceptions
203202
# but cant't change too much now without having a test suite, so leave as is for now with the addition warning message to check alerts for background errors.
204-
if dojo_dispatch_task(jira_helper.push_to_jira, group, sync=True):
203+
if jira_helper.push_to_jira(group, sync=True):
205204
messages.add_message(
206205
request,
207206
messages.SUCCESS,

dojo/importers/base_importer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ def mitigate_finding(
946946
if settings.V3_FEATURE_LOCATIONS:
947947
# Mitigate the location statuses
948948
dojo_dispatch_task(
949-
self.location_manager.mitigate_location_status,
949+
LocationManager.mitigate_location_status,
950950
finding.locations.all(),
951951
self.user,
952952
kwuser=self.user,
@@ -956,7 +956,7 @@ def mitigate_finding(
956956
# TODO: Delete this after the move to Locations
957957
# Mitigate the endpoint statuses
958958
dojo_dispatch_task(
959-
self.endpoint_manager.mitigate_endpoint_status,
959+
EndpointManager.mitigate_endpoint_status,
960960
finding.status_finding.all(),
961961
self.user,
962962
kwuser=self.user,

0 commit comments

Comments
 (0)