Skip to content

Commit 1763105

Browse files
aalexandaalexand
authored
Go 1.19 released, so update supported Go versions. (#721)
* Go 1.19 released, so update supported Go versions. * Remove the usage of the deprecated ioutil package.
1 parent c133b57 commit 1763105

File tree

17 files changed

+48
-56
lines changed

17 files changed

+48
-56
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
go: ['1.17', '1.18', 'tip']
21+
go: ['1.18', '1.19', 'tip']
2222
# Supported macOS versions can be found in
2323
# https://github.com/actions/virtual-environments#available-environments.
2424
os: ['macos-10.15', 'macos-11']
@@ -106,7 +106,7 @@ jobs:
106106
strategy:
107107
fail-fast: false
108108
matrix:
109-
go: ['1.17', '1.18', 'tip']
109+
go: ['1.18', '1.19', 'tip']
110110
os: ['ubuntu-20.04', 'ubuntu-18.04']
111111
steps:
112112
- name: Update Go version using setup-go
@@ -166,7 +166,7 @@ jobs:
166166
strategy:
167167
fail-fast: false
168168
matrix:
169-
go: ['1.17', '1.18']
169+
go: ['1.18', '1.19']
170170
steps:
171171
- name: Update Go version using setup-go
172172
uses: actions/setup-go@v2

‎fuzz/fuzz_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package pprof
1616

1717
import (
18-
"io/ioutil"
18+
"os"
1919
"runtime"
2020
"testing"
2121

@@ -28,13 +28,13 @@ func TestParseData(t *testing.T) {
2828
}
2929

3030
const path = "testdata/"
31-
files, err := ioutil.ReadDir(path)
31+
files, err := os.ReadDir(path)
3232
if err != nil {
3333
t.Errorf("Problem reading directory %s : %v", path, err)
3434
}
3535
for _, f := range files {
3636
file := path + f.Name()
37-
inbytes, err := ioutil.ReadFile(file)
37+
inbytes, err := os.ReadFile(file)
3838
if err != nil {
3939
t.Errorf("Problem reading file: %s : %v", file, err)
4040
continue

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/google/pprof
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/chzyer/readline v1.5.0

‎internal/driver/driver_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"bytes"
1919
"flag"
2020
"fmt"
21-
"io/ioutil"
2221
"net"
2322
_ "net/http/pprof"
2423
"os"
@@ -117,7 +116,7 @@ func TestParse(t *testing.T) {
117116
flags := strings.Split(tc.flags, ",")
118117

119118
// Encode profile into a protobuf and decode it again.
120-
protoTempFile, err := ioutil.TempFile("", "profile_proto")
119+
protoTempFile, err := os.CreateTemp("", "profile_proto")
121120
if err != nil {
122121
t.Errorf("cannot create tempfile: %v", err)
123122
}
@@ -145,7 +144,7 @@ func TestParse(t *testing.T) {
145144
setCurrentConfig(baseConfig)
146145

147146
// Read the profile from the encoded protobuf
148-
outputTempFile, err := ioutil.TempFile("", "profile_output")
147+
outputTempFile, err := os.CreateTemp("", "profile_output")
149148
if err != nil {
150149
t.Errorf("cannot create tempfile: %v", err)
151150
}
@@ -180,14 +179,14 @@ func TestParse(t *testing.T) {
180179
if err := PProf(o2); err != nil {
181180
t.Errorf("%s: %v", tc.source, err)
182181
}
183-
b, err := ioutil.ReadFile(outputTempFile.Name())
182+
b, err := os.ReadFile(outputTempFile.Name())
184183
if err != nil {
185184
t.Errorf("Failed to read profile %s: %v", outputTempFile.Name(), err)
186185
}
187186

188187
// Read data file with expected solution
189188
solution = "testdata/" + solution
190-
sbuf, err := ioutil.ReadFile(solution)
189+
sbuf, err := os.ReadFile(solution)
191190
if err != nil {
192191
t.Fatalf("reading solution file %s: %v", solution, err)
193192
}
@@ -215,7 +214,7 @@ func TestParse(t *testing.T) {
215214
}
216215
t.Errorf("%s\n%s\n", solution, d)
217216
if *updateFlag {
218-
err := ioutil.WriteFile(solution, b, 0644)
217+
err := os.WriteFile(solution, b, 0644)
219218
if err != nil {
220219
t.Errorf("failed to update the solution file %q: %v", solution, err)
221220
}

‎internal/driver/fetch.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"bytes"
1919
"fmt"
2020
"io"
21-
"io/ioutil"
2221
"net/http"
2322
"net/url"
2423
"os"
@@ -507,7 +506,7 @@ func fetchURL(source string, timeout time.Duration, tr http.RoundTripper) (io.Re
507506
func statusCodeError(resp *http.Response) error {
508507
if resp.Header.Get("X-Go-Pprof") != "" && strings.Contains(resp.Header.Get("Content-Type"), "text/plain") {
509508
// error is from pprof endpoint
510-
if body, err := ioutil.ReadAll(resp.Body); err == nil {
509+
if body, err := io.ReadAll(resp.Body); err == nil {
511510
return fmt.Errorf("server response: %s - %s", resp.Status, body)
512511
}
513512
}

‎internal/driver/fetch_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"crypto/x509"
2323
"encoding/pem"
2424
"fmt"
25-
"io/ioutil"
2625
"math/big"
2726
"net"
2827
"net/http"
@@ -52,7 +51,7 @@ func TestSymbolizationPath(t *testing.T) {
5251
saveHome := os.Getenv(homeEnv())
5352
savePath := os.Getenv("PPROF_BINARY_PATH")
5453

55-
tempdir, err := ioutil.TempDir("", "home")
54+
tempdir, err := os.MkdirTemp("", "home")
5655
if err != nil {
5756
t.Fatal("creating temp dir: ", err)
5857
}
@@ -530,7 +529,7 @@ func TestHTTPSInsecure(t *testing.T) {
530529
t.Skip("test assumes tcp available")
531530
}
532531
saveHome := os.Getenv(homeEnv())
533-
tempdir, err := ioutil.TempDir("", "home")
532+
tempdir, err := os.MkdirTemp("", "home")
534533
if err != nil {
535534
t.Fatal("creating temp dir: ", err)
536535
}
@@ -564,7 +563,7 @@ func TestHTTPSInsecure(t *testing.T) {
564563
}()
565564
defer l.Close()
566565

567-
outputTempFile, err := ioutil.TempFile("", "profile_output")
566+
outputTempFile, err := os.CreateTemp("", "profile_output")
568567
if err != nil {
569568
t.Fatalf("Failed to create tempfile: %v", err)
570569
}
@@ -603,7 +602,7 @@ func TestHTTPSWithServerCertFetch(t *testing.T) {
603602
t.Skip("test assumes tcp available")
604603
}
605604
saveHome := os.Getenv(homeEnv())
606-
tempdir, err := ioutil.TempDir("", "home")
605+
tempdir, err := os.MkdirTemp("", "home")
607606
if err != nil {
608607
t.Fatal("creating temp dir: ", err)
609608
}
@@ -645,7 +644,7 @@ func TestHTTPSWithServerCertFetch(t *testing.T) {
645644
}()
646645
defer l.Close()
647646

648-
outputTempFile, err := ioutil.TempFile("", "profile_output")
647+
outputTempFile, err := os.CreateTemp("", "profile_output")
649648
if err != nil {
650649
t.Fatalf("Failed to create tempfile: %v", err)
651650
}
@@ -665,15 +664,15 @@ func TestHTTPSWithServerCertFetch(t *testing.T) {
665664
Symbolize: "remote",
666665
}
667666

668-
certTempFile, err := ioutil.TempFile("", "cert_output")
667+
certTempFile, err := os.CreateTemp("", "cert_output")
669668
if err != nil {
670669
t.Errorf("cannot create cert tempfile: %v", err)
671670
}
672671
defer os.Remove(certTempFile.Name())
673672
defer certTempFile.Close()
674673
certTempFile.Write(certBytes)
675674

676-
keyTempFile, err := ioutil.TempFile("", "key_output")
675+
keyTempFile, err := os.CreateTemp("", "key_output")
677676
if err != nil {
678677
t.Errorf("cannot create key tempfile: %v", err)
679678
}

‎internal/driver/settings.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package driver
33
import (
44
"encoding/json"
55
"fmt"
6-
"io/ioutil"
76
"net/url"
87
"os"
98
"path/filepath"
@@ -33,7 +32,7 @@ func settingsFileName() (string, error) {
3332

3433
// readSettings reads settings from fname.
3534
func readSettings(fname string) (*settings, error) {
36-
data, err := ioutil.ReadFile(fname)
35+
data, err := os.ReadFile(fname)
3736
if err != nil {
3837
if os.IsNotExist(err) {
3938
return &settings{}, nil
@@ -64,7 +63,7 @@ func writeSettings(fname string, settings *settings) error {
6463
return fmt.Errorf("failed to create settings directory: %w", err)
6564
}
6665

67-
if err := ioutil.WriteFile(fname, data, 0644); err != nil {
66+
if err := os.WriteFile(fname, data, 0644); err != nil {
6867
return fmt.Errorf("failed to write settings: %w", err)
6968
}
7069
return nil

‎internal/driver/settings_test.go‎

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

33
import (
4-
"io/ioutil"
54
"net/url"
65
"os"
76
"path/filepath"
@@ -13,7 +12,7 @@ import (
1312
// and the name of the settings file. The caller must delete the directory when
1413
// done.
1514
func settingsDirAndFile(t *testing.T) (string, string) {
16-
tmpDir, err := ioutil.TempDir("", "pprof_settings_test")
15+
tmpDir, err := os.MkdirTemp("", "pprof_settings_test")
1716
if err != nil {
1817
t.Fatalf("error creating temporary directory: %v", err)
1918
}

‎internal/driver/webui_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package driver
1616

1717
import (
1818
"fmt"
19-
"io/ioutil"
19+
"io"
2020
"net"
2121
"net/http"
2222
"net/http/httptest"
@@ -116,7 +116,7 @@ func TestWebInterface(t *testing.T) {
116116
t.Error("could not fetch", c.path, err)
117117
continue
118118
}
119-
data, err := ioutil.ReadAll(res.Body)
119+
data, err := io.ReadAll(res.Body)
120120
if err != nil {
121121
t.Error("could not read response", c.path, err)
122122
continue
@@ -148,7 +148,7 @@ func TestWebInterface(t *testing.T) {
148148
t.Error("could not fetch", c.path, err)
149149
return
150150
}
151-
if _, err = ioutil.ReadAll(res.Body); err != nil {
151+
if _, err = io.ReadAll(res.Body); err != nil {
152152
t.Error("could not read response", c.path, err)
153153
}
154154
}()

‎internal/graph/dotgraph_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"bytes"
1919
"flag"
2020
"fmt"
21-
"io/ioutil"
21+
"os"
2222
"path/filepath"
2323
"reflect"
2424
"strconv"
@@ -214,7 +214,7 @@ func baseAttrsAndConfig() (*DotAttributes, *DotConfig) {
214214

215215
func compareGraphs(t *testing.T, got []byte, wantFile string) {
216216
wantFile = filepath.Join("testdata", wantFile)
217-
want, err := ioutil.ReadFile(wantFile)
217+
want, err := os.ReadFile(wantFile)
218218
if err != nil {
219219
t.Fatalf("error reading test file %s: %v", wantFile, err)
220220
}
@@ -226,7 +226,7 @@ func compareGraphs(t *testing.T, got []byte, wantFile string) {
226226
}
227227
t.Errorf("Compose incorrectly wrote %s", string(d))
228228
if *updateFlag {
229-
err := ioutil.WriteFile(wantFile, got, 0644)
229+
err := os.WriteFile(wantFile, got, 0644)
230230
if err != nil {
231231
t.Errorf("failed to update the golden file %q: %v", wantFile, err)
232232
}

0 commit comments

Comments
 (0)