cli/command/container: exit 126 on EISDIR error

corhere · corhere · commit 9b5ceb52b0a1 · 2023-02-03T17:55:43.000-05:00
The error returned from "os/exec".Command when attempting to execute a directory has been changed from syscall.EACCESS to syscall.EISDIR on Go 1.20. golang/go@2b8f214 Consequently, any runc runtime built against Go 1.20 will return an error containing 'is a directory' and not 'permission denied'. Update the string matching so the CLI exits with status code 126 on 'is a directory' errors (EISDIR) in addition to 'permission denied' (EACCESS). Signed-off-by: Cory Snider <csnider@mirantis.com>
diff --git a/cli/command/container/run.go b/cli/command/container/run.go
@@ -308,7 +308,8 @@ func runStartContainerErr(err error) error {
 		strings.Contains(trimmedErr, "no such file or directory") ||
 		strings.Contains(trimmedErr, "system cannot find the file specified") {
 		statusError = cli.StatusError{StatusCode: 127}
-	} else if strings.Contains(trimmedErr, syscall.EACCES.Error()) {
+	} else if strings.Contains(trimmedErr, syscall.EACCES.Error()) ||
+		strings.Contains(trimmedErr, syscall.EISDIR.Error()) {
 		statusError = cli.StatusError{StatusCode: 126}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,8 @@ func runStartContainerErr(err error) error {`
`308`	`308`	`strings.Contains(trimmedErr, "no such file or directory") \|\|`
`309`	`309`	`strings.Contains(trimmedErr, "system cannot find the file specified") {`
`310`	`310`	`statusError = cli.StatusError{StatusCode: 127}`
`311`		`- } else if strings.Contains(trimmedErr, syscall.EACCES.Error()) {`
	`311`	`+ } else if strings.Contains(trimmedErr, syscall.EACCES.Error()) \|\|`
	`312`	`+ strings.Contains(trimmedErr, syscall.EISDIR.Error()) {`
`312`	`313`	`statusError = cli.StatusError{StatusCode: 126}`
`313`	`314`	`}`
`314`	`315`