refactor dojo async task base task #13986
Open
+773
−287
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
settings_changes
valentijnscholten
added
the
affects_pro
valentijnscholten
changed the title
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Co-authored-by: Cody Maffucci <46459665+Maffooch@users.noreply.github.com>
valentijnscholten
force-pushed
the
remove-dojo-async-task-base-task
branch
from
31a5314 to
917aa72
Compare
Resolved conflicts: - dojo/utils.py: Added grade_product function from upstream, kept removal of @dojo_async_task decorator - unittests/test_importers_performance.py: Updated expected query count to 319 (from upstream)
Contributor
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Member
Author
|
I have had to include the commits from #14090 in this PR to make sure the downstream Pro codebase still works. |
Member
Author
|
i've also had to include the commits from #14109 to make the downstream Pro codebase work. |
…atform, lifecycle, and origin
Member
Author
|
And then I had to include the commits from #14080 to fix other errors in Pro. |
… and maintainability
…al and key assets, and update OrganizationViewSet to use OrganizationFilterSet for filtering.
…cing coverage for asset-related functionalities.
…rmissions, enhancing clarity and maintainability.
…proved readability
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The custom decorators that we have on Celery tasks interfere with some (advanced) celery functionality like signatures. This PR refactors this to have a clean base task that passes on context, but does not interfere with celery mechanisms.
The logic to decide whether or not the task is to be called asyncrhonously is now in a dispatch method.
Pro needs similar changes via https://github.com/DefectDojo-Inc/dojo-pro/pull/973, these must be merged "at the same time".