inline a bunch of stuff

uktrade · Jan 9, 2025 · 05dbbd3 · 05dbbd3
1 parent 078b792
commit 05dbbd3
Showing 1 changed file with 31 additions and 33 deletions.
diff --git a/dbt_platform_helper/domain/terraform_environment.py b/dbt_platform_helper/domain/terraform_environment.py
@@ -8,51 +8,49 @@
 class TerraformEnvironment:
     def __init__(self, config_provider):
         self.config_provider = config_provider
-
-    def generate(self, environment_name, terraform_platform_modules_version_override=None):
-        config = self.config_provider.load_and_validate_platform_config()
-        enriched_config = self.config_provider.apply_environment_defaults(config)
-
-        env_config = enriched_config["environments"][environment_name]
-        contents = self._generate_terraform_environment_manifests(
-            config["application"],
-            environment_name,
-            env_config,
-            terraform_platform_modules_version_override,
+        self.template = setup_templates().get_template("environments/main.tf")
+        self.config = self.config_provider.apply_environment_defaults(
+            self.config_provider.load_and_validate_platform_config()
         )
-        click.echo(
-            FileProvider.mkfile(
-                ".", f"terraform/environments/{environment_name}/main.tf", contents, overwrite=True
-            )
-        )
-
-    def _generate_terraform_environment_manifests(
-        self, application, environment_name, env_config, cli_terraform_platform_modules_version
-    ):
-        env_template = setup_templates().get_template("environments/main.tf")
 
+    def generate(self, environment_name, terraform_platform_modules_version_override=None):
+        env_config = self.config["environments"][environment_name]
         terraform_platform_modules_version = self._determine_terraform_platform_modules_version(
-            env_config, cli_terraform_platform_modules_version
+            env_config, terraform_platform_modules_version_override
         )
 
-        return env_template.render(
+        contents = self.template.render(
             {
-                "application": application,
+                "application": self.config["application"],
                 "environment": environment_name,
                 "config": env_config,
                 "terraform_platform_modules_version": terraform_platform_modules_version,
             }
         )
 
+        click.echo(
+            FileProvider.mkfile(
+                ".", f"terraform/environments/{environment_name}/main.tf", contents, overwrite=True
+            )
+        )
+
     def _determine_terraform_platform_modules_version(
         self, env_conf, terraform_platform_modules_version_override
     ):
-        env_conf_terraform_platform_modules_version = env_conf.get("versions", {}).get(
-            "terraform-platform-modules"
-        )
-        version_preference_order = [
-            terraform_platform_modules_version_override,
-            env_conf_terraform_platform_modules_version,
-            DEFAULT_TERRAFORM_PLATFORM_MODULES_VERSION,
-        ]
-        return [version for version in version_preference_order if version][0]
+        """
+        Terraform platform modules version can be defined as an override, within
+        the config, or defaulted. An override is always prioritied, followed by
+        config version.
+
+        Returns:
+            string: version by priority
+        """
+        if terraform_platform_modules_version_override:
+            return terraform_platform_modules_version_override
+
+        config_version = env_conf.get("versions", {}).get("terraform-platform-modules")
+
+        if config_version:
+            return config_version
+
+        return DEFAULT_TERRAFORM_PLATFORM_MODULES_VERSION