Skip to content

Commit b500e55

Browse files
DevinCarrDevinCarr
committed
TUN-7590: Remove usages of ioutil
1 parent 1b0b6bf commit b500e55

File tree

23 files changed

+49
-62
lines changed

23 files changed

+49
-62
lines changed

‎cfapi/tunnel_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cfapi
33
import (
44
"bytes"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"net"
88
"reflect"
99
"strings"
@@ -49,7 +49,7 @@ func Test_parseListTunnels(t *testing.T) {
4949
}
5050
for _, tt := range tests {
5151
t.Run(tt.name, func(t *testing.T) {
52-
body := ioutil.NopCloser(bytes.NewReader([]byte(tt.args.body)))
52+
body := io.NopCloser(bytes.NewReader([]byte(tt.args.body)))
5353
got, err := parseListTunnels(body)
5454
if (err != nil) != tt.wantErr {
5555
t.Errorf("parseListTunnels() error = %v, wantErr %v", err, tt.wantErr)

‎cmd/cloudflared/service_template.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"bytes"
66
"fmt"
77
"io"
8-
"io/ioutil"
98
"os"
109
"os/exec"
1110
"path"
@@ -64,7 +63,7 @@ func (st *ServiceTemplate) Generate(args *ServiceTemplateArgs) error {
6463
return fmt.Errorf("error creating %s: %v", plistFolder, err)
6564
}
6665

67-
err = ioutil.WriteFile(resolvedPath, buffer.Bytes(), fileMode)
66+
err = os.WriteFile(resolvedPath, buffer.Bytes(), fileMode)
6867
if err != nil {
6968
return fmt.Errorf("error writing %s: %v", resolvedPath, err)
7069
}
@@ -103,7 +102,7 @@ func runCommand(command string, args ...string) error {
103102
return fmt.Errorf("error starting %s: %v", command, err)
104103
}
105104

106-
output, _ := ioutil.ReadAll(stderr)
105+
output, _ := io.ReadAll(stderr)
107106
err = cmd.Wait()
108107
if err != nil {
109108
return fmt.Errorf("%s %v returned with error code %v due to: %v", command, args, err, string(output))

‎cmd/cloudflared/tunnel/cmd.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bufio"
55
"context"
66
"fmt"
7-
"io/ioutil"
87
"net/url"
98
"os"
109
"runtime/trace"
@@ -305,7 +304,7 @@ func StartServer(
305304
}
306305

307306
if c.IsSet("trace-output") {
308-
tmpTraceFile, err := ioutil.TempFile("", "trace")
307+
tmpTraceFile, err := os.CreateTemp("", "trace")
309308
if err != nil {
310309
log.Err(err).Msg("Failed to create new temporary file to save trace output")
311310
}

‎cmd/cloudflared/tunnel/filesystem.go‎

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

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

@@ -23,5 +22,5 @@ func (fs realFileSystem) validFilePath(path string) bool {
2322
}
2423

2524
func (fs realFileSystem) readFile(filePath string) ([]byte, error) {
26-
return ioutil.ReadFile(filePath)
25+
return os.ReadFile(filePath)
2726
}

‎cmd/cloudflared/tunnel/login.go‎

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

33
import (
44
"fmt"
5-
"io/ioutil"
65
"net/url"
76
"os"
87
"path/filepath"
@@ -66,7 +65,7 @@ func login(c *cli.Context) error {
6665
return err
6766
}
6867

69-
if err := ioutil.WriteFile(path, resourceData, 0600); err != nil {
68+
if err := os.WriteFile(path, resourceData, 0600); err != nil {
7069
return errors.Wrap(err, fmt.Sprintf("error writing cert to %s", path))
7170
}
7271

‎cmd/cloudflared/tunnel/subcommands.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"encoding/base64"
66
"encoding/json"
77
"fmt"
8-
"io/ioutil"
98
"os"
109
"path/filepath"
1110
"regexp"
@@ -241,7 +240,7 @@ func writeTunnelCredentials(filePath string, credentials *connection.Credentials
241240
if err != nil {
242241
return errors.Wrap(err, "Unable to marshal tunnel credentials to JSON")
243242
}
244-
return ioutil.WriteFile(filePath, body, 400)
243+
return os.WriteFile(filePath, body, 0400)
245244
}
246245

247246
func buildListCommand() *cli.Command {

‎cmd/cloudflared/updater/workers_service_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"encoding/json"
1212
"errors"
1313
"fmt"
14-
"io/ioutil"
1514
"log"
1615
"net/http"
1716
"net/http/httptest"
@@ -224,7 +223,7 @@ func TestUpdateService(t *testing.T) {
224223
require.Equal(t, v.Version(), mostRecentVersion)
225224

226225
require.NoError(t, v.Apply())
227-
dat, err := ioutil.ReadFile(testFilePath)
226+
dat, err := os.ReadFile(testFilePath)
228227
require.NoError(t, err)
229228

230229
require.Equal(t, string(dat), mostRecentVersion)
@@ -243,7 +242,7 @@ func TestBetaUpdateService(t *testing.T) {
243242
require.Equal(t, v.Version(), mostRecentBetaVersion)
244243

245244
require.NoError(t, v.Apply())
246-
dat, err := ioutil.ReadFile(testFilePath)
245+
dat, err := os.ReadFile(testFilePath)
247246
require.NoError(t, err)
248247

249248
require.Equal(t, string(dat), mostRecentBetaVersion)
@@ -289,7 +288,7 @@ func TestForcedUpdateService(t *testing.T) {
289288
require.Equal(t, v.Version(), mostRecentVersion)
290289

291290
require.NoError(t, v.Apply())
292-
dat, err := ioutil.ReadFile(testFilePath)
291+
dat, err := os.ReadFile(testFilePath)
293292
require.NoError(t, err)
294293

295294
require.Equal(t, string(dat), mostRecentVersion)
@@ -309,7 +308,7 @@ func TestUpdateSpecificVersionService(t *testing.T) {
309308
require.Equal(t, reqVersion, v.Version())
310309

311310
require.NoError(t, v.Apply())
312-
dat, err := ioutil.ReadFile(testFilePath)
311+
dat, err := os.ReadFile(testFilePath)
313312
require.NoError(t, err)
314313

315314
require.Equal(t, reqVersion, string(dat))
@@ -328,7 +327,7 @@ func TestCompressedUpdateService(t *testing.T) {
328327
require.Equal(t, "2020.09.02", v.Version())
329328

330329
require.NoError(t, v.Apply())
331-
dat, err := ioutil.ReadFile(testFilePath)
330+
dat, err := os.ReadFile(testFilePath)
332331
require.NoError(t, err)
333332

334333
require.Equal(t, "2020.09.02", string(dat))

‎connection/http2_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"errors"
77
"fmt"
88
"io"
9-
"io/ioutil"
109
"net"
1110
"net/http"
1211
"net/http/httptest"
@@ -84,7 +83,7 @@ func TestHTTP2ConfigurationSet(t *testing.T) {
8483
resp, err := edgeHTTP2Conn.RoundTrip(req)
8584
require.NoError(t, err)
8685
require.Equal(t, http.StatusOK, resp.StatusCode)
87-
bdy, err := ioutil.ReadAll(resp.Body)
86+
bdy, err := io.ReadAll(resp.Body)
8887
require.NoError(t, err)
8988
assert.Equal(t, `{"lastAppliedVersion":2,"err":null}`, string(bdy))
9089
cancel()
@@ -149,7 +148,7 @@ func TestServeHTTP(t *testing.T) {
149148
require.NoError(t, err)
150149
require.Equal(t, test.expectedStatus, resp.StatusCode)
151150
if test.expectedBody != nil {
152-
respBody, err := ioutil.ReadAll(resp.Body)
151+
respBody, err := io.ReadAll(resp.Body)
153152
require.NoError(t, err)
154153
require.Equal(t, test.expectedBody, respBody)
155154
}
@@ -546,7 +545,7 @@ func benchmarkServeHTTP(b *testing.B, test testRequest) {
546545
require.NoError(b, err)
547546
require.Equal(b, test.expectedStatus, resp.StatusCode)
548547
if test.expectedBody != nil {
549-
respBody, err := ioutil.ReadAll(resp.Body)
548+
respBody, err := io.ReadAll(resp.Body)
550549
require.NoError(b, err)
551550
require.Equal(b, test.expectedBody, respBody)
552551
}

‎h2mux/h2mux_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"context"
66
"fmt"
77
"io"
8-
"io/ioutil"
98
"math/rand"
109
"net"
1110
"os"
@@ -652,7 +651,7 @@ func TestHPACK(t *testing.T) {
652651
if stream.Headers[0].Value != "200" {
653652
t.Fatalf("expected status 200, got %s", stream.Headers[0].Value)
654653
}
655-
_, _ = ioutil.ReadAll(stream)
654+
_, _ = io.ReadAll(stream)
656655
_ = stream.Close()
657656
}
658657
}
@@ -905,7 +904,7 @@ func loadSampleFiles(paths []string) (map[string][]byte, error) {
905904
files := make(map[string][]byte)
906905
for _, path := range paths {
907906
if _, ok := files[path]; !ok {
908-
expectBody, err := ioutil.ReadFile(path)
907+
expectBody, err := os.ReadFile(path)
909908
if err != nil {
910909
return nil, err
911910
}

‎hello/hello.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"encoding/json"
77
"fmt"
88
"html/template"
9-
"io/ioutil"
9+
"io"
1010
"net"
1111
"net/http"
1212
"os"
@@ -234,7 +234,7 @@ func rootHandler(serverName string) http.HandlerFunc {
234234
return func(w http.ResponseWriter, r *http.Request) {
235235
var buffer bytes.Buffer
236236
var body string
237-
rawBody, err := ioutil.ReadAll(r.Body)
237+
rawBody, err := io.ReadAll(r.Body)
238238
if err == nil {
239239
body = string(rawBody)
240240
} else {

0 commit comments

Comments
 (0)