+56
-62
lines changedFilter options
+56
-62
lines changed Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import (
9 9
"bytes"
10 10
"context"
11 11
"fmt"
12 -
"io/ioutil"
12 +
"io"
13 13
"net/http"
14 14
"net/http/httptest"
15 15
"testing"
@@ -113,7 +113,6 @@ func TestTracedClientReceiveError(t *testing.T) {
113 113
defer trace.UnregisterExporter(&te)
114 114 115 115
t.Run("RecordCallingInvoker error", func(t *testing.T) {
116 - 117 116
evt := func() event.Event {
118 117
e := event.Event{
119 118
Context: event.EventContextV03{
@@ -272,7 +271,6 @@ func TestTracingClientSend(t *testing.T) {
272 271
}
273 272 274 273
func TestTracingClientSendError(t *testing.T) {
275 - 276 274
// simple exporter that holds the spans in an array
277 275
trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()})
278 276
var te testExporter
@@ -291,7 +289,6 @@ func TestTracingClientSendError(t *testing.T) {
291 289
defer ts.Close()
292 290 293 291
t.Run("RecordSendingEvent error", func(t *testing.T) {
294 - 295 292
sender := simpleTracingBinaryClient(t, ts.URL, fakeObservabilityServiceWithError{})
296 293
event := func() event.Event {
297 294
e := event.Event{
@@ -391,7 +388,7 @@ func (f *fakeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
391 388
defer r.Body.Close()
392 389 393 390
// Make a copy of the request.
394 -
body, err := ioutil.ReadAll(r.Body)
391 +
body, err := io.ReadAll(r.Body)
395 392
if err != nil {
396 393
f.t.Error("failed to read the request body")
397 394
}
@@ -8,7 +8,6 @@ package amqp
8 8
import (
9 9
"context"
10 10
"io"
11 -
"io/ioutil"
12 11 13 12
"github.com/Azure/go-amqp"
14 13
@@ -37,7 +36,7 @@ func WriteMessage(ctx context.Context, m binding.Message, amqpMessage *amqp.Mess
37 36
type amqpMessageWriter amqp.Message
38 37 39 38
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)
41 40
if err != nil {
42 41
return err
43 42
}
@@ -58,7 +57,7 @@ func (b *amqpMessageWriter) End(ctx context.Context) error {
58 57
}
59 58 60 59
func (b *amqpMessageWriter) SetData(reader io.Reader) error {
61 -
data, err := ioutil.ReadAll(reader)
60 +
data, err := io.ReadAll(reader)
62 61
if err != nil {
63 62
return err
64 63
}
@@ -100,5 +99,7 @@ func (b *amqpMessageWriter) SetExtension(name string, value interface{}) error {
100 99
return nil
101 100
}
102 101 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 +
)
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ import (
10 10
"errors"
11 11
"fmt"
12 12
"io"
13 -
"io/ioutil"
14 13
"sync"
15 14 16 15
"nhooyr.io/websocket"
@@ -110,8 +109,8 @@ func (c *ClientProtocol) UnsafeReceive(ctx context.Context) (binding.Message, er
110 109
}
111 110 112 111
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)
115 114
}
116 115 117 116
func (c *ClientProtocol) Close(ctx context.Context) error {
@@ -131,6 +130,8 @@ func (c *ClientProtocol) Close(ctx context.Context) error {
131 130
return nil
132 131
}
133 132 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 +
)
Original file line number Diff line number Diff line change
@@ -10,9 +10,9 @@ import (
10 10
"crypto/tls"
11 11
"crypto/x509"
12 12
"fmt"
13 -
"io/ioutil"
14 13
"log"
15 14
"net/http"
15 +
"os"
16 16
"time"
17 17 18 18
"github.com/google/uuid"
@@ -52,7 +52,7 @@ func main() {
52 52
if err != nil {
53 53
log.Fatalln("unable to load certs", err)
54 54
}
55 -
clientCACert, err := ioutil.ReadFile(env.ClientCert)
55 +
clientCACert, err := os.ReadFile(env.ClientCert)
56 56
if err != nil {
57 57
log.Fatal("unable to open cert", err)
58 58
}
@@ -6,7 +6,7 @@
6 6
package test
7 7 8 8
import (
9 -
"io/ioutil"
9 +
"io"
10 10
"os"
11 11
"path"
12 12
"runtime"
@@ -111,7 +111,7 @@ func TestTCK(t *testing.T) {
111 111
file, err := os.Open(testFilePath)
112 112
require.NoError(t, err)
113 113 114 -
fileBytes, err := ioutil.ReadAll(file)
114 +
fileBytes, err := io.ReadAll(file)
115 115
require.NoError(t, err)
116 116 117 117
tckFileModel := TckFile{}
@@ -8,7 +8,6 @@ package main
8 8
import (
9 9
"bytes"
10 10
"io"
11 -
"io/ioutil"
12 11
nethttp "net/http"
13 12
"net/http/httptest"
14 13
"net/url"
@@ -52,7 +51,7 @@ func MockedClient() (cloudevents.Client, *http.Protocol) {
52 51
return &nethttp.Response{
53 52
StatusCode: 202,
54 53
Header: make(nethttp.Header),
55 -
Body: ioutil.NopCloser(bytes.NewReader([]byte{})),
54 +
Body: io.NopCloser(bytes.NewReader([]byte{})),
56 55
}
57 56
})
58 57
@@ -8,7 +8,7 @@ package http
8 8
import (
9 9
"bytes"
10 10
"fmt"
11 -
"io/ioutil"
11 +
"io"
12 12
"net/http"
13 13
"net/http/httptest"
14 14
"testing"
@@ -95,12 +95,12 @@ func (t *tapHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
95 95
r.Header.Del("ce-" + unitTestIDKey)
96 96 97 97
// Make a copy of the request.
98 -
body, err := ioutil.ReadAll(r.Body)
98 +
body, err := io.ReadAll(r.Body)
99 99
if err != nil {
100 100
fmt.Printf("failed to read the request body")
101 101
}
102 102
// Set the body back
103 -
r.Body = ioutil.NopCloser(bytes.NewReader(body))
103 +
r.Body = io.NopCloser(bytes.NewReader(body))
104 104 105 105
t.req[id] = TapValidation{
106 106
Method: r.Method,
@@ -129,7 +129,7 @@ func (t *tapHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
129 129
}
130 130
}
131 131
w.WriteHeader(resp.StatusCode)
132 -
body, err = ioutil.ReadAll(resp.Body)
132 +
body, err = io.ReadAll(resp.Body)
133 133
if err != nil {
134 134
fmt.Printf("failed to read the resp body")
135 135
}
@@ -9,7 +9,6 @@ import (
9 9
"bytes"
10 10
"context"
11 11
"io"
12 -
"io/ioutil"
13 12 14 13
"github.com/cloudevents/sdk-go/v2/binding"
15 14
"github.com/cloudevents/sdk-go/v2/binding/spec"
@@ -121,14 +120,16 @@ func (bm *MockBinaryMessage) SetExtension(name string, value interface{}) error
121 120
}
122 121 123 122
func (bm *MockBinaryMessage) SetData(data io.Reader) (err error) {
124 -
bm.Body, err = ioutil.ReadAll(data)
123 +
bm.Body, err = io.ReadAll(data)
125 124
return err
126 125
}
127 126 128 127
func (bm *MockBinaryMessage) End(ctx context.Context) error {
129 128
return nil
130 129
}
131 130 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 +
)
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ import (
9 9
"bytes"
10 10
"context"
11 11
"io"
12 -
"io/ioutil"
13 12
"testing"
14 13 15 14
"github.com/cloudevents/sdk-go/v2/binding"
@@ -49,13 +48,15 @@ func (s *MockStructuredMessage) Finish(error) error { return nil }
49 48 50 49
func (s *MockStructuredMessage) SetStructuredEvent(ctx context.Context, format format.Format, event io.Reader) (err error) {
51 50
s.Format = format
52 -
s.Bytes, err = ioutil.ReadAll(event)
51 +
s.Bytes, err = io.ReadAll(event)
53 52
if err != nil {
54 53
return
55 54
}
56 55 57 56
return nil
58 57
}
59 58 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 +
)
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ package utils_test
8 8
import (
9 9
"bytes"
10 10
"context"
11 -
"io/ioutil"
11 +
"io"
12 12
"testing"
13 13 14 14
"github.com/stretchr/testify/require"
@@ -23,7 +23,7 @@ func TestNewStructuredMessage(t *testing.T) {
23 23
testEvent := test.ConvertEventExtensionsToString(t, test.FullEvent())
24 24
jsonBytes := test.MustJSON(t, testEvent)
25 25 26 -
message := utils.NewStructuredMessage(format.JSON, ioutil.NopCloser(bytes.NewReader(jsonBytes)))
26 +
message := utils.NewStructuredMessage(format.JSON, io.NopCloser(bytes.NewReader(jsonBytes)))
27 27 28 28
require.Equal(t, binding.EncodingStructured, message.ReadEncoding())
29 29 You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4