diff --git a/pkg/util/removeall/removeall_test.go b/pkg/util/removeall/removeall_test.go index bb5acc1c521..98b0dfe0f1d 100644 --- a/pkg/util/removeall/removeall_test.go +++ b/pkg/util/removeall/removeall_test.go @@ -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) } diff --git a/pkg/volume/util/hostutil/hostutil_windows.go b/pkg/volume/util/hostutil/hostutil_windows.go index 51ad0344a13..c8f35a1737c 100644 --- a/pkg/volume/util/hostutil/hostutil_windows.go +++ b/pkg/volume/util/hostutil/hostutil_windows.go @@ -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