search for config with the yml/yaml extension (#4416)

ansible · Dec 4, 2024 · 375c2e3 · 375c2e3
1 parent a5fbd7c
commit 375c2e3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/docs/configuring.md b/docs/configuring.md
@@ -12,9 +12,10 @@ the one specified inside the configuration file.
 
 ## Using local configuration files
 
-Specify Ansible-lint configuration in either `.ansible-lint`,
-`.config/ansible-lint.yml`, or `.config/ansible-lint.yaml` in your current
-working directory.
+Specify Ansible-lint configuration in either
+`.ansible-lint`, `.ansible-lint.yml`, `.ansible-lint.yaml`,
+`.config/ansible-lint.yml`, or `.config/ansible-lint.yaml`
+in your current working directory.
 
 !!! note
 

diff --git a/src/ansiblelint/cli.py b/src/ansiblelint/cli.py
@@ -107,6 +107,8 @@ def get_config_path(config_file: str | None = None) -> str | None:
     else:
         project_filenames = [
             ".ansible-lint",
+            ".ansible-lint.yml",
+            ".ansible-lint.yaml",
             ".config/ansible-lint.yml",
             ".config/ansible-lint.yaml",
         ]
@@ -445,7 +447,7 @@ def get_cli_parser() -> argparse.ArgumentParser:
         "-c",
         "--config-file",
         dest="config_file",
-        help="Specify configuration file to use. By default it will look for '.ansible-lint', '.config/ansible-lint.yml', or '.config/ansible-lint.yaml'",
+        help="Specify configuration file to use. By default it will look for '.ansible-lint', '.ansible-lint.yml', '.ansible-lint.yaml', '.config/ansible-lint.yml', or '.config/ansible-lint.yaml'",
     )
     parser.add_argument(
         "-i",

diff --git a/src/ansiblelint/config.py b/src/ansiblelint/config.py
@@ -42,7 +42,8 @@
     {"text": "**/templates/**/*.*"},  # templates are likely not validable
     {"execution-environment": "**/execution-environment.yml"},
     {"ansible-lint-config": "**/.ansible-lint"},
-    {"ansible-lint-config": "**/.config/ansible-lint.yml"},
+    {"ansible-lint-config": "**/.ansible-lint.{yaml,yml}"},
+    {"ansible-lint-config": "**/.config/ansible-lint.{yaml,yml}"},
     {"ansible-navigator-config": "**/ansible-navigator.{yaml,yml}"},
     {"inventory": "**/inventory/**.{yaml,yml}"},
     {"requirements": "**/meta/requirements.{yaml,yml}"},  # v1 only

diff --git a/src/ansiblelint/constants.py b/src/ansiblelint/constants.py
@@ -207,6 +207,8 @@ def main():
 
 CONFIG_FILENAMES = [
     ".ansible-lint",
+    ".ansible-lint.yml",
+    ".ansible-lint.yaml",
     ".config/ansible-lint.yml",
     ".config/ansible-lint.yaml",
 ]

diff --git a/src/ansiblelint/schemas/ansible-lint-config.json b/src/ansiblelint/schemas/ansible-lint-config.json
@@ -20,6 +20,8 @@
   "description": "https://ansible.readthedocs.io/projects/lint/configuring/",
   "examples": [
     ".ansible-lint",
+    ".ansible-lint.yml",
+    ".ansible-lint.yaml",
     ".config/ansible-lint.yml",
     ".config/ansible-lint.yaml"
   ],