Fix progress display when using JSON, add None option; exhance progress schema

Author: SteveL-MSFT

dsc/Cargo.lock

@@ -254,6 +254,7 @@ impl Configurator {
             match &get_result {
                 GetResult::Resource(resource_result) => {
                     self.context.references.insert(format!("{}:{}", resource.resource_type, resource.name), serde_json::to_value(&resource_result.actual_state)?);
+                    progress.set_resource(&resource.name, &resource.resource_type, Some(&resource_result.actual_state));
                 },
                 GetResult::Group(group) => {
                     let mut results = Vec::<Value>::new();
@@ -402,6 +403,7 @@ impl Configurator {
             match &set_result {
                 SetResult::Resource(resource_result) => {
                     self.context.references.insert(format!("{}:{}", resource.resource_type, resource.name), serde_json::to_value(&resource_result.after_state)?);
+                    progress.set_resource(&resource.name, &resource.resource_type, Some(&resource_result.after_state));
                 },
                 SetResult::Group(group) => {
                     let mut results = Vec::<Value>::new();
@@ -473,6 +475,7 @@ impl Configurator {
             match &test_result {
                 TestResult::Resource(resource_test_result) => {
                     self.context.references.insert(format!("{}:{}", resource.resource_type, resource.name), serde_json::to_value(&resource_test_result.actual_state)?);
+                    progress.set_resource(&resource.name, &resource.resource_type, Some(&resource_test_result.actual_state));
                 },
                 TestResult::Group(group) => {
                     let mut results = Vec::<Value>::new();

dsc_lib/src/configure/mod.rs

@@ -169,7 +169,7 @@ impl Default for CommandDiscovery {
 
 impl ResourceDiscovery for CommandDiscovery {
 
-    fn discover_resources(&mut self, filter: &str) -> Result<(), DscError> {
+    fn discover_resources(&mut self, filter: &str, progress_format: ProgressFormat) -> Result<(), DscError> {
         info!("{}", t!("discovery.commandDiscovery.discoverResources", filter = filter));
 
         let regex_str = convert_wildcard_to_regex(filter);
@@ -246,7 +246,7 @@ impl ResourceDiscovery for CommandDiscovery {
 
     fn discover_adapted_resources(&mut self, name_filter: &str, adapter_filter: &str) -> Result<(), DscError> {
         if self.resources.is_empty() && self.adapters.is_empty() {
-            self.discover_resources("*")?;
+            self.discover_resources("*", progress_format)?;
         }
 
         if self.adapters.is_empty() {
@@ -358,7 +358,7 @@ impl ResourceDiscovery for CommandDiscovery {
         let mut resources = BTreeMap::<String, Vec<DscResource>>::new();
 
         if adapter_name_filter.is_empty() {
-            self.discover_resources(type_name_filter)?;
+            self.discover_resources(type_name_filter, progress_format)?;
             resources.append(&mut self.resources);
             resources.append(&mut self.adapters);
         } else {
@@ -379,7 +379,7 @@ impl ResourceDiscovery for CommandDiscovery {
     fn find_resources(&mut self, required_resource_types: &[String]) -> Result<BTreeMap<String, DscResource>, DscError>
     {
         debug!("Searching for resources: {:?}", required_resource_types);
-        self.discover_resources("*")?;
+        self.discover_resources("*", progress_format)?;
 
         // convert required_resource_types to lowercase to handle case-insentiive search
         let mut remaining_required_resource_types = required_resource_types.iter().map(|x| x.to_lowercase()).collect::<Vec<String>>();