github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 22:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110601 from claudiubelu/path-filepath-update

Browse Source 
Replaces path.Operation with filepath.Operation
This commit is contained in:
Kubernetes Prow Robot
2024-01-29 06:49:26 -08:00
committed by GitHub
parent bb3030bf0e c65d9e4d59
commit 56ee53faf5
2 changed files with 5 additions and 7 deletions
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