fix merge conflicts

Author: SteveL-MSFT

dsc/examples/groups.dsc.yaml

@@ -9,7 +9,7 @@ resources:
     - name: Last
       type: Test/Echo
       properties:
-        text: Last
+        output: Last
   dependsOn:
   - "[resourceId('DSC/Group','First Group')]"
 - name: First Group
@@ -20,7 +20,7 @@ resources:
     - name: First
       type: Test/Echo
       properties:
-        text: First
+        output: First
     - name: Nested Group
       type: DSC/Group
       properties:
@@ -29,10 +29,10 @@ resources:
         - name: Nested Second
           type: Test/Echo
           properties:
-            text: Nested Second
+            output: Nested Second
           dependsOn:
           - "[resourceId('Test/Echo','Nested First')]"
         - name: Nested First
           type: Test/Echo
           properties:
-            text: Nested First
+            output: Nested First

dsc/src/subcommand.rs

@@ -3,9 +3,10 @@
 
 use crate::args::{ConfigSubCommand, DscType, OutputFormat, ResourceSubCommand};
 use crate::resource_command::{get_resource, self};
+use crate::Stream;
 use crate::tablewriter::Table;
-use crate::util::{EXIT_DSC_ERROR, EXIT_INVALID_INPUT, EXIT_JSON_ERROR, EXIT_SUCCESS, EXIT_VALIDATION_FAILED, get_schema, write_output, get_input, set_dscconfigroot, validate_json};
-use dsc_lib::configure::config_result::ResourceGetResult;
+use crate::util::{EXIT_DSC_ERROR, EXIT_INVALID_INPUT, EXIT_JSON_ERROR, EXIT_VALIDATION_FAILED, get_schema, write_output, get_input, set_dscconfigroot, validate_json};
+use dsc_lib::configure::{Configurator, ErrorAction, config_result::ResourceGetResult};
 use dsc_lib::dscerror::DscError;
 use dsc_lib::dscresources::invoke_result::{
     GroupResourceSetResponse, GroupResourceTestResponse, TestResult

dsc/src/util.rs

@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 use crate::args::{DscType, OutputFormat, TraceFormat, TraceLevel};
-use jsonschema::JSONSchema;
-use serde_json::Value;
 
 use atty::Stream;
 use dsc_lib::{
@@ -26,8 +24,9 @@ use dsc_lib::{
         resource_manifest::ResourceManifest
     }
 };
+use jsonschema::JSONSchema;
 use schemars::{schema_for, schema::RootSchema};
-use serde_yaml::Value;
+use serde_json::Value;
 use std::collections::HashMap;
 use std::env;
 use std::path::Path;
@@ -420,40 +419,3 @@ pub fn set_dscconfigroot(config_path: &str)
     debug!("Setting 'DSCConfigRoot' env var as '{}'", config_root);
     env::set_var("DSCConfigRoot", config_root.clone());
 }
-
-/// Validate the JSON against the schema.
-///
-/// # Arguments
-///
-/// * `source` - The source of the JSON
-/// * `schema` - The schema to validate against
-/// * `json` - The JSON to validate
-///
-/// # Returns
-///
-/// Nothing on success.
-///
-/// # Errors
-///
-/// * `DscError` - The JSON is invalid
-pub fn validate_json(source: &str, schema: &Value, json: &Value) -> Result<(), DscError> {
-    debug!("Validating {source} against schema");
-    debug!("JSON: {json}");
-    debug!("Schema: {schema}");
-    let compiled_schema = match JSONSchema::compile(schema) {
-        Ok(compiled_schema) => compiled_schema,
-        Err(err) => {
-            return Err(DscError::Validation(format!("JSON Schema Compilation Error: {err}")));
-        }
-    };
-
-    if let Err(err) = compiled_schema.validate(json) {
-        let mut error = format!("'{source}' failed validation: ");
-        for e in err {
-            error.push_str(&format!("\n{e} "));
-        }
-        return Err(DscError::Validation(error));
-    };
-
-    Ok(())
-}

dsc/tests/dsc_group.tests.ps1

@@ -14,28 +14,28 @@ results:
     type: Test/Echo
     result:
       actualState:
-        text: First
+        output: First
   - name: Nested Group
     type: DSC/Group
     result:
     - name: Nested First
       type: Test/Echo
       result:
         actualState:
-          text: Nested First
+          output: Nested First
     - name: Nested Second
       type: Test/Echo
       result:
         actualState:
-          text: Nested Second
+          output: Nested Second
 - name: Last Group
   type: DSC/Group
   result:
   - name: Last
     type: Test/Echo
     result:
       actualState:
-        text: Last
+        output: Last
 messages: []
 hadErrors: false
 '@