Enable pkg.installed to detect packages by their origin name on FreeBSD

changelog/67126.fixed.md

@@ -0,0 +1 @@
+Fixed pkg.install in test mode would not detect FreeBSD packages installed by their origin name

salt/modules/pkgng.py

@@ -927,7 +927,7 @@ def remove(
 
     .. note::
 
-        This function can accessed using ``pkg.delete`` in addition to
+        This function can be accessed using ``pkg.delete`` in addition to
         ``pkg.remove``, to more closely match the CLI usage of ``pkg(8)``.
 
     name
@@ -1904,7 +1904,7 @@ def hold(name=None, pkgs=None, **kwargs):  # pylint: disable=W0613
     .. note::
         This function is provided primarily for compatibility with some
         parts of :py:mod:`states.pkg <salt.states.pkg>`.
-        Consider using Consider using :py:func:`pkg.lock <salt.modules.pkgng.lock>` instead. instead.
+        Consider using :py:func:`pkg.lock <salt.modules.pkgng.lock>` instead. instead.
 
     name
         The name of the package to be held.
@@ -2030,7 +2030,7 @@ def list_locked(**kwargs):
     Query the package database those packages which are
     locked against reinstallation, modification or deletion.
 
-    Returns returns a list of package names with version strings
+    Returns a list of package names with version strings
 
     CLI Example:
 
@@ -2369,15 +2369,15 @@ def _parse_upgrade(stdout):
     """
     # Match strings like 'python36: 3.6.3 -> 3.6.4 [FreeBSD]'
     upgrade_regex = re.compile(
-        r"^\s+([^:]+):\s([0-9a-z_,.]+)\s+->\s+([0-9a-z_,.]+)\s*(\[([^]]+)\])?\s*(\(([^)]+)\))?"
+        r"^\s+([^:]+):\s([0-9a-z_,.]+)\s+->\s+([0-9a-z_,.]+)\s*(\[([^]]+)])?\s*(\(([^)]+)\))?"
     )
     # Match strings like 'rubygem-bcrypt_pbkdf: 1.0.0 [FreeBSD]'
     install_regex = re.compile(
-        r"^\s+([^:]+):\s+([0-9a-z_,.]+)\s*(\[([^]]+)\])?\s*(\(([^)]+)\))?"
+        r"^\s+([^:]+):\s+([0-9a-z_,.]+)\s*(\[([^]]+)])?\s*(\(([^)]+)\))?"
     )
     # Match strings like 'py27-yaml-3.11_2 [FreeBSD] (direct dependency changed: py27-setuptools)'
     reinstall_regex = re.compile(
-        r"^\s+(\S+)-(?<=-)([0-9a-z_,.]+)\s*(\[([^]]+)\])?\s*(\(([^)]+)\))?"
+        r"^\s+(\S+)-(?<=-)([0-9a-z_,.]+)\s*(\[([^]]+)])?\s*(\(([^)]+)\))?"
     )
 
     result = {

salt/states/pkg.py

@@ -743,7 +743,15 @@ def _find_install_targets(
     warnings = []
     failed_verify = False
     for package_name, version_string in desired.items():
-        cver = cur_pkgs.get(package_name, [])
+
+        # FreeBSD pkg supports `openjdk` and `java/openjdk7` package names
+        origin = bool(re.search('/', package_name))
+
+        if __grains__['os'] == 'FreeBSD' and origin:
+            cver = [k for k, v in cur_pkgs.items() if v['origin'] == package_name]
+        else:
+            cver = cur_pkgs.get(package_name, [])
+
         if resolve_capabilities and not cver and package_name in cur_prov:
             cver = cur_pkgs.get(cur_prov.get(package_name)[0], [])
 

tests/pytests/unit/states/test_pkg.py

@@ -8,6 +8,7 @@
 import salt.modules.pacmanpkg as pacmanpkg
 import salt.modules.pkg_resource as pkg_resource
 import salt.modules.yumpkg as yumpkg
+import salt.modules.pkgng as pkgng
 import salt.states.beacon as beaconstate
 import salt.states.pkg as pkg
 import salt.utils.state as state_utils
@@ -48,6 +49,11 @@ def configure_loader_modules(minion_opts):
             "__salt__": {},
             "__grains__": {"os": "CentOS", "os_family": "RedHat"},
         },
+        pkgng: {
+            "__salt__": {},
+            "__grains__": {"os": "FreeBSD", "osarch": "amd64", "osmajorrelease": 14},
+            "__opts__": minion_opts,
+        },
         yumpkg: {
             "__salt__": {},
             "__grains__": {"osarch": "x86_64", "osmajorrelease": 7},
@@ -883,6 +889,52 @@ def test_installed_with_single_normalize():
         assert ret["changes"] == expected
 
 
+def test_installed_with_freebsd_origin():
+    """
+    Test pkg.installed where the package name is specified as an origin name
+    """
+
+    list_pkgs = MagicMock(
+        return_value={
+            "pkga": {
+                "origin": "test/pkga",
+                "version": ["1.0.1"],
+            }
+        }
+    )
+
+    install_mock = MagicMock(return_value={})
+
+    salt_dict = {
+        "pkg.install": install_mock,
+        "pkg.list_pkgs": list_pkgs,
+        "pkg_resource.version_clean": pkg_resource.version_clean,
+        "pkg_resource.parse_targets": pkg_resource.parse_targets,
+        "pkg_resource.check_extra_requirements": pkg_resource.check_extra_requirements,
+    }
+
+    with (
+        patch("salt.modules.pkgng.list_pkgs", list_pkgs),
+        patch("salt.modules.pkgng.version_cmp", MagicMock(return_value=0)),
+        patch.dict(pkg.__salt__, salt_dict),
+        patch.dict(pkg_resource.__salt__, salt_dict),
+        patch.dict(pkgng.__salt__, salt_dict),
+        patch.dict(
+            pkg.__grains__,
+            {
+                "os": "FreeBSD",
+                "osarch": "amd64",
+                "os_family": "FreeBSD",
+                "osmajorrelease": 14,
+            },
+        ),
+    ):
+
+        ret = pkg.installed("test/pkga")
+        install_mock.assert_not_called()
+        assert ret["result"]
+
+
 def test_removed_with_single_normalize():
     """
     Test pkg.removed with preventing multiple package name normalisation