alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: remove refs to deprecated io/ioutil

Browse Source
This commit is contained in:
guoguangwu
2023-06-25 11:09:17 +08:00
parent dd523a00ef
commit 62c611a51a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/metrics/metrics_test.go
View File

@@ -20,7 +20,6 @@ import (
"context" "context"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"log" "log"
"net" "net"
"net/http" "net/http"
@@ -119,7 +118,7 @@ func TestRecordMetricsForNonExistingOperation(t *testing.T) {
if err != nil || rsp.StatusCode != http.StatusOK { if err != nil || rsp.StatusCode != http.StatusOK {
t.Errorf("failed to get response from server %v, %v", err, rsp) t.Errorf("failed to get response from server %v, %v", err, rsp)
} }
r, err := ioutil.ReadAll(rsp.Body) r, err := io.ReadAll(rsp.Body)
if err != nil { if err != nil {
t.Errorf("failed to read response body %v", err) t.Errorf("failed to read response body %v", err)
} }
@@ -144,7 +143,7 @@ func TestDropOperation(t *testing.T) {
if err != nil || rsp.StatusCode != http.StatusOK { if err != nil || rsp.StatusCode != http.StatusOK {
t.Errorf("failed to get response from server %v, %v", err, rsp) t.Errorf("failed to get response from server %v, %v", err, rsp)
} }
r, err := ioutil.ReadAll(rsp.Body) r, err := io.ReadAll(rsp.Body)
if err != nil { if err != nil {
t.Errorf("failed to read response body %v", err) t.Errorf("failed to read response body %v", err)
} }
@@ -554,7 +553,7 @@ func verifyInFlightMetric(expected string, srvAddr string) error {
if rsp.StatusCode != http.StatusOK { if rsp.StatusCode != http.StatusOK {
return fmt.Errorf("failed to get response from serve: %s", http.StatusText(rsp.StatusCode)) return fmt.Errorf("failed to get response from serve: %s", http.StatusText(rsp.StatusCode))
} }
r, err := ioutil.ReadAll(rsp.Body) r, err := io.ReadAll(rsp.Body)
if err != nil { if err != nil {
return err return err
} }
@@ -574,7 +573,7 @@ func verifyMetric(expected, srvAddr string) error {
if rsp.StatusCode != http.StatusOK { if rsp.StatusCode != http.StatusOK {
return fmt.Errorf("failed to get response from serve: %s", http.StatusText(rsp.StatusCode)) return fmt.Errorf("failed to get response from serve: %s", http.StatusText(rsp.StatusCode))
} }
r, err := ioutil.ReadAll(rsp.Body) r, err := io.ReadAll(rsp.Body)
if err != nil { if err != nil {
return err return err
} }

4
pkg/validation-webhook/webhook.go
View File

@@ -21,7 +21,7 @@ import (
"crypto/tls" "crypto/tls"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"os" "os"
@@ -108,7 +108,7 @@ func serve(w http.ResponseWriter, r *http.Request, admit admitHandler) {
http.Error(w, msg, http.StatusBadRequest) http.Error(w, msg, http.StatusBadRequest)
} }
data, err := ioutil.ReadAll(r.Body) data, err := io.ReadAll(r.Body)
if err != nil { if err != nil {
msg := fmt.Sprintf("Request could not be decoded: %v", err) msg := fmt.Sprintf("Request could not be decoded: %v", err)
klog.Error(msg) klog.Error(msg)