From 4bdbccd72253d393741e2a2603289ac9a722f2d0 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Sun, 5 Mar 2023 13:48:20 +0100 Subject: [PATCH] fix c4k_mixin tests --- src/main/python/ddadevops/application.py | 3 +++ src/main/python/ddadevops/c4k_mixin.py | 8 ++++---- src/test/python/test_c4k_mixin.py | 3 +-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/python/ddadevops/application.py b/src/main/python/ddadevops/application.py index d39bdd8..83ea4ae 100644 --- a/src/main/python/ddadevops/application.py +++ b/src/main/python/ddadevops/application.py @@ -53,6 +53,9 @@ class DockerBuildService(): self.docker_api.test(build.name(), build.build_path()) class C4kBuildService(): + def __init__(self): + self.file_api = FileApi() + def write_c4k_config(self, c4k_build: C4kBuild): with open(c4k_build.build.build_path() + '/out_c4k_config.yaml', 'w', encoding="utf-8") as output_file: yaml.dump(c4k_build.c4k_mixin_config(), output_file) diff --git a/src/main/python/ddadevops/c4k_mixin.py b/src/main/python/ddadevops/c4k_mixin.py index c6e9471..93b0131 100644 --- a/src/main/python/ddadevops/c4k_mixin.py +++ b/src/main/python/ddadevops/c4k_mixin.py @@ -29,14 +29,14 @@ def add_c4k_mixin_config(config, class C4kMixin(DevopsBuild): def __init__(self, project, config): - self.build = C4kBuild(project, config)(project, config) + self.build = C4kBuild(project, config) self.c4k_build_service = C4kBuildService() def write_c4k_config(self): - self.build_service.write_c4k_config(self.build) + self.c4k_build_service.write_c4k_config(self.build) def write_c4k_auth(self): - self.build_service.write_c4k_auth(self.build) + self.c4k_build_service.write_c4k_auth(self.build) def c4k_apply(self, dry_run=False): - self.build_service.c4k_apply(self.build, dry_run) + self.c4k_build_service.c4k_apply(self.build, dry_run) diff --git a/src/test/python/test_c4k_mixin.py b/src/test/python/test_c4k_mixin.py index eb16d53..9442de3 100644 --- a/src/test/python/test_c4k_mixin.py +++ b/src/test/python/test_c4k_mixin.py @@ -24,10 +24,9 @@ def test_c4k_mixin(tmp_path): config = {'a': 1, 'b': 2} auth = {'c': 3, 'd': 4} - add_c4k_mixin_config(project_config, module_name, config, auth, grafana_cloud_user='user', grafana_cloud_password='password') + add_c4k_mixin_config(project_config, config, auth, grafana_cloud_user='user', grafana_cloud_password='password') assert project_config.get('C4kMixin') is not None - assert project_config.get('C4kMixin').get('Name') is module_name assert project_config.get('C4kMixin').get('Config') is config assert project_config.get('C4kMixin').get('Auth') is auth