Merge pull request #6118 from zouyee/ioutil

mxpv · web-flow · commit 10d9d1a60fe7 · 2021-10-13T14:57:38.000-07:00
cleanup deprecated package  `io/ioutil `
diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go
@@ -19,7 +19,6 @@ package fuzz
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -43,7 +42,7 @@ func testEnv() (context.Context, *bolt.DB, func(), error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	ctx = namespaces.WithNamespace(ctx, "testing")
 
-	dirname, err := ioutil.TempDir("", "fuzz-")
+	dirname, err := os.MkdirTemp("", "fuzz-")
 	if err != nil {
 		return ctx, nil, nil, err
 	}
@@ -263,7 +262,7 @@ func testDB(opt ...testOpt) (context.Context, *metadata.DB, func(), error) {
 		o(&topts)
 	}
 
-	dirname, err := ioutil.TempDir("", "fuzzing-")
+	dirname, err := os.MkdirTemp("", "fuzzing-")
 	if err != nil {
 		return ctx, nil, func() { cancel() }, err
 	}
diff --git a/integration/shim_dial_unix_test.go b/integration/shim_dial_unix_test.go
@@ -21,7 +21,6 @@ package integration
 
 import (
 	"context"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -147,7 +146,7 @@ func testFailFastWhenConnectShim(abstract bool, dialFn dialFunc) func(*testing.T
 }
 
 func newTestListener(t testing.TB, abstract bool) (string, net.Listener, func()) {
-	tmpDir, err := ioutil.TempDir("", "shim-ut-XX")
+	tmpDir, err := os.MkdirTemp("", "shim-ut-XX")
 	if err != nil {
 		t.Fatalf("failed to create tmp directory: %v", err)
 	}
diff --git a/runtime/v1/linux/bundle_test.go b/runtime/v1/linux/bundle_test.go
@@ -22,7 +22,6 @@ package linux
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -49,7 +48,7 @@ func TestNewBundle(t *testing.T) {
 
 	for i, tc := range tests {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
-			dir, err := ioutil.TempDir("", "test-new-bundle")
+			dir, err := os.MkdirTemp("", "test-new-bundle")
 			require.NoError(t, err, "failed to create test directory")
 			defer os.RemoveAll(dir)
 			work := filepath.Join(dir, "work")
diff --git a/runtime/v2/bundle_linux_test.go b/runtime/v2/bundle_linux_test.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -48,7 +47,7 @@ func TestNewBundle(t *testing.T) {
 
 	for i, tc := range tests {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
-			dir, err := ioutil.TempDir("", "test-new-bundle")
+			dir, err := os.MkdirTemp("", "test-new-bundle")
 			require.NoError(t, err, "failed to create test directory")
 			defer os.RemoveAll(dir)
 			work := filepath.Join(dir, "work")

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ package integration`
`21`	`21`
`22`	`22`	`import (`
`23`	`23`	`"context"`
`24`		`- "io/ioutil"`
`25`	`24`	`"net"`
`26`	`25`	`"os"`
`27`	`26`	`"path/filepath"`
`@@ -147,7 +146,7 @@ func testFailFastWhenConnectShim(abstract bool, dialFn dialFunc) func(*testing.T`
`147`	`146`	`}`
`148`	`147`
`149`	`148`	`func newTestListener(t testing.TB, abstract bool) (string, net.Listener, func()) {`
`150`		`- tmpDir, err := ioutil.TempDir("", "shim-ut-XX")`
	`149`	`+ tmpDir, err := os.MkdirTemp("", "shim-ut-XX")`
`151`	`150`	`if err != nil {`
`152`	`151`	`t.Fatalf("failed to create tmp directory: %v", err)`
`153`	`152`	`}`