Skip to content

Commit e6fa5a7

Browse files
alpebalpeb
authored
Replace usage of io/ioutil package (#9613)
`io/ioutil` has been deprecated since go 1.16 and the linter started to complain about it.
1 parent 90a8931 commit e6fa5a7

File tree

24 files changed

+76
-86
lines changed

24 files changed

+76
-86
lines changed

‎cli/cmd/check_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"context"
66
"fmt"
7-
"io/ioutil"
7+
"os"
88
"testing"
99

1010
"github.com/linkerd/linkerd2/pkg/healthcheck"
@@ -33,7 +33,7 @@ func TestCheckStatus(t *testing.T) {
3333
output := bytes.NewBufferString("")
3434
healthcheck.RunChecks(output, stderr, hc, tableOutput)
3535

36-
goldenFileBytes, err := ioutil.ReadFile("testdata/check_output.golden")
36+
goldenFileBytes, err := os.ReadFile("testdata/check_output.golden")
3737
if err != nil {
3838
t.Fatalf("Unexpected error: %v", err)
3939
}
@@ -67,7 +67,7 @@ func TestCheckStatus(t *testing.T) {
6767
output := bytes.NewBufferString("")
6868
healthcheck.RunChecks(output, stderr, hc, jsonOutput)
6969

70-
goldenFileBytes, err := ioutil.ReadFile("testdata/check_output_json.golden")
70+
goldenFileBytes, err := os.ReadFile("testdata/check_output_json.golden")
7171
if err != nil {
7272
t.Fatalf("Unexpected error: %v", err)
7373
}

‎cli/cmd/inject_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"bytes"
66
"fmt"
77
"io"
8-
"io/ioutil"
98
"log"
109
"os"
1110
"path/filepath"
@@ -630,10 +629,10 @@ func TestWalk(t *testing.T) {
630629
file1 = filepath.Join(tmpFolderRoot, "root.txt")
631630
file2 = filepath.Join(tmpFolderData, "data.txt")
632631
)
633-
if err := ioutil.WriteFile(file1, data, 0600); err != nil {
632+
if err := os.WriteFile(file1, data, 0600); err != nil {
634633
t.Fatal("Unexpected error: ", err)
635634
}
636-
if err := ioutil.WriteFile(file2, data, 0600); err != nil {
635+
if err := os.WriteFile(file2, data, 0600); err != nil {
637636
t.Fatal("Unexpected error: ", err)
638637
}
639638

‎cli/cmd/install_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"context"
66
"fmt"
7-
"io/ioutil"
7+
"os"
88
"path/filepath"
99
"testing"
1010

@@ -319,7 +319,7 @@ func testInstallOptionsHA(ha bool) (*charts.Values, error) {
319319
return nil, err
320320
}
321321

322-
data, err := ioutil.ReadFile(filepath.Join("testdata", "valid-crt.pem"))
322+
data, err := os.ReadFile(filepath.Join("testdata", "valid-crt.pem"))
323323
if err != nil {
324324
return nil, err
325325
}
@@ -336,7 +336,7 @@ func testInstallOptionsHA(ha bool) (*charts.Values, error) {
336336
}
337337
values.Identity.Issuer.TLS.KeyPEM = key
338338

339-
data, err = ioutil.ReadFile(filepath.Join("testdata", "valid-trust-anchors.pem"))
339+
data, err = os.ReadFile(filepath.Join("testdata", "valid-trust-anchors.pem"))
340340
if err != nil {
341341
return nil, err
342342
}
@@ -376,15 +376,15 @@ func testInstallValues() (*charts.Values, error) {
376376
values.PolicyController.Image.Version = installControlPlaneVersion
377377
values.HeartbeatSchedule = fakeHeartbeatSchedule()
378378

379-
identityCert, err := ioutil.ReadFile(filepath.Join("testdata", "valid-crt.pem"))
379+
identityCert, err := os.ReadFile(filepath.Join("testdata", "valid-crt.pem"))
380380
if err != nil {
381381
return nil, err
382382
}
383-
identityKey, err := ioutil.ReadFile(filepath.Join("testdata", "valid-key.pem"))
383+
identityKey, err := os.ReadFile(filepath.Join("testdata", "valid-key.pem"))
384384
if err != nil {
385385
return nil, err
386386
}
387-
trustAnchorsPEM, err := ioutil.ReadFile(filepath.Join("testdata", "valid-trust-anchors.pem"))
387+
trustAnchorsPEM, err := os.ReadFile(filepath.Join("testdata", "valid-trust-anchors.pem"))
388388
if err != nil {
389389
return nil, err
390390
}
@@ -516,7 +516,7 @@ func TestValidate(t *testing.T) {
516516
}
517517
values.Identity.Issuer.TLS.KeyPEM = key
518518

519-
ca, err := ioutil.ReadFile(filepath.Join("testdata", tc.crtFilePrefix+"-trust-anchors.pem"))
519+
ca, err := os.ReadFile(filepath.Join("testdata", tc.crtFilePrefix+"-trust-anchors.pem"))
520520
if err != nil {
521521
t.Fatal(err)
522522
}

‎cli/cmd/metrics_diagnostics_util_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"errors"
66
"fmt"
7-
"io/ioutil"
7+
"io"
88
"os"
99
"testing"
1010

@@ -84,7 +84,7 @@ func Test_obfuscateMetrics(t *testing.T) {
8484
t.Errorf("error opening test input file: %v\n", err)
8585
}
8686

87-
fileBytes, err := ioutil.ReadAll(file)
87+
fileBytes, err := io.ReadAll(file)
8888
if err != nil {
8989
t.Errorf("error reading test input file: %v\n", err)
9090
}

‎cli/cmd/options.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"path/filepath"
88

99
"fmt"
10-
"io/ioutil"
1110
"net"
1211
"strings"
1312
"time"
@@ -152,7 +151,7 @@ func makeInstallUpgradeFlags(defaults *l5dcharts.Values) ([]flag.Flag, *pflag.Fl
152151
"A path to a PEM-encoded file containing Linkerd Identity trust anchors (generated by default)",
153152
func(values *l5dcharts.Values, value string) error {
154153
if value != "" {
155-
data, err := ioutil.ReadFile(filepath.Clean(value))
154+
data, err := os.ReadFile(filepath.Clean(value))
156155
if err != nil {
157156
return err
158157
}
@@ -184,7 +183,7 @@ func makeInstallUpgradeFlags(defaults *l5dcharts.Values) ([]flag.Flag, *pflag.Fl
184183
}
185184

186185
func loadCrtPEM(path string) (string, error) {
187-
data, err := ioutil.ReadFile(filepath.Clean(path))
186+
data, err := os.ReadFile(filepath.Clean(path))
188187
if err != nil {
189188
return "", err
190189
}
@@ -197,7 +196,7 @@ func loadCrtPEM(path string) (string, error) {
197196
}
198197

199198
func loadKeyPEM(path string) (string, error) {
200-
data, err := ioutil.ReadFile(filepath.Clean(path))
199+
data, err := os.ReadFile(filepath.Clean(path))
201200
if err != nil {
202201
return "", err
203202
}

‎cli/cmd/upgrade_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"encoding/base64"
77
"fmt"
88
"io"
9-
"io/ioutil"
109
"os"
1110
"strings"
1211
"testing"
@@ -462,15 +461,15 @@ func generateCerts(t *testing.T, name string, b64encode bool) issuerCerts {
462461
keyPem := strings.TrimSpace(issuer.Cred.EncodePrivateKeyPEM())
463462
crtPem := strings.TrimSpace(issuer.Cred.EncodeCertificatePEM())
464463

465-
caFile, err := ioutil.TempFile("", "ca.*.pem")
464+
caFile, err := os.CreateTemp("", "ca.*.pem")
466465
if err != nil {
467466
t.Fatal(err)
468467
}
469-
crtFile, err := ioutil.TempFile("", "crt.*.pem")
468+
crtFile, err := os.CreateTemp("", "crt.*.pem")
470469
if err != nil {
471470
t.Fatal(err)
472471
}
473-
keyFile, err := ioutil.TempFile("", "key.*.pem")
472+
keyFile, err := os.CreateTemp("", "key.*.pem")
474473
if err != nil {
475474
t.Fatal(err)
476475
}

‎cni-plugin/test/install-cni_test.go

+8-9
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"bytes"
2020
"flag"
2121
"fmt"
22-
"io/ioutil"
2322
"os"
2423
"os/exec"
2524
"os/user"
@@ -58,7 +57,7 @@ func setEnv(key, value string, t *testing.T) {
5857
}
5958

6059
func mktemp(dir, prefix string, t *testing.T) string {
61-
tempDir, err := ioutil.TempDir(dir, prefix)
60+
tempDir, err := os.MkdirTemp(dir, prefix)
6261
if err != nil {
6362
testutil.AnnotatedFatalf(t, "couldn't get current working directory",
6463
"couldn't get current working directory: %v", err)
@@ -77,7 +76,7 @@ func pwd(t *testing.T) string {
7776
}
7877

7978
func ls(dir string, t *testing.T) []string {
80-
files, err := ioutil.ReadDir(dir)
79+
files, err := os.ReadDir(dir)
8180
if err != nil {
8281
testutil.AnnotatedFatalf(t, "failed to list files",
8382
"failed to list files: %v", err)
@@ -90,12 +89,12 @@ func ls(dir string, t *testing.T) []string {
9089
}
9190

9291
func cp(src, dest string, t *testing.T) {
93-
data, err := ioutil.ReadFile(src)
92+
data, err := os.ReadFile(src)
9493
if err != nil {
9594
testutil.AnnotatedFatalf(t, fmt.Sprintf("failed to read file %v", src),
9695
"failed to read file %v: %v", src, err)
9796
}
98-
if err = ioutil.WriteFile(dest, data, 0600); err != nil {
97+
if err = os.WriteFile(dest, data, 0600); err != nil {
9998
testutil.AnnotatedFatalf(t, fmt.Sprintf("failed to write file %v", dest),
10099
"failed to write file %v: %v", dest, err)
101100
}
@@ -192,7 +191,7 @@ func startDocker(testNum int, wd string, testWorkRootDir string, tempCNINetDir s
192191

193192
containerID, err := cmd.Output()
194193
if err != nil {
195-
errFileContents, _ := ioutil.ReadFile(errFileName)
194+
errFileContents, _ := os.ReadFile(errFileName)
196195
t.Logf("%v contents:\n\n%v\n\n", errFileName, string(errFileContents))
197196
testutil.Fatalf(t,
198197
"test %v ERROR: failed to start docker container '%v', see %v", testNum, dockerImage, errFileName)
@@ -214,13 +213,13 @@ func docker(cmd, containerID string, t *testing.T) {
214213
// compareConfResult does a string compare of 2 test files.
215214
func compareConfResult(testWorkRootDir string, tempCNINetDir string, result string, expected string, t *testing.T) {
216215
tempResult := tempCNINetDir + "/" + result
217-
resultFile, err := ioutil.ReadFile(tempResult)
216+
resultFile, err := os.ReadFile(tempResult)
218217
if err != nil {
219218
testutil.AnnotatedFatalf(t, "failed to read file",
220219
"failed to read file %v: %v", tempResult, err)
221220
}
222221

223-
expectedFile, err := ioutil.ReadFile(expected)
222+
expectedFile, err := os.ReadFile(expected)
224223
if err != nil {
225224
testutil.AnnotatedFatalf(t, fmt.Sprintf("failed to read file %v", expected),
226225
"failed to read file %v, err: %v", expected, err)
@@ -265,7 +264,7 @@ func doTest(testNum int, wd string, initialNetConfFile string, finalNetConfFile
265264
if initialNetConfFile != "NONE" {
266265
setEnv(cniConfName, initialNetConfFile, t)
267266
}
268-
defaultData, err := ioutil.ReadFile(wd + "../deployment/linkerd-cni.conf.default")
267+
defaultData, err := os.ReadFile(wd + "../deployment/linkerd-cni.conf.default")
269268
if err != nil {
270269
testutil.AnnotatedFatalf(t, "failed to read file linkerd-cni.conf.default",
271270
"failed to read file %v, err: %v", wd+"../deployment/linkerd-cni.conf.default", err)

‎controller/cmd/identity/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"flag"
66
"fmt"
7-
"io/ioutil"
87
"net"
98
"os"
109
"os/signal"
@@ -53,7 +52,7 @@ func Main(args []string) {
5352

5453
flags.ConfigureAndParse(cmd, args)
5554

56-
identityTrustAnchorPEM, err := ioutil.ReadFile(k8s.MountPathTrustRootsPEM)
55+
identityTrustAnchorPEM, err := os.ReadFile(k8s.MountPathTrustRootsPEM)
5756
if err != nil {
5857
log.Fatalf("could not read identity trust anchors PEM: %s", err.Error())
5958
}

‎controller/proxy-injector/fake/factory.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fake
22

33
import (
4-
"io/ioutil"
4+
"os"
55
"path/filepath"
66

77
admissionv1beta1 "k8s.io/api/admission/v1beta1"
@@ -31,7 +31,7 @@ func NewFactory(rootDir string) *Factory {
3131
// bytes. If the file doesn't exist in the 'fake/data' folder, an error will be
3232
// returned.
3333
func (f *Factory) FileContents(filename string) ([]byte, error) {
34-
return ioutil.ReadFile(filepath.Join(f.rootDir, filename))
34+
return os.ReadFile(filepath.Join(f.rootDir, filename))
3535
}
3636

3737
// AdmissionReview returns the content of the specified file as an
@@ -40,7 +40,7 @@ func (f *Factory) FileContents(filename string) ([]byte, error) {
4040
// ii. the file content isn't a valid YAML structure that can be unmarshalled
4141
// into AdmissionReview type
4242
func (f *Factory) AdmissionReview(filename string) (*admissionv1beta1.AdmissionReview, error) {
43-
b, err := ioutil.ReadFile(filepath.Join(f.rootDir, filename))
43+
b, err := os.ReadFile(filepath.Join(f.rootDir, filename))
4444
if err != nil {
4545
return nil, err
4646
}
@@ -58,7 +58,7 @@ func (f *Factory) AdmissionReview(filename string) (*admissionv1beta1.AdmissionR
5858
// ii. the file content isn't a valid YAML structure that can be unmarshalled
5959
// into Deployment type
6060
func (f *Factory) Deployment(filename string) (*appsv1.Deployment, error) {
61-
b, err := ioutil.ReadFile(filepath.Join(f.rootDir, filename))
61+
b, err := os.ReadFile(filepath.Join(f.rootDir, filename))
6262
if err != nil {
6363
return nil, err
6464
}
@@ -77,7 +77,7 @@ func (f *Factory) Deployment(filename string) (*appsv1.Deployment, error) {
7777
// ii. the file content isn't a valid YAML structure that can be unmarshalled
7878
// into Container type
7979
func (f *Factory) Container(filename string) (*corev1.Container, error) {
80-
b, err := ioutil.ReadFile(filepath.Join(f.rootDir, filename))
80+
b, err := os.ReadFile(filepath.Join(f.rootDir, filename))
8181
if err != nil {
8282
return nil, err
8383
}
@@ -96,7 +96,7 @@ func (f *Factory) Container(filename string) (*corev1.Container, error) {
9696
// ii. the file content isn't a valid YAML structure that can be unmarshalled
9797
// into ConfigMap type
9898
func (f *Factory) ConfigMap(filename string) (*corev1.ConfigMap, error) {
99-
b, err := ioutil.ReadFile(filepath.Join(f.rootDir, filename))
99+
b, err := os.ReadFile(filepath.Join(f.rootDir, filename))
100100
if err != nil {
101101
return nil, err
102102
}
@@ -115,7 +115,7 @@ func (f *Factory) ConfigMap(filename string) (*corev1.ConfigMap, error) {
115115
// ii. the file content isn't a valid YAML structure that can be unmarshalled
116116
// into Namespace type
117117
func (f *Factory) Namespace(filename string) (*corev1.Namespace, error) {
118-
b, err := ioutil.ReadFile(filepath.Join(f.rootDir, filename))
118+
b, err := os.ReadFile(filepath.Join(f.rootDir, filename))
119119
if err != nil {
120120
return nil, err
121121
}
@@ -134,7 +134,7 @@ func (f *Factory) Namespace(filename string) (*corev1.Namespace, error) {
134134
// ii. the file content isn't a valid YAML structure that can be unmarshalled
135135
// into Volume type
136136
func (f *Factory) Volume(filename string) (*corev1.Volume, error) {
137-
b, err := ioutil.ReadFile(filepath.Join(f.rootDir, filename))
137+
b, err := os.ReadFile(filepath.Join(f.rootDir, filename))
138138
if err != nil {
139139
return nil, err
140140
}

‎controller/proxy-injector/webhook.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package injector
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
6+
"os"
77
"strings"
88

99
"github.com/linkerd/linkerd2/controller/k8s"
@@ -45,7 +45,7 @@ func Inject(linkerdNamespace string) webhook.Handler {
4545
return nil, err
4646
}
4747

48-
caPEM, err := ioutil.ReadFile(pkgK8s.MountPathTrustRootsPEM)
48+
caPEM, err := os.ReadFile(pkgK8s.MountPathTrustRootsPEM)
4949
if err != nil {
5050
return nil, err
5151
}

‎pkg/config/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package config
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
6+
"os"
77
"path/filepath"
88

99
"github.com/linkerd/linkerd2/pkg/k8s"
@@ -19,7 +19,7 @@ import (
1919
// Values returns the Value struct from the linkerd-config ConfigMap
2020
func Values(path string) (*l5dcharts.Values, error) {
2121
p := filepath.Clean(path)
22-
configYaml, err := ioutil.ReadFile(p)
22+
configYaml, err := os.ReadFile(p)
2323
if err != nil {
2424
return nil, fmt.Errorf("failed to read config file: %w", err)
2525
}

0 commit comments

Comments
 (0)