feat(kc-compat): include distro version in --report

Author: histrio

kc-compat.py

@@ -43,8 +43,6 @@ def get_kernel_hash_from_data(version_data):
     return sha1(version_data).hexdigest()
 
 
-
-
 def inside_vz_container():
     """
     determines if we are inside Virtuozzo container
@@ -60,24 +58,29 @@ def inside_lxc_container():
 def get_distro_info():
     """
     Get current distribution name and version
-    :return: distro name or None if detection fails
+    :return: tuple of (distro_name, distro_version) or (None, None) if detection fails
     """
 
     def parse_value(line):
         return line.split('=', 1)[1].strip().strip('"\'')
 
     os_release_path = '/etc/os-release'
     if not os.path.exists(os_release_path):
-        return None
+        return None, None
 
     try:
+        distro_name = None
+        distro_version = None
         with open(os_release_path, 'r') as f:
             for line in f:
                 line = line.strip()
                 if line.startswith('ID='):
-                    return parse_value(line)
+                    distro_name = parse_value(line)
+                elif line.startswith('VERSION_ID='):
+                    distro_version = parse_value(line)
+        return distro_name, distro_version
     except (IOError, OSError):
-        return None
+        return None, None
 
 
 def is_distro_supported(distro_name):
@@ -127,13 +130,13 @@ def main():
         version_data = b''
 
     kernel_hash = get_kernel_hash_from_data(version_data)
-    distro_name = get_distro_info()
+    distro_name, distro_version = get_distro_info()
 
     if report:
         print("=== KernelCare Compatibility Report ===")
         print(f"Kernel Hash: {kernel_hash}")
         print(f"Distribution: {distro_name or 'Unknown'}")
-        print(f"Version: Not available")
+        print(f"Version: {distro_version or 'Unknown'}")
         print(f"Kernel: {version_data.decode('utf-8', errors='replace').strip()}")
         print("=====================================")
 

test_kc_compat.py

@@ -19,6 +19,7 @@ def test_get_kernel_hash_from_data(self):
 
 
 
+
 class TestContainerDetection:
     @patch('os.path.exists')
     def test_inside_vz_container_true(self, mock_exists):
@@ -57,20 +58,22 @@ class TestGetDistroInfo:
     @patch('os.path.exists', return_value=True)
     @patch('builtins.open', new_callable=mock_open, read_data='ID=centos\nVERSION_ID="7"\n')
     def test_get_distro_info_success(self, mock_file, mock_exists):
-        name = kc_compat.get_distro_info()
+        name, version = kc_compat.get_distro_info()
         assert name == 'centos'
-
+        assert version == '7'
 
     @patch('os.path.exists', return_value=False)
     def test_get_distro_info_no_file(self, mock_exists):
-        name = kc_compat.get_distro_info()
+        name, version = kc_compat.get_distro_info()
         assert name is None
+        assert version is None
 
     @patch('os.path.exists', return_value=True)
     @patch('builtins.open', side_effect=IOError("Permission denied"))
     def test_get_distro_info_read_error(self, mock_file, mock_exists):
-        name = kc_compat.get_distro_info()
+        name, version = kc_compat.get_distro_info()
         assert name is None
+        assert version is None
 
 
 class TestIsDistroSupported:
@@ -149,7 +152,7 @@ def test_main_compatible(self, mock_print, mock_compat, mock_lxc, mock_vz):
     @patch.object(kc_compat, 'inside_vz_container', return_value=False)
     @patch.object(kc_compat, 'inside_lxc_container', return_value=False)
     @patch.object(kc_compat, 'is_compat', return_value=False)
-    @patch.object(kc_compat, 'get_distro_info', return_value='centos')
+    @patch.object(kc_compat, 'get_distro_info', return_value=('centos', '7'))
     @patch.object(kc_compat, 'is_distro_supported', return_value=True)
     @patch('builtins.print')
     def test_main_kernel_not_found_but_distro_supported(self, mock_print, mock_distro_supported, 
@@ -167,7 +170,7 @@ def test_main_kernel_not_found_but_distro_supported(self, mock_print, mock_distr
     @patch.object(kc_compat, 'inside_vz_container', return_value=False)
     @patch.object(kc_compat, 'inside_lxc_container', return_value=False)
     @patch.object(kc_compat, 'is_compat', return_value=False)
-    @patch.object(kc_compat, 'get_distro_info', return_value='unknown')
+    @patch.object(kc_compat, 'get_distro_info', return_value=('unknown', None))
     @patch.object(kc_compat, 'is_distro_supported', return_value=False)
     @patch('builtins.print')
     def test_main_kernel_not_found_distro_not_supported(self, mock_print, mock_distro_supported,
@@ -192,7 +195,7 @@ def test_main_silent_mode(self, mock_print, mock_compat, mock_lxc, mock_vz):
         mock_print.assert_not_called()
 
     @patch('sys.argv', ['kc-compat.py', '--report'])
-    @patch.object(kc_compat, 'get_distro_info', return_value='centos')
+    @patch.object(kc_compat, 'get_distro_info', return_value=('centos', '7'))
     @patch.object(kc_compat, 'inside_vz_container', return_value=False)
     @patch.object(kc_compat, 'inside_lxc_container', return_value=False)
     @patch.object(kc_compat, 'is_compat', return_value=True)
@@ -210,7 +213,7 @@ def test_main_report_mode(self, mock_print, mock_file, mock_compat, mock_lxc, mo
         assert calls[0].args[0] == "=== KernelCare Compatibility Report ==="
         assert calls[1].args[0].startswith("Kernel Hash: ")
         assert calls[2].args[0] == "Distribution: centos"
-        assert calls[3].args[0] == "Version: Not available"
+        assert calls[3].args[0] == "Version: 7"
         assert calls[4].args[0] == "Kernel: Linux version 5.4.0-test"
         assert calls[5].args[0] == "====================================="
         assert calls[6].args[0] == "COMPATIBLE"