saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #52008 from waynew/51832-re-allow-slash-includes

Browse source 
Allow `/` in pillar includes
This commit is contained in:
Daniel Wozniak 2019-04-11 17:02:39 -07:00 • committed by GitHub
commit b551bbd2e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/pillar/__init__.py
View file

@ -256,7 +256,7 @@ class RemotePillar(RemotePillarMixin):
return ret_pillar
def destroy(self):
if self._closing:
if hasattr(self, '_closing') and self._closing:
return
self._closing = True
@ -773,7 +773,10 @@ class Pillar(object):
key = None
try:
matched_pstates += fnmatch.filter(self.avail[saltenv], sub_sls)
matched_pstates.extend(fnmatch.filter(
self.avail[saltenv],
sub_sls.lstrip('.').replace('/', '.'),
))
except KeyError:
errors.extend(
['No matching pillar environment for environment '

33
tests/unit/test_pillar.py
View file

@ -659,14 +659,21 @@ generic:
'oscodename': 'raring',
'osfullname': 'Ubuntu',
'osrelease': '13.04',
'kernel': 'Linux'
'kernel': 'Linux',
}
sls_files = self._setup_test_include_sls(tempdir)
fc_mock = MockFileclient(
cache_file=sls_files['top']['dest'],
get_state=sls_files,
list_states=['top', 'test.init', 'test.sub1',
'test.sub2', 'test.sub_wildcard_1'],
list_states=[
'top',
'test.init',
'test.sub1',
'test.sub2',
'test.sub_wildcard_1',
'test.sub_with_init_dot',
'test.sub.with.slashes',
],
)
with patch.object(salt.fileclient, 'get_file_client',
MagicMock(return_value=fc_mock)):
@ -677,6 +684,8 @@ generic:
self.assertEqual(compiled_pillar['foo_wildcard'], 'bar_wildcard')
self.assertEqual(compiled_pillar['foo1'], 'bar1')
self.assertEqual(compiled_pillar['foo2'], 'bar2')
self.assertEqual(compiled_pillar['sub_with_slashes'], 'sub_slashes_worked')
self.assertEqual(compiled_pillar['sub_init_dot'], 'sub_with_init_dot_worked')
def _setup_test_include_sls(self, tempdir):
top_file = tempfile.NamedTemporaryFile(dir=tempdir, delete=False)
@ -695,6 +704,8 @@ base:
include:
- test.sub1
- test.sub_wildcard*
- .test.sub_with_init_dot
- test/sub/with/slashes
''')
init_sls.flush()
sub1_sls = tempfile.NamedTemporaryFile(dir=tempdir, delete=False)
@ -717,12 +728,28 @@ foo_wildcard:
''')
sub_wildcard_1_sls.flush()
sub_with_init_dot_sls = tempfile.NamedTemporaryFile(dir=tempdir, delete=False)
sub_with_init_dot_sls.write(b'''
sub_init_dot:
sub_with_init_dot_worked
''')
sub_with_init_dot_sls.flush()
sub_with_slashes_sls = tempfile.NamedTemporaryFile(dir=tempdir, delete=False)
sub_with_slashes_sls.write(b'''
sub_with_slashes:
sub_slashes_worked
''')
sub_with_slashes_sls.flush()
return {
'top': {'path': '', 'dest': top_file.name},
'test': {'path': '', 'dest': init_sls.name},
'test.sub1': {'path': '', 'dest': sub1_sls.name},
'test.sub2': {'path': '', 'dest': sub2_sls.name},
'test.sub_wildcard_1': {'path': '', 'dest': sub_wildcard_1_sls.name},
'test.sub_with_init_dot': {'path': '', 'dest': sub_with_init_dot_sls.name},
'test.sub.with.slashes': {'path': '', 'dest': sub_with_slashes_sls.name},
}