From b2bf0670dc0f552334becadf7103ae773a737989 Mon Sep 17 00:00:00 2001 From: guoguangwu Date: Sat, 8 Jul 2023 16:34:54 +0800 Subject: [PATCH] chore: remove refs to deprecated io/ioutil Signed-off-by: guoguangwu --- pkg/cluster/cluster_test.go | 5 ++--- pkg/filters/kafkabackend/kafka.go | 4 ++-- pkg/object/autocertmanager/autocertmanager_test.go | 9 ++++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkg/cluster/cluster_test.go b/pkg/cluster/cluster_test.go index f7552d9547..647ac8c39c 100644 --- a/pkg/cluster/cluster_test.go +++ b/pkg/cluster/cluster_test.go @@ -19,7 +19,6 @@ package cluster import ( "fmt" - "io/ioutil" "math/rand" "os" "path" @@ -568,7 +567,7 @@ func TestUtilEqual(t *testing.T) { } func TestIsLeader(t *testing.T) { - etcdDirName, err := ioutil.TempDir("", "cluster-test") + etcdDirName, err := os.MkdirTemp("", "cluster-test") check(err) defer os.RemoveAll(etcdDirName) @@ -592,7 +591,7 @@ func TestInvalidConfig(t *testing.T) { func TestRunDefrag(t *testing.T) { assert := assert.New(t) - etcdDirName, err := ioutil.TempDir("", "cluster-test") + etcdDirName, err := os.MkdirTemp("", "cluster-test") check(err) defer os.RemoveAll(etcdDirName) diff --git a/pkg/filters/kafkabackend/kafka.go b/pkg/filters/kafkabackend/kafka.go index ec0080df84..0b8dd51d06 100644 --- a/pkg/filters/kafkabackend/kafka.go +++ b/pkg/filters/kafkabackend/kafka.go @@ -20,7 +20,7 @@ package kafka import ( "fmt" - "io/ioutil" + "io" "net/http" "github.com/Shopify/sarama" @@ -156,7 +156,7 @@ func (k *Kafka) Handle(ctx *context.Context) (result string) { req := ctx.GetInputRequest().(*httpprot.Request) topic := k.getTopic(req) - body, err := ioutil.ReadAll(req.GetPayload()) + body, err := io.ReadAll(req.GetPayload()) if err != nil { return resultParseErr } diff --git a/pkg/object/autocertmanager/autocertmanager_test.go b/pkg/object/autocertmanager/autocertmanager_test.go index de96143b8b..032a4b688a 100644 --- a/pkg/object/autocertmanager/autocertmanager_test.go +++ b/pkg/object/autocertmanager/autocertmanager_test.go @@ -32,7 +32,6 @@ import ( "fmt" "html/template" "io" - "io/ioutil" "math/big" "net/http" "net/http/httptest" @@ -543,7 +542,7 @@ domains: name: customDNS zone: megaease.com directoryURL: ` + url - etcdDirName, err := ioutil.TempDir("", "autocertmanager-test") + etcdDirName, err := os.MkdirTemp("", "autocertmanager-test") if err != nil { t.Errorf(err.Error()) } @@ -677,7 +676,7 @@ domains: name: customDNS zone: megaease.com directoryURL: ` + url - etcdDirName, err := ioutil.TempDir("", "autocertmanager-test") + etcdDirName, err := os.MkdirTemp("", "autocertmanager-test") if err != nil { t.Errorf(err.Error()) } @@ -725,7 +724,7 @@ domains: name: customDNS zone: megaease.com directoryURL: ` + url - etcdDirName, err := ioutil.TempDir("", "autocertmanager-test") + etcdDirName, err := os.MkdirTemp("", "autocertmanager-test") if err != nil { t.Errorf(err.Error()) } @@ -835,7 +834,7 @@ func waitDNSRecordTest(t *testing.T, d Domain) { } func TestDomain(t *testing.T) { - etcdDirName, err := ioutil.TempDir("", "autocertmanager-domain-test") + etcdDirName, err := os.MkdirTemp("", "autocertmanager-domain-test") if err != nil { t.Errorf(err.Error()) }