Os release should always provide codename (bugfix) (#1794)

* Os release should always provide codename

* Remember to finish comments

Author: Hook25

providers/resource/bin/os_resource.py

@@ -38,13 +38,19 @@ def get_release_info(release_file_content: str):
         "VERSION_CODENAME": "codename",
     }
     os_release = {}
-    for line in release_file_content.strip().splitlines():
-        if line:
-            (key, value) = line.split("=", 1)
-            if key in os_release_map:
-                k = os_release_map[key]
-                # Strip out quotes and newlines
-                os_release[k] = re.sub('["\n]', "", value)
+    lines = filter(bool, release_file_content.strip().splitlines())
+    for line in lines:
+        (key, value) = line.split("=", 1)
+        if key in os_release_map:
+            k = os_release_map[key]
+            # Strip out quotes and newlines
+            os_release[k] = re.sub('["\n]', "", value)
+    # this is needed by C3, on core there is no VERSION_CODENAME, lets put
+    # description (PRETTY_NAME) here by default or unknown (which should be
+    # impossible but resources aren't supposed to crash)
+    os_release["codename"] = os_release.get(
+        "codename", os_release.get("description", "unknown")
+    )
     return os_release
 
 

providers/resource/tests/test_os_resource.py

@@ -71,3 +71,25 @@ def test_get_release_info_empty_lines(self):
             "codename": "jammy",
         }
         self.assertEqual(os_release, expected)
+
+    def test_get_release_info_core_no_codename(self):
+        # core doesn't have codename
+        os_release_data = textwrap.dedent(
+            """
+            NAME="Ubuntu Core"
+            VERSION="22"
+            ID=ubuntu-core
+            PRETTY_NAME="Ubuntu Core 22"
+            VERSION_ID="22"
+            HOME_URL="https://snapcraft.io/"
+            BUG_REPORT_URL="https://bugs.launchpad.net/snappy/
+            """
+        ).strip()
+        os_release = os_resource.get_release_info(os_release_data)
+        expected = {
+            "distributor_id": "Ubuntu Core",
+            "description": "Ubuntu Core 22",
+            "release": "22",
+            "codename": "Ubuntu Core 22",
+        }
+        self.assertEqual(os_release, expected)