From 4243f9f3ea5ddcccae43cb583cd6c9d786a15ed9 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Wed, 10 Aug 2022 12:45:37 -0400 Subject: [PATCH] Common: Export IEventQueue from common.event_queue --- monkey/common/event_queue/__init__.py | 1 + monkey/common/event_queue/pypubsub_event_queue.py | 3 +-- monkey/monkey_island/cc/services/initialize.py | 2 +- .../unit_tests/common/event_queue/test_pypubsub_event_queue.py | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/monkey/common/event_queue/__init__.py b/monkey/common/event_queue/__init__.py index de8c0494b..5d04040e2 100644 --- a/monkey/common/event_queue/__init__.py +++ b/monkey/common/event_queue/__init__.py @@ -1 +1,2 @@ from .types import EventSubscriber +from .i_event_queue import IEventQueue diff --git a/monkey/common/event_queue/pypubsub_event_queue.py b/monkey/common/event_queue/pypubsub_event_queue.py index 6398db4ff..bf4b789d4 100644 --- a/monkey/common/event_queue/pypubsub_event_queue.py +++ b/monkey/common/event_queue/pypubsub_event_queue.py @@ -4,8 +4,7 @@ from pubsub.core import Publisher from common.events import AbstractEvent -from . import EventSubscriber -from .i_event_queue import IEventQueue +from . import EventSubscriber, IEventQueue _ALL_EVENTS_TOPIC = "all_events_topic" diff --git a/monkey/monkey_island/cc/services/initialize.py b/monkey/monkey_island/cc/services/initialize.py index 3b55a7cb9..6247ea64d 100644 --- a/monkey/monkey_island/cc/services/initialize.py +++ b/monkey/monkey_island/cc/services/initialize.py @@ -14,7 +14,7 @@ from common.agent_configuration import ( ) from common.aws import AWSInstance from common.common_consts.telem_categories import TelemCategoryEnum -from common.event_queue.i_event_queue import IEventQueue +from common.event_queue import IEventQueue from common.event_queue.pypubsub_event_queue import PyPubSubEventQueue from common.utils.file_utils import get_binary_io_sha256_hash from common.version import get_version diff --git a/monkey/tests/unit_tests/common/event_queue/test_pypubsub_event_queue.py b/monkey/tests/unit_tests/common/event_queue/test_pypubsub_event_queue.py index f641b36e5..b6edc4e46 100644 --- a/monkey/tests/unit_tests/common/event_queue/test_pypubsub_event_queue.py +++ b/monkey/tests/unit_tests/common/event_queue/test_pypubsub_event_queue.py @@ -6,8 +6,7 @@ from uuid import UUID import pytest from pubsub.core import Publisher -from common.event_queue import EventSubscriber -from common.event_queue.i_event_queue import IEventQueue +from common.event_queue import EventSubscriber, IEventQueue from common.event_queue.pypubsub_event_queue import PyPubSubEventQueue from common.events import AbstractEvent