fix wmi adapter and tests

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

wmi-adapter/Tests/wmi.tests.ps1

@@ -40,10 +40,10 @@ Describe 'WMI adapter resource tests' {
         $r = Get-Content -Raw $configPath | dsc config get -f -
         $LASTEXITCODE | Should -Be 0
         $res = $r | ConvertFrom-Json
-        $res.results[0].result.actualState[0].LastBootUpTime | Should -BeNullOrEmpty
-        $res.results[0].result.actualState[0].Caption | Should -Not -BeNullOrEmpty
-        $res.results[0].result.actualState[0].Version | Should -Not -BeNullOrEmpty
-        $res.results[0].result.actualState[0].OSArchitecture | Should -Not -BeNullOrEmpty
+        $res.results[0].result.actualState.result[0].properties.LastBootUpTime | Should -BeNullOrEmpty
+        $res.results[0].result.actualState.result[0].properties.Caption | Should -Not -BeNullOrEmpty
+        $res.results[0].result.actualState.result[0].properties.Version | Should -Not -BeNullOrEmpty
+        $res.results[0].result.actualState.result[0].properties.OSArchitecture | Should -Not -BeNullOrEmpty
     }
 
     It 'Example config works' -Skip:(!$IsWindows) {
@@ -52,10 +52,10 @@ Describe 'WMI adapter resource tests' {
         $LASTEXITCODE | Should -Be 0
         $r | Should -Not -BeNullOrEmpty
         $res = $r | ConvertFrom-Json
-        $res.results[1].result.actualState[0].Name | Should -Not -BeNullOrEmpty
-        $res.results[1].result.actualState[0].BootupState | Should -BeNullOrEmpty
-        $res.results[1].result.actualState[1].Caption | Should -Not -BeNullOrEmpty
-        $res.results[1].result.actualState[1].BuildNumber | Should -BeNullOrEmpty
-        $res.results[1].result.actualState[4].AdapterType | Should -BeLike "Ethernet*"
+        $res.results[1].result.actualState.result[0].properties.Name | Should -Not -BeNullOrEmpty
+        $res.results[1].result.actualState.result[0].properties.BootupState | Should -BeNullOrEmpty
+        $res.results[1].result.actualState.result[1].properties.Caption | Should -Not -BeNullOrEmpty
+        $res.results[1].result.actualState.result[1].properties.BuildNumber | Should -BeNullOrEmpty
+        $res.results[1].result.actualState.result[4].properties.AdapterType | Should -BeLike "Ethernet*"
     }
 }

wmi-adapter/wmi.resource.ps1

@@ -81,7 +81,7 @@ elseif ($Operation -eq 'Get')
 
     $result = @()
 
-    foreach($r in $inputobj_pscustomobj.resources)
+    foreach ($r in $inputobj_pscustomobj.resources)
     {
         $type_fields = $r.type -split "/"
         $wmi_namespace = $type_fields[0].Replace('.','\')
@@ -133,7 +133,7 @@ elseif ($Operation -eq 'Get')
 
         if ($wmi_instances)
         {
-            $instance_result = @{}
+            $instance_result = [ordered]@{}
             # TODO: for a `Get`, they key property must be provided so a specific instance is returned rather than just the first
             $wmi_instance = $wmi_instances[0] # for 'Get' we return just first matching instance; for 'export' we return all instances
             $wmi_instance.psobject.properties | %{
@@ -153,11 +153,11 @@ elseif ($Operation -eq 'Get')
                 }
             }
 
-            $result += @($instance_result)
+            $result += [pscustomobject]@{ name = $r.name; type = $r.type; properties = $instance_result }
         }
     }
 
-    $result | ConvertTo-Json -Compress
+    @{result = $result } | ConvertTo-Json -Depth 10 -Compress
 }
 elseif ($Operation -eq 'Validate')
 {