diff --git a/src/main/python/ddadevops/aws_mixin.py b/src/main/python/ddadevops/aws_mixin.py index 870267c..e9d7813 100644 --- a/src/main/python/ddadevops/aws_mixin.py +++ b/src/main/python/ddadevops/aws_mixin.py @@ -4,8 +4,9 @@ from .devops_terraform_build import DevopsTerraformBuild def add_aws_mixin_config(config, account_name): - return config.update({'AwsMixin': - {'account_name': account_name}}) + config.update({'AwsMixin': + {'account_name': account_name}}) + return config class AwsMixin(DevopsTerraformBuild): @@ -30,7 +31,7 @@ class AwsMixin(DevopsTerraformBuild): except: tf.workspace('new', self.stage) return tf - + def plan(self): tf = self.init_client() tf.plan(capture_output=False, var=self.project_vars, diff --git a/src/main/python/ddadevops/dda_pallet_mixin.py b/src/main/python/ddadevops/dda_pallet_mixin.py index b82105d..35c0b2c 100644 --- a/src/main/python/ddadevops/dda_pallet_mixin.py +++ b/src/main/python/ddadevops/dda_pallet_mixin.py @@ -4,18 +4,19 @@ from .devops_build import DevopsBuild def add_dda_pallet_mixin_config(config, tenant, application, domain_file_name): - return config.update({'DdaPalletMixin': - {'tenant': tenant, - 'application': application, - 'domain_file_name': domain_file_name, - 'target_edn_name': 'target.edn', - 'jar_file': 'target/meissa-tenant-server.jar', - 'target_template': - """ + config.update({'DdaPalletMixin': + {'tenant': tenant, + 'application': application, + 'domain_file_name': domain_file_name, + 'target_edn_name': 'target.edn', + 'jar_file': 'target/meissa-tenant-server.jar', + 'target_template': + """ {:existing [{:node-name "$node_name" :node-ip "$ipv4"}] :provisioning-user {:login "root"}} """, }}) + return config class DdaPalletMixin(DevopsBuild): diff --git a/src/main/python/ddadevops/devops_terraform_build.py b/src/main/python/ddadevops/devops_terraform_build.py index c9fe2ae..3e2167f 100644 --- a/src/main/python/ddadevops/devops_terraform_build.py +++ b/src/main/python/ddadevops/devops_terraform_build.py @@ -9,12 +9,13 @@ def create_devops_terraform_build_config(stage, project_root_path, build_commons account_name, additional_vars, tf_import_name, tf_import_resource): ret = create_devops_build_config( stage, project_root_path, build_commons_path, module) - return ret.update({'account_name': account_name, - 'additional_vars': additional_vars, - 'tf_import_name': tf_import_name, - 'tf_import_resource': tf_import_resource, - 'terraform_build_commons_dir_name': 'terraform', - 'output_json_name': 'output.json'}) + ret.update({'account_name': account_name, + 'additional_vars': additional_vars, + 'tf_import_name': tf_import_name, + 'tf_import_resource': tf_import_resource, + 'terraform_build_commons_dir_name': 'terraform', + 'output_json_name': 'output.json'}) + return ret class DevopsTerraformBuild(DevopsBuild): diff --git a/src/main/python/ddadevops/hetzner_mixin.py b/src/main/python/ddadevops/hetzner_mixin.py index 014d37b..c3a451e 100644 --- a/src/main/python/ddadevops/hetzner_mixin.py +++ b/src/main/python/ddadevops/hetzner_mixin.py @@ -3,8 +3,9 @@ from .devops_terraform_build import DevopsTerraformBuild def add_hetzner_mixin_config(config): - return config.update({'HetznerMixin': - {'HETZNER_API_KEY_PATH_ENVIRONMENT': 'HETZNER_API_KEY_PATH'}}) + config.update({'HetznerMixin': + {'HETZNER_API_KEY_PATH_ENVIRONMENT': 'HETZNER_API_KEY_PATH'}}) + return config class HetznerMixin(DevopsTerraformBuild):