From c77c4347949988542052b40d8bf27c7f40a0de11 Mon Sep 17 00:00:00 2001 From: jem Date: Tue, 3 Mar 2020 10:20:54 +0100 Subject: [PATCH] try mixin --- src/main/python/ddadevops/hetzner_mixin.py | 13 ++++++ src/main/python/ddadevops/meissa_build.py | 49 ---------------------- 2 files changed, 13 insertions(+), 49 deletions(-) create mode 100644 src/main/python/ddadevops/hetzner_mixin.py delete mode 100644 src/main/python/ddadevops/meissa_build.py diff --git a/src/main/python/ddadevops/hetzner_mixin.py b/src/main/python/ddadevops/hetzner_mixin.py new file mode 100644 index 0000000..8993820 --- /dev/null +++ b/src/main/python/ddadevops/hetzner_mixin.py @@ -0,0 +1,13 @@ +from .credential import gopass_credential_from_env_path + +class HetznerMixin: + + def __init__(self, project, project_root_path, build_commons_path, module, stage): + super().__init__(self, project, project_root_path, build_commons_path, module, stage) + self.hetzner_api_key = gopass_credential_from_env_path('HETZNER_API_KEY_PATH') + + def project_vars(self): + ret = super().project_vars + if self.hetzner_api_key: + ret['hetzner_api_key'] = self.hetzner_api_key + return ret \ No newline at end of file diff --git a/src/main/python/ddadevops/meissa_build.py b/src/main/python/ddadevops/meissa_build.py deleted file mode 100644 index ed36745..0000000 --- a/src/main/python/ddadevops/meissa_build.py +++ /dev/null @@ -1,49 +0,0 @@ -import os -from .credential import gopass_credential_from_env_path -from .build import init_project -from subprocess import run - -STAGE = 'stage' -HTTP_NET_API_KEY = 'http_net_api_key' -HETZNER_API_KEY = 'hetzner_api_key' -PROJECT_ROOT_PATH = 'project_root_path' -BUILD_COMMONS_PATH = 'build_commons_path' - -def meissa_init_project(project, project_root_path, build_commons_path, module): - project = init_project(project, project_root_path, build_commons_path, module) - project.set_property(HTTP_NET_API_KEY, \ - gopass_credential_from_env_path('HTTP_NET_API_KEY_PATH')) - project.set_property(HETZNER_API_KEY, \ - gopass_credential_from_env_path('HETZNER_API_KEY_PATH')) - return project - -def hetzner_api_key(project): - return project.get_property(HETZNER_API_KEY) - -def stage(project): - return project.get_property(STAGE) - -def module(project): - return project.get_property('name') - -def project_root_path(project): - return project.get_property(PROJECT_ROOT_PATH) - -def build_commons_path(project): - return project.get_property(BUILD_COMMONS_PATH) - -def build_target_path(project): - return project_root_path(project) + 'target/' + project.name + '/' - -def tf_import_name(project): - return project.get_property('tf_import_name') - -def tf_import_resource(project): - return project.get_property('tf_import_resource') - -def initialize_target(project): - run('rm -rf ' + build_target_path(project), shell=True) - run('mkdir -p ' + build_target_path(project), shell=True) - run('cp *.tf ' + build_target_path(project), shell=True) - run('cp *.tfars ' + build_target_path(project), shell=True) - run('cp *.edn ' + build_target_path(project), shell=True)