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

Ensure errors are returned for missing pillars #57208

Merged
merged 1 commit into from
May 12, 2020
Merged

Conversation

lnattrass
Copy link
Contributor

@lnattrass lnattrass commented May 11, 2020

What does this PR do?

Ensures that errors are returned when including from a pillar like this:

include:
- pillar_name

What issues does this PR fix or reference?

Fixes: This PR

Previous Behavior

Salt 2018.3.5 returns errors when a pillar is not found.
Newer versions currently do not.

New Behavior

Salt returns errors when pillars fail to render

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@lnattrass lnattrass requested a review from a team as a code owner May 11, 2020 18:03
@ghost ghost requested review from garethgreenaway and removed request for a team May 11, 2020 18:03
@garethgreenaway
Copy link
Contributor

@lnattrass Thanks for the PR! Looks like there are some small lint issues with the new tests you added, extra white space at the end of the lines.

@lnattrass
Copy link
Contributor Author

There sure are!
I'll sort it out.

@lnattrass
Copy link
Contributor Author

lnattrass commented May 11, 2020

Ok, I've resolved the lint issues (pending what the tests say..)
Sorry for the hassle!
edit :And they failed.

This will cause render_pstate to return an error when the pillar is not found.
Currently, missing pillars are silently continued, which may lead to unexpected pillar states (and makes testing the existence of pillars difficult.)
@dwoz dwoz merged commit 7a862f6 into saltstack:master May 12, 2020
@sagetherage sagetherage added the ZRelease-Sodium retired label label May 18, 2020
@sagetherage sagetherage added this to Done in Sodium May 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZRelease-Sodium retired label
Projects
No open projects
Sodium
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants