Skip to content

Commit fd07eff

Browse files
geofffranksebroberson
authored andcommitted
Stop using deprecated ioutil package
1 parent 1acee84 commit fd07eff

35 files changed

+96
-75
lines changed

client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"crypto/tls"
66
"errors"
77
"fmt"
8-
"io/ioutil"
8+
"io"
99
"mime"
1010
"net"
1111
"net/http"
@@ -990,7 +990,7 @@ func handleProtoResponse(response *http.Response, responseObject proto.Message)
990990
return models.NewError(models.Error_InvalidRequest, "responseObject cannot be nil")
991991
}
992992

993-
buf, err := ioutil.ReadAll(response.Body)
993+
buf, err := io.ReadAll(response.Body)
994994
if err != nil {
995995
return models.NewError(models.Error_InvalidResponse, fmt.Sprint("failed to read body: ", err.Error()))
996996
}

cmd/bbs/config/config_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package config_test
22

33
import (
4-
"io/ioutil"
54
"os"
65
"time"
76

@@ -88,7 +87,7 @@ var _ = Describe("BBSConfig", func() {
8887
})
8988

9089
JustBeforeEach(func() {
91-
configFile, err := ioutil.TempFile("", "config-file")
90+
configFile, err := os.CreateTemp("", "config-file")
9291
Expect(err).NotTo(HaveOccurred())
9392

9493
n, err := configFile.WriteString(configData)

cmd/bbs/main_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main_test
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"log"
88
"net"
99
"net/http"
@@ -83,7 +83,7 @@ var _ = SynchronizedBeforeSuite(
8383
return []byte(strings.Join([]string{bbsPath, locketPath}, ","))
8484
},
8585
func(binPaths []byte) {
86-
grpclog.SetLogger(log.New(ioutil.Discard, "", 0))
86+
grpclog.SetLogger(log.New(io.Discard, "", 0))
8787
startPort := 1050 * GinkgoParallelProcess()
8888
portRange := 1000
8989
var err error

cmd/bbs/testrunner/runner.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package testrunner
22

33
import (
44
"encoding/json"
5-
"io/ioutil"
65
"os"
76
"os/exec"
87
"time"
@@ -19,7 +18,7 @@ func New(binPath string, bbsConfig config.BBSConfig) *ginkgomon.Runner {
1918
bbsConfig.ReportInterval = durationjson.Duration(time.Minute)
2019
}
2120

22-
f, err := ioutil.TempFile("", "bbs.config")
21+
f, err := os.CreateTemp("", "bbs.config")
2322
Expect(err).NotTo(HaveOccurred())
2423

2524
err = json.NewEncoder(f).Encode(bbsConfig)

db/sqldb/fakesqldriver/fakesqldriver_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"code.cloudfoundry.org/clock/fakeclock"
1818
mfakes "code.cloudfoundry.org/diego-logging-client/testhelpers"
1919
"code.cloudfoundry.org/lager/v3/lagertest"
20-
"github.com/nu7hatch/gouuid"
20+
uuid "github.com/nu7hatch/gouuid"
2121
. "github.com/onsi/ginkgo/v2"
2222
. "github.com/onsi/gomega"
2323

db/sqldb/helpers/connection_string.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"crypto/tls"
55
"crypto/x509"
66
"database/sql"
7-
"io/ioutil"
7+
"os"
88
"strconv"
99
"time"
1010

@@ -99,7 +99,7 @@ func generateTLSConfig(logger lager.Logger, sqlCACertPath string, sqlEnableIdent
9999
return tlsConfig
100100
}
101101

102-
certBytes, err := ioutil.ReadFile(sqlCACertPath)
102+
certBytes, err := os.ReadFile(sqlCACertPath)
103103
if err != nil {
104104
logger.Fatal("failed-to-read-sql-ca-file", err)
105105
}

handlers/handlers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package handlers
22

33
import (
4-
"io/ioutil"
4+
"io"
55
"net/http"
66
"strconv"
77

@@ -152,7 +152,7 @@ func route(f http.HandlerFunc) http.Handler {
152152
}
153153

154154
func parseRequest(logger lager.Logger, req *http.Request, request MessageValidator) error {
155-
data, err := ioutil.ReadAll(req.Body)
155+
data, err := io.ReadAll(req.Body)
156156
if err != nil {
157157
logger.Error("failed-to-read-body", err)
158158
return models.ErrUnknownError

metrics/file_descriptor_metron_notifier.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package metrics
22

33
import (
4-
"io/ioutil"
54
"os"
65

76
"github.com/tedsuo/ifrit"
@@ -62,7 +61,7 @@ func (notifier FileDescriptorMetronNotifier) Run(signals <-chan os.Signal, ready
6261
}
6362

6463
func (notifier FileDescriptorMetronNotifier) descriptorCount() (int, error) {
65-
descriptorInfos, err := ioutil.ReadDir(notifier.procFSPath)
64+
descriptorInfos, err := os.ReadDir(notifier.procFSPath)
6665

6766
if err != nil {
6867
return 0, err

metrics/file_descriptor_metron_notifier_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package metrics_test
22

33
import (
4-
"io/ioutil"
54
"os"
65
"path/filepath"
76
"strconv"
@@ -32,10 +31,10 @@ var _ = Describe("FileDescriptorMetronNotifier", func() {
3231
)
3332

3433
BeforeEach(func() {
35-
fakeProcFileSystemPath, err = ioutil.TempDir("", "proc")
34+
fakeProcFileSystemPath, err = os.MkdirTemp("", "proc")
3635
Expect(err).NotTo(HaveOccurred())
3736

38-
symlinkedFileDir, err = ioutil.TempDir("", "tmpdir")
37+
symlinkedFileDir, err = os.MkdirTemp("", "tmpdir")
3938
Expect(err).NotTo(HaveOccurred())
4039

4140
fakeMetronClient = new(mfakes.FakeIngressClient)
@@ -113,7 +112,7 @@ var _ = Describe("FileDescriptorMetronNotifier", func() {
113112
})
114113

115114
func createSymlink(dir, tmpdir, symlinkId string) {
116-
fd, err := ioutil.TempFile(tmpdir, "socket")
115+
fd, err := os.CreateTemp(tmpdir, "socket")
117116
Expect(err).NotTo(HaveOccurred())
118117
symlink := filepath.Join(dir, symlinkId)
119118

models/actions.pb.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)