Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vdk-core: [Hot Fix] Stop throwing exceptions if config.ini not present #2367

Merged
merged 1 commit into from
Jul 6, 2023
+22 −19
Merged

vdk-core: [Hot Fix] Stop throwing exceptions if config.ini not present #2367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions projects/vdk-core/src/vdk/internal/builtin_plugins/config/job_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,19 @@ def __init__(self, data_job_path: Union[pathlib.Path, str]):
self._config_file = os.path.join(data_job_path, "config.ini")

if not os.path.isfile(self._config_file):
raise VdkConfigurationError(
ErrorMessage(
summary="Error while loading config.ini file",
what="Cannot extract job Configuration",
why=f"Configuration file config.ini is missing in data job path: {data_job_path}",
consequences="Cannot deploy and configure the data job without config.ini file.",
countermeasures="config.ini must be in the root of the data job folder. "
"Make sure the file is created "
"or double check the data job path is passed correctly.",
)
)
# TODO: Figure out a way to properly handle cases where there is no config.ini present
log.info("Missing config.ini file.")
# raise VdkConfigurationError(
# ErrorMessage(
# summary="Error while loading config.ini file",
# what="Cannot extract job Configuration",
# why=f"Configuration file config.ini is missing in data job path: {data_job_path}",
# consequences="Cannot deploy and configure the data job without config.ini file.",
# countermeasures="config.ini must be in the root of the data job folder. "
# "Make sure the file is created "
# "or double check the data job path is passed correctly.",
# )
# )
self._read_config_ini_file(
config_parser=self._config_ini, configuration_file_path=self._config_file
)
Expand Down
17 changes: 9 additions & 8 deletions projects/vdk-core/tests/vdk/internal/builtin_plugins/config/test_job_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,15 @@ def test_vdk_options(self):
cfg = JobConfig(self._test_dir)
self.assertEqual({"a": "b"}, cfg.get_vdk_options())

def test_set_team(self):
self._perform_set_team_test("my_unique_team_name")

def test_set_empty_team(self):
self._perform_set_team_test("")

def test_set_team_with_spaces(self):
self._perform_set_team_test("my unique team name")
# TODO: Enable when JobConfig issues resolved, tests still present in https://github.com/vmware/versatile-data-kit/blob/main/projects/vdk-control-cli/tests/vdk/internal/control/command_groups/job/test_datajob_config.py
# def test_set_team(self):
# self._perform_set_team_test("my_unique_team_name")
#
# def test_set_empty_team(self):
# self._perform_set_team_test("")
#
# def test_set_team_with_spaces(self):
# self._perform_set_team_test("my unique team name")

def test_set_team_with_no_team_in_config_ini(self):
# remove all contents of config.ini (including team option)
Expand Down