Commit Graph

98251 Commits

Author SHA1 Message Date
Erik Johnson
b829729fec
Fix pillar unit tests to work properly with loader-based matchers 2018-09-24 15:43:19 -05:00
Erik Johnson
d627af803d
Add a dunder init for matchers 2018-09-24 15:40:37 -05:00
Erik Johnson
112d2ec080
Fix netapi tests
localhost should not appear in minion list unless there is an exchanged
key for it, which there is not
2018-09-24 15:39:29 -05:00
Nicole Thomas
f664515ac0
Merge pull request #49760 from Ch3LL/raid_docs
Add mdadm as dependency in mdadm state docs
2018-09-24 15:42:34 -04:00
Ch3LL
8467235ba0
Handle Auth exceptions in run_job 2018-09-24 15:34:29 -04:00
Ch3LL
0eb90c1f15
Add mdadm as dependency in mdadm state docs 2018-09-24 15:15:38 -04:00
Nicole Thomas
db6f68afdb
Merge pull request #49757 from bbinet/fix-influxdb_user-test
Fix influxdb_user state when test=True
2018-09-24 15:14:22 -04:00
Erik Johnson
93dd1ad89d
Add target to the warning log message 2018-09-24 12:57:02 -05:00
C. R. Oldham
95a9ae8595
Merge pull request #16 from terminalmage/matcher-optimizations
Make sequence optimization more efficient
2018-09-24 11:50:41 -06:00
Erik Johnson
b58fa9dabe
Make sequence optimization more efficient 2018-09-24 12:47:05 -05:00
Nicole Thomas
d5a75bf9d0
Merge pull request #49749 from erwindon/docufix
fixed link in documentation
2018-09-24 09:30:46 -04:00
Bruno Binet
0d9ef4b14f Fix influxdb_user state when test=True
this fixes the error "ValueError: too many values to unpack"
2018-09-24 14:50:07 +02:00
Daniel Wozniak
ec2386eed8
Merge pull request #49679 from dwoz/whitelist
Add more tests to whitelist
2018-09-22 10:46:50 -07:00
Erwin Dondorp
baee678ba5 fixed link in documentation 2018-09-22 17:00:17 +01:00
Daniel A. Wozniak
0a3d95fa18
Fix linter issues 2018-09-21 15:50:17 -07:00
Daniel A. Wozniak
4c457c9afb
Close handles only if they exist 2018-09-21 15:44:30 -07:00
Daniel A. Wozniak
a44b37a510
Merge remote-tracking branch 'saltstack/2018.3' into whitelist 2018-09-21 15:39:45 -07:00
C. R. Oldham
72b2c21d31
Imported wrong six. 2018-09-21 16:00:18 -06:00
C. R. Oldham
05b216ac95
Try list matcher optimization again. 2018-09-21 15:44:40 -06:00
Megan Wilhite
0b254373b1
Merge pull request #49743 from Ch3LL/8.3_in_progress
Remove In Progress note for 2018.3.3 release
2018-09-21 16:33:17 -04:00
Megan Wilhite
f2810b8736
Merge pull request #49742 from Ch3LL/man_8.3
Update man pages for 2018.3.3
2018-09-21 16:32:54 -04:00
Ch3LL
3043b0890f
Remove In Progress note for 2018.3.3 release 2018-09-21 16:28:49 -04:00
Ch3LL
a418ef87b1
Update man pages for 2018.3.3 2018-09-21 16:18:36 -04:00
Nicole Thomas
728fa596e1
Merge pull request #49741 from Ch3LL/change_log
Add Changelog for 2018.3.3
2018-09-21 14:54:22 -04:00
Ch3LL
aef85d3b3f
Add Changelog for 2018.3.3 2018-09-21 14:22:04 -04:00
Daniel A. Wozniak
90489709ce
Add some debug info to assert 2018-09-21 09:05:12 -07:00
Erik Johnson
631eab325b
Also support passing address as a tuple
*Just* in case something else that invokes this starts using tuples at
some point, it'll save us a traceback.
2018-09-21 09:36:07 -06:00
Erik Johnson
4373a0b546
Optimize subdict matching
This reverses the order in which matches are attempted so that we start
with more deeply-nested matches first. The rationale for this is that it
is much more likely that when one uses `foo:bar:baz:hello:world`, they
are looking for a deeply-nested dictionary containing a key `hello`
which maps to `world`, than a key named `foo` matching the string
`bar:baz:hello:world`. The one case in which this change would be less
performant would be in the case where the value being checked is a
UNIX-style PATH (which uses colons as separators).
2018-09-21 09:36:07 -06:00
Erik Johnson
a3c5d248e4
Optimize subnet membership check
By using a generator comprehension, we avoid pre-allocating an entire
list of objects.
2018-09-21 09:36:06 -06:00
Erik Johnson
1593b58e3b
Optimize list matcher by doing string membership checks,
This is faster than splitting into a list and then iterating over it.
2018-09-21 09:36:06 -06:00
C. R. Oldham
5ca3b9c424
Pass __opts__ in modules/match.py since we no longer have self. 2018-09-21 09:36:05 -06:00
C. R. Oldham
4c1f2151ef
Backed out the change too far :-( 2018-09-21 09:36:04 -06:00
C. R. Oldham
3cd0848e9a
Back out list matcher optimization, somehow breaks nodegroup matching. 2018-09-21 09:36:04 -06:00
C. R. Oldham
8941245800
Lint 2018-09-21 09:36:03 -06:00
C. R. Oldham
efb8abe906
Lint 2018-09-21 09:36:02 -06:00
C. R. Oldham
85ac68b62c
Clarify doc 2018-09-21 09:36:02 -06:00
C. R. Oldham
bb40119bb9
Remove self
Fix vimfail in modules/match.py
2018-09-21 09:36:01 -06:00
C. R. Oldham
75749c7851
Remove self 2018-09-21 09:36:00 -06:00
C. R. Oldham
bee93a7bdc
Typo. 2018-09-21 09:36:00 -06:00
C. R. Oldham
04ff6a032c
Typo. 2018-09-21 09:35:59 -06:00
C. R. Oldham
6120ac247d
Add logging back into confirm_top.py, lint. 2018-09-21 09:35:58 -06:00
C. R. Oldham
34d3ef0900
Remove Matcher class and use the bare loader. 2018-09-21 09:35:58 -06:00
C. R. Oldham
7c1519ec3a
Lint 2018-09-21 09:35:57 -06:00
C. R. Oldham
c952368d36
Remove default.py 2018-09-21 09:35:56 -06:00
C. R. Oldham
2f3f4e94b4
lint 2018-09-21 09:35:56 -06:00
C. R. Oldham
1697a4340c
Revert "Fix test."
This reverts commit 86b5c95c6cece645e69f098d3dd88220435a569b.
2018-09-21 09:35:55 -06:00
C. R. Oldham
138e389e5b
Fix test. 2018-09-21 09:35:54 -06:00
C. R. Oldham
17ed9f4045
Add compound pillar_exact_match 2018-09-21 09:35:54 -06:00
C. R. Oldham
9577f15fd4
Add master-side cache matcher 2018-09-21 09:35:53 -06:00
C. R. Oldham
2495d48f49
Add docs for loadable matchers. 2018-09-21 09:35:52 -06:00