From a466e97cb0e9cee8837dd4339b0dc518f46a8125 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Mon, 2 May 2022 09:28:41 -0400 Subject: [PATCH] Island: Move AwsCmdRunner to monkey_island/cc/server_utils/ --- .../cmd/aws => monkey_island/cc/server_utils}/aws_cmd_result.py | 0 .../cmd/aws => monkey_island/cc/server_utils}/aws_cmd_runner.py | 2 +- monkey/monkey_island/cc/services/remote_run_aws.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename monkey/{common/cmd/aws => monkey_island/cc/server_utils}/aws_cmd_result.py (100%) rename monkey/{common/cmd/aws => monkey_island/cc/server_utils}/aws_cmd_runner.py (95%) diff --git a/monkey/common/cmd/aws/aws_cmd_result.py b/monkey/monkey_island/cc/server_utils/aws_cmd_result.py similarity index 100% rename from monkey/common/cmd/aws/aws_cmd_result.py rename to monkey/monkey_island/cc/server_utils/aws_cmd_result.py diff --git a/monkey/common/cmd/aws/aws_cmd_runner.py b/monkey/monkey_island/cc/server_utils/aws_cmd_runner.py similarity index 95% rename from monkey/common/cmd/aws/aws_cmd_runner.py rename to monkey/monkey_island/cc/server_utils/aws_cmd_runner.py index bc50c03a8..16c959197 100644 --- a/monkey/common/cmd/aws/aws_cmd_runner.py +++ b/monkey/monkey_island/cc/server_utils/aws_cmd_runner.py @@ -1,9 +1,9 @@ import logging import time -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.server_utils.aws_cmd_result import AwsCmdResult from monkey_island.cc.services import aws_service logger = logging.getLogger(__name__) diff --git a/monkey/monkey_island/cc/services/remote_run_aws.py b/monkey/monkey_island/cc/services/remote_run_aws.py index 3dbb15477..c3219171c 100644 --- a/monkey/monkey_island/cc/services/remote_run_aws.py +++ b/monkey/monkey_island/cc/services/remote_run_aws.py @@ -1,8 +1,8 @@ import logging -from common.cmd.aws.aws_cmd_runner import AwsCmdRunner from common.cmd.cmd import Cmd from common.cmd.cmd_runner import CmdRunner +from monkey_island.cc.server_utils.aws_cmd_runner import AwsCmdRunner logger = logging.getLogger(__name__)