Merge pull request #499 from testwill/ioutil

chore: remove refs to deprecated io/ioutil

Author: k8s-ci-robot

cmd/server/app/server.go

@@ -21,7 +21,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	netpprof "net/http/pprof"
@@ -274,7 +273,7 @@ func (p *Proxy) getTLSConfig(caFile, certFile, keyFile, cipherSuites string) (*t
 	}
 
 	certPool := x509.NewCertPool()
-	caCert, err := ioutil.ReadFile(filepath.Clean(caFile))
+	caCert, err := os.ReadFile(filepath.Clean(caFile))
 	if err != nil {
 		return nil, fmt.Errorf("failed to read cluster CA cert %s: %v", caFile, err)
 	}

cmd/test-client/main.go

@@ -23,7 +23,7 @@ import (
 	"flag"
 	"fmt"
 	"golang.org/x/net/http2"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"os"
@@ -385,7 +385,7 @@ func (c *Client) makeRequest(o *GrpcProxyClientOptions, client *http.Client) err
 		}
 	}() // TODO: proxy server should handle the case where Body isn't closed.
 
-	data, err := ioutil.ReadAll(response.Body)
+	data, err := io.ReadAll(response.Body)
 	if err != nil {
 		return fmt.Errorf("failed to read response from client, got %v", err)
 	}

pkg/agent/client.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 	"net"
 	runpprof "runtime/pprof"
 	"strconv"
@@ -286,7 +286,7 @@ func (a *Client) initializeAuthContext(ctx context.Context) (context.Context, er
 	var b []byte
 
 	// load current service account's token value
-	if b, err = ioutil.ReadFile(a.serviceAccountTokenPath); err != nil {
+	if b, err = os.ReadFile(a.serviceAccountTokenPath); err != nil {
 		klog.ErrorS(err, "Failed to read token", "path", a.serviceAccountTokenPath)
 		return nil, err
 	}

pkg/util/certificates.go

@@ -20,14 +20,14 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 )
 
 // getCACertPool loads CA certificates to pool
 func getCACertPool(caFile string) (*x509.CertPool, error) {
 	certPool := x509.NewCertPool()
-	caCert, err := ioutil.ReadFile(filepath.Clean(caFile))
+	caCert, err := os.ReadFile(filepath.Clean(caFile))
 	if err != nil {
 		return nil, fmt.Errorf("failed to read CA cert %s: %v", caFile, err)
 	}

tests/agent_disconnect_test.go

@@ -20,7 +20,7 @@ import (
 	"bufio"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -175,7 +175,7 @@ func clientRequest(c *http.Client, addr string) ([]byte, error) {
 		return nil, fmt.Errorf("http GET %q: %w", addr, err)
 	}
 
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err != nil {
 		return nil, fmt.Errorf("error reading response body: %w", err)
 	}

tests/concurrent_client_request_test.go

@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"sync"
@@ -41,7 +41,7 @@ type simpleServer struct {
 // ServeHTTP blocks the response to the request whose body is "1" until a
 // request whose body is "2" is handled.
 func (s *simpleServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	bytes, err := ioutil.ReadAll(req.Body)
+	bytes, err := io.ReadAll(req.Body)
 	if err != nil {
 		w.Write([]byte(err.Error()))
 	}
@@ -161,7 +161,7 @@ func TestConcurrentClientRequest(t *testing.T) {
 			t.Error(err)
 			return
 		}
-		data, err := ioutil.ReadAll(r.Body)
+		data, err := io.ReadAll(r.Body)
 		if err != nil {
 			t.Error(err)
 		}
@@ -178,7 +178,7 @@ func TestConcurrentClientRequest(t *testing.T) {
 			t.Error(err)
 			return
 		}
-		data, err := ioutil.ReadAll(r.Body)
+		data, err := io.ReadAll(r.Body)
 		if err != nil {
 			t.Error(err)
 		}

tests/concurrent_test.go

@@ -18,7 +18,7 @@ package tests
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"sync"
@@ -70,7 +70,7 @@ func TestProxy_ConcurrencyGRPC(t *testing.T) {
 			return
 		}
 
-		data, err := ioutil.ReadAll(r.Body)
+		data, err := io.ReadAll(r.Body)
 		if err != nil {
 			t.Error(err)
 			return

tests/custom_alpn_test.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/pem"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -47,7 +46,7 @@ func TestCustomALPN(t *testing.T) {
 	}
 	svr.StartTLS()
 
-	ca, err := ioutil.TempFile("", "")
+	ca, err := os.CreateTemp("", "")
 	if err != nil {
 		t.Fatal(err)
 	}

tests/ha_proxy_server_test.go

@@ -19,7 +19,6 @@ package tests
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"log"
 	"math/rand"
 	"net"
@@ -211,7 +210,7 @@ func testProxyServer(t *testing.T, front string, target string) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err != nil {
 		t.Error(err)
 	}

tests/proxy_test.go

@@ -21,7 +21,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"net"
 	"net/http"
@@ -162,7 +161,7 @@ func TestBasicProxy_GRPC(t *testing.T) {
 	}
 	defer r.Body.Close()
 
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err != nil {
 		t.Error(err)
 	}
@@ -600,7 +599,7 @@ func TestProxy_LargeResponse(t *testing.T) {
 		t.Error(err)
 	}
 
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err != nil {
 		t.Error(err)
 	}
@@ -669,7 +668,7 @@ func TestBasicProxy_HTTPCONN(t *testing.T) {
 		t.Error(err)
 	}
 
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err != nil {
 		t.Error(err)
 	}