Allow to check whether a function is available on the AliasesLoader wrapper

salt/utils/templates.py

@@ -82,6 +82,13 @@ class AliasedLoader(object):
         else:
             return getattr(self.wrapped, name)
 
+    def __contains__(self, name):
+        if name in ALIASES:
+            salt.utils.warn_until('Nitrogen', ALIAS_WARN)
+            return ALIASES[name] in self.wrapped
+        else:
+            return name in self.wrapped
+
 
 class AliasedModule(object):
     '''

tests/integration/files/file/base/jinja_salt_contains_function.sls

@@ -0,0 +1,10 @@
+{% set salt_foo_bar_exist = 'foo.bar' in salt %}
+{% set salt_test_ping_exist = 'test.ping' in salt %}
+
+test-ping-exist:
+  test.succeed_without_changes:
+    - name: salt_test_ping_exist_{{ salt_test_ping_exist }}
+
+foo-bar-not-exist:
+  test.succeed_without_changes:
+    - name: salt_foo_bar_exist_{{ salt_foo_bar_exist }}

tests/integration/states/renderers.py

@@ -26,6 +26,14 @@ class TestJinjaRenderer(integration.ModuleCase):
         for state_ret in ret.values():
             self.assertTrue(state_ret['result'])
 
+    def test_salt_contains_function(self):
+        '''
+        Test if we are able to check if a function exists inside the "salt"
+        wrapper (AliasLoader) which is available on Jinja templates.
+        '''
+        ret = self.run_function('state.sls', ['jinja_salt_contains_function'])
+        for state_ret in ret.values():
+            self.assertTrue(state_ret['result'])
 
 if __name__ == '__main__':
     from integration import run_tests