Skip to content

Commit 11e1d66

Browse files
committed
[test] clean up io/ioutil package
Signed-off-by: xin.li <xin.li@daocloud.io>
1 parent c39fd32 commit 11e1d66

9 files changed

+14
-21
lines changed

test/artifact_bucket_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ package test
2222
import (
2323
"context"
2424
"fmt"
25-
"io/ioutil"
2625
"os"
2726
"testing"
2827
"time"
@@ -280,7 +279,7 @@ func updateConfigMap(ctx context.Context, client kubernetes.Interface, name stri
280279

281280
func getBucketSecret(t *testing.T, configFilePath, namespace string) *corev1.Secret {
282281
t.Helper()
283-
f, err := ioutil.ReadFile(configFilePath)
282+
f, err := os.ReadFile(configFilePath)
284283
if err != nil {
285284
t.Fatalf("Failed to read json key file %s at path %s", err, configFilePath)
286285
}

test/build_logs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package test
1919
import (
2020
"context"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323
"strings"
2424

2525
corev1 "k8s.io/api/core/v1"
@@ -65,7 +65,7 @@ func getContainerLogsFromPod(ctx context.Context, c kubernetes.Interface, pod, c
6565
if err != nil {
6666
return "", err
6767
}
68-
bs, err := ioutil.ReadAll(rc)
68+
bs, err := io.ReadAll(rc)
6969
if err != nil {
7070
return "", err
7171
}

test/examples_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"bytes"
2424
"context"
2525
"errors"
26-
"io/ioutil"
2726
"os"
2827
"os/exec"
2928
"path/filepath"
@@ -137,7 +136,7 @@ func exampleTest(path string, waitValidateFunc waitFunc, createFunc createFunc,
137136
knativetest.CleanupOnInterrupt(func() { tearDown(ctx, t, c, namespace) }, t.Logf)
138137
defer tearDown(ctx, t, c, namespace)
139138

140-
inputExample, err := ioutil.ReadFile(path)
139+
inputExample, err := os.ReadFile(path)
141140
if err != nil {
142141
t.Fatalf("Error reading file: %v", err)
143142
}

test/pullrequest/e2e_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"encoding/json"
2626
"flag"
2727
"fmt"
28-
"io/ioutil"
2928
"net"
3029
"net/http"
3130
"os"
@@ -45,7 +44,7 @@ var (
4544
)
4645

4746
func TestPullRequest(t *testing.T) {
48-
tmpdir, err := ioutil.TempDir("", t.Name())
47+
tmpdir, err := os.MkdirTemp("", t.Name())
4948
if err != nil {
5049
t.Fatalf("could not create test temp dir: %v", err)
5150
}

test/pullrequest/http.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package pullrequest
33
import (
44
"fmt"
55
"io"
6-
"io/ioutil"
76
"log"
87
"net/http"
98
"path/filepath"
@@ -21,8 +20,8 @@ type handler struct {
2120
func reflect(w http.ResponseWriter, r *http.Request) {
2221
t := io.TeeReader(r.Body, w)
2322
defer r.Body.Close()
24-
if _, err := ioutil.ReadAll(t); err != nil {
25-
log.Printf("ioutil.ReadAll: %v", err)
23+
if _, err := io.ReadAll(t); err != nil {
24+
log.Printf("io.ReadAll: %v", err)
2625
w.WriteHeader(http.StatusInternalServerError)
2726
return
2827
}

test/resolvers_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"context"
2525
"encoding/base64"
2626
"fmt"
27-
"io/ioutil"
27+
"os"
2828
"path/filepath"
2929
"regexp"
3030
"testing"
@@ -540,7 +540,7 @@ spec:
540540
// just confused things.
541541
func setupGitea(ctx context.Context, t *testing.T, c *clients, namespace string) (string, string) {
542542
t.Helper()
543-
giteaYaml, err := ioutil.ReadFile(filepath.Join("git-resolver", "gitea.yaml"))
543+
giteaYaml, err := os.ReadFile(filepath.Join("git-resolver", "gitea.yaml"))
544544
if err != nil {
545545
t.Fatalf("failed to read gitea.yaml: %v", err)
546546
}
@@ -640,7 +640,7 @@ spec:
640640
t.Fatalf("Failed to create gitea token secret %s: %v", secretName, err)
641641
}
642642

643-
remoteTaskBytes, err := ioutil.ReadFile(filepath.Join("git-resolver", "remote-task.yaml"))
643+
remoteTaskBytes, err := os.ReadFile(filepath.Join("git-resolver", "remote-task.yaml"))
644644
if err != nil {
645645
t.Fatalf("Failed to read git-resolver/remote-task.yaml: %v", err)
646646
}

test/secret.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ package test
2222
import (
2323
"context"
2424
"fmt"
25-
"io/ioutil"
2625
"os"
2726
"testing"
2827

@@ -53,7 +52,7 @@ func CreateGCPServiceAccountSecret(t *testing.T, c kubernetes.Interface, namespa
5352
},
5453
}
5554

56-
bs, err := ioutil.ReadFile(file)
55+
bs, err := os.ReadFile(file)
5756
if err != nil {
5857
return false, fmt.Errorf("couldn't read secret json from %s: %w", file, err)
5958
}

test/tektonbundles_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"context"
2626
"fmt"
2727
"io"
28-
"io/ioutil"
2928
"os"
3029
"path/filepath"
3130
"strings"
@@ -540,7 +539,7 @@ spec:
540539

541540
func tarImageInOCIFormat(namespace string, img v1.Image) ([]byte, error) {
542541
// Write the image in the OCI layout and then tar it up.
543-
dir, err := ioutil.TempDir(os.TempDir(), namespace)
542+
dir, err := os.MkdirTemp(os.TempDir(), namespace)
544543
if err != nil {
545544
return nil, err
546545
}
@@ -588,7 +587,7 @@ func tarImageInOCIFormat(namespace string, img v1.Image) ([]byte, error) {
588587
}
589588

590589
// Pull out the tar bundle into a bytes object.
591-
return ioutil.ReadAll(&buf)
590+
return io.ReadAll(&buf)
592591
}
593592

594593
// publishImg will generate a Pod that runs in the namespace to publish an OCI compliant image into the local registry

test/trusted_resources_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"context"
2424
"crypto"
2525
"fmt"
26-
"io/ioutil"
2726
"os"
2827
"path/filepath"
2928
"testing"
@@ -448,7 +447,7 @@ func setSecretAndConfig(ctx context.Context, t *testing.T, client kubernetes.Int
448447
t.Errorf("error getting signer from key file: %v", err)
449448
}
450449

451-
fileBytes, err := ioutil.ReadFile(filepath.Clean(pubKey))
450+
fileBytes, err := os.ReadFile(filepath.Clean(pubKey))
452451
if err != nil {
453452
t.Fatal(err)
454453
}

0 commit comments

Comments
 (0)