Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

list_all_bots: use bot name as module #2564

Merged
merged 2 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- comment
SPDX-FileCopyrightText: 2015-2024 Sebastian Wagner
SPDX-FileCopyrightText: 2015-2025 Sebastian Wagner
SPDX-License-Identifier: AGPL-3.0-or-later
-->

Expand All @@ -13,6 +13,7 @@

### Core
- Python 3.8 or newer is required (PR#2541 by Sebastian Wagner).
- `intelmq.lib.utils.list_all_bots`/`intelmqctl check`: Fix check for bot executable in $PATH by using the bot name instead of the import path (fixes #2559, PR#2564 by Sebastian Wagner).

### Development

Expand Down Expand Up @@ -366,7 +367,7 @@ This is short list of the most important known issues. The full list can be retr
- Added an ExpertBot class - it should be used by all expert bots as a parent class
- Introduced a module for IntelMQ related datatypes `intelmq.lib.datatypes` which for now only contains an Enum listing the four bot types
- Added a `bottype` attribute to CollectorBot, ParserBot, ExpertBot, OutputBot
- Introduces a module for IntelMQ processmanagers. The processmanagers were up until now part of the intelmqct script.
- Introduces a module for IntelMQ processmanagers. The processmanagers were up until now part of the intelmqctl script.
They now reside in `intelmq.lib.processmanager` which also contains an interface definition the processmanager implementations must adhere to.
Both the processmanagers and the `intelmqctl` script were cleaned up a bit.
The `LogLevel` and `ReturnType` Enums were added to `intelmq.lib.datatypes`.
Expand Down
2 changes: 1 addition & 1 deletion intelmq/lib/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ def list_all_bots() -> dict:
name = name.replace(bot_type, '')

bots[module_name.split('.')[2].capitalize()[:-1]][name] = {
"module": mod.__name__,
"module": bot.name,
"description": "Missing description" if not getattr(mod.BOT, '__doc__', None) else textwrap.dedent(mod.BOT.__doc__).strip(),
"parameters": keys,
}
Expand Down
Loading