Fix detection of relative path

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

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

@@ -169,6 +169,7 @@ invalidKey = "Unsupported value for key '%{key}'.  Only string, bool, number, an
 inDesiredStateNotBool = "'_inDesiredState' is not a boolean"
 exportNotSupportedUsingGet = "Export is not supported by resource '%{resource}' using get operation"
 runProcessError = "Failed to run process '%{executable}': %{error}"
+executableNotFound = "Executable '%{executable}' not found"
 
 [dscresources.dscresource]
 invokeGet = "Invoking get for '%{resource}'"

lib/dsc-lib/src/discovery/command_discovery.rs

@@ -804,17 +804,17 @@ fn load_extension_manifest(path: &Path, manifest: &ExtensionManifest) -> Result<
 }
 
 fn verify_executable(resource: &str, operation: &str, executable: &str, directory: &Path) {
-    // check if executable has a relative path
-    if !Path::new(executable).is_absolute() {
-        // combine with directory and see if it exists
-        let exe_path = directory.join(executable);
-        if exe_path.exists() {
+    if which(executable).is_err() {
+        if !Path::new(executable).is_absolute() {
+            // combine with directory and see if it exists
+            let exe_path = directory.join(executable);
+            if exe_path.exists() {
+                return;
+            }
+            info!("{}", t!("discovery.commandDiscovery.executableNotFound", resource = resource, operation = operation, executable = exe_path.to_string_lossy()));
             return;
         }
-        info!("{}", t!("discovery.commandDiscovery.executableNotFound", resource = resource, operation = operation, executable = exe_path.to_string_lossy()));
-        return;
-    }
-    if which(executable).is_err() {
+
         info!("{}", t!("discovery.commandDiscovery.executableNotFound", resource = resource, operation = operation, executable = executable));
     }
 }

lib/dsc-lib/src/dscresources/command_resource.rs

@@ -12,6 +12,7 @@ use crate::dscerror::DscError;
 use super::{dscresource::{get_diff, redact}, invoke_result::{ExportResult, GetResult, ResolveResult, SetResult, TestResult, ValidateResult, ResourceGetResponse, ResourceSetResponse, ResourceTestResponse, get_in_desired_state}, resource_manifest::{ArgKind, InputKind, Kind, ResourceManifest, ReturnKind, SchemaKind}};
 use tracing::{error, warn, info, debug, trace};
 use tokio::{io::{AsyncBufReadExt, AsyncWriteExt, BufReader}, process::Command};
+use which::which;
 
 pub const EXIT_PROCESS_TERMINATED: i32 = 0x102;
 
@@ -764,7 +765,7 @@ fn convert_hashmap_string_keys_to_i32(input: Option<&HashMap<String, String>>) -
 pub fn invoke_command(executable: &str, args: Option<Vec<String>>, input: Option<&str>, cwd: Option<&str>, env: Option<HashMap<String, String>>, exit_codes: Option<&HashMap<String, String>>) -> Result<(i32, String, String), DscError> {
     let exit_codes = convert_hashmap_string_keys_to_i32(exit_codes)?;
     let mut executable = executable.to_string();
-    if !Path::new(&executable).is_absolute() && cwd.is_some() {
+    if which(&executable).is_err() && !Path::new(&executable).is_absolute() && cwd.is_some() {
         if let Some(cwd) = cwd {
             let cwd_path = Path::new(cwd);
             let executable_path = cwd_path.join(&executable);