address copilot feedback

Author: SteveL-MSFT

lib/dsc-lib/locales/en-us.toml

@@ -79,7 +79,7 @@ nameResultNotString = "Resource name result is not a string"
 circularDependency = "Circular dependency or unresolvable parameter references detected in parameters: %{parameters}"
 userFunctionAlreadyDefined = "User function '%{name}' in namespace '%{namespace}' is already defined"
 addingUserFunction = "Adding user function '%{name}'"
-copyCountResultNotInteger = "Copy count is not an integer: %{value}"
+copyCountResultNotInteger = "Copy count result is not an integer: %{expression}"
 
 [discovery.commandDiscovery]
 couldNotReadSetting = "Could not read 'resourcePath' setting"

lib/dsc-lib/src/configure/mod.rs

@@ -966,9 +966,9 @@ impl Configurator {
                     IntOrExpression::Int(i) => *i,
                     IntOrExpression::Expression(e) => {
                         let Value::Number(n) = self.statement_parser.parse_and_execute(e, &self.context)? else {
-                            return Err(DscError::Parser(t!("configure.mod.copyCountResultNotInteger", value = &copy.count).to_string()))
+                            return Err(DscError::Parser(t!("configure.mod.copyCountResultNotInteger", expression = e).to_string()))
                         };
-                        n.as_i64().ok_or_else(|| DscError::Parser(t!("configure.mod.copyCountResultNotInteger", value = &copy.count).to_string()))?
+                        n.as_i64().ok_or_else(|| DscError::Parser(t!("configure.mod.copyCountResultNotInteger", expression = e).to_string()))?
                     },
                 };
                 for i in 0..count {

lib/dsc-lib/src/functions/parameters.rs

@@ -43,45 +43,41 @@ impl Function for Parameters {
                         let secure_string = SecureString {
                             secure_string: value.to_string(),
                         };
-                        Ok(serde_json::to_value(secure_string)?)
+                        return Ok(serde_json::to_value(secure_string)?);
                     },
                     DataType::SecureObject => {
                         let secure_object = SecureObject {
                             secure_object: value.clone(),
                         };
-                        Ok(serde_json::to_value(secure_object)?)
+                        return Ok(serde_json::to_value(secure_object)?);
                     },
                     DataType::String => {
-                        let Some(value) = value.as_str() else {
+                        let Some(_value) = value.as_str() else {
                             return Err(DscError::Parser(t!("functions.parameters.keyNotString", key = key).to_string()));
                         };
-                        Ok(serde_json::to_value(value)?)
                     },
                     DataType::Int => {
-                        let Some(value) = value.as_i64() else {
+                        let Some(_value) = value.as_i64() else {
                             return Err(DscError::Parser(t!("functions.parameters.keyNotInt", key = key).to_string()));
                         };
-                        Ok(serde_json::to_value(value)?)
                     },
                     DataType::Bool => {
-                        let Some(value) = value.as_bool() else {
+                        let Some(_value) = value.as_bool() else {
                             return Err(DscError::Parser(t!("functions.parameters.keyNotBool", key = key).to_string()));
                         };
-                        Ok(serde_json::to_value(value)?)
                     },
                     DataType::Object => {
-                        let Some(value) = value.as_object() else {
+                        let Some(_value) = value.as_object() else {
                             return Err(DscError::Parser(t!("functions.parameters.keyNotObject", key = key).to_string()));
                         };
-                        Ok(serde_json::to_value(value)?)
                     },
                     DataType::Array => {
-                        let Some(value) = value.as_array() else {
+                        let Some(_value) = value.as_array() else {
                             return Err(DscError::Parser(t!("functions.parameters.keyNotArray", key = key).to_string()));
                         };
-                        Ok(serde_json::to_value(value)?)
                     },
                 }
+                Ok(value.clone())
             }
             else {
                 Err(DscError::Parser(t!("functions.parameters.keyNotFound", key = key).to_string()))