Skip to content

Fix mod_aggregate for pkg state module when a version is specified in a pkgs argument #69737

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
bdrx312 wants to merge 1 commit into
base: 3008.x
Choose a base branch
from
+12 −11
Open

Fix mod_aggregate for pkg state module when a version is specified in a pkgs argument #69737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/69736.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed mod_aggregate for pkg state when an item in pkgs argument list contains a name: version dict
12 changes: 6 additions & 6 deletions salt/states/pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3655,7 +3655,7 @@ def mod_aggregate(low, chunks, running):
return low
is_sources = "sources" in low
# use a dict instead of a set to maintain insertion order
pkgs = {}
pkgs: dict[str, set[str | None]] = {}
for chunk in chunks:
tag = __utils__["state.gen_tag"](chunk)
if tag in running:
Expand Down Expand Up @@ -3692,10 +3692,10 @@ def mod_aggregate(low, chunks, running):
chunk["__agg__"] = True
if pkgs:
pkg_type = "sources" if is_sources else "pkgs"
low_pkgs = {}
low_pkgs: dict[str, set[str | None]] = {}
_combine_pkgs(low_pkgs, low.get(pkg_type, []))
for pkg, values in pkgs.items():
low_pkgs.setdefault(pkg, {None}).update(values)
low_pkgs.setdefault(pkg, set()).update(values)
# the value is the version for pkgs and
# the URI for sources
low_pkgs_list = [
Expand All @@ -3707,13 +3707,13 @@ def mod_aggregate(low, chunks, running):
return low


def _combine_pkgs(pkgs_dict, additional_pkgs_list):
def _combine_pkgs(pkgs_dict: dict[str, set[str | None]], additional_pkgs_list):
for item in additional_pkgs_list:
if isinstance(item, str):
pkgs_dict.setdefault(item, {None})
else:
for pkg, version in item:
pkgs_dict.setdefault(pkg, {None}).add(version)
for pkg, version in item.items():
pkgs_dict.setdefault(pkg, set()).add(version)


def mod_watch(name, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions tests/pytests/unit/states/test_pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ def test_mod_aggregate():
"__sls__": "47628",
"__env __": "base",
"__id__": "other_pkgs",
"pkgs": ["byobu"],
"pkgs": ["byobu", {"tput": "1.0.1"}],
"aggregate": True,
"order": 10002,
"fun": "installed",
Expand Down Expand Up @@ -552,7 +552,7 @@ def test_mod_aggregate():
}

expected = {
"pkgs": ["byobu", "vim", "tmux", "google-cloud-sdk"],
"pkgs": ["byobu", {"tput": "1.0.1"}, "vim", "tmux", "google-cloud-sdk"],
"name": "other_pkgs",
"fun": "installed",
"aggregate": True,
Expand Down
6 changes: 3 additions & 3 deletions tests/pytests/unit/utils/requisite/test_dependency_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ def test_get_aggregate_chunks():
"name": "packages-2",
"state": "pkg",
"fun": "installed",
"pkgs": ["cowsay", "fortune-mod"],
"pkgs": ["cowsay", "fortune-mod", {"tput": "1.0.1"}],
"require": ["requirement"],
},
{
Expand Down Expand Up @@ -388,7 +388,7 @@ def test_get_dependencies():
"name": "packages-2",
"state": "pkg",
"fun": "installed",
"pkgs": ["cowsay", "fortune-mod"],
"pkgs": ["cowsay", "fortune-mod", {"tput": "1.0.1"}],
"require": ["requirement"],
},
{
Expand Down Expand Up @@ -465,7 +465,7 @@ def test_get_dependencies_when_aggregated():
"name": "packages-2",
"state": "pkg",
"fun": "installed",
"pkgs": ["cowsay", "fortune-mod"],
"pkgs": ["cowsay", "fortune-mod", {"tput": "1.0.1"}],
"require": ["requirement"],
},
{
Expand Down
Loading