Skip to content

Commit f61f772

Browse files
tobyclemsontobyclemson
committed
Reorganise source files.
1 parent 905585d commit f61f772

9 files changed

Lines changed: 39 additions & 37 deletions

File tree

‎src/infrablocks/invoke_terraform/task_factory.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
Environment,
1717
StreamNames,
1818
Terraform,
19+
TerraformFactory,
1920
Variables,
2021
)
21-
from infrablocks.invoke_terraform.terraform_factory import TerraformFactory
2222

2323

2424
@dataclass

‎src/infrablocks/invoke_terraform/terraform/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from .factory import TerraformFactory
2+
from .invoke_executor import InvokeExecutor
13
from .terraform import (
24
BackendConfig,
35
ConfigurationValue,
@@ -15,9 +17,11 @@
1517
"ConfigurationValue",
1618
"Environment",
1719
"Executor",
20+
"InvokeExecutor",
1821
"Result",
1922
"StreamName",
2023
"StreamNames",
2124
"Terraform",
25+
"TerraformFactory",
2226
"Variables",
2327
]

‎src/infrablocks/invoke_terraform/terraform/factory.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
from invoke.context import Context
2+
3+
from .invoke_executor import InvokeExecutor
4+
from .terraform import Terraform
5+
6+
7+
class TerraformFactory:
8+
def build(self, context: Context) -> Terraform:
9+
return Terraform(InvokeExecutor(context))

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22

33
from invoke.context import Context
44

5-
import infrablocks.invoke_terraform.terraform as tf
6-
from infrablocks.invoke_terraform.terraform.terraform import (
7-
Environment,
8-
)
5+
from .terraform import Environment, Executor
96

107

11-
class InvokeExecutor(tf.Executor):
8+
class InvokeExecutor(Executor):
129
def __init__(self, context: Context):
1310
self._context = context
1411

‎src/infrablocks/invoke_terraform/terraform_factory.py‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from invoke.context import Context
44

5-
from infrablocks.invoke_terraform.invoke_executor import InvokeExecutor
5+
from infrablocks.invoke_terraform.terraform import InvokeExecutor
66

77

88
class TestInvokeExecutor:

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
from .terraform_factory import (
2-
TerraformFactory as TerraformFactory,
3-
)
1+
from .terraform_factory import MockTerraformFactory
2+
3+
__all__ = [
4+
"MockTerraformFactory",
5+
]

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
from invoke.context import Context
44

5-
import infrablocks.invoke_terraform.task_factory as task_factory
6-
import infrablocks.invoke_terraform.terraform as tf
5+
from infrablocks.invoke_terraform.terraform import Terraform, TerraformFactory
76

87

9-
class TerraformFactory(task_factory.TerraformFactory):
8+
class MockTerraformFactory(TerraformFactory):
109
def __init__(self, terraform: Mock):
1110
self._terraform = terraform
1211

13-
def build(self, context: Context) -> tf.Terraform:
12+
def build(self, context: Context) -> Terraform:
1413
return self._terraform

‎tests/unit/infrablocks/invoke_terraform/test_task_factory.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Variables,
1919
)
2020
from tests.unit.infrablocks.invoke_terraform.test_support import (
21-
TerraformFactory,
21+
MockTerraformFactory,
2222
)
2323

2424

@@ -132,7 +132,7 @@ def test_adds_both_all_and_plan_parameters_to_plan_task(self):
132132
def test_plan_does_not_use_workspace_when_not_set(self):
133133
terraform = Mock(spec=Terraform)
134134
task_factory = TaskFactory(
135-
terraform_factory=TerraformFactory(terraform)
135+
terraform_factory=MockTerraformFactory(terraform)
136136
)
137137

138138
def pre_task_function(_context, _, configuration: Configuration):
@@ -149,7 +149,7 @@ def pre_task_function(_context, _, configuration: Configuration):
149149
def test_plan_uses_workspace_when_set(self):
150150
terraform = Mock(spec=Terraform)
151151
task_factory = TaskFactory(
152-
terraform_factory=TerraformFactory(terraform)
152+
terraform_factory=MockTerraformFactory(terraform)
153153
)
154154
workspace = "workspace"
155155
source_directory = "/some/path"
@@ -170,7 +170,7 @@ def pre_task_function(_context, _, configuration: Configuration):
170170
def test_plan_initialises_with_reconfigure(self):
171171
terraform = Mock(spec=Terraform)
172172
task_factory = TaskFactory(
173-
terraform_factory=TerraformFactory(terraform)
173+
terraform_factory=MockTerraformFactory(terraform)
174174
)
175175
source_directory = "/some/path"
176176

@@ -193,7 +193,7 @@ def pre_task_function(_context, _, configuration: Configuration):
193193
def test_plan_invokes_init_and_plan(self):
194194
terraform = Mock(spec=Terraform)
195195
task_factory = TaskFactory(
196-
terraform_factory=TerraformFactory(terraform)
196+
terraform_factory=MockTerraformFactory(terraform)
197197
)
198198
source_directory = "/some/path"
199199
variables: Variables = {"foo": 1}
@@ -222,7 +222,7 @@ def pre_task_function(_context, _, configuration: Configuration):
222222
def test_plan_uses_environment_in_all_commands_when_set(self):
223223
terraform = Mock(spec=Terraform)
224224
task_factory = TaskFactory(
225-
terraform_factory=TerraformFactory(terraform)
225+
terraform_factory=MockTerraformFactory(terraform)
226226
)
227227
source_directory = "/some/path"
228228
environment = {"ENV_VAR": "value"}
@@ -314,7 +314,7 @@ def test_adds_both_all_and_apply_parameters_to_apply_task(self):
314314
def test_apply_invokes_init_and_apply(self):
315315
terraform = Mock(spec=Terraform)
316316
task_factory = TaskFactory(
317-
terraform_factory=TerraformFactory(terraform)
317+
terraform_factory=MockTerraformFactory(terraform)
318318
)
319319
source_directory = "/some/path"
320320
variables: Variables = {"foo": 1}
@@ -346,7 +346,7 @@ def pre_task_function(_context, _, configuration: Configuration):
346346
def test_apply_uses_workspace(self):
347347
terraform = Mock(spec=Terraform)
348348
task_factory = TaskFactory(
349-
terraform_factory=TerraformFactory(terraform)
349+
terraform_factory=MockTerraformFactory(terraform)
350350
)
351351
workspace = "workspace"
352352
source_directory = "/some/path"
@@ -367,7 +367,7 @@ def pre_task_function(_context, _, configuration: Configuration):
367367
def test_apply_uses_environment_in_all_commands_when_set(self):
368368
terraform = Mock(spec=Terraform)
369369
task_factory = TaskFactory(
370-
terraform_factory=TerraformFactory(terraform)
370+
terraform_factory=MockTerraformFactory(terraform)
371371
)
372372
source_directory = "/some/path"
373373
environment = {"ENV_VAR": "value"}
@@ -462,7 +462,7 @@ def test_adds_both_all_and_output_parameters_to_output_task(self):
462462
def test_output_invokes_init_and_output(self):
463463
terraform = Mock(spec=Terraform)
464464
task_factory = TaskFactory(
465-
terraform_factory=TerraformFactory(terraform)
465+
terraform_factory=MockTerraformFactory(terraform)
466466
)
467467
source_directory = "/some/path"
468468
backend_config: BackendConfig = {"path": "state_file.tfstate"}
@@ -492,7 +492,7 @@ def pre_task_function(_context, _, configuration: Configuration):
492492
def test_output_uses_workspace(self):
493493
terraform = Mock(spec=Terraform)
494494
task_factory = TaskFactory(
495-
terraform_factory=TerraformFactory(terraform)
495+
terraform_factory=MockTerraformFactory(terraform)
496496
)
497497
workspace = "workspace"
498498
source_directory = "/some/path"
@@ -513,7 +513,7 @@ def pre_task_function(_context, _, configuration: Configuration):
513513
def test_output_uses_json(self):
514514
terraform = Mock(spec=Terraform)
515515
task_factory = TaskFactory(
516-
terraform_factory=TerraformFactory(terraform)
516+
terraform_factory=MockTerraformFactory(terraform)
517517
)
518518
workspace = "workspace"
519519
source_directory = "/some/path"
@@ -538,7 +538,7 @@ def pre_task_function(_context, _, configuration: Configuration):
538538
def test_output_uses_environment_in_all_commands_when_set(self):
539539
terraform = Mock(spec=Terraform)
540540
task_factory = TaskFactory(
541-
terraform_factory=TerraformFactory(terraform)
541+
terraform_factory=MockTerraformFactory(terraform)
542542
)
543543
source_directory = "/some/path"
544544
environment = {"ENV_VAR": "value"}
@@ -578,7 +578,7 @@ def pre_task_function(_context, _, configuration: Configuration):
578578
def test_output_returns_standard_output_when_capture_stdout_true(self):
579579
terraform = Mock(spec=Terraform)
580580
task_factory = TaskFactory(
581-
terraform_factory=TerraformFactory(terraform)
581+
terraform_factory=MockTerraformFactory(terraform)
582582
)
583583
source_directory = "/some/path"
584584

0 commit comments

Comments
 (0)