diff --git a/src/main/python/ddadevops/c4k_build.py b/src/main/python/ddadevops/c4k_build.py index 9cd0f99..2cb7b15 100644 --- a/src/main/python/ddadevops/c4k_build.py +++ b/src/main/python/ddadevops/c4k_build.py @@ -10,7 +10,7 @@ def add_c4k_mixin_config( config, c4k_config_dict, c4k_auth_dict, - executabel_name=None, + executable_name=None, grafana_cloud_user=None, grafana_cloud_password=None, grafana_cloud_url="https://prometheus-prod-01-eu-west-0.grafana.net/api/prom/push", @@ -35,7 +35,7 @@ def add_c4k_mixin_config( config.update( { "C4kMixin": { - "executabel_name": executabel_name, + "executable_name": executable_name, "config": c4k_config_dict, "auth": c4k_auth_dict, } diff --git a/src/main/python/ddadevops/domain/c4k.py b/src/main/python/ddadevops/domain/c4k.py index bb26686..ca086a6 100644 --- a/src/main/python/ddadevops/domain/c4k.py +++ b/src/main/python/ddadevops/domain/c4k.py @@ -10,7 +10,7 @@ class C4k(Validateable): def __init__(self, input: dict): self.module = input.get("module") self.stage = input.get("stage") - self.c4k_executabel_name = input.get("c4k_executabel_name", input.get("module")) + self.c4k_executable_name = input.get("c4k_executable_name", input.get("module")) self.c4k_config = input.get("c4k_config", {}) self.c4k_grafana_cloud_url = input.get( "c4k_grafana_cloud_url", @@ -29,7 +29,7 @@ class C4k(Validateable): result = [] result += self.__validate_is_not_empty__("module") result += self.__validate_is_not_empty__("stage") - result += self.__validate_is_not_empty__("c4k_executabel_name") + result += self.__validate_is_not_empty__("c4k_executable_name") result += self.__validate_is_not_empty__("c4k_grafana_cloud_user") result += self.__validate_is_not_empty__("c4k_grafana_cloud_password") if self.dns_record: @@ -62,4 +62,4 @@ class C4k(Validateable): config_path = f"{build_path}/out_c4k_config.yaml" auth_path = f"{build_path}/out_c4k_auth.yaml" output_path = f"{build_path}/out_{module}.yaml" - return f"c4k-{self.c4k_executabel_name}-standalone.jar {config_path} {auth_path} > {output_path}" + return f"c4k-{self.c4k_executable_name}-standalone.jar {config_path} {auth_path} > {output_path}" diff --git a/src/test/python/domain/test_c4k.py b/src/test/python/domain/test_c4k.py index 175980e..e9d14d9 100644 --- a/src/test/python/domain/test_c4k.py +++ b/src/test/python/domain/test_c4k.py @@ -87,11 +87,11 @@ def test_c4k_build_should_calculate_command(): sut = build_devops( { "project_root_path": ".", - "c4k_executabel_name": "executabel_name", + "c4k_executable_name": "executable_name", } ) assert ( - "c4k-executabel_name-standalone.jar " + "c4k-executable_name-standalone.jar " + "./target/name/module/out_c4k_config.yaml " + "./target/name/module/out_c4k_auth.yaml > " + "./target/name/module/out_module.yaml"