Skip to content

Set grain#31427 #68305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 3006.x
Choose a base branch
from
Open

Set grain#31427 #68305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9b9913
second commit
bertdawg76 Sep 3, 2025
1201c4b
Merge branch '3006.x' into set-grain#31427
bertdawg76 Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/31427.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Removes duplicate list items from custom grains before being saved into grain file.
2 changes: 2 additions & 0 deletions salt/modules/grains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,8 @@ def setval(key, val, destructive=False, refresh_pillar=True):
salt '*' grains.setval key val
salt '*' grains.setval key "{'sub-key': 'val', 'sub-key2': 'val2'}"
"""
if isinstance(val, list):
val = list(dict.fromkeys(val))
return setvals({key: val}, destructive, refresh_pillar=refresh_pillar)


Expand Down
7 changes: 7 additions & 0 deletions tests/pytests/unit/modules/test_grains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,3 +738,10 @@ def test_delkey_nested_key_force_needed():
assert res["result"]
assert res["changes"] == {"b": None}
assert grainsmod.__grains__ == {"a": "aval", "c": 8}


def test_set_val_removing_duplicates():
val = ["one", "two", "three", "three", "four"]
key = "roles"
ret = grainsmod.setval(key, val, refresh_pillar=True)
assert ret == {"roles": ["one", "two", "three", "four"]}
Loading