Fix issues with PowerShell adapter tests and module imports

Author: mgreenegit

powershell-adapter/Tests/powershellgroup.resource.tests.ps1

@@ -28,14 +28,22 @@ Describe 'PowerShell adapter resource tests' {
         ($resources | ? {$_.Type -eq 'PSDesiredStateConfiguration/File'}).Count | Should -Be 1
     }
 
-    It 'Get works on Binary resource' -Skip:(!$IsWindows){
+    It 'Get works on Binary "File" resource' -Skip:(!$IsWindows){
 
-        $r = '{"Name": "File test", "Type":"PSDesiredStateConfiguration/File", "DestinationPath":"$env:TEMP\\test.txt"}' | dsc resource get -r 'Microsoft.Dsc/WindowsPowerShell'
+        $r = '{"DestinationPath":"$env:TEMP\\test.txt"}' | dsc resource get -r 'PSDesiredStateConfiguration/File'
         $LASTEXITCODE | Should -Be 0
         $res = $r | ConvertFrom-Json
         $res.actualState.result.properties.Contents | Should -BeNullOrEmpty
     }
 
+    It 'Get works on traditional "Script" resource' -Skip:(!$IsWindows){
+
+        $r = '{"GetScript": "Get-Content $env:TEMP\\tests.txt", "SetScript": "throw", "TestScript": "throw"}' | dsc resource get -r 'PSDesiredStateConfiguration/Script'
+        $LASTEXITCODE | Should -Be 0
+        $res = $r | ConvertFrom-Json
+        $res.actualState.result.properties.GetScript | Should -BeNullOrEmpty
+    }
+
     It 'Get works on class-based resource' -Skip:(!$IsWindows){
 
         $r = "{'Name':'TestClassResource1', 'Type':'TestClassResource/TestClassResource'}" | dsc resource get -r 'Microsoft.Dsc/PowerShell'

powershell-adapter/psDscAdapter/psDscAdapter.psm1

@@ -55,7 +55,7 @@ function Invoke-DscCacheRefresh {
     }
     elseif ('PSDesiredStateConfiguration' -eq $module) {
         # workaround: the binary modules don't have a module name, so we have to special case File and SignatureValidation resources that ship in Windows
-        $DscResources = Get-DscResource | Where-Object { $_.modulename -eq 'PSDesiredStateConfiguration' -or ( $_.modulename -eq $null -and $_.parentpath -like "$env:windir\System32\Configuration\*" )}
+        $DscResources = Get-DscResource | Where-Object { $_.modulename -eq 'PSDesiredStateConfiguration' -or ( $_.modulename -eq $null -and $_.parentpath -like "$env:windir\System32\Configuration\*" ) }
     }
     else {
         # if no module is specified, get all resources
@@ -242,9 +242,14 @@ function Get-ActualState {
                 try {
                     $getResult = Invoke-DscResource -Method Get -ModuleName $cachedDscResourceInfo.ModuleName -Name $cachedDscResourceInfo.Name -Property $property
 
-                    # only return DSC properties
-                    $getResult.psobject.Properties.name | Where-Object { 'CimClass','CimInstanceProperties','CimSystemProperties' -notcontains $_ } | ForEach-Object -Begin { $getDscResult = @{} } -Process { $getDscResult[$_] = $getResult.$_ }
-
+                    if ($getResult.GetType().Name -eq 'Hashtable') {
+                        $getResult.keys | ForEach-Object -Begin { $getDscResult = @{} } -Process { $getDscResult[$_] = $getResult.$_ }
+                    }
+                    else {
+                        # the object returned by WMI is a CIM instance with a lot of additional data. only return DSC properties
+                        $getResult.psobject.Properties.name | Where-Object { 'CimClass', 'CimInstanceProperties', 'CimSystemProperties' -notcontains $_ } | ForEach-Object -Begin { $getDscResult = @{} } -Process { $getDscResult[$_] = $getResult.$_ }
+                    }
+                    
                     # set the properties of the OUTPUT object from the result of Get-TargetResource
                     $addToActualState.properties = $getDscResult
                 }
@@ -296,9 +301,14 @@ function Get-ActualState {
                 try {
                     $getResult = $PSDesiredStateConfiguration.invoke({ param($Name, $Property) Invoke-DscResource -Name $Name -Method Get -ModuleName @{ModuleName = 'PSDesiredStateConfiguration'; ModuleVersion = '1.1' } -Property $Property -ErrorAction Stop }, $cachedDscResourceInfo.Name, $property )
 
-                    # only return DSC properties
-                    $getResult.psobject.Properties.name | Where-Object { 'CimClass','CimInstanceProperties','CimSystemProperties' -notcontains $_ } | ForEach-Object -Begin { $getDscResult = @{} } -Process { $getDscResult[$_] = $getResult.$_ }
-
+                    if ($getResult.GetType().Name -eq 'Hashtable') {
+                        $getResult.keys | ForEach-Object -Begin { $getDscResult = @{} } -Process { $getDscResult[$_] = $getResult.$_ }
+                    }
+                    else {
+                        # the object returned by WMI is a CIM instance with a lot of additional data. only return DSC properties
+                        $getResult.psobject.Properties.name | Where-Object { 'CimClass', 'CimInstanceProperties', 'CimSystemProperties' -notcontains $_ } | ForEach-Object -Begin { $getDscResult = @{} } -Process { $getDscResult[$_] = $getResult.$_ }
+                    }
+                    
                     # set the properties of the OUTPUT object from the result of Get-TargetResource
                     $addToActualState.properties = $getDscResult
                 }

powershell-adapter/~/.config/powershell/Microsoft.PowerShell_profile.ps1

@@ -0,0 +1 @@
+$env:psmodulepath = $env:psmodulepath.trimend(';')