Skip to content

Commit 766b88e

Browse files
yanmxayanmxa
committed
remove the usage of deprecated io/ioutil package
Signed-off-by: myan <myan@redhat.com>
1 parent e15d03d commit 766b88e

File tree

15 files changed

+56
-62
lines changed

15 files changed

+56
-62
lines changed

‎observability/opencensus/v2/client/client_test.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"bytes"
1010
"context"
1111
"fmt"
12-
"io/ioutil"
12+
"io"
1313
"net/http"
1414
"net/http/httptest"
1515
"testing"
@@ -113,7 +113,6 @@ func TestTracedClientReceiveError(t *testing.T) {
113113
defer trace.UnregisterExporter(&te)
114114

115115
t.Run("RecordCallingInvoker error", func(t *testing.T) {
116-
117116
evt := func() event.Event {
118117
e := event.Event{
119118
Context: event.EventContextV03{
@@ -272,7 +271,6 @@ func TestTracingClientSend(t *testing.T) {
272271
}
273272

274273
func TestTracingClientSendError(t *testing.T) {
275-
276274
// simple exporter that holds the spans in an array
277275
trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()})
278276
var te testExporter
@@ -291,7 +289,6 @@ func TestTracingClientSendError(t *testing.T) {
291289
defer ts.Close()
292290

293291
t.Run("RecordSendingEvent error", func(t *testing.T) {
294-
295292
sender := simpleTracingBinaryClient(t, ts.URL, fakeObservabilityServiceWithError{})
296293
event := func() event.Event {
297294
e := event.Event{
@@ -391,7 +388,7 @@ func (f *fakeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
391388
defer r.Body.Close()
392389

393390
// Make a copy of the request.
394-
body, err := ioutil.ReadAll(r.Body)
391+
body, err := io.ReadAll(r.Body)
395392
if err != nil {
396393
f.t.Error("failed to read the request body")
397394
}

‎protocol/amqp/v2/write_message.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package amqp
88
import (
99
"context"
1010
"io"
11-
"io/ioutil"
1211

1312
"github.com/Azure/go-amqp"
1413

@@ -37,7 +36,7 @@ func WriteMessage(ctx context.Context, m binding.Message, amqpMessage *amqp.Mess
3736
type amqpMessageWriter amqp.Message
3837

3938
func (b *amqpMessageWriter) SetStructuredEvent(ctx context.Context, format format.Format, event io.Reader) error {
40-
val, err := ioutil.ReadAll(event)
39+
val, err := io.ReadAll(event)
4140
if err != nil {
4241
return err
4342
}
@@ -58,7 +57,7 @@ func (b *amqpMessageWriter) End(ctx context.Context) error {
5857
}
5958

6059
func (b *amqpMessageWriter) SetData(reader io.Reader) error {
61-
data, err := ioutil.ReadAll(reader)
60+
data, err := io.ReadAll(reader)
6261
if err != nil {
6362
return err
6463
}
@@ -100,5 +99,7 @@ func (b *amqpMessageWriter) SetExtension(name string, value interface{}) error {
10099
return nil
101100
}
102101

103-
var _ binding.BinaryWriter = (*amqpMessageWriter)(nil) // Test it conforms to the interface
104-
var _ binding.StructuredWriter = (*amqpMessageWriter)(nil) // Test it conforms to the interface
102+
var (
103+
_ binding.BinaryWriter = (*amqpMessageWriter)(nil) // Test it conforms to the interface
104+
_ binding.StructuredWriter = (*amqpMessageWriter)(nil) // Test it conforms to the interface
105+
)

‎protocol/ws/v2/client_protocol.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"errors"
1111
"fmt"
1212
"io"
13-
"io/ioutil"
1413
"sync"
1514

1615
"nhooyr.io/websocket"
@@ -110,8 +109,8 @@ func (c *ClientProtocol) UnsafeReceive(ctx context.Context) (binding.Message, er
110109
}
111110

112111
func consumeStream(reader io.Reader) {
113-
//TODO is there a less expensive way to consume the stream?
114-
ioutil.ReadAll(reader)
112+
// TODO is there a less expensive way to consume the stream?
113+
io.ReadAll(reader)
115114
}
116115

117116
func (c *ClientProtocol) Close(ctx context.Context) error {
@@ -131,6 +130,8 @@ func (c *ClientProtocol) Close(ctx context.Context) error {
131130
return nil
132131
}
133132

134-
var _ protocol.Receiver = (*ClientProtocol)(nil)
135-
var _ protocol.Sender = (*ClientProtocol)(nil)
136-
var _ protocol.Closer = (*ClientProtocol)(nil)
133+
var (
134+
_ protocol.Receiver = (*ClientProtocol)(nil)
135+
_ protocol.Sender = (*ClientProtocol)(nil)
136+
_ protocol.Closer = (*ClientProtocol)(nil)
137+
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"crypto/tls"
1111
"crypto/x509"
1212
"fmt"
13-
"io/ioutil"
1413
"log"
1514
"net/http"
15+
"os"
1616
"time"
1717

1818
"github.com/google/uuid"
@@ -52,7 +52,7 @@ func main() {
5252
if err != nil {
5353
log.Fatalln("unable to load certs", err)
5454
}
55-
clientCACert, err := ioutil.ReadFile(env.ClientCert)
55+
clientCACert, err := os.ReadFile(env.ClientCert)
5656
if err != nil {
5757
log.Fatal("unable to open cert", err)
5858
}

‎sql/v2/test/tck_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package test
77

88
import (
9-
"io/ioutil"
9+
"io"
1010
"os"
1111
"path"
1212
"runtime"
@@ -111,7 +111,7 @@ func TestTCK(t *testing.T) {
111111
file, err := os.Open(testFilePath)
112112
require.NoError(t, err)
113113

114-
fileBytes, err := ioutil.ReadAll(file)
114+
fileBytes, err := io.ReadAll(file)
115115
require.NoError(t, err)
116116

117117
tckFileModel := TckFile{}

‎test/benchmark/e2e/http/http_mock.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package main
88
import (
99
"bytes"
1010
"io"
11-
"io/ioutil"
1211
nethttp "net/http"
1312
"net/http/httptest"
1413
"net/url"
@@ -52,7 +51,7 @@ func MockedClient() (cloudevents.Client, *http.Protocol) {
5251
return &nethttp.Response{
5352
StatusCode: 202,
5453
Header: make(nethttp.Header),
55-
Body: ioutil.NopCloser(bytes.NewReader([]byte{})),
54+
Body: io.NopCloser(bytes.NewReader([]byte{})),
5655
}
5756
})
5857

‎test/integration/http/tap_handler.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package http
88
import (
99
"bytes"
1010
"fmt"
11-
"io/ioutil"
11+
"io"
1212
"net/http"
1313
"net/http/httptest"
1414
"testing"
@@ -95,12 +95,12 @@ func (t *tapHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
9595
r.Header.Del("ce-" + unitTestIDKey)
9696

9797
// Make a copy of the request.
98-
body, err := ioutil.ReadAll(r.Body)
98+
body, err := io.ReadAll(r.Body)
9999
if err != nil {
100100
fmt.Printf("failed to read the request body")
101101
}
102102
// Set the body back
103-
r.Body = ioutil.NopCloser(bytes.NewReader(body))
103+
r.Body = io.NopCloser(bytes.NewReader(body))
104104

105105
t.req[id] = TapValidation{
106106
Method: r.Method,
@@ -129,7 +129,7 @@ func (t *tapHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
129129
}
130130
}
131131
w.WriteHeader(resp.StatusCode)
132-
body, err = ioutil.ReadAll(resp.Body)
132+
body, err = io.ReadAll(resp.Body)
133133
if err != nil {
134134
fmt.Printf("failed to read the resp body")
135135
}

‎v2/binding/test/mock_binary_message.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"bytes"
1010
"context"
1111
"io"
12-
"io/ioutil"
1312

1413
"github.com/cloudevents/sdk-go/v2/binding"
1514
"github.com/cloudevents/sdk-go/v2/binding/spec"
@@ -121,14 +120,16 @@ func (bm *MockBinaryMessage) SetExtension(name string, value interface{}) error
121120
}
122121

123122
func (bm *MockBinaryMessage) SetData(data io.Reader) (err error) {
124-
bm.Body, err = ioutil.ReadAll(data)
123+
bm.Body, err = io.ReadAll(data)
125124
return err
126125
}
127126

128127
func (bm *MockBinaryMessage) End(ctx context.Context) error {
129128
return nil
130129
}
131130

132-
var _ binding.Message = (*MockBinaryMessage)(nil)
133-
var _ binding.MessageMetadataReader = (*MockBinaryMessage)(nil)
134-
var _ binding.BinaryWriter = (*MockBinaryMessage)(nil)
131+
var (
132+
_ binding.Message = (*MockBinaryMessage)(nil)
133+
_ binding.MessageMetadataReader = (*MockBinaryMessage)(nil)
134+
_ binding.BinaryWriter = (*MockBinaryMessage)(nil)
135+
)

‎v2/binding/test/mock_structured_message.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"bytes"
1010
"context"
1111
"io"
12-
"io/ioutil"
1312
"testing"
1413

1514
"github.com/cloudevents/sdk-go/v2/binding"
@@ -49,13 +48,15 @@ func (s *MockStructuredMessage) Finish(error) error { return nil }
4948

5049
func (s *MockStructuredMessage) SetStructuredEvent(ctx context.Context, format format.Format, event io.Reader) (err error) {
5150
s.Format = format
52-
s.Bytes, err = ioutil.ReadAll(event)
51+
s.Bytes, err = io.ReadAll(event)
5352
if err != nil {
5453
return
5554
}
5655

5756
return nil
5857
}
5958

60-
var _ binding.Message = (*MockStructuredMessage)(nil)
61-
var _ binding.StructuredWriter = (*MockStructuredMessage)(nil)
59+
var (
60+
_ binding.Message = (*MockStructuredMessage)(nil)
61+
_ binding.StructuredWriter = (*MockStructuredMessage)(nil)
62+
)

‎v2/binding/utils/structured_message_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package utils_test
88
import (
99
"bytes"
1010
"context"
11-
"io/ioutil"
11+
"io"
1212
"testing"
1313

1414
"github.com/stretchr/testify/require"
@@ -23,7 +23,7 @@ func TestNewStructuredMessage(t *testing.T) {
2323
testEvent := test.ConvertEventExtensionsToString(t, test.FullEvent())
2424
jsonBytes := test.MustJSON(t, testEvent)
2525

26-
message := utils.NewStructuredMessage(format.JSON, ioutil.NopCloser(bytes.NewReader(jsonBytes)))
26+
message := utils.NewStructuredMessage(format.JSON, io.NopCloser(bytes.NewReader(jsonBytes)))
2727

2828
require.Equal(t, binding.EncodingStructured, message.ReadEncoding())
2929

0 commit comments

Comments
 (0)