p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

island: Move setup/island_config_options.py -> cc/setup/

This commit is contained in:
Mike Salvatore 2021-06-03 11:16:02 -04:00
parent 623d551c6c
commit 03b543f7f6
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/monkey_island/cc/environment/server_config_handler.py
View File

@ -6,7 +6,7 @@ from monkey_island.cc.server_utils.consts import (
DEFAULT_DEVELOP_SERVER_CONFIG_PATH,
DEFAULT_SERVER_CONFIG_PATH,
)
from monkey_island.setup.island_config_options import IslandConfigOptions
from monkey_island.cc.setup.island_config_options import IslandConfigOptions
def create_default_server_config_file() -> None:

2
monkey/monkey_island/cc/server_setup.py
View File

@ -28,6 +28,7 @@ from monkey_island.cc.server_utils.island_logger import reset_logger, setup_logg
from monkey_island.cc.services.initialize import initialize_services # noqa: E402
from monkey_island.cc.services.reporting.exporter_init import populate_exporter_list # noqa: E402
from monkey_island.cc.services.utils.network_utils import local_ip_addresses # noqa: E402
from monkey_island.cc.setup.island_config_options import IslandConfigOptions # noqa: E402
from monkey_island.cc.setup.mongo.database_initializer import init_collections # noqa: E402
from monkey_island.cc.setup.mongo.mongo_setup import ( # noqa: E402
MONGO_URL,
@ -35,7 +36,6 @@ from monkey_island.cc.setup.mongo.mongo_setup import ( # noqa: E402
register_mongo_shutdown_callback,
start_mongodb,
)
from monkey_island.setup.island_config_options import IslandConfigOptions # noqa: E402
logger = logging.getLogger(__name__)

2
monkey/monkey_island/cc/setup/config_setup.py
View File

@ -5,7 +5,7 @@ from monkey_island.cc.arg_parser import IslandCmdArgs
from monkey_island.cc.environment import server_config_handler
from monkey_island.cc.environment.utils import create_secure_directory
from monkey_island.cc.server_utils.consts import DEFAULT_DATA_DIR, DEFAULT_SERVER_CONFIG_PATH
from monkey_island.setup.island_config_options import IslandConfigOptions
from monkey_island.cc.setup.island_config_options import IslandConfigOptions
def setup_data_dir(island_args: IslandCmdArgs) -> Tuple[IslandConfigOptions, str]:

0
monkey/monkey_island/setup/island_config_options.py → monkey/monkey_island/cc/setup/island_config_options.py
View File

2
monkey/tests/unit_tests/monkey_island/setup/test_island_config_options.py → monkey/tests/unit_tests/monkey_island/cc/setup/test_island_config_options.py
View File

@ -5,7 +5,7 @@ from monkey_island.cc.server_utils.consts import (
DEFAULT_LOG_LEVEL,
DEFAULT_START_MONGO_DB,
)
from monkey_island.setup.island_config_options import IslandConfigOptions
from monkey_island.cc.setup.island_config_options import IslandConfigOptions
TEST_CONFIG_FILE_CONTENTS_SPECIFIED = {
"data_dir": "/tmp",