[3006.x] fix(saltclass): don't lose nested classes and states in recursion #66918
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
twangboy
reviewed
Sep 23, 2024
|
We'll need a changelog and some tests for this. |
Ok, the changelog is quite easy, I'll need to document for testing. |
baby-gnu
force-pushed
the
fix/saltclass-nested-states
branch
from
0af0ff8 to
2d967b6
Compare
twangboy
previously approved these changes
Sep 26, 2024
baby-gnu
force-pushed
the
fix/saltclass-nested-states
branch
3 times, most recently
from
316a5b6 to
45eab43
Compare
twangboy
previously approved these changes
Sep 30, 2024
|
Thanks @twangboy, should I rebase the branch over 3006.x from time to time until it get merge? |
A pillars dict in a minion node definition was not overridding correctly the same dict in classes. * salt/utils/saltclass.py (expanded_dict_from_minion): do not pass a reference to minion dict or it will be overridden by classes during expansion. Fixes: saltstack#63933
baby-gnu
force-pushed
the
fix/saltclass-nested-states
branch
from
45eab43 to
6476468
Compare
I reword my commit message to fix typo as you did in the title 👍 |
twangboy
approved these changes
Oct 1, 2024
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?
This PR keep all the classes and states from recursive expansion of saltclass classes.
What issues does this PR fix or reference?
Fixes #58969
Fixes #63933
Previous Behavior
Only states from top level classes were kept.
New Behavior
All states from all classes are used, in the correct order.
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, including the
PR Guidelines.
See GitHub's page on GPG signing for more information about signing commits with GPG.