address Andrew's feedback to use single TraceLevel enum and shorten Process to PID

Author: SteveL-MSFT

dsc/Cargo.lock

@@ -3,6 +3,7 @@
 
 use clap::{Parser, Subcommand, ValueEnum};
 use clap_complete::Shell;
+use dsc_lib::dscresources::command_resource::TraceLevel;
 
 #[derive(Debug, Clone, PartialEq, Eq, ValueEnum)]
 pub enum OutputFormat {
@@ -20,15 +21,6 @@ pub enum TraceFormat {
     PassThrough,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, ValueEnum)]
-pub enum TraceLevel {
-    Error,
-    Warn,
-    Info,
-    Debug,
-    Trace
-}
-
 #[derive(Debug, Parser)]
 #[clap(name = "dsc", version = env!("CARGO_PKG_VERSION"), about = "Apply configuration or invoke specific DSC resources", long_about = None)]
 pub struct Args {

dsc/src/args.rs

@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use crate::args::{DscType, OutputFormat, TraceFormat, TraceLevel};
-
+use crate::args::{DscType, OutputFormat, TraceFormat};
 use atty::Stream;
 use crate::resolve::Include;
 use dsc_lib::{
@@ -16,6 +15,7 @@ use dsc_lib::{
     },
     dscerror::DscError,
     dscresources::{
+        command_resource::TraceLevel,
         dscresource::DscResource, invoke_result::{
             GetResult,
             SetResult,

dsc/src/util.rs

@@ -6,6 +6,7 @@ edition = "2021"
 [dependencies]
 base64 = "0.22.1"
 chrono = "0.4.26"
+clap = { version = "4.4", features = ["derive"] }
 derive_builder ="0.20.0"
 indicatif = "0.17.0"
 jsonschema = "0.18.0"

dsc_lib/Cargo.lock

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+use clap::ValueEnum;
 use jsonschema::JSONSchema;
 use serde::Deserialize;
 use serde_json::Value;
@@ -827,15 +828,15 @@ pub fn log_stderr_line<'a>(process_id: &u32, trace_line: &'a str) -> &'a str
                 0
             };
             let trace_message = if include_target {
-                format!("Process {process_id}: {target}: {line_number}: {}", trace_object.fields.message)
+                format!("PID {process_id}: {target}: {line_number}: {}", trace_object.fields.message)
             } else {
-                format!("Process {process_id}: {}", trace_object.fields.message)
+                format!("PID {process_id}: {}", trace_object.fields.message)
             };
             match trace_object.level {
                 TraceLevel::Error => {
                     error!(trace_message);
                 },
-                TraceLevel::Warning => {
+                TraceLevel::Warn => {
                     warn!(trace_message);
                 },
                 TraceLevel::Info => {
@@ -851,36 +852,36 @@ pub fn log_stderr_line<'a>(process_id: &u32, trace_line: &'a str) -> &'a str
         }
         else if let Ok(json_obj) = serde_json::from_str::<Value>(trace_line) {
             if let Some(msg) = json_obj.get("Error") {
-                error!("Process {process_id}: {}", msg.as_str().unwrap_or_default());
+                error!("PID {process_id}: {}", msg.as_str().unwrap_or_default());
             } else if let Some(msg) = json_obj.get("Warning") {
-                warn!("Process {process_id}: {}", msg.as_str().unwrap_or_default());
+                warn!("PID {process_id}: {}", msg.as_str().unwrap_or_default());
             } else if let Some(msg) = json_obj.get("Info") {
-                info!("Process {process_id}: {}", msg.as_str().unwrap_or_default());
+                info!("PID {process_id}: {}", msg.as_str().unwrap_or_default());
             } else if let Some(msg) = json_obj.get("Debug") {
-                debug!("Process {process_id}: {}", msg.as_str().unwrap_or_default());
+                debug!("PID {process_id}: {}", msg.as_str().unwrap_or_default());
             } else if let Some(msg) = json_obj.get("Trace") {
-                trace!("Process {process_id}: {}", msg.as_str().unwrap_or_default());
+                trace!("PID {process_id}: {}", msg.as_str().unwrap_or_default());
             } else {
                 // the line is a valid json, but not one of standard trace lines - return it as filtered stderr_line
-                trace!("Process {process_id}: {trace_line}");
+                trace!("PID {process_id}: {trace_line}");
                 return trace_line;
             };
         } else {
             // the line is not a valid json - return it as filtered stderr_line
-            trace!("Process {process_id}: {}", trace_line);
+            trace!("PID {process_id}: {}", trace_line);
             return trace_line;
         }
     };
 
     ""
 }
 
-#[derive(PartialEq, Eq, Deserialize)]
-enum TraceLevel {
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, ValueEnum)]
+pub enum TraceLevel {
     #[serde(rename = "ERROR")]
     Error,
     #[serde(rename = "WARN")]
-    Warning,
+    Warn,
     #[serde(rename = "INFO")]
     Info,
     #[serde(rename = "DEBUG")]