Fix TypeError when beacons.list returns None in beacon state functions#69422
Open
Federicorao wants to merge 3 commits into
Open
Fix TypeError when beacons.list returns None in beacon state functions#69422Federicorao wants to merge 3 commits into
Federicorao wants to merge 3 commits into
Conversation
dwoz
force-pushed
the
codex/issue-66440-1781215354
branch
from
539c7d8 to
de5181f
Compare
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.
Fixes #66440.
What changed
Fix TypeError when beacons.list returns None in beacon state functions
Why
The issue reports that
beacon.presentcrashes with TypeError: argument of type 'NoneType' is not iterable whenbeacons.listreturns None, which can happen when the event system fails. The fix adds a None check on the return value ofbeacons.listin all four beacon state functions (present,absent,enabled,disabled) and defaults to an empty dict, which is safe to iterate over. This addresses the root cause without adding retry logic, which would be a larger feature change.Verification
Not run
Changed files
salt/states/beacon.pytests/pytests/unit/states/test_beacon.py