Merge pull request #1029 from andrewjamesbrown/refactor/modernize-os-isnotexist

refactor(execd): modernize os.IsNotExist to errors.Is(err, fs.ErrNotExist)

Author: Pangjiping

components/execd/pkg/runtime/workingdir.go

@@ -15,7 +15,9 @@
 package runtime
 
 import (
+	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 
 	"github.com/alibaba/opensandbox/execd/pkg/util/pathutil"
@@ -31,8 +33,8 @@ func ValidateWorkingDir(cwd string) error {
 	}
 	fi, err := os.Stat(resolvedCwd)
 	if err != nil {
-		if os.IsNotExist(err) {
-			return fmt.Errorf("working directory does not exist: %s", cwd)
+		if errors.Is(err, fs.ErrNotExist) {
+			return fmt.Errorf("working directory does not exist: %s: %w", cwd, err)
 		}
 		return fmt.Errorf("cannot access working directory %q: %w", cwd, err)
 	}

components/execd/pkg/web/controller/filesystem.go

@@ -374,7 +374,7 @@ func (c *FilesystemController) SearchFiles() {
 
 	files := make([]model.FileInfo, 0, 16)
 	err = filepath.Walk(path, func(filePath string, info os.FileInfo, err error) error {
-		if os.IsNotExist(err) {
+		if errors.Is(err, fs.ErrNotExist) {
 			return nil
 		}
 		if err != nil {

components/execd/pkg/web/controller/filesystem_windows.go

@@ -374,7 +374,7 @@ func (c *FilesystemController) SearchFiles() {
 
 	files := make([]model.FileInfo, 0, 16)
 	err = filepath.Walk(path, func(filePath string, info os.FileInfo, err error) error {
-		if os.IsNotExist(err) {
+		if errors.Is(err, fs.ErrNotExist) {
 			return nil
 		}
 		if err != nil {

components/execd/pkg/web/controller/utils.go

@@ -20,6 +20,7 @@ package controller
 import (
 	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -40,7 +41,7 @@ func DeleteFile(filePath string) error {
 
 	fileInfo, err := os.Stat(absPath)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, fs.ErrNotExist) {
 			return nil
 		}
 		return err
@@ -213,7 +214,7 @@ func GetFileInfo(filePath string) (model.FileInfo, error) {
 
 	fileInfo, err := os.Lstat(absPath)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, fs.ErrNotExist) {
 			return model.FileInfo{}, fmt.Errorf("file not found: %s: %w", filePath, err)
 		}
 		return model.FileInfo{}, fmt.Errorf("error accessing file %s: %w", filePath, err)

components/execd/pkg/web/controller/utils_windows.go

@@ -20,6 +20,7 @@ package controller
 import (
 	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -39,7 +40,7 @@ func DeleteFile(filePath string) error {
 
 	fileInfo, err := os.Stat(absPath)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, fs.ErrNotExist) {
 			return nil
 		}
 		return err
@@ -173,7 +174,7 @@ func GetFileInfo(filePath string) (model.FileInfo, error) {
 
 	fileInfo, err := os.Lstat(absPath)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, fs.ErrNotExist) {
 			return model.FileInfo{}, fmt.Errorf("file not found: %s: %w", filePath, err)
 		}
 		return model.FileInfo{}, fmt.Errorf("error accessing file %s: %w", filePath, err)