[master] Allow all primitive grain types for autosign_grains #65232
Conversation
This file contains 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
salt-project-bot-prod-environment
bot
changed the title
agraul
force-pushed
the
autosing_grains_more_types
branch
from
9315937
to
a69dd09
Compare
agraul
force-pushed
the
autosing_grains_more_types
branch
from
a69dd09
to
4366b98
Compare
Ch3LL
approved these changes
Oct 9, 2023
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Allow non-str grain types for autosign grains. Currently the code is very naive and only compares
grain == line, wheregraincan be any type a grain can be andlineis a string. The change castsgrainto a str, which makes it easy to use with e.g. numeric grains. More complex autosign_grains, such as nested dicts, are not really covered (str() is not stable across Python versions afaik).What issues does this PR fix or reference?
Fixes: #61436
Fixes: #63708
Previous Behavior
Autosign_grain with a non-str (e.g. numeric/boolean) grain does not work (never matches the contents of a file in /etc/autosign_grains/).
New Behavior
Autosign_grain with a non-str (e.g. numeric/boolean) grain works.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.