fixes saltstack#66262 pillar.ls doesn't accept kwargs

nicholasmhughes · Mar 23, 2024 · d78f515 · d78f515
1 parent 35bc5fc
commit d78f515
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/changelog/66262.fixed.md b/changelog/66262.fixed.md
@@ -0,0 +1 @@
+Fixed pillar.ls doesn't accept kwargs
diff --git a/salt/modules/pillar.py b/salt/modules/pillar.py
@@ -328,7 +328,7 @@ def obfuscate(*args, **kwargs):
 
 # naming chosen for consistency with grains.ls, although it breaks the short
 # identifier rule.
-def ls(*args):
+def ls(*args, **kwargs):
     """
     .. versionadded:: 2015.8.0
 
@@ -342,7 +342,7 @@ def ls(*args):
         salt '*' pillar.ls
     """
 
-    return list(items(*args))
+    return list(items(*args, **kwargs))
 
 
 def item(*args, **kwargs):

diff --git a/tests/pytests/unit/modules/test_pillar.py b/tests/pytests/unit/modules/test_pillar.py
@@ -180,3 +180,9 @@ def test_pillar_keys():
         test_key = "7:11"
         res = pillarmod.keys(test_key)
         assert res == ["12"]
+
+
+def test_ls_pass_kwargs(pillar_value):
+    with patch("salt.modules.pillar.items", MagicMock(return_value=pillar_value)):
+        ls = sorted(pillarmod.ls(pillarenv="base"))
+        assert ls == ["a", "b"]