rm more uses of ioutil

Author: eli-darkly

httphelpers/certificates.go

@@ -10,7 +10,6 @@ import (
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"math/big"
 	"net"
@@ -26,7 +25,7 @@ import (
 // function's second and third parameters provide the CA certificate for configuring the client,
 // and a preconfigured CertPool in case that is more convenient to use.
 func WithSelfSignedServer(handler http.Handler, action func(*httptest.Server, []byte, *x509.CertPool)) {
-	certFile, err := ioutil.TempFile("", "test")
+	certFile, err := os.CreateTemp("", "test")
 	if err != nil {
 		panic(fmt.Errorf("can't create temp file: %s", err))
 	}
@@ -39,7 +38,7 @@ func WithSelfSignedServer(handler http.Handler, action func(*httptest.Server, []
 		}
 	}
 	defer tryToDelete(certFilePath)
-	keyFile, err := ioutil.TempFile("", "test")
+	keyFile, err := os.CreateTemp("", "test")
 	if err != nil {
 		panic(fmt.Errorf("can't create temp file: %s", err))
 	}
@@ -50,7 +49,7 @@ func WithSelfSignedServer(handler http.Handler, action func(*httptest.Server, []
 	if err != nil {
 		panic(fmt.Errorf("can't create self-signed certificate: %s", err))
 	}
-	certData, err := ioutil.ReadFile(certFilePath) //nolint:gosec
+	certData, err := os.ReadFile(certFilePath) //nolint:gosec
 	if err != nil {
 		panic(fmt.Errorf("can't read self-signed certificate: %s", err))
 	}

httphelpers/handlers.go

@@ -2,7 +2,7 @@ package httphelpers
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"net/http/httptest"
@@ -19,7 +19,7 @@ func getRequestBody(request *http.Request) []byte {
 	if request.Body == nil {
 		return nil
 	}
-	body, _ := ioutil.ReadAll(request.Body)
+	body, _ := io.ReadAll(request.Body)
 	return body
 }
 

httphelpers/handlers_sse_test.go

@@ -1,7 +1,7 @@
 package httphelpers
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -31,7 +31,7 @@ func TestSSEHandler(t *testing.T) {
 		stream.Enqueue(SSEEvent{"", "event3", "data3", 500})
 		stream.EndAll()
 
-		data, err := ioutil.ReadAll(resp1.Body)
+		data, err := io.ReadAll(resp1.Body)
 
 		assert.NoError(t, err)
 		assert.Equal(t, `id: id1

httphelpers/handlers_streaming_test.go

@@ -1,7 +1,7 @@
 package httphelpers
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -79,7 +79,7 @@ func TestChunkedStreamingHandlerEndAll(t *testing.T) {
 		}()
 
 		// ReadAll won't return until the stream is closed
-		data, err := ioutil.ReadAll(resp1.Body)
+		data, err := io.ReadAll(resp1.Body)
 		require.NoError(t, err)
 		assert.Equal(t, "hello,goodbye.", string(data))
 
@@ -91,7 +91,7 @@ func TestChunkedStreamingHandlerEndAll(t *testing.T) {
 			stream.EndAll()
 		}()
 
-		data, err = ioutil.ReadAll(resp2.Body)
+		data, err = io.ReadAll(resp2.Body)
 		require.NoError(t, err)
 		assert.Equal(t, "hello,", string(data))
 	})
@@ -112,7 +112,7 @@ func TestChunkedStreamingHandlerClose(t *testing.T) {
 			stream.Close()
 		}()
 
-		data, err := ioutil.ReadAll(resp1.Body)
+		data, err := io.ReadAll(resp1.Body)
 		require.NoError(t, err)
 		assert.Equal(t, "hello,goodbye.", string(data))