From 8b348771e054e613c1e5cb347315c095d66ef85f Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Mon, 22 May 2023 09:51:29 +0200 Subject: [PATCH] fix terraform-build --- build.py | 2 +- .../python/ddadevops/devops_terraform_build.py | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build.py b/build.py index 38c97cf..0c579c0 100644 --- a/build.py +++ b/build.py @@ -28,7 +28,7 @@ use_plugin("python.distutils") default_task = "publish" name = "ddadevops" -version = "4.0.0-dev41" +version = "4.0.0-dev44" summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud" description = __doc__ authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")] diff --git a/src/main/python/ddadevops/devops_terraform_build.py b/src/main/python/ddadevops/devops_terraform_build.py index f2019fb..a039d51 100644 --- a/src/main/python/ddadevops/devops_terraform_build.py +++ b/src/main/python/ddadevops/devops_terraform_build.py @@ -44,7 +44,14 @@ def create_devops_terraform_build_config(stage, class DevopsTerraformBuild(DevopsBuild): def __init__(self, project, config): - super().__init__(project, config) + inp = {} + inp["name"]=project.name + inp["module"]=config.get("module") + inp["stage"]=config.get("stage") + inp["project_root_path"]=config.get("project_root_path") + inp["build_types"]=[] + inp["mixin_types"]=[] + super().__init__(project, inp) project.build_depends_on('dda-python-terraform') self.additional_vars = config['additional_vars'] self.output_json_name = config['output_json_name'] @@ -83,13 +90,13 @@ class DevopsTerraformBuild(DevopsBuild): def copy_build_resources_from_dir(self): run('cp -f ' + self.terraform_build_commons_path() + - '* ' + self.build_path(), shell=False, check=False) + '* ' + self.build_path(), shell=True, check=False) def copy_local_state(self): - run('cp terraform.tfstate ' + self.build_path(), shell=False, check=False) + run('cp terraform.tfstate ' + self.build_path(), shell=True, check=False) def rescue_local_state(self): - run('cp ' + self.build_path() + '/terraform.tfstate .', shell=False, check=False) + run('cp ' + self.build_path() + '/terraform.tfstate .', shell=True, check=False) def initialize_build_dir(self): super().initialize_build_dir()