Skip to content

Commit 14f9d2a

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent c65ecf6 commit 14f9d2a

File tree

5 files changed

+50
-52
lines changed

5 files changed

+50
-52
lines changed

src/pre_commit_terraform/_cli.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
from typing import cast as cast_to
55

66
from ._cli_parsing import initialize_argument_parser
7-
from ._errors import (
8-
PreCommitTerraformBaseError,
9-
PreCommitTerraformExit,
10-
PreCommitTerraformRuntimeError,
11-
)
7+
from ._errors import PreCommitTerraformBaseError
8+
from ._errors import PreCommitTerraformExit
9+
from ._errors import PreCommitTerraformRuntimeError
1210
from ._structs import ReturnCode
13-
from ._types import CLIAppEntryPointCallableType, ReturnCodeType
11+
from ._types import CLIAppEntryPointCallableType
12+
from ._types import ReturnCodeType
1413

1514

1615
def invoke_cli_app(cli_args: list[str]) -> ReturnCodeType:
@@ -34,8 +33,7 @@ def invoke_cli_app(cli_args: list[str]) -> ReturnCodeType:
3433
raise
3534
except PreCommitTerraformRuntimeError as unhandled_exc:
3635
print(
37-
f'App execution took an unexpected turn: {unhandled_exc !s}. '
38-
'Exiting...',
36+
f'App execution took an unexpected turn: {unhandled_exc !s}. ' 'Exiting...',
3937
file=sys.stderr,
4038
)
4139
return ReturnCode.ERROR

src/pre_commit_terraform/_types.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
"""Composite types for annotating in-project code."""
22

3-
from argparse import ArgumentParser, Namespace
3+
from argparse import ArgumentParser
4+
from argparse import Namespace
45
from collections.abc import Callable
5-
from typing import Protocol, Union
6+
from typing import Protocol
7+
from typing import Union
68

79
from pre_commit_terraform._structs import ReturnCode
810

9-
1011
ReturnCodeType = Union[ReturnCode, int] # Union instead of pipe for Python 3.9
1112
CLIAppEntryPointCallableType = Callable[[Namespace], ReturnCodeType]
1213

src/pre_commit_terraform/terraform_docs_replace.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import os
44
import subprocess
55
import warnings
6-
from argparse import ArgumentParser, Namespace
6+
from argparse import ArgumentParser
7+
from argparse import Namespace
78
from typing import Final
89
from typing import cast as cast_to
910

@@ -71,8 +72,9 @@ def invoke_cli_app(parsed_cli_args: Namespace) -> ReturnCodeType:
7172

7273
dirs = []
7374
for filename in cast_to(list[str], parsed_cli_args.filenames):
74-
if (os.path.realpath(filename) not in dirs and
75-
(filename.endswith(".tf") or filename.endswith(".tfvars"))):
75+
if os.path.realpath(filename) not in dirs and (
76+
filename.endswith('.tf') or filename.endswith('.tfvars')
77+
):
7678
dirs.append(os.path.dirname(filename))
7779

7880
retval = ReturnCode.OK
@@ -84,13 +86,12 @@ def invoke_cli_app(parsed_cli_args: Namespace) -> ReturnCodeType:
8486
if cast_to(bool, parsed_cli_args.sort):
8587
procArgs.append('--sort-by-required')
8688
procArgs.append('md')
87-
procArgs.append("./{dir}".format(dir=dir))
89+
procArgs.append('./{dir}'.format(dir=dir))
8890
procArgs.append('>')
8991
procArgs.append(
90-
'./{dir}/{dest}'.
91-
format(dir=dir, dest=cast_to(bool, parsed_cli_args.dest)),
92+
'./{dir}/{dest}'.format(dir=dir, dest=cast_to(bool, parsed_cli_args.dest)),
9293
)
93-
subprocess.check_call(" ".join(procArgs), shell=True)
94+
subprocess.check_call(' '.join(procArgs), shell=True)
9495
except subprocess.CalledProcessError as e:
9596
print(e)
9697
retval = ReturnCode.ERROR

tests/pytest/_cli_test.py

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
"""Tests for the high-level CLI entry point."""
22

3-
from argparse import ArgumentParser, Namespace
3+
from argparse import ArgumentParser
4+
from argparse import Namespace
5+
46
import pytest
57

68
from pre_commit_terraform import _cli_parsing as _cli_parsing_mod
79
from pre_commit_terraform._cli import invoke_cli_app
8-
from pre_commit_terraform._errors import (
9-
PreCommitTerraformExit,
10-
PreCommitTerraformBaseError,
11-
PreCommitTerraformRuntimeError,
12-
)
10+
from pre_commit_terraform._errors import PreCommitTerraformBaseError
11+
from pre_commit_terraform._errors import PreCommitTerraformExit
12+
from pre_commit_terraform._errors import PreCommitTerraformRuntimeError
1313
from pre_commit_terraform._structs import ReturnCode
1414
from pre_commit_terraform._types import ReturnCodeType
1515

16-
1716
pytestmark = pytest.mark.filterwarnings(
1817
'ignore:`terraform_docs_replace` hook is DEPRECATED.:UserWarning:'
1918
'pre_commit_terraform.terraform_docs_replace',
@@ -42,17 +41,19 @@
4241
),
4342
)
4443
def test_known_interrupts(
45-
capsys: pytest.CaptureFixture[str],
46-
expected_stderr: str,
47-
monkeypatch: pytest.MonkeyPatch,
48-
raised_error: BaseException,
44+
capsys: pytest.CaptureFixture[str],
45+
expected_stderr: str,
46+
monkeypatch: pytest.MonkeyPatch,
47+
raised_error: BaseException,
4948
) -> None:
5049
"""Check that known interrupts are turned into return code 1."""
50+
5151
class CustomCmdStub:
5252
CLI_SUBCOMMAND_NAME = 'sentinel'
5353

5454
def populate_argument_parser(
55-
self, subcommand_parser: ArgumentParser,
55+
self,
56+
subcommand_parser: ArgumentParser,
5657
) -> None:
5758
return None
5859

@@ -72,15 +73,17 @@ def invoke_cli_app(self, parsed_cli_args: Namespace) -> ReturnCodeType:
7273

7374

7475
def test_app_exit(
75-
capsys: pytest.CaptureFixture[str],
76-
monkeypatch: pytest.MonkeyPatch,
76+
capsys: pytest.CaptureFixture[str],
77+
monkeypatch: pytest.MonkeyPatch,
7778
) -> None:
7879
"""Check that an exit exception is re-raised."""
80+
7981
class CustomCmdStub:
8082
CLI_SUBCOMMAND_NAME = 'sentinel'
8183

8284
def populate_argument_parser(
83-
self, subcommand_parser: ArgumentParser,
85+
self,
86+
subcommand_parser: ArgumentParser,
8487
) -> None:
8588
return None
8689

tests/pytest/terraform_docs_replace_test.py

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
"""Tests for the `replace-docs` subcommand."""
22

3-
from argparse import ArgumentParser, Namespace
3+
from argparse import ArgumentParser
4+
from argparse import Namespace
45
from subprocess import CalledProcessError
56

67
import pytest
78
import pytest_mock
89

910
from pre_commit_terraform._structs import ReturnCode
11+
from pre_commit_terraform.terraform_docs_replace import invoke_cli_app
12+
from pre_commit_terraform.terraform_docs_replace import populate_argument_parser
1013
from pre_commit_terraform.terraform_docs_replace import (
11-
invoke_cli_app,
12-
populate_argument_parser,
13-
subprocess as replace_docs_subprocess_mod,
14+
subprocess as replace_docs_subprocess_mod,
1415
)
1516

1617

@@ -23,10 +24,7 @@ def test_arg_parser_populated() -> None:
2324

2425
def test_check_is_deprecated() -> None:
2526
"""Verify that `replace-docs` shows a deprecation warning."""
26-
deprecation_msg_regex = (
27-
r'^`terraform_docs_replace` hook is DEPRECATED\.'
28-
'For migration.*$'
29-
)
27+
deprecation_msg_regex = r'^`terraform_docs_replace` hook is DEPRECATED\.' 'For migration.*$'
3028
with pytest.warns(UserWarning, match=deprecation_msg_regex):
3129
# not `pytest.deprecated_call()` due to this being a user warning
3230
invoke_cli_app(Namespace(filenames=[]))
@@ -53,8 +51,7 @@ def test_check_is_deprecated() -> None:
5351
),
5452
[
5553
'terraform-docs --sort-by-required md ./ > .//SENTINEL.md',
56-
'terraform-docs --sort-by-required md ./thing '
57-
'> ./thing/SENTINEL.md',
54+
'terraform-docs --sort-by-required md ./thing ' '> ./thing/SENTINEL.md',
5855
],
5956
id='two-sorted-files',
6057
),
@@ -70,10 +67,10 @@ def test_check_is_deprecated() -> None:
7067
'pre_commit_terraform.terraform_docs_replace',
7168
)
7269
def test_control_flow_positive(
73-
expected_cmds: list[str],
74-
mocker: pytest_mock.MockerFixture,
75-
monkeypatch: pytest.MonkeyPatch,
76-
parsed_cli_args: Namespace,
70+
expected_cmds: list[str],
71+
mocker: pytest_mock.MockerFixture,
72+
monkeypatch: pytest.MonkeyPatch,
73+
parsed_cli_args: Namespace,
7774
) -> None:
7875
"""Check that the subcommand's happy path works."""
7976
check_call_mock = mocker.Mock()
@@ -85,9 +82,7 @@ def test_control_flow_positive(
8582

8683
assert ReturnCode.OK == invoke_cli_app(parsed_cli_args)
8784

88-
executed_commands = [
89-
cmd for ((cmd, ), _shell) in check_call_mock.call_args_list
90-
]
85+
executed_commands = [cmd for ((cmd,), _shell) in check_call_mock.call_args_list]
9186

9287
assert len(expected_cmds) == check_call_mock.call_count
9388
assert expected_cmds == executed_commands
@@ -98,8 +93,8 @@ def test_control_flow_positive(
9893
'pre_commit_terraform.terraform_docs_replace',
9994
)
10095
def test_control_flow_negative(
101-
mocker: pytest_mock.MockerFixture,
102-
monkeypatch: pytest.MonkeyPatch,
96+
mocker: pytest_mock.MockerFixture,
97+
monkeypatch: pytest.MonkeyPatch,
10398
) -> None:
10499
"""Check that the subcommand's error processing works."""
105100
parsed_cli_args = Namespace(

0 commit comments

Comments
 (0)