Merge branch 'main' into security/workflow-permissions

Author: arpitjain099

crates/cargo-wdk/src/actions/build/mod.rs

@@ -85,6 +85,10 @@ impl<'a> BuildAction<'a> {
         metadata: &'a Metadata,
     ) -> Result<Self> {
         // TODO: validate params
+        anyhow::ensure!(
+            !params.working_dir.as_os_str().is_empty(),
+            "working_dir must not be empty"
+        );
         Ok(Self {
             working_dir: absolute(params.working_dir)?,
             profile: params.profile,
@@ -151,14 +155,13 @@ impl<'a> BuildAction<'a> {
         );
 
         let mut is_valid_dir_with_rust_projects = false;
-        for dir in &dirs {
-            if self.fs.dir_file_type(dir)?.is_dir()
-                && self.fs.exists(&dir.path().join("Cargo.toml"))
-            {
+        for entry in &dirs {
+            if entry.is_dir && self.fs.exists(&entry.path.join("Cargo.toml")) {
                 debug!(
-                    "Found atleast one valid Rust project directory: {}, continuing with the \
+                    "Found at least one valid Rust project directory: {}, continuing with the \
                      build flow",
-                    dir.path()
+                    entry
+                        .path
                         .file_name()
                         .expect(
                             "package sub directory name ended with \"..\" which is not expected"
@@ -179,26 +182,24 @@ impl<'a> BuildAction<'a> {
         info!("Building packages in {}", self.working_dir.display());
 
         let mut failed_atleast_one_project = false;
-        for dir in dirs {
-            debug!("Checking dir entry: {}", dir.path().display());
-            if !self.fs.dir_file_type(&dir)?.is_dir()
-                || !self.fs.exists(&dir.path().join("Cargo.toml"))
-            {
+        for entry in dirs {
+            debug!("Checking dir entry: {}", entry.path.display());
+            if !entry.is_dir || !self.fs.exists(&entry.path.join("Cargo.toml")) {
                 debug!("Dir entry is not a valid Rust package");
                 continue;
             }
 
-            let working_dir_path = dir.path(); // Avoids a short-lived temporary
-            let sub_dir = working_dir_path
+            let cargo_package_path = entry.path;
+            let package_dir_name = cargo_package_path
                 .file_name()
                 .expect("package sub directory name ended with \"..\" which is not expected")
                 .to_string_lossy();
 
-            debug!("Building package(s) in dir {sub_dir}");
-            if let Err(e) = self.run_from_workspace_root(&dir.path()) {
+            debug!("Building package(s) in dir {package_dir_name}");
+            if let Err(e) = self.run_from_workspace_root(&cargo_package_path) {
                 failed_atleast_one_project = true;
                 err!(
-                    "Error building project: {sub_dir}, error: {:?}",
+                    "Error building project: {package_dir_name}, error: {:?}",
                     anyhow::Error::new(e)
                 );
             }

crates/cargo-wdk/src/actions/clean/error.rs

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation
+// License: MIT OR Apache-2.0
+//! This module defines error types for the clean action module.
+
+use std::path::PathBuf;
+
+use thiserror::Error;
+
+use crate::providers::error::{CommandError, FileError};
+
+/// Errors for the clean action layer
+#[derive(Error, Debug)]
+pub enum CleanActionError {
+    #[error(transparent)]
+    FileIo(#[from] FileError),
+    #[error("No valid rust projects in the current working directory: {0}")]
+    NoValidRustProjectsInTheDirectory(PathBuf),
+    #[error("One or more projects failed to clean in the emulated workspace: {0}")]
+    OneOrMoreRustProjectsFailedToClean(PathBuf),
+    #[error(transparent)]
+    CargoClean(#[from] CommandError),
+}