Merge pull request #16950 from swagiaal/handle-exec-not-found

Auto commit by PR queue bot

pkg/util/exec/exec.go

@@ -21,6 +21,9 @@ import (
 	"syscall"
 )
 
+// ErrExecutableNotFound is returned if the executable is not found.
+var ErrExecutableNotFound = osexec.ErrNotFound
+
 // Interface is an interface that presents a subset of the os/exec API.  Use this
 // when you want to inject fakeable/mockable exec behavior.
 type Interface interface {
@@ -81,13 +84,17 @@ func (cmd *cmdWrapper) SetDir(dir string) {
 func (cmd *cmdWrapper) CombinedOutput() ([]byte, error) {
 	out, err := (*osexec.Cmd)(cmd).CombinedOutput()
 	if err != nil {
-		ee, ok := err.(*osexec.ExitError)
+		if ee, ok := err.(*osexec.ExitError); ok {
-		if !ok {
+			// Force a compile fail if exitErrorWrapper can't convert to ExitError.
-			return out, err
+			var x ExitError = &exitErrorWrapper{ee}
+			return out, x
 		}
-		// Force a compile fail if exitErrorWrapper can't convert to ExitError.
+		if ee, ok := err.(*osexec.Error); ok {
-		var x ExitError = &exitErrorWrapper{ee}
+			if ee.Err == osexec.ErrNotFound {
-		return out, x
+				return out, ErrExecutableNotFound
+			}
+		}
+		return out, err
 	}
 	return out, nil
 }

pkg/util/exec/exec_test.go

@@ -92,3 +92,12 @@ func TestLookPath(t *testing.T) {
 		t.Errorf("unexpected result for LookPath: got %s, expected %s", sh, shExpected)
 	}
 }
+
+func TestExecutableNotFound(t *testing.T) {
+	exec := New()
+	cmd := exec.Command("fake_executable_name")
+	_, err := cmd.CombinedOutput()
+	if err != ErrExecutableNotFound {
+		t.Errorf("Expected error ErrExecutableNotFound but got %v", err)
+	}
+}