Fix #22063: pillar wildcard support include

salt/pillar/__init__.py

@@ -754,13 +754,25 @@ def render_pstate(self, sls, saltenv, mods, defaults=None):
                     else:
                         # render included state(s)
                         include_states = []
+
+                        matched_pstates = []
                         for sub_sls in state.pop('include'):
                             if isinstance(sub_sls, dict):
                                 sub_sls, v = next(six.iteritems(sub_sls))
                                 defaults = v.get('defaults', {})
                                 key = v.get('key', None)
                             else:
                                 key = None
+
+                            try:
+                                matched_pstates = fnmatch.filter(self.avail[saltenv], sub_sls)
+                            except KeyError:
+                                errors.extend(
+                                    ['No matching pillar environment for environment '
+                                     '\'{0}\' found'.format(saltenv)]
+                                )
+
+                        for sub_sls in matched_pstates:
                             if sub_sls not in mods:
                                 nstate, mods, err = self.render_pstate(
                                         sub_sls,

tests/unit/test_pillar.py

@@ -296,7 +296,8 @@ def test_ext_pillar_with_extra_minion_data_val_elem(self):
             'mocked-minion', 'fake_pillar', 'bar',
             extra_minion_data={'fake_key': 'foo'})
 
-    def test_malformed_pillar_sls(self):
+    @patch('salt.fileclient.Client.list_states')
+    def test_malformed_pillar_sls(self, mock_list_states):
         with patch('salt.pillar.compile_template') as compile_template:
             opts = {
                 'renderer': 'json',
@@ -315,6 +316,7 @@ def test_malformed_pillar_sls(self):
                 'osrelease': '13.04',
                 'kernel': 'Linux'
             }
+            mock_list_states.return_value = ['foo', 'blah']
             pillar = salt.pillar.Pillar(opts, grains, 'mocked-minion', 'base')
             # Mock getting the proper template files
             pillar.client.get_state = MagicMock(
@@ -366,6 +368,16 @@ def test_malformed_pillar_sls(self):
                 ({'foo': 'bar', 'foo2': 'bar2'}, [])
             )
 
+            # Test includes as a list with wildcard
+            compile_template.side_effect = [
+                {'foo': 'bar', 'include': ['bl*']},
+                {'foo2': 'bar2'}
+            ]
+            self.assertEqual(
+                pillar.render_pillar({'base': ['foo.sls']}),
+                ({'foo': 'bar', 'foo2': 'bar2'}, [])
+            )
+
             # Test includes as a list overriding data
             compile_template.side_effect = [
                 {'foo': 'bar', 'include': ['blah']},