Move constant LongPathPrefix to utils package

Author: laozc

pkg/os/smb/api.go

@@ -6,12 +6,12 @@ import (
 	"syscall"
 
 	"github.com/kubernetes-csi/csi-proxy/pkg/cim"
+	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
 	"golang.org/x/sys/windows"
 )
 
 const (
 	credentialDelimiter = ":"
-	longPathPrefix      = `\\?\`
 )
 
 type API interface {
@@ -88,14 +88,8 @@ func (*SmbAPI) NewSmbLink(remotePath, localPath string) error {
 		// so add one if needed.
 		remotePath = remotePath + "\\"
 	}
-	longRemotePath := remotePath
-	if !strings.HasPrefix(longRemotePath, longPathPrefix) {
-		longRemotePath = longPathPrefix + longRemotePath
-	}
-	longLocalPath := localPath
-	if !strings.HasPrefix(longLocalPath, longPathPrefix) {
-		longLocalPath = longPathPrefix + longLocalPath
-	}
+	longRemotePath := utils.EnsureLongPath(remotePath)
+	longLocalPath := utils.EnsureLongPath(localPath)
 
 	err := createSymlink(longLocalPath, longRemotePath, true)
 	if err != nil {

pkg/os/volume/api.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/go-ole/go-ole"
 	"github.com/kubernetes-csi/csi-proxy/pkg/cim"
+	"github.com/kubernetes-csi/csi-proxy/pkg/utils"
 	wmierrors "github.com/microsoft/wmi/pkg/errors"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/windows"
@@ -57,8 +58,6 @@ var (
 	// PS C:\disks> (Get-Disk -Number 1 | Get-Partition | Get-Volume).UniqueId
 	// \\?\Volume{452e318a-5cde-421e-9831-b9853c521012}\
 	VolumeRegexp = regexp.MustCompile(`Volume\{[\w-]*\}`)
-	// longPathPrefix is the prefix of Windows long path
-	longPathPrefix = "\\\\?\\"
 
 	notMountedFolder = errors.New("not a mounted folder")
 )
@@ -337,7 +336,7 @@ func getTarget(mount string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	targetPath := longPathPrefix + windows.UTF16PtrToString(&outPathBuffer[0])
+	targetPath := utils.EnsureLongPath(windows.UTF16PtrToString(&outPathBuffer[0]))
 	if !strings.HasSuffix(targetPath, "\\") {
 		targetPath += "\\"
 	}

pkg/utils/utils.go

@@ -3,11 +3,24 @@ package utils
 import (
 	"os"
 	"os/exec"
+	"strings"
 
 	"k8s.io/klog/v2"
 )
 
-const MaxPathLengthWindows = 260
+const (
+	MaxPathLengthWindows = 260
+
+	// LongPathPrefix is the prefix of Windows long path
+	LongPathPrefix = `\\?\`
+)
+
+func EnsureLongPath(path string) string {
+	if !strings.HasPrefix(path, LongPathPrefix) {
+		path = LongPathPrefix + path
+	}
+	return path
+}
 
 func RunPowershellCmd(command string, envs ...string) ([]byte, error) {
 	cmd := exec.Command("powershell", "-Mta", "-NoProfile", "-Command", command)