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

Fix traceback when excludes are present in an included SLS file #47682

Merged
merged 3 commits into from May 18, 2018

Conversation

Projects
None yet
5 participants
@terminalmage
Member

terminalmage commented May 16, 2018

This causes a traceback in salt.state.find_sls_ids() as it expects the high chunks to all be dicts, but the excludes are a list of excluded SLS targets.

Resolves #47182.

terminalmage added some commits May 16, 2018

Skip __exclude__ in find_sls_ids
The corresponding value would be a list and thus raises a TypeError when
attempting to perform a dict lookup.

@salt-jenkins salt-jenkins requested a review from saltstack/team-state May 16, 2018

Suppress spurious lint failure
This is failing because elsewhere in the test module the get_top()
member function returns None, but this is done in a highstate attribute
which is cleaned up in the tearDown and established as a fresh
salt.state.HighState instance in the setUp.

@rallytime rallytime merged commit 00a1376 into saltstack:2017.7 May 18, 2018

4 of 9 checks passed

default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #4963 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #22897 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #9933 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19020 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25150 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17250 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #21880 — SUCCESS
Details

@terminalmage terminalmage deleted the terminalmage:issue47182 branch May 21, 2018

@jeffdyke

This comment has been minimized.

jeffdyke commented Aug 21, 2018

Hello. Is there a reason that this is not in 2018.3.2? I'm running into the same issue.

Thanks

@gtmanfred

This comment has been minimized.

Contributor

gtmanfred commented Aug 21, 2018

@jeffdyke because it was merged into 2017.7 after the release branches had already been branched. It will be in 2018.3.3.

Once release branches are branched, we focus on getting stuff into those branches that are committed for that release, and everything else has to wait for the next release, so that we can make sure the tests are stable for the release.

@jeffdyke

This comment has been minimized.

jeffdyke commented Aug 21, 2018

Thank you @gtmanfred, this is kind of a big deal for me, how far out is 2018.3.3? As i'll patch all minions, if its going to be a while. Edited b/c i made a mistake

Appreciate the quick response.

@gtmanfred

This comment has been minimized.

Contributor

gtmanfred commented Aug 21, 2018

2018.3.3 is branched, we are working on getting it out this month.

@jeffdyke

This comment has been minimized.

jeffdyke commented Aug 21, 2018

again thanks for the quick response @gtmanfred. Just to give a reason why this is important to me, is that I can use it for configuration compliance. Nothing changes on our servers without salt and i like to be able to prove that.

Thanks again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment