Skip to content
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.

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

[3006.x] Ensure sync from _grains occurs before attempting pillar compilation in case custom grain used in pillar file #65186

Merged
merged 14 commits into from
Oct 21, 2023

Conversation

dmurphy18
Copy link
Contributor

What does this PR do?

Ensures that grains are sync'd before loading grains and then compiling pillar, since there could be custom grains used in pillar files, which will throw rendering errors if not found.

What issues does this PR fix or reference?

Fixes:#65027

Previous Behavior

Would throw rendering errors if custom grains in salt://_grains were used in pillar files.

New Behavior

No rendering errors thrown if custom grains in salt://_grains were used in pillar files, and custom grains values available in pillar

Test still to be written

A very old PR #13011(d83e663), A change was made to not refresh on sync_all. I believe this was in error, the previous code did refresh, and the changes was made to save a module load, but what about everything else, like grains. Also the old code would not refresh if local so as to not fire events, and I am not sure that that reasoning holds almost 10 years later, either.
Welcome close examination and reasoning of that change in salt/state.py.

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.

@dmurphy18 dmurphy18 requested a review from a team as a code owner September 13, 2023 16:49
@dmurphy18 dmurphy18 requested review from dwoz and removed request for a team September 13, 2023 16:49
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 17:06 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 17:06 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 17:06 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 17:06 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 17:22 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 17:24 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 18:25 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 18:25 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 18:25 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 18:25 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 18:26 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 18:26 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 19:26 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 19:26 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 19:26 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 19:26 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 19:26 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 19:26 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 23:54 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 23:54 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 23:54 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 13, 2023 23:54 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 14, 2023 00:10 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 14, 2023 00:12 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 14, 2023 05:01 — with GitHub Actions Inactive
@dmurphy18 dmurphy18 temporarily deployed to ci September 14, 2023 05:01 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 13:41 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 13:41 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 13:42 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 13:42 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 13:43 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 13:43 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 16:20 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 16:20 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 16:20 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 16:20 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 16:20 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci October 20, 2023 16:20 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch merged commit 28cc894 into saltstack:3006.x Oct 21, 2023
401 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test:pkg Run the package tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants