fix using canonical path and test

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

dsc/tests/dsc_extension_discover.tests.ps1

@@ -138,7 +138,7 @@ Describe 'Discover extension tests' {
             $out = dsc -l warn resource list 2> $TestDrive/error.log | ConvertFrom-Json
             $LASTEXITCODE | Should -Be 0
             $out.Count | Should -BeGreaterThan 0
-            (Get-Content -Path "$TestDrive/error.log" -Raw) | Should -BeLike "*WARN Extension 'Microsoft.Windows.Appx/Discover' failed to discover resources: Command: Operation Executable 'powershell.exe' not found*" -Because (Get-Content -Path "$TestDrive/error.log" -Raw | Out-String)
+            (Get-Content -Path "$TestDrive/error.log" -Raw) | Should -BeLike "*WARN Extension 'Microsoft.Windows.Appx/Discover' failed to discover resources: Command: Operation Executable 'powershell' not found*" -Because (Get-Content -Path "$TestDrive/error.log" -Raw | Out-String)
         } finally {
             $env:PATH = $oldPath
         }

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

@@ -698,4 +698,5 @@ failedToGetExePath = "Can't get 'dsc' executable path"
 settingNotFound = "Setting '%{name}' not found"
 failedToAbsolutizePath = "Failed to absolutize path '%{path}'"
 invalidExitCodeKey = "Invalid exit code key '%{key}'"
-executableNotFound = "Executable '%{executable}' not found with working directory '%{cwd}'"
+executableNotFoundInWorkingDirectory = "Executable '%{executable}' not found with working directory '%{cwd}'"
+executableNotFound = "Executable '%{executable}' not found"

lib/dsc-lib/src/util.rs

@@ -242,11 +242,12 @@ pub fn canonicalize_which(executable: &str, cwd: Option<&str>) -> Result<String,
     if which(executable).is_err() {
         if let Some(cwd) = cwd {
             let cwd_path = Path::new(cwd);
-            if let Ok(canonical_path) = canonicalize(cwd_path.join(executable)) {
+            if let Ok(canonical_path) = canonicalize(cwd_path.join(&executable_path)) {
                 return Ok(canonical_path.to_string_lossy().to_string());
             }
+            return Err(DscError::CommandOperation(t!("util.executableNotFoundInWorkingDirectory", executable = &executable, cwd = cwd_path.to_string_lossy()).to_string(), executable_path.to_string_lossy().to_string()));
         }
-        return Err(DscError::CommandOperation(t!("util.executableNotFound", executable = &executable, cwd = cwd : {:?}).to_string(), executable.to_string()));
+        return Err(DscError::CommandOperation(t!("util.executableNotFound", executable = &executable).to_string(), executable.to_string()));
     }
     Ok(executable.to_string())
 }