From 1fe4e47d03fe24f956ed081b37fc3ef5549b847f Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Thu, 15 Jul 2021 10:52:44 +0100 Subject: [PATCH] Assure variable naming rule always use a pattern (#1667) Fixes bug which made the rule raise an error when options were not initialized (var_naming_pattern being None). --- src/ansiblelint/cli.py | 1 - src/ansiblelint/rules/VariableNamingRule.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ansiblelint/cli.py b/src/ansiblelint/cli.py index e453cd3725..9317350200 100644 --- a/src/ansiblelint/cli.py +++ b/src/ansiblelint/cli.py @@ -327,7 +327,6 @@ def merge_config(file_config: Dict[Any, Any], cli_config: Namespace) -> Namespac scalar_map = { "loop_var_prefix": None, "project_dir": ".", - "var_naming_pattern": "^[a-z_][a-z0-9_]*$", } if not file_config: diff --git a/src/ansiblelint/rules/VariableNamingRule.py b/src/ansiblelint/rules/VariableNamingRule.py index 96dccb137f..ecfee997d4 100644 --- a/src/ansiblelint/rules/VariableNamingRule.py +++ b/src/ansiblelint/rules/VariableNamingRule.py @@ -44,7 +44,7 @@ class VariableNamingRule(AnsibleLintRule): @lru_cache() def re_pattern(self) -> Pattern[str]: - return re.compile(options.var_naming_pattern) + return re.compile(options.var_naming_pattern or "^[a-z_][a-z0-9_]*$") def is_invalid_variable_name(self, ident: str) -> bool: """Check if variable name is using right pattern."""