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

Fix 3 bugs in subdict matching #49791

Merged
merged 2 commits into from Sep 28, 2018

Conversation

Projects
None yet
4 participants
@terminalmage
Copy link
Contributor

commented Sep 26, 2018

  1. Non-ascii was causing a UnicodeDecodeError when matching
  2. Matching a dict value after a wildcard (i.e. the key is the wildcard) did not work. This is because it was matching the pattern against the key, instead of the value as it should have.
  3. It was not possible to use a wildcard for the first level of matching.

Fixes #49626.

terminalmage added some commits Sep 26, 2018

Fix 3 bugs in subdict matching
1. Non-ascii was causing a UnicodeDecodeError when matching
2. Matching a dict value after a wildcard (i.e. the key is the wildcard)
   did not work. This is because it was matching the pattern against the
   key, instead of the value as it should have.
3. It was not possible to use a wildcard for the first level of
   matching.

@terminalmage terminalmage force-pushed the terminalmage:issue49626 branch from d701d07 to 6795472 Sep 26, 2018

@Ch3LL

Ch3LL approved these changes Sep 26, 2018

@rallytime rallytime merged commit 4d9fc7c into saltstack:2018.3 Sep 28, 2018

7 of 10 checks passed

jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:issue49626 branch Sep 28, 2018

@doesitblend doesitblend added ZD and removed ZD labels Nov 28, 2018

@doesitblend

This comment has been minimized.

Copy link
Contributor

commented Dec 4, 2018

ZD-3024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.