Review requests

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>

changelogs/fragments/required-and-default.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - tests - update regex for detecting default and required values in FieldAttributes (https://github.com/ansible/ansible/issues/61460).

test/sanity/code-smell/required-and-default-attributes.py

@@ -1,30 +1,24 @@
 from __future__ import annotations
 
-import sys
 import ast
+import pathlib
+import sys
 
 
 class CallVisitor(ast.NodeVisitor):
-    def __init__(self, path):
+    def __init__(self, path: str) -> None:
         self.path = path
 
-    def visit_Call(self, node):
+    def visit_Call(self, node: ast.Call) -> None:
-        if getattr(node.func, "id", "").endswith("FieldAttribute"):
+        if isinstance(node.func, ast.Name) and node.func.id.endswith("FieldAttribute"):
-            count = 0
+            if len([kw for kw in node.keywords if kw.arg in ("default", "required")]) > 1:
-            for kw in node.keywords:
+                print(f"{self.path}:{node.lineno}:{node.col_offset}: use only one of `default` or `required` with `{node.func.id}`")
-                if kw.arg in ("default", "required"):
-                    count += 1
-            if count > 1:
-                print(
-                    f"{self.path}:{node.lineno}:{node.col_offset}: use only one of `default` or `required` with `{node.func.id}`"
-                )
 
 
-def main():
+def main() -> None:
     for path in sys.argv[1:] or sys.stdin.read().splitlines():
-        with open(path, "r") as path_fd:
+        tree = ast.parse(pathlib.Path(path).read_text(), path)
-            tree = ast.parse(path_fd.read())
+        CallVisitor(path).visit(tree)
-            CallVisitor(path).visit(tree)
 
 
 if __name__ == "__main__":