Island: Relocate aws_service from common to monkey_island

monkey/common/cmd/aws/aws_cmd_runner.py

@@ -1,10 +1,10 @@
 import logging
 import time
 
-from common.aws import aws_service
 from common.cmd.aws.aws_cmd_result import AwsCmdResult
 from common.cmd.cmd_runner import CmdRunner
 from common.cmd.cmd_status import CmdStatus
+from monkey_island.cc.services import aws_service
 
 logger = logging.getLogger(__name__)
 

monkey/monkey_island/cc/resources/remote_run.py

@@ -4,8 +4,8 @@ import flask_restful
 from botocore.exceptions import ClientError, NoCredentialsError
 from flask import jsonify, make_response, request
 
-from common.aws import aws_service
 from monkey_island.cc.resources.auth.auth import jwt_required
+from monkey_island.cc.services import aws_service
 from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService
 
 CLIENT_ERROR_FORMAT = (

monkey/monkey_island/cc/services/initialize.py

@@ -2,8 +2,7 @@ from pathlib import Path
 from threading import Thread
 
 from common import DIContainer
-from common.aws import aws_service
-from monkey_island.cc.services import DirectoryFileStorageService, IFileStorageService
+from monkey_island.cc.services import DirectoryFileStorageService, IFileStorageService, aws_service
 from monkey_island.cc.services.post_breach_files import PostBreachFilesService
 from monkey_island.cc.services.run_local_monkey import LocalMonkeyRunService
 

monkey/monkey_island/cc/services/reporting/aws_exporter.py

@@ -5,8 +5,8 @@ from datetime import datetime
 import boto3
 from botocore.exceptions import UnknownServiceError
 
-from common.aws import aws_service
 from common.aws.aws_instance import AwsInstance
+from monkey_island.cc.services import aws_service
 from monkey_island.cc.services.reporting.exporter import Exporter
 
 __authors__ = ["maor.rayzin", "shay.nehmad"]

monkey/monkey_island/cc/services/reporting/exporter_init.py

@@ -1,6 +1,6 @@
 import logging
 
-from common.aws import aws_service
+from monkey_island.cc.services import aws_service
 from monkey_island.cc.services.reporting.aws_exporter import AWSExporter
 from monkey_island.cc.services.reporting.report_exporter_manager import ReportExporterManager
 

monkey/tests/unit_tests/monkey_island/cc/services/test_aws_service.py

@@ -1,7 +1,7 @@
 import json
 from unittest import TestCase
 
-from common.aws.aws_service import filter_instance_data_from_aws_response
+from monkey_island.cc.services.aws_service import filter_instance_data_from_aws_response
 
 
 class TestAwsService(TestCase):