Merge pull request #789 from SteveL-MSFT/ps-export

Fix exporting an adapted resource

Author: SteveL-MSFT

dsc_lib/src/dscresources/dscresource.rs

@@ -437,11 +437,17 @@ impl Invoke for DscResource {
             let mut export_result = ExportResult {
                 actual_state: Vec::new(),
             };
+            debug!("Export result: {}", serde_json::to_string(&configuration)?);
             for resource in configuration.resources {
                 let Some(properties) = resource.properties else {
                     return Err(DscError::Operation(t!("dscresources.dscresource.invokeExportReturnedNoResult", resource = self.type_name).to_string()));
                 };
-                export_result.actual_state.push(serde_json::to_value(properties["properties"].clone())?);
+                let results = properties
+                    .get("result").ok_or(DscError::Operation(t!("dscresources.dscresource.propertyNotFound", property = "result").to_string()))?
+                    .as_array().ok_or(DscError::Operation(t!("dscresources.dscresource.propertyIncorrectType", property = "result", property_type = "array").to_string()))?;
+                for result in results {
+                    export_result.actual_state.push(serde_json::to_value(result.clone())?);
+                }
             }
             return Ok(export_result);
         }

powershell-adapter/Tests/TestAdapter/testadapter.resource.ps1

@@ -58,8 +58,10 @@ switch ($Operation) {
 
     }
     'Export' {
-        @(@{name = $inputobj.resources.name; type = $inputobj.resources.type; properties = @{'TestCaseId' = 1; 'Input' = ''}}) | ConvertTo-Json -Depth 10 -Compress
-        @(@{name = $inputobj.resources.name; type = $inputobj.resources.type; properties = @{'TestCaseId' = 2; 'Input' = ''}}) | ConvertTo-Json -Depth 10 -Compress
+        @{result = @(
+            @{'TestCaseId' = 1; 'Input' = ''},
+            @{'TestCaseId' = 2; 'Input' = ''}
+        )} | ConvertTo-Json -Depth 10 -Compress
     }
     'Validate' {
         @{ valid = $true } | ConvertTo-Json