github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

storage: stop using deprecated io/ioutil

Browse Source 
This replaces deprecated ioutil variables and functions as follows:

* ioutil.ReadDir -> os.ReadDir
* ioutil.ReadFile -> os.ReadFile
* ioutil.TempDir -> os.MkdirTemp
* ioutil.TempFile -> os.CreateTemp
* ioutil.WriteFile -> os.WriteFile

The ReadDir conversion involves an API change, the replacement
function returns a slice of fs.DirEntry instead of fs.FileInfo.
Where appropriate, the surrounding code has been adjusted; mostly,
that means using DirEntry.Type() instead of FileInfo.Mode().
Applying this change to the IoUtil interface would mean changing its
API, so this is left for later.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
This commit is contained in:
Stephen Kitt
2023-05-02 17:02:27 +02:00
parent 2e93c65eff
commit ab75e48494
19 changed files with 38 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/volume/util/fs/fs_windows_test.go
View File

@@ -18,7 +18,6 @@ package fs
import (
"fmt"
"io/ioutil"
"os"
"testing"
@@ -28,21 +27,21 @@ import (
func TestDiskUsage(t *testing.T) {
dir1, err := ioutil.TempDir("", "dir_1")
dir1, err := os.MkdirTemp("", "dir_1")
if err != nil {
t.Fatalf("TestDiskUsage failed: %s", err.Error())
}
defer os.RemoveAll(dir1)
tmpfile1, err := ioutil.TempFile(dir1, "test")
tmpfile1, err := os.CreateTemp(dir1, "test")
if _, err = tmpfile1.WriteString("just for testing"); err != nil {
t.Fatalf("TestDiskUsage failed: %s", err.Error())
}
dir2, err := ioutil.TempDir(dir1, "dir_2")
dir2, err := os.MkdirTemp(dir1, "dir_2")
if err != nil {
t.Fatalf("TestDiskUsage failed: %s", err.Error())
}
tmpfile2, err := ioutil.TempFile(dir2, "test")
tmpfile2, err := os.CreateTemp(dir2, "test")
if _, err = tmpfile2.WriteString("just for testing"); err != nil {
t.Fatalf("TestDiskUsage failed: %s", err.Error())
}
@@ -92,7 +91,7 @@ func TestDiskUsage(t *testing.T) {
}
func TestInfo(t *testing.T) {
dir1, err := ioutil.TempDir("", "dir_1")
dir1, err := os.MkdirTemp("", "dir_1")
if err != nil {
t.Fatalf("TestInfo failed: %s", err.Error())
}
@@ -107,7 +106,7 @@ func TestInfo(t *testing.T) {
validateInfo(t, availablebytes, capacity, usage, inodesTotal, inodeUsage, inodesFree)
// should pass for file
tmpfile1, err := ioutil.TempFile(dir1, "test")
tmpfile1, err := os.CreateTemp(dir1, "test")
if _, err = tmpfile1.WriteString("just for testing"); err != nil {
t.Fatalf("TestInfo failed: %s", err.Error())
}