Reorganise source files.

Author: tobyclemson

src/infrablocks/invoke_terraform/task_factory.py

@@ -16,9 +16,9 @@
     Environment,
     StreamNames,
     Terraform,
+    TerraformFactory,
     Variables,
 )
-from infrablocks.invoke_terraform.terraform_factory import TerraformFactory
 
 
 @dataclass

src/infrablocks/invoke_terraform/terraform/__init__.py

@@ -1,3 +1,5 @@
+from .factory import TerraformFactory
+from .invoke_executor import InvokeExecutor
 from .terraform import (
     BackendConfig,
     ConfigurationValue,
@@ -15,9 +17,11 @@
     "ConfigurationValue",
     "Environment",
     "Executor",
+    "InvokeExecutor",
     "Result",
     "StreamName",
     "StreamNames",
     "Terraform",
+    "TerraformFactory",
     "Variables",
 ]

src/infrablocks/invoke_terraform/terraform/factory.py

@@ -0,0 +1,9 @@
+from invoke.context import Context
+
+from .invoke_executor import InvokeExecutor
+from .terraform import Terraform
+
+
+class TerraformFactory:
+    def build(self, context: Context) -> Terraform:
+        return Terraform(InvokeExecutor(context))

src/infrablocks/invoke_terraform/invoke_executor.py renamed to src/infrablocks/invoke_terraform/terraform/invoke_executor.py

@@ -2,13 +2,10 @@
 
 from invoke.context import Context
 
-import infrablocks.invoke_terraform.terraform as tf
-from infrablocks.invoke_terraform.terraform.terraform import (
-    Environment,
-)
+from .terraform import Environment, Executor
 
 
-class InvokeExecutor(tf.Executor):
+class InvokeExecutor(Executor):
     def __init__(self, context: Context):
         self._context = context
 

src/infrablocks/invoke_terraform/terraform_factory.py

@@ -2,7 +2,7 @@
 
 from invoke.context import Context
 
-from infrablocks.invoke_terraform.invoke_executor import InvokeExecutor
+from infrablocks.invoke_terraform.terraform import InvokeExecutor
 
 
 class TestInvokeExecutor:

tests/unit/infrablocks/invoke_terraform/test_invoke_executor.py renamed to tests/unit/infrablocks/invoke_terraform/terraform/test_invoke_executor.py

@@ -1,3 +1,5 @@
-from .terraform_factory import (
-    TerraformFactory as TerraformFactory,
-)
+from .terraform_factory import MockTerraformFactory
+
+__all__ = [
+    "MockTerraformFactory",
+]

tests/unit/infrablocks/invoke_terraform/test_support/__init__.py

@@ -2,13 +2,12 @@
 
 from invoke.context import Context
 
-import infrablocks.invoke_terraform.task_factory as task_factory
-import infrablocks.invoke_terraform.terraform as tf
+from infrablocks.invoke_terraform.terraform import Terraform, TerraformFactory
 
 
-class TerraformFactory(task_factory.TerraformFactory):
+class MockTerraformFactory(TerraformFactory):
     def __init__(self, terraform: Mock):
         self._terraform = terraform
 
-    def build(self, context: Context) -> tf.Terraform:
+    def build(self, context: Context) -> Terraform:
         return self._terraform

tests/unit/infrablocks/invoke_terraform/test_support/terraform_factory.py

@@ -18,7 +18,7 @@
     Variables,
 )
 from tests.unit.infrablocks.invoke_terraform.test_support import (
-    TerraformFactory,
+    MockTerraformFactory,
 )
 
 
@@ -132,7 +132,7 @@ def test_adds_both_all_and_plan_parameters_to_plan_task(self):
     def test_plan_does_not_use_workspace_when_not_set(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
 
         def pre_task_function(_context, _, configuration: Configuration):
@@ -149,7 +149,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_plan_uses_workspace_when_set(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         workspace = "workspace"
         source_directory = "/some/path"
@@ -170,7 +170,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_plan_initialises_with_reconfigure(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         source_directory = "/some/path"
 
@@ -193,7 +193,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_plan_invokes_init_and_plan(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         source_directory = "/some/path"
         variables: Variables = {"foo": 1}
@@ -222,7 +222,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_plan_uses_environment_in_all_commands_when_set(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         source_directory = "/some/path"
         environment = {"ENV_VAR": "value"}
@@ -314,7 +314,7 @@ def test_adds_both_all_and_apply_parameters_to_apply_task(self):
     def test_apply_invokes_init_and_apply(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         source_directory = "/some/path"
         variables: Variables = {"foo": 1}
@@ -346,7 +346,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_apply_uses_workspace(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         workspace = "workspace"
         source_directory = "/some/path"
@@ -367,7 +367,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_apply_uses_environment_in_all_commands_when_set(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         source_directory = "/some/path"
         environment = {"ENV_VAR": "value"}
@@ -462,7 +462,7 @@ def test_adds_both_all_and_output_parameters_to_output_task(self):
     def test_output_invokes_init_and_output(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         source_directory = "/some/path"
         backend_config: BackendConfig = {"path": "state_file.tfstate"}
@@ -492,7 +492,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_output_uses_workspace(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         workspace = "workspace"
         source_directory = "/some/path"
@@ -513,7 +513,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_output_uses_json(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         workspace = "workspace"
         source_directory = "/some/path"
@@ -538,7 +538,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_output_uses_environment_in_all_commands_when_set(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         source_directory = "/some/path"
         environment = {"ENV_VAR": "value"}
@@ -578,7 +578,7 @@ def pre_task_function(_context, _, configuration: Configuration):
     def test_output_returns_standard_output_when_capture_stdout_true(self):
         terraform = Mock(spec=Terraform)
         task_factory = TaskFactory(
-            terraform_factory=TerraformFactory(terraform)
+            terraform_factory=MockTerraformFactory(terraform)
         )
         source_directory = "/some/path"