From bec4d01063a4569e946587b95a89da094411feca Mon Sep 17 00:00:00 2001
From: jerger <michael.jerger@meissa-gmbh.de>
Date: Sat, 10 Dec 2022 15:29:08 +0100
Subject: [PATCH] rename do-mixin to do-build

---
 .../python/ddadevops/digitalocean_mixin.py    | 32 ----------
 .../ddadevops/digitalocean_terraform_build.py | 61 +++++++++++++++++++
 2 files changed, 61 insertions(+), 32 deletions(-)
 delete mode 100644 src/main/python/ddadevops/digitalocean_mixin.py
 create mode 100644 src/main/python/ddadevops/digitalocean_terraform_build.py

diff --git a/src/main/python/ddadevops/digitalocean_mixin.py b/src/main/python/ddadevops/digitalocean_mixin.py
deleted file mode 100644
index e0fa708..0000000
--- a/src/main/python/ddadevops/digitalocean_mixin.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from .devops_terraform_build import DevopsTerraformBuild
-
-
-def add_digitalocean_mixin_config(config, do_api_key, do_spaces_access_id, do_spaces_secret_key):
-    config.update({'DigitaloceanMixin':
-                   {'do_api_key': do_api_key,
-                    'do_spaces_access_id': do_spaces_access_id,
-                    'do_spaces_secret_key': do_spaces_secret_key}})
-    return config
-
-
-class DigitaloceanMixin(DevopsTerraformBuild):
-
-    def __init__(self, project, config):
-        super().__init__(project, config)
-        do_mixin_config = config['DigitaloceanMixin']
-        self.do_api_key = do_mixin_config['do_api_key']
-        self.do_spaces_access_id = do_mixin_config['do_spaces_access_id']
-        self.do_spaces_secret_key = do_mixin_config['do_spaces_secret_key']
-
-    def project_vars(self):
-        ret = super().project_vars()
-        ret['do_api_key'] = self.do_api_key
-        ret['do_spaces_access_id'] = self.do_spaces_access_id
-        ret['do_spaces_secret_key'] = self.do_spaces_secret_key
-        return ret
-
-    def copy_build_resources_from_package(self):
-        super().copy_build_resources_from_package()
-        self.copy_build_resource_file_from_package('provider_registry.tf')
-        self.copy_build_resource_file_from_package('do_provider.tf')
-        self.copy_build_resource_file_from_package('do_mixin_vars.tf')
diff --git a/src/main/python/ddadevops/digitalocean_terraform_build.py b/src/main/python/ddadevops/digitalocean_terraform_build.py
new file mode 100644
index 0000000..fe88b8c
--- /dev/null
+++ b/src/main/python/ddadevops/digitalocean_terraform_build.py
@@ -0,0 +1,61 @@
+from .devops_terraform_build import DevopsTerraformBuild
+
+
+def create_digitalocean_terraform_build_config(stage,
+                                               project_root_path,
+                                               module,
+                                               additional_vars,
+                                               do_api_key,
+                                               do_spaces_access_id,
+                                               do_spaces_secret_key,
+                                               build_dir_name='target',
+                                               output_json_name=None,
+                                               use_workspace=True,
+                                               use_package_common_files=True,
+                                               build_commons_path=None,
+                                               terraform_build_commons_dir_name='terraform',
+                                               debug_print_terraform_command=False,
+                                               additional_tfvar_files=[],
+                                               terraform_semantic_version="1.0.8",
+                                               ):
+    config = create_devops_terraform_build_config(stage,
+                                                  project_root_path,
+                                                  module,
+                                                  additional_vars,
+                                                  build_dir_name,
+                                                  output_json_name,
+                                                  use_workspace,
+                                                  use_package_common_files,
+                                                  build_commons_path,
+                                                  terraform_build_commons_dir_name,
+                                                  debug_print_terraform_command,
+                                                  additional_tfvar_files,
+                                                  terraform_semantic_version)
+    config.update({'DigitaloceanTerraformBuild':
+                   {'do_api_key': do_api_key,
+                    'do_spaces_access_id': do_spaces_access_id,
+                    'do_spaces_secret_key': do_spaces_secret_key}})
+    return config
+
+
+class DigitaloceanTerraformBuild(DevopsTerraformBuild):
+
+    def __init__(self, project, config):
+        super().__init__(project, config)
+        do_mixin_config = config['DigitaloceanTerraformBuild']
+        self.do_api_key = do_mixin_config['do_api_key']
+        self.do_spaces_access_id = do_mixin_config['do_spaces_access_id']
+        self.do_spaces_secret_key = do_mixin_config['do_spaces_secret_key']
+
+    def project_vars(self):
+        ret = super().project_vars()
+        ret['do_api_key'] = self.do_api_key
+        ret['do_spaces_access_id'] = self.do_spaces_access_id
+        ret['do_spaces_secret_key'] = self.do_spaces_secret_key
+        return ret
+
+    def copy_build_resources_from_package(self):
+        super().copy_build_resources_from_package()
+        self.copy_build_resource_file_from_package('provider_registry.tf')
+        self.copy_build_resource_file_from_package('do_provider.tf')
+        self.copy_build_resource_file_from_package('do_mixin_vars.tf')