From 3495f69a6bd20e9887426762a179c16dceb1b3b2 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Sat, 29 Apr 2023 14:57:15 +0200 Subject: [PATCH] adjust filename --- src/main/python/ddadevops/__init__.py | 2 +- .../python/ddadevops/{c4k_mixin.py => c4k_build.py} | 11 ++++++----- src/test/python/domain/test_domain.py | 2 +- .../python/{test_c4k_mixin.py => test_c4k_build.py} | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) rename src/main/python/ddadevops/{c4k_mixin.py => c4k_build.py} (88%) rename src/test/python/{test_c4k_mixin.py => test_c4k_build.py} (95%) diff --git a/src/main/python/ddadevops/__init__.py b/src/main/python/ddadevops/__init__.py index 3cd3560..30ae280 100644 --- a/src/main/python/ddadevops/__init__.py +++ b/src/main/python/ddadevops/__init__.py @@ -9,7 +9,7 @@ from .provs_k3s_mixin import ProvsK3sMixin, add_provs_k3s_mixin_config from .aws_rds_pg_mixin import AwsRdsPgMixin, add_aws_rds_pg_mixin_config from .aws_mfa_mixin import AwsMfaMixin, add_aws_mfa_mixin_config from .aws_backend_properties_mixin import AwsBackendPropertiesMixin, add_aws_backend_properties_mixin_config -from .c4k_mixin import C4kBuild, add_c4k_mixin_config +from .c4k_build import C4kBuild, add_c4k_mixin_config from .exoscale_mixin import ExoscaleMixin, add_exoscale_mixin_config from .digitalocean_backend_properties_mixin import DigitaloceanBackendPropertiesMixin, add_digitalocean_backend_properties_mixin_config from .digitalocean_terraform_build import DigitaloceanTerraformBuild, create_digitalocean_terraform_build_config diff --git a/src/main/python/ddadevops/c4k_mixin.py b/src/main/python/ddadevops/c4k_build.py similarity index 88% rename from src/main/python/ddadevops/c4k_mixin.py rename to src/main/python/ddadevops/c4k_build.py index 8a5f3f2..cbeb8bd 100644 --- a/src/main/python/ddadevops/c4k_mixin.py +++ b/src/main/python/ddadevops/c4k_build.py @@ -1,12 +1,11 @@ import deprecation -from .domain import C4k, DnsRecord +from .domain import BuildType, DnsRecord from .devops_build import DevopsBuild from .credential import gopass_field_from_path, gopass_password_from_path from .infrastructure import ExecutionApi -@deprecation.deprecated(deprecated_in="3.2") -# create objects direct instead +@deprecation.deprecated(deprecated_in="3.2", details="use direct dict instead") def add_c4k_mixin_config( config, c4k_config_dict, @@ -44,12 +43,14 @@ def add_c4k_mixin_config( ) return config + class C4kBuild(DevopsBuild): def __init__(self, project, config): super().__init__(project, config) self.execution_api = ExecutionApi() - c4k_build = C4k(config) - self.repo.set_c4k(self.project, c4k_build) + devops = self.repo.get_devops(self.project) + if BuildType.C4K not in devops.specialized_builds: + raise ValueError(f"C4kBuild requires BuildType.C4K") def update_runtime_config(self, dns_record: DnsRecord): c4k_build = self.repo.get_c4k(self.project) diff --git a/src/test/python/domain/test_domain.py b/src/test/python/domain/test_domain.py index 375e10d..00ed640 100644 --- a/src/test/python/domain/test_domain.py +++ b/src/test/python/domain/test_domain.py @@ -14,7 +14,7 @@ from src.main.python.ddadevops.domain import ( ) from src.main.python.ddadevops.domain.image import Image from src.main.python.ddadevops.domain.c4k import C4k -from src.main.python.ddadevops.c4k_mixin import add_c4k_mixin_config +from src.main.python.ddadevops.c4k_build import add_c4k_mixin_config from .test_helper import build_devops diff --git a/src/test/python/test_c4k_mixin.py b/src/test/python/test_c4k_build.py similarity index 95% rename from src/test/python/test_c4k_mixin.py rename to src/test/python/test_c4k_build.py index c4c2b17..b1e90a0 100644 --- a/src/test/python/test_c4k_mixin.py +++ b/src/test/python/test_c4k_build.py @@ -1,7 +1,7 @@ import os from pybuilder.core import Project from src.main.python.ddadevops.domain import DnsRecord -from src.main.python.ddadevops.c4k_mixin import C4kBuild, add_c4k_mixin_config +from src.main.python.ddadevops.c4k_build import C4kBuild, add_c4k_mixin_config class MyC4kBuild(C4kBuild): pass