Skip to content

Commit

Permalink
cc: deploy "develop" environment by default
Browse files Browse the repository at this point in the history
  • Loading branch information
mssalvatore committed Feb 17, 2021
1 parent 52f80e8 commit 737d1bb
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ os: linux

before_install:
# Init server_config.json to default
- cp monkey/monkey_island/cc/server_config.json.default monkey/monkey_island/cc/server_config.json
- cp monkey/monkey_island/cc/server_config.json.develop monkey/monkey_island/cc/server_config.json

install:
# Python
Expand Down
4 changes: 2 additions & 2 deletions monkey/monkey_island/cc/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
MONKEY_ISLAND_ABS_PATH, "cc", "server_config.json"
)

DEFAULT_STANDARD_SERVER_CONFIG_PATH = os.path.join(
MONKEY_ISLAND_ABS_PATH, "cc", "server_config.json.standard"
DEFAULT_DEVELOP_SERVER_CONFIG_PATH = os.path.join(
MONKEY_ISLAND_ABS_PATH, "cc", "server_config.json.develop"
)
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from pathlib import Path

from monkey_island.cc.consts import DEFAULT_STANDARD_SERVER_CONFIG_PATH
from monkey_island.cc.consts import DEFAULT_DEVELOP_SERVER_CONFIG_PATH


def create_default_config_file(path):
default_config = Path(DEFAULT_STANDARD_SERVER_CONFIG_PATH).read_text()
default_config = Path(DEFAULT_DEVELOP_SERVER_CONFIG_PATH).read_text()
Path(path).write_text(default_config)
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def test_generate_default_file(config_file):
assert os.path.isfile(config_file)

assert environment_config.server_config == "password"
assert environment_config.deployment == "standard"
assert environment_config.deployment == "develop"
assert environment_config.user_creds.username == ""
assert environment_config.user_creds.password_hash == ""
assert environment_config.aws is None
4 changes: 0 additions & 4 deletions monkey/monkey_island/cc/server_config.json.standard

This file was deleted.

0 comments on commit 737d1bb

Please sign in to comment.