Updated PS and WMI adapters

Author: Andrew

powershell-adapter/psDscAdapter/psDscAdapter.psm1

@@ -379,8 +379,8 @@ function Get-DscResourceObject {
     }
     else {
         # mimic a config object with a single resource
-        $type = $inputObj.type
-        $inputObj.psobject.properties.Remove('type')
+        $type = $inputObj.adapted_dsc_type
+        $inputObj.psobject.properties.Remove('adapted_dsc_type')
         $desiredState += [dscResourceObject]@{
             name       = $adapterName
             type       = $type
@@ -412,7 +412,7 @@ function Invoke-DscOperation {
     'PSDesiredStateConfiguration module version: ' + $moduleVersion | Write-DscTrace
 
     # get details from cache about the DSC resource, if it exists
-    $cachedDscResourceInfo = $dscResourceCache | Where-Object Type -EQ $DesiredState.type | ForEach-Object DscResourceInfo
+    $cachedDscResourceInfo = $dscResourceCache | Where-Object Type -EQ $DesiredState.adapted_dsc_type | ForEach-Object DscResourceInfo
 
     # if the resource is found in the cache, get the actual state
     if ($cachedDscResourceInfo) {
@@ -477,7 +477,7 @@ function Invoke-DscOperation {
     }
     else {
         $dsJSON = $DesiredState | ConvertTo-Json -Depth 10
-        $errmsg = 'Can not find type "' + $DesiredState.type + '" for resource "' + $dsJSON + '". Please ensure that Get-DscResource returns this resource type.'
+        $errmsg = 'Can not find type "' + $DesiredState.adapted_dsc_type + '" for resource "' + $dsJSON + '". Please ensure that Get-DscResource returns this resource type.'
         'ERROR: ' + $errmsg | Write-DscTrace
         exit 1
     }

powershell-adapter/psDscAdapter/win_psDscAdapter.psm1

@@ -276,8 +276,8 @@ function Get-DscResourceObject {
     }
     else {
         # mimic a config object with a single resource
-        $type = $inputObj.type
-        $inputObj.psobject.properties.Remove('type')
+        $type = $inputObj.adapted_dsc_type
+        $inputObj.psobject.properties.Remove('adapted_dsc_type')
         $desiredState += [dscResourceObject]@{
             name       = $adapterName
             type       = $type
@@ -309,7 +309,7 @@ function Invoke-DscOperation {
     'PSDesiredStateConfiguration module version: ' + $moduleVersion | Write-DscTrace
 
     # get details from cache about the DSC resource, if it exists
-    $cachedDscResourceInfo = $dscResourceCache | Where-Object Type -EQ $DesiredState.type | ForEach-Object DscResourceInfo
+    $cachedDscResourceInfo = $dscResourceCache | Where-Object Type -EQ $DesiredState.adapted_dsc_type | ForEach-Object DscResourceInfo
 
     # if the resource is found in the cache, get the actual state
     if ($cachedDscResourceInfo) {
@@ -453,7 +453,7 @@ function Invoke-DscOperation {
     }
     else {
         $dsJSON = $DesiredState | ConvertTo-Json -Depth 10
-        $errmsg = 'Can not find type "' + $DesiredState.type + '" for resource "' + $dsJSON + '". Please ensure that Get-DscResource returns this resource type.'
+        $errmsg = 'Can not find type "' + $DesiredState.adapted_dsc_type + '" for resource "' + $dsJSON + '". Please ensure that Get-DscResource returns this resource type.'
         'ERROR: ' + $errmsg | Write-DscTrace
         exit 1
     }

wmi-adapter/wmi.resource.ps1

@@ -105,7 +105,7 @@ elseif ($Operation -eq 'Get')
     }
     else # we are processing an individual resource call
     {
-        $type_fields = $inputobj_pscustomobj.type -split "/"
+        $type_fields = $inputobj_pscustomobj.adapted_dsc_type -split "/"
         $wmi_namespace = $type_fields[0].Replace('.','\')
         $wmi_classname = $type_fields[1]