Skip to content

cfengine lint: Fixed looking for body calls in cases where we expect a bundle #95

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.

Sign up for GitHub

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

Merged
olehermanse merged 1 commit into from
Apr 29, 2026
+9 −2
Merged

cfengine lint: Fixed looking for body calls in cases where we expect a bundle #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/cfengine_cli/lint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"string",
}
PROMISE_BLOCK_ATTRIBUTES = ("path", "interpreter")
IMPLIES_BUNDLE = {"usebundle", "servicebundle", "service_bundle"}
KNOWN_FAULTY_FUNCTION_DEFS = {"regex_replace", "peers"}
# Generally, we don't want to allow creating bodies / bundles with the same
# name as a built in function, as it can make things more confusing
Expand Down Expand Up @@ -653,7 +654,10 @@ def _lint_node(
return 1
if state.strict and (
qualified_name not in state.bundles
and qualified_name not in state.bodies
and (
state.attribute_name in IMPLIES_BUNDLE
or qualified_name not in state.bodies
)
and name not in syntax_data.BUILTIN_FUNCTIONS
):
_highlight_range(node, lines)
Expand Down Expand Up @@ -764,7 +768,10 @@ def _lint_node(
f"Error: Expected {expected} arguments, received {len(args)} for bundle '{call}' {location}"
)
return 1
if qualified_name in state.bodies:
if (
qualified_name in state.bodies
and state.attribute_name not in IMPLIES_BUNDLE
):
definitions = state.bodies[qualified_name]
valid_counts = {len(d.get("parameters", [])) for d in definitions}
if len(args) not in valid_counts:
Expand Down
Loading