p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Island: Relocate aws_service from common to monkey_island

This commit is contained in:
Mike Salvatore 2022-05-02 09:16:59 -04:00
parent 2714617797
commit ae83c2e3e0
7 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/common/cmd/aws/aws_cmd_runner.py
View File

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

2
monkey/monkey_island/cc/resources/remote_run.py
View File

@ -4,8 +4,8 @@ import flask_restful
from botocore.exceptions import ClientError, NoCredentialsError from botocore.exceptions import ClientError, NoCredentialsError
from flask import jsonify, make_response, request 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.resources.auth.auth import jwt_required
from monkey_island.cc.services import aws_service
from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService
CLIENT_ERROR_FORMAT = ( CLIENT_ERROR_FORMAT = (

0
monkey/common/aws/aws_service.py → monkey/monkey_island/cc/services/aws_service.py
View File

3
monkey/monkey_island/cc/services/initialize.py
View File

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

2
monkey/monkey_island/cc/services/reporting/aws_exporter.py
View File

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

2
monkey/monkey_island/cc/services/reporting/exporter_init.py
View File

@ -1,6 +1,6 @@
import logging 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.aws_exporter import AWSExporter
from monkey_island.cc.services.reporting.report_exporter_manager import ReportExporterManager from monkey_island.cc.services.reporting.report_exporter_manager import ReportExporterManager

2
monkey/tests/unit_tests/common/cloud/aws/test_aws_service.py → monkey/tests/unit_tests/monkey_island/cc/services/test_aws_service.py
View File

@ -1,7 +1,7 @@
import json import json
from unittest import TestCase 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): class TestAwsService(TestCase):