💚 fix portability failures

Author: acabarbaye

utils/filesystem/files_posix.go

@@ -10,6 +10,14 @@ import (
 	"github.com/ARM-software/golang-utils/utils/commonerrors"
 )
 
+func isPrivilegeError(err error) bool {
+	return commonerrors.Any(err, syscall.EPERM)
+}
+
+func isNotSupportedError(err error) bool {
+	return commonerrors.Any(err, syscall.ENOTSUP, syscall.EOPNOTSUPP)
+}
+
 func determineFileOwners(info os.FileInfo) (uid, gid int, err error) {
 	if raw, ok := info.Sys().(*syscall.Stat_t); ok {
 		gid = int(raw.Gid)

utils/filesystem/files_windows.go

@@ -7,8 +7,18 @@ package filesystem
 import (
 	"os"
 	"syscall"
+
+	"github.com/ARM-software/golang-utils/utils/commonerrors"
 )
 
+func isPrivilegeError(err error) bool {
+	return commonerrors.Any(err, syscall.EPERM, syscall.ERROR_PRIVILEGE_NOT_HELD)
+}
+
+func isNotSupportedError(err error) bool {
+	return commonerrors.Any(err, syscall.ENOTSUP, syscall.EOPNOTSUPP, syscall.EWINDOWS)
+}
+
 func determineFileOwners(_ os.FileInfo) (uid, gid int, err error) {
 	uid = syscall.Getuid()
 	gid = syscall.Getgid()

utils/filesystem/filesystem.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"syscall"
 
 	"github.com/spf13/afero"
 
@@ -114,7 +113,7 @@ func ConvertFileSystemError(err error) error {
 		return commonerrors.WrapError(commonerrors.ErrExists, err, "")
 	case commonerrors.CorrespondTo(err, "bad file descriptor") || os.IsPermission(err) || commonerrors.Any(err, os.ErrPermission, os.ErrClosed, afero.ErrFileClosed, ErrPathNotExist, io.ErrClosedPipe):
 		return commonerrors.WrapError(commonerrors.ErrConflict, err, "")
-	case commonerrors.Any(err, syscall.EPERM, syscall.ERROR_PRIVILEGE_NOT_HELD) || commonerrors.CorrespondTo(err, "required privilege is not held", "operation not permitted"):
+	case isPrivilegeError(err) || commonerrors.CorrespondTo(err, "required privilege is not held", "operation not permitted"):
 		return commonerrors.WrapError(commonerrors.ErrForbidden, err, "")
 	case os.IsNotExist(err) || commonerrors.Any(err, os.ErrNotExist, afero.ErrFileNotFound) || IsPathNotExist(err) || commonerrors.CorrespondTo(err, "No such file or directory"):
 		return commonerrors.WrapError(commonerrors.ErrNotFound, err, "")
@@ -131,7 +130,7 @@ func ConvertFileSystemError(err error) error {
 	case commonerrors.Any(err, io.ErrUnexpectedEOF):
 		// Do not add io.EOF as it is used to read files
 		return commonerrors.WrapError(commonerrors.ErrEOF, err, "")
-	case commonerrors.Any(err, syscall.ENOTSUP, syscall.EOPNOTSUPP, syscall.EWINDOWS, afero.ErrNoSymlink, afero.ErrNoReadlink) || commonerrors.CorrespondTo(err, "not supported"):
+	case isNotSupportedError(err) || commonerrors.Any(err, afero.ErrNoSymlink, afero.ErrNoReadlink) || commonerrors.CorrespondTo(err, "not supported"):
 		return commonerrors.WrapError(commonerrors.ErrUnsupported, err, "")
 	}
 

utils/filesystem/links_test.go

@@ -5,12 +5,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ARM-software/golang-utils/utils/commonerrors"
-	"github.com/ARM-software/golang-utils/utils/commonerrors/errortest"
-	"github.com/ARM-software/golang-utils/utils/platform"
 	"github.com/go-faker/faker/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/ARM-software/golang-utils/utils/commonerrors"
+	"github.com/ARM-software/golang-utils/utils/commonerrors/errortest"
+	"github.com/ARM-software/golang-utils/utils/platform"
 )
 
 func printWarningOnWindows(t *testing.T) {