schema: add ability to recognize ansible-lint config files (#2127)

ansible · May 12, 2022 · 33db532 · 33db532
1 parent 06c78ff
commit 33db532
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -155,7 +155,7 @@ jobs:
       WSLENV: FORCE_COLOR:PYTEST_REQPASS:TOXENV:TOX_PARALLEL_NO_SPINNER
       # Number of expected test passes, safety measure for accidental skip of
       # tests. Update value if you add/remove tests.
-      PYTEST_REQPASS: 637
+      PYTEST_REQPASS: 640
 
     steps:
       - name: Activate WSL1

diff --git a/examples/.config/ansible-lint.yml b/examples/.config/ansible-lint.yml
@@ -0,0 +1 @@
+../../.ansible-lint
diff --git a/examples/broken/.ansible-lint b/examples/broken/.ansible-lint
@@ -0,0 +1,2 @@
+# invalid ansible-lint config file
+foo: bar  # invalid based on schema
diff --git a/src/ansiblelint/config.py b/src/ansiblelint/config.py
@@ -12,6 +12,8 @@
     {"yaml": ".github/**/*.{yaml,yml}"},  # github workflows
     {"text": "**/templates/**/*.*"},  # templates are likely not validable
     {"execution-environment": "**/execution-environment.yml"},
+    {"ansible-lint-config": "**/.ansible-lint"},
+    {"ansible-lint-config": "**/.config/ansible-lint.yml"},
     {"inventory": "**/inventory/**.yml"},
     {"requirements": "**/meta/requirements.yml"},  # v1 only
     # https://docs.ansible.com/ansible/latest/dev_guide/collections_galaxy_meta.html

diff --git a/src/ansiblelint/rules/schema.py b/src/ansiblelint/rules/schema.py
@@ -141,6 +141,21 @@ def matchyaml(self, file: Lintable) -> List[MatchError]:
                 "inventory",
                 ["Additional properties are not allowed ('foo' was unexpected)"],
             ),
+            (
+                ".ansible-lint",
+                "ansible-lint-config",
+                [],
+            ),
+            (
+                "examples/.config/ansible-lint.yml",
+                "ansible-lint-config",
+                [],
+            ),
+            (
+                "examples/broken/.ansible-lint",
+                "ansible-lint-config",
+                ["Additional properties are not allowed ('foo' was unexpected)"],
+            ),
         ),
         ids=(
             # "playbook-fail",
@@ -154,6 +169,9 @@ def matchyaml(self, file: Lintable) -> List[MatchError]:
             "meta-runtime-broken",
             "inventory",
             "inventory-broken",
+            "lint-config",
+            "lint-config2",
+            "lint-config-broken",
         ),
     )
     # # unsupported yet: