fix construction of runtime config

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

dsc_lib/src/dscresources/dscresource.rs

@@ -201,13 +201,15 @@ impl Invoke for DscResource {
             for property in &self.properties {
                 resource_properties.insert(property.clone(), Value::Null);
             }
+            let mut resources_map = Map::new();
             property_map.insert("properties".to_string(), Value::Object(resource_properties));
+            resources_map.insert("resources".to_string(), Value::Object(property_map));
             let adapter_resource = Resource {
                 name: self.type_name.clone(),
                 resource_type: adapter.clone(),
                 depends_on: None,
                 metadata: None,
-                properties: Some(property_map),
+                properties: Some(resources_map),
             };
             configuration.resources.push(adapter_resource);
             let config_json = serde_json::to_string(&configuration)?;

powershell-adapter/psDscAdapter/powershell.resource.ps1

@@ -189,7 +189,7 @@ switch ($Operation) {
         @{ valid = $true } | ConvertTo-Json
     }
     Default {
-        Write-Error 'Unsupported operation. Please use one of the following: List, Get, Set, Test, Export, Validate'
+        Write-DscTrace -Operation Error -Message 'Unsupported operation. Please use one of the following: List, Get, Set, Test, Export, Validate'
     }
 }
 

powershell-adapter/psDscAdapter/win_psDscAdapter.psm1

@@ -377,7 +377,7 @@ function Invoke-DscOperation {
                 # using the cmdlet the appropriate dsc module, and handle errors
                 try {
                     Write-DscTrace -Operation Debug -Message "Module: $($cachedDscResourceInfo.ModuleName), Name: $($cachedDscResourceInfo.Name), Property: $($property)"
-                    $invokeResult = Invoke-DscResource -Method $Operation -ModuleName $cachedDscResourceInfo.ModuleName -Name $cachedDscResourceInfo.Name -Property $property
+                    $invokeResult = Invoke-DscResource -Method $Operation -ModuleName $cachedDscResourceInfo.ModuleName -Name $cachedDscResourceInfo.Name -Property $property -ErrorAction Stop
 
                     if ($invokeResult.GetType().Name -eq 'Hashtable') {
                         $invokeResult.keys | ForEach-Object -Begin { $ResultProperties = @{} } -Process { $ResultProperties[$_] = $invokeResult.$_ }