address Tess' feedback

Author: SteveL-MSFT

dsc/tests/dsc_user_functions.tests.ps1

@@ -149,6 +149,6 @@ resources:
 "@
         dsc -l trace config get -i $configYaml 2>$testdrive/error.log | Out-Null
         $LASTEXITCODE | Should -Be 2 -Because (Get-Content $testdrive/error.log | Out-String)
-        (Get-Content $testdrive/error.log -Raw) | Should -BeLike "*Output of user function 'MyFunction.BadFunction' returned an integer, but was expected to be of type 'int'*" -Because (Get-Content $testdrive/error.log | Out-String)
+        (Get-Content $testdrive/error.log -Raw) | Should -BeLike "*Output of user function 'MyFunction.BadFunction' did not returned expected type 'int'*" -Because (Get-Content $testdrive/error.log | Out-String)
     }
 }

dsc_lib/locales/en-us.toml

@@ -480,14 +480,10 @@ description = "Returns a deterministic unique string from the given strings"
 invoked = "uniqueString function"
 
 [functions.userFunction]
-expectedNoParamters = "User function '%{name}' does not accept parameters"
+expectedNoParameters = "User function '%{name}' does not accept parameters"
 unknownUserFunction = "Unknown user function '%{name}'"
 wrongParamCount = "User function '%{name}' expects %{expected} parameters, but %{got} were provided"
-outputNotString = "Output of user function '%{name}' returned a string, but was expected to be of type '%{expected_type}'"
-outputNotInteger = "Output of user function '%{name}' returned an integer, but was expected to be of type '%{expected_type}'"
-outputNotBoolean = "Output of user function '%{name}' returned a boolean, but was expected to be of type '%{expected_type}'"
-outputNotArray = "Output of user function '%{name}' returned an array, but was expected to be of type '%{expected_type}'"
-outputNotObject = "Output of user function '%{name}' returned an object, but was expected to be of type '%{expected_type}'"
+incorrectOutputType = "Output of user function '%{name}' did not returned expected type '%{expected_type}'"
 
 [functions.utcNow]
 description = "Returns the current UTC time"

dsc_lib/src/functions/user_function.rs

@@ -32,7 +32,7 @@ pub fn invoke_user_function(name: &str, args: &[Value], context: &Context) -> Re
         user_context.user_functions.clear();
         for (i, arg) in args.iter().enumerate() {
             let Some(params) = &function_definition.parameters else {
-                return Err(DscError::Parser(t!("functions.userFunction.expectedNoParamters", name = name).to_string()));
+                return Err(DscError::Parser(t!("functions.userFunction.expectedNoParameters", name = name).to_string()));
             };
             user_context.parameters.insert(params[i].name.clone(), (arg.clone(), params[i].r#type.clone()));
         }
@@ -61,27 +61,27 @@ fn validate_output_type(name: &str, function_definition: &UserFunctionDefinition
     match function_definition.output.r#type {
         DataType::String | DataType::SecureString => {
             if !output.is_string() {
-                return Err(DscError::Validation(t!("functions.userFunction.outputNotString", name = name, expected_type = function_definition.output.r#type.to_string()).to_string()));
+                return Err(DscError::Validation(t!("functions.userFunction.incorrectOutputType", name = name, expected_type = "string").to_string()));
             }
         },
         DataType::Int => {
             if !output.is_i64() {
-                return Err(DscError::Validation(t!("functions.userFunction.outputNotInteger", name = name, expected_type = function_definition.output.r#type.to_string()).to_string()));
+                return Err(DscError::Validation(t!("functions.userFunction.incorrectOutputType", name = name, expected_type = "int").to_string()));
             }
         },
         DataType::Bool => {
             if !output.is_boolean() {
-                return Err(DscError::Validation(t!("functions.userFunction.outputNotBoolean", name = name, expected_type = function_definition.output.r#type.to_string()).to_string()));
+                return Err(DscError::Validation(t!("functions.userFunction.incorrectOutputType", name = name, expected_type = "bool").to_string()));
             }
         },
         DataType::Array => {
             if !output.is_array() {
-                return Err(DscError::Validation(t!("functions.userFunction.outputNotArray", name = name, expected_type = function_definition.output.r#type.to_string()).to_string()));
+                return Err(DscError::Validation(t!("functions.userFunction.incorrectOutputType", name = name, expected_type = "array").to_string()));
             }
         },
         DataType::Object | DataType::SecureObject => {
             if !output.is_object() {
-                return Err(DscError::Validation(t!("functions.userFunction.outputNotObject", name = name, expected_type = function_definition.output.r#type.to_string()).to_string()));
+                return Err(DscError::Validation(t!("functions.userFunction.incorrectOutputType", name = name, expected_type = "object").to_string()));
             }
         },
     }