Remove caches for the KATalogus in the scheduler #4108
+37
−389
Conversation
This file contains 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
Add filter parameter in the KATalogus Plugins API to allow filtering on what the plugin consumes and produces to support it
underdarknl
reviewed
Feb 19, 2025
| plugins = [plugin for plugin in plugins if filter_params.consumes.issubset(set(plugin.consumes))] | ||
|
|
||
| if filter_params.produces is not None: | ||
| plugins = [plugin for plugin in plugins if filter_params.produces.issubset(set(plugin.produces))] |
There was a problem hiding this comment.
Does this actually allow for plugins that only produce one of the filtered produce values?
Eg, I filter on produces, X or Y. this plugin produces Y and Z.
X and y is not a subset of Y and Z. It does produce an intersect result which Is probably what we are looking for as filters are usually OR, not AND?
There was a problem hiding this comment.
Suggested change
| plugins = [plugin for plugin in plugins if filter_params.produces.issubset(set(plugin.produces))] | |
| plugins = [plugin for plugin in plugins if filter_params.produces.intersection(set(plugin.produces))] |
There was a problem hiding this comment.
Perhaps not relevant to the discussion, but the scheduler will only request one type.
underdarknl
reviewed
Feb 19, 2025
| @@ -70,6 +70,12 @@ def list_plugins( | |||
| # filter plugins by scan level for boefje plugins | |||
| plugins = [plugin for plugin in plugins if plugin.type != "boefje" or plugin.scan_level >= filter_params.scan_level] | |||
|
|
|||
| if filter_params.consumes is not None: | |||
| plugins = [plugin for plugin in plugins if filter_params.consumes.issubset(set(plugin.consumes))] | |||
There was a problem hiding this comment.
Suggested change
| plugins = [plugin for plugin in plugins if filter_params.consumes.issubset(set(plugin.consumes))] | |
| plugins = [plugin for plugin in plugins if filter_params.consumes.intersection(set(plugin.consumes))] |
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes
Issue link
Reference #3357
QA notes
Interaction between the scheduler and katalogus has been optimized. Scanning of large volumes of items should function better, and without any issues monitored in either the katalogus or the scheduler.
Code Checklist
.envchanges files if required and changed the.env-distaccordingly.Checklist for code reviewers:
Copy-paste the checklist from the docs/source/templates folder into your comment.
Checklist for QA:
Copy-paste the checklist from the docs/source/templates folder into your comment.