remove the usage of deprecated io/ioutil package

Signed-off-by: myan <[email protected]>

observability/opencensus/v2/client/client_test.go

@@ -9,7 +9,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -113,7 +113,6 @@ func TestTracedClientReceiveError(t *testing.T) {
 	defer trace.UnregisterExporter(&te)
 
 	t.Run("RecordCallingInvoker error", func(t *testing.T) {
-
 		evt := func() event.Event {
 			e := event.Event{
 				Context: event.EventContextV03{
@@ -272,7 +271,6 @@ func TestTracingClientSend(t *testing.T) {
 }
 
 func TestTracingClientSendError(t *testing.T) {
-
 	// simple exporter that holds the spans in an array
 	trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()})
 	var te testExporter
@@ -291,7 +289,6 @@ func TestTracingClientSendError(t *testing.T) {
 	defer ts.Close()
 
 	t.Run("RecordSendingEvent error", func(t *testing.T) {
-
 		sender := simpleTracingBinaryClient(t, ts.URL, fakeObservabilityServiceWithError{})
 		event := func() event.Event {
 			e := event.Event{
@@ -391,7 +388,7 @@ func (f *fakeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 
 	// Make a copy of the request.
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		f.t.Error("failed to read the request body")
 	}

protocol/amqp/v2/write_message.go

@@ -8,7 +8,6 @@ package amqp
 import (
 	"context"
 	"io"
-	"io/ioutil"
 
 	"github.com/Azure/go-amqp"
 
@@ -37,7 +36,7 @@ func WriteMessage(ctx context.Context, m binding.Message, amqpMessage *amqp.Mess
 type amqpMessageWriter amqp.Message
 
 func (b *amqpMessageWriter) SetStructuredEvent(ctx context.Context, format format.Format, event io.Reader) error {
-	val, err := ioutil.ReadAll(event)
+	val, err := io.ReadAll(event)
 	if err != nil {
 		return err
 	}
@@ -58,7 +57,7 @@ func (b *amqpMessageWriter) End(ctx context.Context) error {
 }
 
 func (b *amqpMessageWriter) SetData(reader io.Reader) error {
-	data, err := ioutil.ReadAll(reader)
+	data, err := io.ReadAll(reader)
 	if err != nil {
 		return err
 	}
@@ -100,5 +99,7 @@ func (b *amqpMessageWriter) SetExtension(name string, value interface{}) error {
 	return nil
 }
 
-var _ binding.BinaryWriter = (*amqpMessageWriter)(nil)     // Test it conforms to the interface
-var _ binding.StructuredWriter = (*amqpMessageWriter)(nil) // Test it conforms to the interface
+var (
+	_ binding.BinaryWriter     = (*amqpMessageWriter)(nil) // Test it conforms to the interface
+	_ binding.StructuredWriter = (*amqpMessageWriter)(nil) // Test it conforms to the interface
+)

protocol/ws/v2/client_protocol.go

@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"sync"
 
 	"nhooyr.io/websocket"
@@ -110,8 +109,8 @@ func (c *ClientProtocol) UnsafeReceive(ctx context.Context) (binding.Message, er
 }
 
 func consumeStream(reader io.Reader) {
-	//TODO is there a less expensive way to consume the stream?
-	ioutil.ReadAll(reader)
+	// TODO is there a less expensive way to consume the stream?
+	io.ReadAll(reader)
 }
 
 func (c *ClientProtocol) Close(ctx context.Context) error {
@@ -131,6 +130,8 @@ func (c *ClientProtocol) Close(ctx context.Context) error {
 	return nil
 }
 
-var _ protocol.Receiver = (*ClientProtocol)(nil)
-var _ protocol.Sender = (*ClientProtocol)(nil)
-var _ protocol.Closer = (*ClientProtocol)(nil)
+var (
+	_ protocol.Receiver = (*ClientProtocol)(nil)
+	_ protocol.Sender   = (*ClientProtocol)(nil)
+	_ protocol.Closer   = (*ClientProtocol)(nil)
+)

samples/http/requester-with-custom-client/main.go

@@ -10,9 +10,9 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net/http"
+	"os"
 	"time"
 
 	"github.com/google/uuid"
@@ -52,7 +52,7 @@ func main() {
 	if err != nil {
 		log.Fatalln("unable to load certs", err)
 	}
-	clientCACert, err := ioutil.ReadFile(env.ClientCert)
+	clientCACert, err := os.ReadFile(env.ClientCert)
 	if err != nil {
 		log.Fatal("unable to open cert", err)
 	}

sql/v2/test/tck_test.go

@@ -6,7 +6,7 @@
 package test
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"path"
 	"runtime"
@@ -111,7 +111,7 @@ func TestTCK(t *testing.T) {
 		file, err := os.Open(testFilePath)
 		require.NoError(t, err)
 
-		fileBytes, err := ioutil.ReadAll(file)
+		fileBytes, err := io.ReadAll(file)
 		require.NoError(t, err)
 
 		tckFileModel := TckFile{}

test/benchmark/e2e/http/http_mock.go

@@ -8,7 +8,6 @@ package main
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	nethttp "net/http"
 	"net/http/httptest"
 	"net/url"
@@ -52,7 +51,7 @@ func MockedClient() (cloudevents.Client, *http.Protocol) {
 		return &nethttp.Response{
 			StatusCode: 202,
 			Header:     make(nethttp.Header),
-			Body:       ioutil.NopCloser(bytes.NewReader([]byte{})),
+			Body:       io.NopCloser(bytes.NewReader([]byte{})),
 		}
 	})
 

test/integration/http/tap_handler.go

@@ -8,7 +8,7 @@ package http
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -95,12 +95,12 @@ func (t *tapHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	r.Header.Del("ce-" + unitTestIDKey)
 
 	// Make a copy of the request.
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		fmt.Printf("failed to read the request body")
 	}
 	// Set the body back
-	r.Body = ioutil.NopCloser(bytes.NewReader(body))
+	r.Body = io.NopCloser(bytes.NewReader(body))
 
 	t.req[id] = TapValidation{
 		Method:        r.Method,
@@ -129,7 +129,7 @@ func (t *tapHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 	w.WriteHeader(resp.StatusCode)
-	body, err = ioutil.ReadAll(resp.Body)
+	body, err = io.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Printf("failed to read the resp body")
 	}

v2/binding/test/mock_binary_message.go

@@ -9,7 +9,6 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"io/ioutil"
 
 	"github.com/cloudevents/sdk-go/v2/binding"
 	"github.com/cloudevents/sdk-go/v2/binding/spec"
@@ -121,14 +120,16 @@ func (bm *MockBinaryMessage) SetExtension(name string, value interface{}) error
 }
 
 func (bm *MockBinaryMessage) SetData(data io.Reader) (err error) {
-	bm.Body, err = ioutil.ReadAll(data)
+	bm.Body, err = io.ReadAll(data)
 	return err
 }
 
 func (bm *MockBinaryMessage) End(ctx context.Context) error {
 	return nil
 }
 
-var _ binding.Message = (*MockBinaryMessage)(nil)
-var _ binding.MessageMetadataReader = (*MockBinaryMessage)(nil)
-var _ binding.BinaryWriter = (*MockBinaryMessage)(nil)
+var (
+	_ binding.Message               = (*MockBinaryMessage)(nil)
+	_ binding.MessageMetadataReader = (*MockBinaryMessage)(nil)
+	_ binding.BinaryWriter          = (*MockBinaryMessage)(nil)
+)

v2/binding/test/mock_structured_message.go

@@ -9,7 +9,6 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"io/ioutil"
 	"testing"
 
 	"github.com/cloudevents/sdk-go/v2/binding"
@@ -49,13 +48,15 @@ func (s *MockStructuredMessage) Finish(error) error { return nil }
 
 func (s *MockStructuredMessage) SetStructuredEvent(ctx context.Context, format format.Format, event io.Reader) (err error) {
 	s.Format = format
-	s.Bytes, err = ioutil.ReadAll(event)
+	s.Bytes, err = io.ReadAll(event)
 	if err != nil {
 		return
 	}
 
 	return nil
 }
 
-var _ binding.Message = (*MockStructuredMessage)(nil)
-var _ binding.StructuredWriter = (*MockStructuredMessage)(nil)
+var (
+	_ binding.Message          = (*MockStructuredMessage)(nil)
+	_ binding.StructuredWriter = (*MockStructuredMessage)(nil)
+)

v2/binding/utils/structured_message_test.go

@@ -8,7 +8,7 @@ package utils_test
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -23,7 +23,7 @@ func TestNewStructuredMessage(t *testing.T) {
 	testEvent := test.ConvertEventExtensionsToString(t, test.FullEvent())
 	jsonBytes := test.MustJSON(t, testEvent)
 
-	message := utils.NewStructuredMessage(format.JSON, ioutil.NopCloser(bytes.NewReader(jsonBytes)))
+	message := utils.NewStructuredMessage(format.JSON, io.NopCloser(bytes.NewReader(jsonBytes)))
 
 	require.Equal(t, binding.EncodingStructured, message.ReadEncoding())
 

v2/client/client_test.go

@@ -10,7 +10,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net"
 	"net/http"
@@ -181,7 +181,7 @@ func TestClientSend(t *testing.T) {
 func simpleBinaryOptions(port int, path string) []cehttp.Option {
 	opts := []cehttp.Option{
 		cehttp.WithPort(port),
-		//cehttp.WithBinaryEncoding(),
+		// cehttp.WithBinaryEncoding(),
 	}
 	if len(path) > 0 {
 		opts = append(opts, cehttp.WithPath(path))
@@ -192,7 +192,7 @@ func simpleBinaryOptions(port int, path string) []cehttp.Option {
 func simpleStructuredOptions(port int, path string) []cehttp.Option {
 	opts := []cehttp.Option{
 		cehttp.WithPort(port),
-		//cehttp.WithStructuredEncoding(),
+		// cehttp.WithStructuredEncoding(),
 	}
 	if len(path) > 0 {
 		opts = append(opts, cehttp.WithPath(path))
@@ -268,7 +268,6 @@ func TestClientReceive(t *testing.T) {
 	for n, tc := range testCases {
 		for _, path := range []string{"", "/", "/unittest/"} {
 			t.Run(n+" at path "+path, func(t *testing.T) {
-
 				events := make(chan event.Event)
 
 				p, err := cehttp.New(tc.optsFn(0, "")...)
@@ -318,7 +317,7 @@ func TestClientReceive(t *testing.T) {
 					Method:        "POST",
 					URL:           target,
 					Header:        tc.req.Headers,
-					Body:          ioutil.NopCloser(bytes.NewReader(tc.req.Body)),
+					Body:          io.NopCloser(bytes.NewReader(tc.req.Body)),
 					ContentLength: int64(len(tc.req.Body)),
 				}
 
@@ -373,7 +372,6 @@ func TestClientContext(t *testing.T) {
 			next.ServeHTTP(w, r.WithContext(ctx))
 		})
 	}))
-
 	if err != nil {
 		t.Fatalf("error creating client: %v", err)
 	}
@@ -417,7 +415,7 @@ func (f *fakeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 
 	// Make a copy of the request.
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		f.t.Error("failed to read the request body")
 	}

v2/protocol/http/message_test.go

@@ -9,7 +9,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -38,7 +38,6 @@ func TestNewMessageFromHttpRequest(t *testing.T) {
 	for _, tt := range tests {
 		test.EachEvent(t, test.Events(), func(t *testing.T, eventIn event.Event) {
 			t.Run(tt.name, func(t *testing.T) {
-
 				ctx := context.TODO()
 				if tt.encoding == binding.EncodingStructured {
 					ctx = binding.WithForceStructured(ctx)
@@ -167,7 +166,7 @@ func TestNewMessageFromHttpResponse(t *testing.T) {
 			Header: http.Header{
 				"Content-Type": {event.ApplicationCloudEventsJSON},
 			},
-			Body:          ioutil.NopCloser(bytes.NewReader([]byte(`{"data":"foo","datacontenttype":"application/json","id":"id","source":"source","specversion":"1.0","type":"type"}`))),
+			Body:          io.NopCloser(bytes.NewReader([]byte(`{"data":"foo","datacontenttype":"application/json","id":"id","source":"source","specversion":"1.0","type":"type"}`))),
 			ContentLength: 113,
 		},
 	}, {

v2/protocol/http/protocol_retry.go

@@ -10,7 +10,6 @@ import (
 	"context"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"time"
@@ -67,7 +66,7 @@ func (p *Protocol) doWithRetry(ctx context.Context, params *cecontext.RetryParam
 				cecontext.LoggerFrom(ctx).Warnw("could not close request body", zap.Error(err))
 			}
 		}()
-		body, err = ioutil.ReadAll(req.Body)
+		body, err = io.ReadAll(req.Body)
 		if err != nil {
 			panic(err)
 		}
@@ -134,12 +133,12 @@ func resetBody(req *http.Request, body []byte) {
 		return
 	}
 
-	req.Body = ioutil.NopCloser(bytes.NewReader(body))
+	req.Body = io.NopCloser(bytes.NewReader(body))
 
 	// do not modify existing GetBody function
 	if req.GetBody == nil {
 		req.GetBody = func() (io.ReadCloser, error) {
-			return ioutil.NopCloser(bytes.NewReader(body)), nil
+			return io.NopCloser(bytes.NewReader(body)), nil
 		}
 	}
 }