Update OSInfo resource to return _name

osinfo/src/config.rs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 use serde::Serialize;
+use std::fmt::Display;
 use std::string::ToString;
 
 /// Returns information about the operating system.
@@ -24,6 +25,8 @@ pub struct OsInfo {
     /// Defines the processor architecture as reported by `uname -m` on the operating system.
     #[serde(skip_serializing_if = "Option::is_none")]
     architecture: Option<String>,
+    #[serde(rename = "_name", skip_serializing_if = "Option::is_none")]
+    name: Option<String>,
 }
 
 /// Defines whether the operating system is a 32-bit or 64-bit operating system.
@@ -46,6 +49,16 @@ pub enum Family {
     Windows,
 }
 
+impl Display for Family {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Family::Linux => write!(f, "Linux"),
+            Family::MacOS => write!(f, "macOS"),
+            Family::Windows => write!(f, "Windows"),
+        }
+    }
+}
+
 const ID: &str = "https://developer.microsoft.com/json-schemas/dsc/os_info/20230303/Microsoft.Dsc.OS_Info.schema.json";
 
 impl OsInfo {
@@ -64,14 +77,22 @@ impl OsInfo {
             os_info::Bitness::X64 => Bitness::Bit64,
             _ => Bitness::Unknown,
         };
+        let version = os_info.version().to_string();
+        let name = Some(
+            match &architecture {
+                Some(arch) => format!("{family} {version} {arch}"),
+                None => format!("{family:?} {version}"),
+            }
+        );
         Self {
             id: ID.to_string(),
             family,
-            version: os_info.version().to_string(),
+            version,
             edition,
             codename,
             bitness: bits,
             architecture,
+            name,
         }
     }
 }

osinfo/tests/osinfo.tests.ps1

@@ -52,5 +52,6 @@ Describe 'osinfo resource tests' {
         elseif ($IsMacOS) {
             $out.resources[0].properties.family | Should -BeExactly 'macOS'
         }
+        $out.resources[0].name | Should -BeExactly "$($out.resources[0].properties.family) $($out.resources[0].properties.version) $($out.resources[0].properties.architecture)"
     }
 }