Move PathValid function to utils package

Author: laozc

pkg/os/filesystem/api.go

@@ -1,13 +1,11 @@
 package filesystem
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 
-	"golang.org/x/sys/windows"
-	"k8s.io/klog/v2"
+	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
 )
 
 // Implements the Filesystem OS API calls. All code here should be very simple
@@ -50,26 +48,6 @@ func (filesystemAPI) PathExists(path string) (bool, error) {
 	return pathExists(path)
 }
 
-func pathValid(path string) (bool, error) {
-	pathString, err := windows.UTF16PtrFromString(path)
-	if err != nil {
-		return false, fmt.Errorf("invalid path: %w", err)
-	}
-
-	attrs, err := windows.GetFileAttributes(pathString)
-	if err != nil {
-		if errors.Is(err, windows.ERROR_PATH_NOT_FOUND) || errors.Is(err, windows.ERROR_FILE_NOT_FOUND) || errors.Is(err, windows.ERROR_INVALID_NAME) {
-			return false, nil
-		}
-
-		// GetFileAttribute returns user or password incorrect for a disconnected SMB connection after the password is changed
-		return false, fmt.Errorf("failed to get path %s attribute: %w", path, err)
-	}
-
-	klog.V(6).Infof("Path %s attribute: %d", path, attrs)
-	return attrs != windows.INVALID_FILE_ATTRIBUTES, nil
-}
-
 // PathValid determines whether all elements of a path exist
 //
 //	https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.management/test-path?view=powershell-7
@@ -78,7 +56,7 @@ func pathValid(path string) (bool, error) {
 //
 //	e.g. in a SMB server connection, if password is changed, connection will be lost, this func will return false
 func (filesystemAPI) PathValid(path string) (bool, error) {
-	return pathValid(path)
+	return utils.IsPathValid(path)
 }
 
 // Mkdir makes a dir with `os.MkdirAll`.

pkg/os/filesystem/api_test.go

@@ -3,6 +3,7 @@ package filesystem
 import (
 	"testing"
 
+	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -25,7 +26,7 @@ func TestPathValid(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		result, err := pathValid(test.remotepath)
+		result, err := utils.IsPathValid(test.remotepath)
 		assert.Equal(t, result, test.expectedResult, "Expect result not equal with pathValid(%s) return: %q, expected: %q, error: %v",
 			test.remotepath, result, test.expectedResult, err)
 		if test.expectError {

pkg/utils/utils.go

@@ -1,10 +1,13 @@
 package utils
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"strings"
 
+	"github.com/pkg/errors"
+	"golang.org/x/sys/windows"
 	"k8s.io/klog/v2"
 )
 
@@ -29,3 +32,23 @@ func RunPowershellCmd(command string, envs ...string) ([]byte, error) {
 	out, err := cmd.CombinedOutput()
 	return out, err
 }
+
+func IsPathValid(path string) (bool, error) {
+	pathString, err := windows.UTF16PtrFromString(path)
+	if err != nil {
+		return false, fmt.Errorf("invalid path: %w", err)
+	}
+
+	attrs, err := windows.GetFileAttributes(pathString)
+	if err != nil {
+		if errors.Is(err, windows.ERROR_PATH_NOT_FOUND) || errors.Is(err, windows.ERROR_FILE_NOT_FOUND) || errors.Is(err, windows.ERROR_INVALID_NAME) {
+			return false, nil
+		}
+
+		// GetFileAttribute returns user or password incorrect for a disconnected SMB connection after the password is changed
+		return false, fmt.Errorf("failed to get path %s attribute: %w", path, err)
+	}
+
+	klog.V(6).Infof("Path %s attribute: %d", path, attrs)
+	return attrs != windows.INVALID_FILE_ATTRIBUTES, nil
+}