From 82d894f0c9ae9051facbe67786ce31054a61bb22 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Tue, 12 Jul 2022 09:01:18 -0400 Subject: [PATCH] Island: Remove unnecessary services.authentication subpackage --- monkey/monkey_island/cc/services/__init__.py | 2 +- monkey/monkey_island/cc/services/authentication/__init__.py | 0 .../cc/services/{authentication => }/authentication_service.py | 0 .../monkey_island/cc/services/test_authentication_service.py | 3 +-- 4 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 monkey/monkey_island/cc/services/authentication/__init__.py rename monkey/monkey_island/cc/services/{authentication => }/authentication_service.py (100%) diff --git a/monkey/monkey_island/cc/services/__init__.py b/monkey/monkey_island/cc/services/__init__.py index 91bea103c..14c5664e9 100644 --- a/monkey/monkey_island/cc/services/__init__.py +++ b/monkey/monkey_island/cc/services/__init__.py @@ -1,4 +1,4 @@ -from .authentication.authentication_service import AuthenticationService +from .authentication_service import AuthenticationService from .aws import AWSService from .island_mode_service import IslandModeService diff --git a/monkey/monkey_island/cc/services/authentication/__init__.py b/monkey/monkey_island/cc/services/authentication/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/monkey/monkey_island/cc/services/authentication/authentication_service.py b/monkey/monkey_island/cc/services/authentication_service.py similarity index 100% rename from monkey/monkey_island/cc/services/authentication/authentication_service.py rename to monkey/monkey_island/cc/services/authentication_service.py diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/test_authentication_service.py b/monkey/tests/unit_tests/monkey_island/cc/services/test_authentication_service.py index 071f11828..558d17a84 100644 --- a/monkey/tests/unit_tests/monkey_island/cc/services/test_authentication_service.py +++ b/monkey/tests/unit_tests/monkey_island/cc/services/test_authentication_service.py @@ -10,8 +10,7 @@ from common.utils.exceptions import ( ) from monkey_island.cc.models import UserCredentials from monkey_island.cc.repository import IUserRepository -from monkey_island.cc.services import AuthenticationService -from monkey_island.cc.services.authentication import authentication_service +from monkey_island.cc.services import AuthenticationService, authentication_service USERNAME = "user1" PASSWORD = "test"