Skip to content

Commit 1482587

Browse files
inosatoinosato
authored
Remove ioutil (#395)
Signed-off-by: inosato <[email protected]>
1 parent 49b3603 commit 1482587

9 files changed

+34
-36
lines changed

‎assets/embed_gzip_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package assets
1515

1616
import (
1717
"embed"
18-
"io/ioutil"
18+
"io"
1919
"strings"
2020
"testing"
2121
)
@@ -81,7 +81,7 @@ func TestFS(t *testing.T) {
8181
return
8282
}
8383

84-
content, err := ioutil.ReadAll(f)
84+
content, err := io.ReadAll(f)
8585
if err != nil {
8686
t.Fatal(err)
8787
}

‎config/generate.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import (
2828
"encoding/pem"
2929
"fmt"
3030
"io"
31-
"io/ioutil"
3231
"log"
3332
"math/big"
3433
"net"
34+
"os"
3535
"time"
3636
)
3737

@@ -170,7 +170,7 @@ func writeCertificateAndKey(path string, cert *x509.Certificate, key *rsa.Privat
170170
return err
171171
}
172172

173-
if err := ioutil.WriteFile(fmt.Sprintf("%s.crt", path), b.Bytes(), 0644); err != nil {
173+
if err := os.WriteFile(fmt.Sprintf("%s.crt", path), b.Bytes(), 0644); err != nil {
174174
return err
175175
}
176176

@@ -179,7 +179,7 @@ func writeCertificateAndKey(path string, cert *x509.Certificate, key *rsa.Privat
179179
return err
180180
}
181181

182-
if err := ioutil.WriteFile(fmt.Sprintf("%s.key", path), b.Bytes(), 0644); err != nil {
182+
if err := os.WriteFile(fmt.Sprintf("%s.key", path), b.Bytes(), 0644); err != nil {
183183
return err
184184
}
185185

@@ -239,7 +239,7 @@ func main() {
239239
log.Fatal(err)
240240
}
241241

242-
if err := ioutil.WriteFile("testdata/tls-ca-chain.pem", b.Bytes(), 0644); err != nil {
242+
if err := os.WriteFile("testdata/tls-ca-chain.pem", b.Bytes(), 0644); err != nil {
243243
log.Fatal(err)
244244
}
245245
}

‎config/http_config.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"crypto/x509"
2222
"encoding/json"
2323
"fmt"
24-
"io/ioutil"
2524
"net"
2625
"net/http"
2726
"net/url"
27+
"os"
2828
"strings"
2929
"sync"
3030
"time"
@@ -571,7 +571,7 @@ func NewAuthorizationCredentialsFileRoundTripper(authType, authCredentialsFile s
571571

572572
func (rt *authorizationCredentialsFileRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
573573
if len(req.Header.Get("Authorization")) == 0 {
574-
b, err := ioutil.ReadFile(rt.authCredentialsFile)
574+
b, err := os.ReadFile(rt.authCredentialsFile)
575575
if err != nil {
576576
return nil, fmt.Errorf("unable to read authorization credentials file %s: %s", rt.authCredentialsFile, err)
577577
}
@@ -609,7 +609,7 @@ func (rt *basicAuthRoundTripper) RoundTrip(req *http.Request) (*http.Response, e
609609
}
610610
req = cloneRequest(req)
611611
if rt.passwordFile != "" {
612-
bs, err := ioutil.ReadFile(rt.passwordFile)
612+
bs, err := os.ReadFile(rt.passwordFile)
613613
if err != nil {
614614
return nil, fmt.Errorf("unable to read basic auth password file %s: %s", rt.passwordFile, err)
615615
}
@@ -651,7 +651,7 @@ func (rt *oauth2RoundTripper) RoundTrip(req *http.Request) (*http.Response, erro
651651
)
652652

653653
if rt.config.ClientSecretFile != "" {
654-
data, err := ioutil.ReadFile(rt.config.ClientSecretFile)
654+
data, err := os.ReadFile(rt.config.ClientSecretFile)
655655
if err != nil {
656656
return nil, fmt.Errorf("unable to read oauth2 client secret file %s: %s", rt.config.ClientSecretFile, err)
657657
}
@@ -836,7 +836,7 @@ func (c *TLSConfig) getClientCertificate(*tls.CertificateRequestInfo) (*tls.Cert
836836

837837
// readCAFile reads the CA cert file from disk.
838838
func readCAFile(f string) ([]byte, error) {
839-
data, err := ioutil.ReadFile(f)
839+
data, err := os.ReadFile(f)
840840
if err != nil {
841841
return nil, fmt.Errorf("unable to load specified CA cert %s: %s", f, err)
842842
}

‎config/http_config_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"encoding/json"
2121
"errors"
2222
"fmt"
23-
"io/ioutil"
23+
"io"
2424
"net"
2525
"net/http"
2626
"net/http/httptest"
@@ -124,7 +124,7 @@ var invalidHTTPClientConfigs = []struct {
124124
func newTestServer(handler func(w http.ResponseWriter, r *http.Request)) (*httptest.Server, error) {
125125
testServer := httptest.NewUnstartedServer(http.HandlerFunc(handler))
126126

127-
tlsCAChain, err := ioutil.ReadFile(TLSCAChainPath)
127+
tlsCAChain, err := os.ReadFile(TLSCAChainPath)
128128
if err != nil {
129129
return nil, fmt.Errorf("Can't read %s", TLSCAChainPath)
130130
}
@@ -432,7 +432,7 @@ func TestNewClientFromConfig(t *testing.T) {
432432
continue
433433
}
434434

435-
message, err := ioutil.ReadAll(response.Body)
435+
message, err := io.ReadAll(response.Body)
436436
response.Body.Close()
437437
if err != nil {
438438
t.Errorf("Can't read the server response body using this config: %+v", validConfig.clientConfig)
@@ -630,7 +630,7 @@ func TestTLSConfig(t *testing.T) {
630630
InsecureSkipVerify: false,
631631
}
632632

633-
tlsCAChain, err := ioutil.ReadFile(TLSCAChainPath)
633+
tlsCAChain, err := os.ReadFile(TLSCAChainPath)
634634
if err != nil {
635635
t.Fatalf("Can't read the CA certificate chain (%s)",
636636
TLSCAChainPath)
@@ -833,7 +833,7 @@ func getCertificateBlobs(t *testing.T) map[string][]byte {
833833
}
834834
bs := make(map[string][]byte, len(files)+1)
835835
for _, f := range files {
836-
b, err := ioutil.ReadFile(f)
836+
b, err := os.ReadFile(f)
837837
if err != nil {
838838
t.Fatal(err)
839839
}
@@ -848,15 +848,15 @@ func writeCertificate(bs map[string][]byte, src string, dst string) {
848848
if !ok {
849849
panic(fmt.Sprintf("Couldn't find %q in bs", src))
850850
}
851-
if err := ioutil.WriteFile(dst, b, 0664); err != nil {
851+
if err := os.WriteFile(dst, b, 0664); err != nil {
852852
panic(err)
853853
}
854854
}
855855

856856
func TestTLSRoundTripper(t *testing.T) {
857857
bs := getCertificateBlobs(t)
858858

859-
tmpDir, err := ioutil.TempDir("", "tlsroundtripper")
859+
tmpDir, err := os.MkdirTemp("", "tlsroundtripper")
860860
if err != nil {
861861
t.Fatal("Failed to create tmp dir", err)
862862
}
@@ -976,7 +976,7 @@ func TestTLSRoundTripper(t *testing.T) {
976976
t.Fatalf("Can't connect to the test server")
977977
}
978978

979-
b, err := ioutil.ReadAll(r.Body)
979+
b, err := io.ReadAll(r.Body)
980980
r.Body.Close()
981981
if err != nil {
982982
t.Errorf("Can't read the server response body")
@@ -993,7 +993,7 @@ func TestTLSRoundTripper(t *testing.T) {
993993
func TestTLSRoundTripperRaces(t *testing.T) {
994994
bs := getCertificateBlobs(t)
995995

996-
tmpDir, err := ioutil.TempDir("", "tlsroundtripper")
996+
tmpDir, err := os.MkdirTemp("", "tlsroundtripper")
997997
if err != nil {
998998
t.Fatal("Failed to create tmp dir", err)
999999
}
@@ -1137,7 +1137,7 @@ func LoadHTTPConfig(s string) (*HTTPClientConfig, error) {
11371137

11381138
// LoadHTTPConfigFile parses the given YAML file into a HTTPClientConfig.
11391139
func LoadHTTPConfigFile(filename string) (*HTTPClientConfig, []byte, error) {
1140-
content, err := ioutil.ReadFile(filename)
1140+
content, err := os.ReadFile(filename)
11411141
if err != nil {
11421142
return nil, nil, err
11431143
}
@@ -1305,7 +1305,7 @@ func TestOAuth2WithFile(t *testing.T) {
13051305
}))
13061306
defer ts.Close()
13071307

1308-
secretFile, err := ioutil.TempFile("", "oauth2_secret")
1308+
secretFile, err := os.CreateTemp("", "oauth2_secret")
13091309
if err != nil {
13101310
t.Fatal(err)
13111311
}

‎config/tls_config_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"bytes"
1818
"crypto/tls"
1919
"fmt"
20-
"io/ioutil"
20+
"os"
2121
"path/filepath"
2222
"reflect"
2323
"testing"
@@ -29,7 +29,7 @@ import (
2929

3030
// LoadTLSConfig parses the given file into a tls.Config.
3131
func LoadTLSConfig(filename string) (*tls.Config, error) {
32-
content, err := ioutil.ReadFile(filename)
32+
content, err := os.ReadFile(filename)
3333
if err != nil {
3434
return nil, err
3535
}

‎expfmt/bench_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"bytes"
1818
"compress/gzip"
1919
"io"
20-
"io/ioutil"
20+
"os"
2121
"testing"
2222

2323
"github.com/matttproud/golang_protobuf_extensions/pbutil"
@@ -47,7 +47,7 @@ var parser TextParser
4747
// family DTOs.
4848
func BenchmarkParseText(b *testing.B) {
4949
b.StopTimer()
50-
data, err := ioutil.ReadFile("testdata/text")
50+
data, err := os.ReadFile("testdata/text")
5151
if err != nil {
5252
b.Fatal(err)
5353
}
@@ -64,7 +64,7 @@ func BenchmarkParseText(b *testing.B) {
6464
// into metric family DTOs.
6565
func BenchmarkParseTextGzip(b *testing.B) {
6666
b.StopTimer()
67-
data, err := ioutil.ReadFile("testdata/text.gz")
67+
data, err := os.ReadFile("testdata/text.gz")
6868
if err != nil {
6969
b.Fatal(err)
7070
}
@@ -89,7 +89,7 @@ func BenchmarkParseTextGzip(b *testing.B) {
8989
// protobuf-format guarantees bundling at one place.)
9090
func BenchmarkParseProto(b *testing.B) {
9191
b.StopTimer()
92-
data, err := ioutil.ReadFile("testdata/protobuf")
92+
data, err := os.ReadFile("testdata/protobuf")
9393
if err != nil {
9494
b.Fatal(err)
9595
}
@@ -114,7 +114,7 @@ func BenchmarkParseProto(b *testing.B) {
114114
// protobuf format.
115115
func BenchmarkParseProtoGzip(b *testing.B) {
116116
b.StopTimer()
117-
data, err := ioutil.ReadFile("testdata/protobuf.gz")
117+
data, err := os.ReadFile("testdata/protobuf.gz")
118118
if err != nil {
119119
b.Fatal(err)
120120
}
@@ -144,7 +144,7 @@ func BenchmarkParseProtoGzip(b *testing.B) {
144144
// separate it from the overhead of the text format parsing.
145145
func BenchmarkParseProtoMap(b *testing.B) {
146146
b.StopTimer()
147-
data, err := ioutil.ReadFile("testdata/protobuf")
147+
data, err := os.ReadFile("testdata/protobuf")
148148
if err != nil {
149149
b.Fatal(err)
150150
}

‎expfmt/text_create.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"bufio"
1818
"fmt"
1919
"io"
20-
"io/ioutil"
2120
"math"
2221
"strconv"
2322
"strings"
@@ -44,7 +43,7 @@ const (
4443
var (
4544
bufPool = sync.Pool{
4645
New: func() interface{} {
47-
return bufio.NewWriter(ioutil.Discard)
46+
return bufio.NewWriter(io.Discard)
4847
},
4948
}
5049
numBufPool = sync.Pool{

‎sigv4/sigv4.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"bytes"
1818
"fmt"
1919
"io"
20-
"io/ioutil"
2120
"net/http"
2221
"net/textproto"
2322
"path"
@@ -114,7 +113,7 @@ func (rt *sigV4RoundTripper) RoundTrip(req *http.Request) (*http.Response, error
114113
defer func() {
115114
_, _ = seeker.Seek(0, io.SeekStart)
116115
}()
117-
req.Body = ioutil.NopCloser(seeker)
116+
req.Body = io.NopCloser(seeker)
118117

119118
// Clean path like documented in AWS documentation.
120119
// https://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html

‎sigv4/sigv4_config_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
package sigv4
1515

1616
import (
17-
"io/ioutil"
17+
"os"
1818
"strings"
1919
"testing"
2020

2121
"gopkg.in/yaml.v2"
2222
)
2323

2424
func loadSigv4Config(filename string) (*SigV4Config, error) {
25-
content, err := ioutil.ReadFile(filename)
25+
content, err := os.ReadFile(filename)
2626
if err != nil {
2727
return nil, err
2828
}

0 commit comments

Comments
 (0)