diff --git a/monkey/monkey_island/cc/setup/island_config_options.py b/monkey/monkey_island/cc/setup/island_config_options.py index fb94e6396..c497af529 100644 --- a/monkey/monkey_island/cc/setup/island_config_options.py +++ b/monkey/monkey_island/cc/setup/island_config_options.py @@ -14,9 +14,7 @@ from monkey_island.cc.server_utils.consts import ( class IslandConfigOptions: def __init__(self, config_contents: dict): - self.data_dir = IslandConfigOptions._expand_path( - config_contents.get("data_dir", DEFAULT_DATA_DIR) - ) + self.data_dir = _expand_path(config_contents.get("data_dir", DEFAULT_DATA_DIR)) self.log_level = config_contents.get("log_level", DEFAULT_LOG_LEVEL) @@ -24,17 +22,17 @@ class IslandConfigOptions: "mongodb", {"start_mongodb": DEFAULT_START_MONGO_DB} ).get("start_mongodb", DEFAULT_START_MONGO_DB) - self.crt_path = IslandConfigOptions._expand_path( + self.crt_path = _expand_path( config_contents.get("ssl_certificate", DEFAULT_CERTIFICATE_PATHS).get( "ssl_certificate_file", DEFAULT_CRT_PATH ) ) - self.key_path = IslandConfigOptions._expand_path( + self.key_path = _expand_path( config_contents.get("ssl_certificate", DEFAULT_CERTIFICATE_PATHS).get( "ssl_certificate_key_file", DEFAULT_KEY_PATH ) ) - @staticmethod - def _expand_path(path: str) -> str: - return os.path.expandvars(os.path.expanduser(path)) + +def _expand_path(path: str) -> str: + return os.path.expandvars(os.path.expanduser(path))