From 1bcc8908e9b2b483525b8ca4a2675c4e6d3f416f Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Tue, 14 Mar 2023 15:07:47 +0100 Subject: [PATCH] refactoring: rename C4kBuild -> C4k --- doc/architecture/Build.md | 2 +- doc/architecture/Domain.md | 4 ++-- src/main/python/ddadevops/__init__.py | 2 +- src/main/python/ddadevops/application.py | 2 +- src/main/python/ddadevops/c4k_mixin.py | 16 ++++++++-------- src/main/python/ddadevops/domain.py | 2 +- src/main/python/ddadevops/infrastructure.py | 6 +++--- src/test/python/test_c4k_mixin.py | 2 +- src/test/python/test_domain.py | 8 ++++---- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/architecture/Build.md b/doc/architecture/Build.md index 622fd27..735136b 100644 --- a/doc/architecture/Build.md +++ b/doc/architecture/Build.md @@ -71,7 +71,7 @@ classDiagram } class C4kMixin { - // C4kMixin -> C4kBuild + // C4kMixin -> C4k def write_c4k_config() def write_c4k_auth() c4k_apply(dry_run=False) diff --git a/doc/architecture/Domain.md b/doc/architecture/Domain.md index 1c6147b..8179192 100644 --- a/doc/architecture/Domain.md +++ b/doc/architecture/Domain.md @@ -12,7 +12,7 @@ classDiagram class Docker - class C4kBuild { + class C4k { executabel_name c4k_mixin_config c4k_mixin_auth @@ -24,7 +24,7 @@ classDiagram ipv6 } - C4kBuild *-- DnsRecord + C4k *-- DnsRecord ``` diff --git a/src/main/python/ddadevops/__init__.py b/src/main/python/ddadevops/__init__.py index 5c06c33..c42e550 100644 --- a/src/main/python/ddadevops/__init__.py +++ b/src/main/python/ddadevops/__init__.py @@ -19,7 +19,7 @@ from .devops_terraform_build import DevopsTerraformBuild, create_devops_terrafor from .devops_build import DevopsBuild, create_devops_build_config, get_devops_build, get_tag_from_latest_commit from .credential import gopass_password_from_path, gopass_field_from_path -from .domain import Validateable, DnsRecord, Devops, Docker, C4kBuild +from .domain import Validateable, DnsRecord, Devops, Docker, C4k from .application import DockerBuildService from .infrastructure import ProjectRepository, ResourceApi, FileApi, DockerApi, ExecutionApi diff --git a/src/main/python/ddadevops/application.py b/src/main/python/ddadevops/application.py index e284e6e..e2058f6 100644 --- a/src/main/python/ddadevops/application.py +++ b/src/main/python/ddadevops/application.py @@ -1,4 +1,4 @@ -from .domain import Devops, Docker, C4kBuild +from .domain import Devops, Docker from .infrastructure import FileApi, ResourceApi, DockerApi, ExecutionApi diff --git a/src/main/python/ddadevops/c4k_mixin.py b/src/main/python/ddadevops/c4k_mixin.py index b5469dd..8999146 100644 --- a/src/main/python/ddadevops/c4k_mixin.py +++ b/src/main/python/ddadevops/c4k_mixin.py @@ -1,5 +1,5 @@ import deprecation -from .domain import C4kBuild, DnsRecord +from .domain import C4k, DnsRecord from .devops_build import DevopsBuild from .credential import gopass_field_from_path, gopass_password_from_path from .infrastructure import ProjectRepository, FileApi, ExecutionApi @@ -50,27 +50,27 @@ class C4kMixin(DevopsBuild): def __init__(self, project, config): super().__init__(project, config) self.execution_api = ExecutionApi() - c4k_build = C4kBuild(config) - self.repo.set_c4k_build(self.project, c4k_build) + c4k_build = C4k(config) + self.repo.set_c4k(self.project, c4k_build) def update_runtime_config(self, dns_record: DnsRecord): - c4k_build = self.repo.get_c4k_build(self.project) + c4k_build = self.repo.get_c4k(self.project) c4k_build.update_runtime_config(dns_record) - self.repo.set_c4k_build(self.project, c4k_build) + self.repo.set_c4k(self.project, c4k_build) def write_c4k_config(self): build = self.repo.get_devops(self.project) - c4k_build = self.repo.get_c4k_build(self.project) + c4k_build = self.repo.get_c4k(self.project) path = build.build_path() + "/out_c4k_config.yaml" self.file_api.write_yaml_to_file(path, c4k_build.config()) def write_c4k_auth(self): build = self.repo.get_devops(self.project) - c4k_build = self.repo.get_c4k_build(self.project) + c4k_build = self.repo.get_c4k(self.project) path = build.build_path() + "/out_c4k_auth.yaml" self.file_api.write_yaml_to_file(path, c4k_build.c4k_mixin_auth) def c4k_apply(self, dry_run=False): build = self.repo.get_devops(self.project) - c4k_build = self.repo.get_c4k_build(self.project) + c4k_build = self.repo.get_c4k(self.project) return self.execution_api.execute(c4k_build.command(build), dry_run) diff --git a/src/main/python/ddadevops/domain.py b/src/main/python/ddadevops/domain.py index b1dbcaf..8a06bea 100644 --- a/src/main/python/ddadevops/domain.py +++ b/src/main/python/ddadevops/domain.py @@ -78,7 +78,7 @@ class Docker(Validateable): return "/".join(filter_none(list)) + "/" -class C4kBuild(Validateable): +class C4k(Validateable): def __init__(self, config: map): tmp_executabel_name = config["C4kMixin"]["executabel_name"] if not tmp_executabel_name: diff --git a/src/main/python/ddadevops/infrastructure.py b/src/main/python/ddadevops/infrastructure.py index 0b0bb02..9056583 100644 --- a/src/main/python/ddadevops/infrastructure.py +++ b/src/main/python/ddadevops/infrastructure.py @@ -3,7 +3,7 @@ from sys import stdout from pkg_resources import resource_string from os import chmod import yaml -from .domain import Devops, Docker, C4kBuild +from .domain import Devops, Docker, C4k from .python_util import execute @@ -20,10 +20,10 @@ class ProjectRepository: def set_docker(self, project, build: Docker): project.set_property("docker_build", build) - def get_c4k_build(self, project) -> C4kBuild: + def get_c4k(self, project) -> C4k: return project.get_property("c4k_build") - def set_c4k_build(self, project, build: C4kBuild): + def set_c4k(self, project, build: C4k): project.set_property("c4k_build", build) diff --git a/src/test/python/test_c4k_mixin.py b/src/test/python/test_c4k_mixin.py index 00487af..2f5db38 100644 --- a/src/test/python/test_c4k_mixin.py +++ b/src/test/python/test_c4k_mixin.py @@ -34,7 +34,7 @@ def test_c4k_mixin(tmp_path): assert mixin.build_path() == f'{tmp_path_str}/{build_dir}/{project_name}/{module_name}' mixin.update_runtime_config(DnsRecord('test.de', ipv6="1::")) - sut = mixin.repo.get_c4k_build(mixin.project) + sut = mixin.repo.get_c4k(mixin.project) assert 'fqdn' in sut.config() assert 'mon-cfg' in sut.config() assert 'mon-auth' in sut.c4k_mixin_auth diff --git a/src/test/python/test_domain.py b/src/test/python/test_domain.py index 360ec7e..0f85e8f 100644 --- a/src/test/python/test_domain.py +++ b/src/test/python/test_domain.py @@ -1,5 +1,5 @@ from pybuilder.core import Project -from src.main.python.ddadevops.domain import Validateable, DnsRecord, C4kBuild, Devops +from src.main.python.ddadevops.domain import Validateable, DnsRecord, C4k, Devops from src.main.python.ddadevops.c4k_mixin import add_c4k_mixin_config @@ -78,7 +78,7 @@ def test_c4k_build_should_update_fqdn(tmp_path): grafana_cloud_password="password", ) build = Devops(project_config) - sut = C4kBuild(project_config) + sut = C4k(project_config) sut.update_runtime_config(DnsRecord("test.de", ipv6="1::")) assert { @@ -118,7 +118,7 @@ def test_c4k_build_should_calculate_command(tmp_path): grafana_cloud_password="password", ) build = Devops(project_config) - sut = C4kBuild(project_config) + sut = C4k(project_config) assert ( "c4k-module-standalone.jar " + "/target/name/module/out_c4k_config.yaml " @@ -143,7 +143,7 @@ def test_c4k_build_should_calculate_command(tmp_path): grafana_cloud_password="password", ) build = Devops(project_config) - sut = C4kBuild(project_config) + sut = C4k(project_config) assert ( "c4k-executabel_name-standalone.jar " + "/target/name/module/out_c4k_config.yaml "