Skip to content

Commit 2898735

Browse files
authored
Remove ioutil (#650)
Signed-off-by: inosato <si17_21@yahoo.co.jp>
1 parent 4e46dd9 commit 2898735

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

mysqld_exporter.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"crypto/tls"
1919
"crypto/x509"
2020
"fmt"
21-
"io/ioutil"
2221
"net/http"
2322
"os"
2423
"path"
@@ -153,7 +152,7 @@ func parseMycnf(config interface{}) (string, error) {
153152
func customizeTLS(sslCA string, sslCert string, sslKey string) error {
154153
var tlsCfg tls.Config
155154
caBundle := x509.NewCertPool()
156-
pemCA, err := ioutil.ReadFile(sslCA)
155+
pemCA, err := os.ReadFile(sslCA)
157156
if err != nil {
158157
return err
159158
}

mysqld_exporter_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package main
1616
import (
1717
"context"
1818
"fmt"
19-
"io/ioutil"
19+
"io"
2020
"net"
2121
"net/http"
2222
"net/url"
@@ -157,7 +157,7 @@ func TestBin(t *testing.T) {
157157
var err error
158158
binName := "mysqld_exporter"
159159

160-
binDir, err := ioutil.TempDir("/tmp", binName+"-test-bindir-")
160+
binDir, err := os.MkdirTemp("/tmp", binName+"-test-bindir-")
161161
if err != nil {
162162
t.Fatal(err)
163163
}
@@ -294,7 +294,7 @@ func getBody(urlToGet string) ([]byte, error) {
294294
}
295295
defer resp.Body.Close()
296296

297-
body, err := ioutil.ReadAll(resp.Body)
297+
body, err := io.ReadAll(resp.Body)
298298
if err != nil {
299299
return nil, err
300300
}

0 commit comments

Comments
 (0)