Handle the exception in salt/utils/platform.py instead

Signed-off-by: Pedro Algarvio <[email protected]>

salt/grains/core.py

@@ -2320,14 +2320,9 @@ def _legacy_linux_distribution_data(grains, os_release, lsb_has_error):
     log.trace(
         "Getting OS name, release, and codename from distro id, version, codename"
     )
-    try:
-        (osname, osrelease, oscodename) = (
-            x.strip('"').strip("'") for x in _linux_distribution()
-        )
-    except subprocess.CalledProcessError:
-        # When running under the salt user, a call to `lsb_release` might raise
-        # permissin errors.
-        return grains
+    (osname, osrelease, oscodename) = (
+        x.strip('"').strip("'") for x in _linux_distribution()
+    )
     # Try to assign these three names based on the lsb info, they tend to
     # be more accurate than what python gets from /etc/DISTRO-release.
     # It's worth noting that Ubuntu has patched their Python distribution

salt/utils/platform.py

@@ -1,7 +1,7 @@
 """
 Functions for identifying which platform a machine is
 """
-
+import contextlib
 import multiprocessing
 import os
 import platform
@@ -18,8 +18,16 @@ def linux_distribution(full_distribution_name=True):
     Simple function to return information about the OS distribution (id_name, version, codename).
     """
     if full_distribution_name:
-        return distro.name(), distro.version(best=True), distro.codename()
-    return distro.id(), distro.version(best=True), distro.codename()
+        distro_name = distro.name()
+    else:
+        distro_name = distro.id()
+    # Empty string fallbacks
+    distro_version = distro_codename = ""
+    with contextlib.suppress(subprocess.CalledProcessError):
+        distro_version = distro.version(best=True)
+    with contextlib.suppress(subprocess.CalledProcessError):
+        distro_codename = distro.codename()
+    return distro_name, distro_version, distro_codename
 
 
 @real_memoize

tests/pytests/unit/utils/test_platform.py

@@ -0,0 +1,47 @@
+import subprocess
+
+import salt.utils.platform
+from tests.support.mock import patch
+
+
+def test_linux_distribution():
+    """
+    Test that when `distro` fails with a `subprocess.CalledProcessError` salt
+    returns empty strings as default values.
+    """
+    distro_name = "Salt"
+    distro_version = "1"
+    distro_codename = "Awesome"
+    with patch("distro.name", return_value=distro_name):
+        with patch("distro.version", return_value=distro_version), patch(
+            "distro.codename", return_value=distro_codename
+        ):
+            assert salt.utils.platform.linux_distribution() == (
+                distro_name,
+                distro_version,
+                distro_codename,
+            )
+
+        distro_version = ""
+        with patch(
+            "distro.version",
+            side_effect=subprocess.CalledProcessError(returncode=1, cmd=["foo"]),
+        ), patch("distro.codename", return_value=distro_codename):
+            assert salt.utils.platform.linux_distribution() == (
+                distro_name,
+                distro_version,
+                distro_codename,
+            )
+        distro_codename = ""
+        with patch(
+            "distro.version",
+            side_effect=subprocess.CalledProcessError(returncode=1, cmd=["foo"]),
+        ), patch(
+            "distro.codename",
+            side_effect=subprocess.CalledProcessError(returncode=1, cmd=["foo"]),
+        ):
+            assert salt.utils.platform.linux_distribution() == (
+                distro_name,
+                distro_version,
+                distro_codename,
+            )