Skip to content

Commit b9605d4

Browse files
authored
chore: remove refs to deprecated io/ioutil (#374)
Signed-off-by: guoguangwu <[email protected]>
1 parent 175baa0 commit b9605d4

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

cache/tmp_file_response_writer.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bufio"
55
"fmt"
66
"io"
7-
"io/ioutil"
87
"net/http"
98
"os"
109

@@ -32,7 +31,7 @@ func NewTmpFileResponseWriter(rw http.ResponseWriter, dir string) (*TmpFileRespo
3231
return nil, fmt.Errorf("the response writer does not implement http.CloseNotifier")
3332
}
3433

35-
f, err := ioutil.TempFile(dir, "tmp")
34+
f, err := os.CreateTemp(dir, "tmp")
3635
if err != nil {
3736
return nil, fmt.Errorf("cannot create temporary file in %q: %w", dir, err)
3837
}

cache/tmp_file_response_writer_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cache
22

33
import (
4-
"io/ioutil"
4+
"io"
55
"log"
66
"net/http"
77
"os"
@@ -57,7 +57,7 @@ func init() {
5757

5858
func TestFileCreation(t *testing.T) {
5959
srw := newFakeResponse()
60-
files, _ := ioutil.ReadDir(testTmpWriterDir)
60+
files, _ := os.ReadDir(testTmpWriterDir)
6161
nbFileBefore := len(files)
6262

6363
tmpFileRespWriter, err := NewTmpFileResponseWriter(srw, testTmpWriterDir)
@@ -67,7 +67,7 @@ func TestFileCreation(t *testing.T) {
6767
return
6868
}
6969

70-
files, _ = ioutil.ReadDir(testTmpWriterDir)
70+
files, _ = os.ReadDir(testTmpWriterDir)
7171
nbFileAfter := len(files)
7272
if nbFileAfter == nbFileBefore {
7373
t.Fatalf("Error while creating tmp file")
@@ -77,7 +77,7 @@ func TestFileCreation(t *testing.T) {
7777

7878
func TestFileRemoval(t *testing.T) {
7979
srw := newFakeResponse()
80-
files, _ := ioutil.ReadDir(testTmpWriterDir)
80+
files, _ := os.ReadDir(testTmpWriterDir)
8181
nbFileBefore := len(files)
8282

8383
tmpFileRespWriter, err := NewTmpFileResponseWriter(srw, testTmpWriterDir)
@@ -87,7 +87,7 @@ func TestFileRemoval(t *testing.T) {
8787
}
8888
tmpFileRespWriter.Close()
8989

90-
files, _ = ioutil.ReadDir(testTmpWriterDir)
90+
files, _ = os.ReadDir(testTmpWriterDir)
9191
nbFileAfter := len(files)
9292
if nbFileAfter != nbFileBefore {
9393
t.Fatalf("Error while deleting tmp file")
@@ -147,7 +147,7 @@ func TestWriteThenReadContent(t *testing.T) {
147147
return
148148
}
149149
tmpFileRespWriter.ResetFileOffset()
150-
buffer, err := ioutil.ReadAll(reader)
150+
buffer, err := io.ReadAll(reader)
151151
if err != nil {
152152
t.Fatalf("could not read tmp file:%s", err)
153153
return

proxy.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"errors"
77
"fmt"
88
"io"
9-
"io/ioutil"
109
"net"
1110
"net/http"
1211
"net/http/httputil"
@@ -208,7 +207,7 @@ func executeWithRetry(
208207
var since float64
209208

210209
// keep the request body
211-
body, err := ioutil.ReadAll(req.Body)
210+
body, err := io.ReadAll(req.Body)
212211
req.Body.Close()
213212
if err != nil {
214213
since = time.Since(startTime).Seconds()
@@ -219,7 +218,7 @@ func executeWithRetry(
219218
numRetry := 0
220219
for {
221220
// update body
222-
req.Body = ioutil.NopCloser(bytes.NewBuffer(body))
221+
req.Body = io.NopCloser(bytes.NewBuffer(body))
223222
req.Body.Close()
224223

225224
rp(rw, req)

proxyretry_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
"context"
5-
"io/ioutil"
5+
"io"
66
"net/http"
77
"net/http/httptest"
88
"net/url"
@@ -177,7 +177,7 @@ func (mhs *mockHosts) mockReverseProxy(rw http.ResponseWriter, req *http.Request
177177
rw.WriteHeader(http.StatusOK)
178178
}
179179

180-
b, err := ioutil.ReadAll(req.Body)
180+
b, err := io.ReadAll(req.Body)
181181
if err != nil {
182182
mhs.t.Errorf("The req body cannot be read: %v", err)
183183
}

0 commit comments

Comments
 (0)