ENT-13824/13826: Errors on userdefined bundles that shadow built-ins & function-calls inside vars that are not built-in#46
Merged
olehermanse merged 2 commits intocfengine:mainfrom Apr 8, 2026
Conversation
Member
|
@SimonThalvorsen The failing test is adjusted in #47 - rebase this PR and please add some more tests to test your new functionality :) |
SimonThalvorsen
force-pushed
the
main
branch
3 times, most recently
from
8a6ca2a to
cb5c862
Compare
olehermanse
reviewed
Apr 8, 2026
olehermanse
reviewed
Apr 8, 2026
…ars-promise Signed-off-by: Simon Halvorsen <simon.halvorsen@northern.tech>
…-in func Signed-off-by: Simon Halvorsen <simon.halvorsen@northern.tech>
olehermanse
reviewed
Apr 8, 2026
Comment on lines
+527
to
+531
| if ( | ||
| name not in BUILTIN_FUNCTIONS | ||
| and state.promise_type == "vars" | ||
| and state.attribute_name not in ("action", "classes") | ||
| ): |
Member
There was a problem hiding this comment.
@SimonThalvorsen Small nitpick: I think it makes a bit more sense to start "top-level" and go further specific in the condition. I would do:
Suggested change
| if ( | |
| name not in BUILTIN_FUNCTIONS | |
| and state.promise_type == "vars" | |
| and state.attribute_name not in ("action", "classes") | |
| ): | |
| if ( | |
| state.promise_type == "vars" | |
| and state.attribute_name not in ("action", "classes") | |
| and name not in BUILTIN_FUNCTIONS | |
| ): |
It could even make sense to add state.block_keyword == "bundle" at the start for readability.
Also, if name not in BUILTIN_FUNCTIONS might be a slow operation, makes sense to save some time by doing the fast checks first.
olehermanse
approved these changes
Apr 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.