github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

Replaces path.Operation with filepath.Operation

Browse Source 
The path module has a few different functions:
Clean, Split, Join, Ext, Dir, Base, IsAbs. These functions do not
take into account the OS-specific path separator, meaning that they
won't behave as intended on Windows.

For example, Dir is supposed to return all but the last element of the
path. For the path "C:\some\dir\somewhere", it is supposed to return
"C:\some\dir\", however, it returns ".".

Instead of these functions, the ones in filepath should be used instead.
This commit is contained in:
Claudiu Belu 2022-06-15 15:17:24 +03:00
parent ad9b60e2c9
commit c65d9e4d59
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/util/removeall/removeall_test.go
View File

@ -19,7 +19,6 @@ package removeall
import (
"errors"
"os"
"path"
"path/filepath"
"strings"
"testing"
@ -117,11 +116,11 @@ func TestRemoveAllOneFilesystem(t *testing.T) {
for _, item := range test.items {
if strings.HasSuffix(item, "/") {
item = strings.TrimRight(item, "/")
if err = os.Mkdir(path.Join(tmpDir, item), 0777); err != nil {
if err = os.Mkdir(filepath.Join(tmpDir, item), 0777); err != nil {
t.Fatalf("error creating %s: %v", item, err)
}
} else {
f, err := os.Create(path.Join(tmpDir, item))
f, err := os.Create(filepath.Join(tmpDir, item))
if err != nil {
t.Fatalf("error creating %s: %v", item, err)
}
@ -237,11 +236,11 @@ func TestRemoveDirsOneFilesystem(t *testing.T) {
for _, item := range test.items {
if strings.HasSuffix(item, "/") {
item = strings.TrimRight(item, "/")
if err = os.Mkdir(path.Join(tmpDir, item), 0777); err != nil {
if err = os.Mkdir(filepath.Join(tmpDir, item), 0777); err != nil {
t.Fatalf("error creating %s: %v", item, err)
}
} else {
f, err := os.Create(path.Join(tmpDir, item))
f, err := os.Create(filepath.Join(tmpDir, item))
if err != nil {
t.Fatalf("error creating %s: %v", item, err)
}

3
pkg/volume/util/hostutil/hostutil_windows.go
View File

@ -23,7 +23,6 @@ import (
"fmt"
"io/fs"
"os"
"path"
"path/filepath"
"strings"
"syscall"
@ -72,7 +71,7 @@ func getDeviceNameFromMount(mounter mount.Interface, mountPath, pluginMountDir s
}
}
return path.Base(mountPath), nil
return filepath.Base(mountPath), nil
}
// DeviceOpened determines if the device is in use elsewhere