Skip to content

Commit 504f578

Browse files
mykauldkropachev
authored andcommitted
(cleanup) remove deprecated ioutil usage
The package has been deprecated. Cleaned up its usage. Signed-off-by: Yaniv Kaul <yaniv.kaul@scylladb.com>
1 parent c0c72b8 commit 504f578

6 files changed

Lines changed: 12 additions & 16 deletions

File tree

cluster.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"crypto/x509"
3131
"errors"
3232
"fmt"
33-
"io/ioutil"
3433
"net"
3534
"os"
3635
"sync/atomic"
@@ -656,7 +655,7 @@ func setupTLSConfig(sslOpts *SslOptions) (*tls.Config, error) {
656655
tlsConfig.RootCAs = x509.NewCertPool()
657656
}
658657

659-
pem, err := ioutil.ReadFile(sslOpts.CaPath)
658+
pem, err := os.ReadFile(sslOpts.CaPath)
660659
if err != nil {
661660
return nil, fmt.Errorf("unable to open CA certs: %v", err)
662661
}

conn.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"errors"
3232
"fmt"
3333
"io"
34-
"io/ioutil"
3534
"net"
3635
"strconv"
3736
"sync"
@@ -742,7 +741,7 @@ func (c *Conn) serve(ctx context.Context) {
742741
}
743742

744743
func (c *Conn) discardFrame(head frm.FrameHeader) error {
745-
_, err := io.CopyN(ioutil.Discard, c, int64(head.Length))
744+
_, err := io.CopyN(io.Discard, c, int64(head.Length))
746745
if err != nil {
747746
return err
748747
}

conn_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"errors"
3838
"fmt"
3939
"io"
40-
"io/ioutil"
4140
"math/rand"
4241
"net"
4342
"os"
@@ -1200,7 +1199,7 @@ func NewSSLTestServer(t testing.TB, protocol uint8, ctx context.Context) *TestSe
12001199
}
12011200

12021201
func NewSSLTestServerWithSupportedFactory(t testing.TB, protocol uint8, ctx context.Context, supportedFactory testSupportedFactory) *TestServer {
1203-
pem, err := ioutil.ReadFile("testdata/pki/ca.crt")
1202+
pem, err := os.ReadFile("testdata/pki/ca.crt")
12041203
certPool := x509.NewCertPool()
12051204
if !certPool.AppendCertsFromPEM(pem) {
12061205
t.Fatalf("Failed parsing or appending certs")

frame.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"errors"
3131
"fmt"
3232
"io"
33-
"io/ioutil"
3433
"net"
3534
"runtime"
3635
"strconv"
@@ -364,7 +363,7 @@ func (f *framer) readFrame(r io.Reader, head *frm.FrameHeader) error {
364363
return fmt.Errorf("frame body length can not be less than 0: %d", head.Length)
365364
} else if head.Length > maxFrameSize {
366365
// need to free up the connection to be used again
367-
_, err := io.CopyN(ioutil.Discard, r, int64(head.Length))
366+
_, err := io.CopyN(io.Discard, r, int64(head.Length))
368367
if err != nil {
369368
return fmt.Errorf("error whilst trying to discard frame with invalid length: %v", err)
370369
}

framer_bench_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ package gocql
2929

3030
import (
3131
"compress/gzip"
32-
"io/ioutil"
32+
"io"
3333
"os"
3434
"testing"
3535
)
@@ -47,7 +47,7 @@ func readGzipData(path string) ([]byte, error) {
4747
}
4848
defer r.Close()
4949

50-
return ioutil.ReadAll(r)
50+
return io.ReadAll(r)
5151
}
5252

5353
func BenchmarkParseRowsFrame(b *testing.B) {

recreate_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"encoding/json"
1111
"flag"
1212
"fmt"
13-
"io/ioutil"
13+
"os"
1414
"regexp"
1515
"sort"
1616
"strings"
@@ -97,7 +97,7 @@ func TestRecreateSchema(t *testing.T) {
9797
}
9898
cleanup(t, session, test.Keyspace)
9999

100-
in, err := ioutil.ReadFile(test.Input)
100+
in, err := os.ReadFile(test.Input)
101101
if err != nil {
102102
t.Fatal(err)
103103
}
@@ -153,11 +153,11 @@ func TestRecreateSchema(t *testing.T) {
153153
golden = []byte(trimSchema(string(golden)))
154154
} else {
155155
if *updateGolden {
156-
if err := ioutil.WriteFile(test.Golden, []byte(dump), 0644); err != nil {
156+
if err := os.WriteFile(test.Golden, []byte(dump), 0644); err != nil {
157157
t.Fatal(err)
158158
}
159159
}
160-
golden, err = ioutil.ReadFile(test.Golden)
160+
golden, err = os.ReadFile(test.Golden)
161161
if err != nil {
162162
t.Fatal(err)
163163
}
@@ -241,12 +241,12 @@ func TestScyllaEncryptionOptionsUnmarshaller(t *testing.T) {
241241
golden = "testdata/recreate/scylla_encryption_options_golden.json"
242242
)
243243

244-
inputBuf, err := ioutil.ReadFile(input)
244+
inputBuf, err := os.ReadFile(input)
245245
if err != nil {
246246
t.Fatal(err)
247247
}
248248

249-
goldenBuf, err := ioutil.ReadFile(golden)
249+
goldenBuf, err := os.ReadFile(golden)
250250
if err != nil {
251251
t.Fatal(err)
252252
}

0 commit comments

Comments
 (0)