pkgrepo: account for 'name' attr being part of the state

mattp- · mattp- · commit cbe8c6e57a4c · 2025-06-27T16:02:06.000-04:00
fixes #21369. I'm not 100% sure that name is safe across all repo types this state manages, but it fixes the root issue referenced, and I'm pretty sure it's ok.
diff --git a/salt/states/pkgrepo.py b/salt/states/pkgrepo.py
@@ -413,7 +413,8 @@ def managed(name, ppa=None, copr=None, aptkey=True, **kwargs):
             )
             return ret
 
-    repo = name
+    kwargs["name"] = repo = name
+
     if __grains__["os"] in ("Ubuntu", "Mint"):
         if ppa is not None:
             # overload the name/repo value for PPAs cleanly
@@ -437,9 +438,6 @@ def managed(name, ppa=None, copr=None, aptkey=True, **kwargs):
 
         if "humanname" in kwargs:
             kwargs["name"] = kwargs.pop("humanname")
-        if "name" not in kwargs:
-            # Fall back to the repo name if humanname not provided
-            kwargs["name"] = repo
 
         kwargs["enabled"] = (
             not salt.utils.data.is_true(disabled)
diff --git a/tests/pytests/unit/states/test_pkgrepo.py b/tests/pytests/unit/states/test_pkgrepo.py
@@ -18,6 +18,26 @@ def configure_loader_modules():
     }
 
 
+def test_name_change():
+    """
+    Test when only the key_url is changed that a change is triggered
+    """
+    kwargs = {
+        "name": "deb http://apt.example.com/{{grains['os'] | lower}} {{grains['oscodename']}} main",
+        "disabled": False,
+        "key_url": "https://mock/changed_gpg.key",
+    }
+
+    new = kwargs.copy()
+    new["name"] = (
+        "deb [arch=amd64] http://apt.example.com/{{grains['os'] | lower}} {{grains['oscodename']}} main"
+    )
+
+    with patch.dict(pkgrepo.__salt__, {"pkg.get_repo": MagicMock(return_value=kwargs)}):
+        ret = pkgrepo.managed(**new)
+        assert ret["changes"] == {"name": {"old": kwargs["name"], "new": new["name"]}}
+
+
 def test_new_key_url():
     """
     Test when only the key_url is changed that a change is triggered
