-
-
Notifications
You must be signed in to change notification settings - Fork 575
feat: New Python-based terraform_fmt hook to better support Windows
#652
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from 5 commits
18291bd
9409f77
ef844ce
806a87a
3f3fdd9
a37971b
85269df
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,4 @@ | ||
| tests/results/* | ||
| __pycache__/ | ||
| *.py[cod] | ||
| node_modules/ |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +0,0 @@ | ||
| print( | ||
| '`terraform_docs_replace` hook is DEPRECATED.' | ||
| 'For migration instructions see https://github.com/antonbabenko/pre-commit-terraform/issues/248#issuecomment-1290829226' | ||
| ) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's start a PR scope thread here: How much do we want to be implemented in this PR?1.1. Current 2.1. Just Choose one from 1. and 2.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
ps: I don't get the difference between
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 1.2 Means that should be implemented too in this PR |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| """ | ||
| Here located common functions for hooks. | ||
|
|
||
| It not executed directly, but imported by other hooks. | ||
| """ | ||
| from __future__ import annotations | ||
|
|
||
| import argparse | ||
| import logging | ||
| import os | ||
| from collections.abc import Sequence | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| def setup_logging(): | ||
| """ | ||
| Set up the logging configuration based on the value of the 'PCT_LOG' environment variable. | ||
|
|
||
| The 'PCT_LOG' environment variable determines the logging level to be used. | ||
| The available levels are: | ||
| - 'error': Only log error messages. | ||
| - 'warn' or 'warning': Log warning messages and above. | ||
| - 'info': Log informational messages and above. | ||
| - 'debug': Log debug messages and above. | ||
|
|
||
| If the 'PCT_LOG' environment variable is not set or has an invalid value, | ||
| the default logging level is 'warning'. | ||
|
|
||
| Returns: | ||
| None | ||
| """ | ||
| log_level = { | ||
| 'error': logging.ERROR, | ||
| 'warn': logging.WARNING, | ||
| 'warning': logging.WARNING, | ||
| 'info': logging.INFO, | ||
| 'debug': logging.DEBUG, | ||
| }[os.environ.get('PCT_LOG', 'warning').lower()] | ||
|
|
||
| logging.basicConfig(level=log_level) | ||
|
|
||
|
|
||
| def parse_env_vars(env_var_strs: list[str]) -> dict[str, str]: | ||
| """ | ||
| Expand environment variables definition into their values in '--args'. | ||
|
|
||
| Args: | ||
| env_var_strs (list[str]): A list of environment variable strings in the format "name=value". | ||
|
|
||
| Returns: | ||
| dict[str, str]: A dictionary mapping variable names to their corresponding values. | ||
| """ | ||
| ret = {} | ||
| for env_var_str in env_var_strs: | ||
| name, env_var_value = env_var_str.split('=', 1) | ||
| if env_var_value.startswith('"') and env_var_value.endswith('"'): | ||
| env_var_value = env_var_value[1:-1] | ||
| ret[name] = env_var_value | ||
| return ret | ||
|
|
||
|
|
||
| def parse_cmdline( | ||
| argv: Sequence[str] | None = None, | ||
| ) -> tuple[list[str], list[str], list[str], list[str], dict[str, str]]: | ||
| """ | ||
| Parse the command line arguments and return a tuple containing the parsed values. | ||
|
|
||
| Args: | ||
| argv (Sequence[str] | None): The command line arguments to parse. | ||
| If None, the arguments from sys.argv will be used. | ||
|
|
||
| Returns: | ||
| tuple[list[str], list[str], list[str], list[str], dict[str, str]]: | ||
| A tuple containing the parsed values: | ||
| - args (list[str]): The parsed arguments. | ||
| - hook_config (list[str]): The parsed hook configurations. | ||
| - files (list[str]): The parsed files. | ||
| - tf_init_args (list[str]): The parsed Terraform initialization arguments. | ||
| - env_var_dict (dict[str, str]): The parsed environment variables as a dictionary. | ||
| """ | ||
|
|
||
| parser = argparse.ArgumentParser( | ||
| add_help=False, # Allow the use of `-h` for compatibility with the Bash version of the hook | ||
| ) | ||
| parser.add_argument('-a', '--args', action='append', help='Arguments') | ||
| parser.add_argument('-h', '--hook-config', action='append', help='Hook Config') | ||
| parser.add_argument('-i', '--init-args', '--tf-init-args', action='append', help='Init Args') | ||
| parser.add_argument('-e', '--envs', '--env-vars', action='append', help='Environment Variables') | ||
| parser.add_argument('FILES', nargs='*', help='Files') | ||
|
|
||
| parsed_args = parser.parse_args(argv) | ||
|
|
||
| args = parsed_args.args or [] | ||
| hook_config = parsed_args.hook_config or [] | ||
| files = parsed_args.FILES or [] | ||
| tf_init_args = parsed_args.init_args or [] | ||
| env_vars = parsed_args.envs or [] | ||
|
|
||
| env_var_dict = parse_env_vars(env_vars) | ||
|
|
||
| if hook_config: | ||
| raise NotImplementedError('TODO: implement: hook_config') | ||
|
|
||
| if tf_init_args: | ||
| raise NotImplementedError('TODO: implement: tf_init_args') | ||
|
|
||
| return args, hook_config, files, tf_init_args, env_var_dict |
ericfrederich marked this conversation as resolved.
Show resolved
Hide resolved
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| """ | ||
| Pre-commit hook for terraform fmt. | ||
| """ | ||
| from __future__ import annotations | ||
|
|
||
| import logging | ||
| import os | ||
| import shlex | ||
| import sys | ||
| from subprocess import PIPE | ||
| from subprocess import run | ||
| from typing import Sequence | ||
|
|
||
| from .common import parse_cmdline | ||
| from .common import setup_logging | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| def main(argv: Sequence[str] | None = None) -> int: | ||
|
|
||
| setup_logging() | ||
|
|
||
| logger.debug(sys.version_info) | ||
|
|
||
| args, hook_config, files, tf_init_args, env_vars = parse_cmdline(argv) | ||
|
|
||
| if os.environ.get('PRE_COMMIT_COLOR') == 'never': | ||
| args.append('-no-color') | ||
|
|
||
| cmd = ['terraform', 'fmt', *args, *files] | ||
|
|
||
| logger.info('calling %s', shlex.join(cmd)) | ||
| logger.debug('env_vars: %r', env_vars) | ||
| logger.debug('args: %r', args) | ||
|
|
||
| completed_process = run(cmd, env={**os.environ, **env_vars}, text=True, stdout=PIPE) | ||
|
|
||
| if completed_process.stdout: | ||
| print(completed_process.stdout) | ||
|
|
||
| return completed_process.returncode | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| raise SystemExit(main()) |

Uh oh!
There was an error while loading. Please reload this page.