From 288499ad9575fb998cf1f3851776b7239614bf7a Mon Sep 17 00:00:00 2001 From: knbr13 Date: Sun, 2 Feb 2025 14:10:14 +0200 Subject: [PATCH] use the 'os' and 'io' packages instead of the deperecated 'ioutil' package --- cmd/kaf/kaf.go | 9 ++++----- cmd/kaf/main_test.go | 3 +-- cmd/kaf/produce.go | 5 ++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cmd/kaf/kaf.go b/cmd/kaf/kaf.go index 6e582397..e435d538 100644 --- a/cmd/kaf/kaf.go +++ b/cmd/kaf/kaf.go @@ -6,7 +6,6 @@ import ( "crypto/tls" "crypto/x509" - "io/ioutil" "log" "os" @@ -49,7 +48,7 @@ func getConfig() (saramaConfig *sarama.Config) { } if cluster.TLS.Cafile != "" { - caCert, err := ioutil.ReadFile(cluster.TLS.Cafile) + caCert, err := os.ReadFile(cluster.TLS.Cafile) if err != nil { errorExit("Unable to read Cafile :%v\n", err) } @@ -59,11 +58,11 @@ func getConfig() (saramaConfig *sarama.Config) { } if cluster.TLS.Clientfile != "" && cluster.TLS.Clientkeyfile != "" { - clientCert, err := ioutil.ReadFile(cluster.TLS.Clientfile) + clientCert, err := os.ReadFile(cluster.TLS.Clientfile) if err != nil { errorExit("Unable to read Clientfile :%v\n", err) } - clientKey, err := ioutil.ReadFile(cluster.TLS.Clientkeyfile) + clientKey, err := os.ReadFile(cluster.TLS.Clientkeyfile) if err != nil { errorExit("Unable to read Clientkeyfile :%v\n", err) } @@ -86,7 +85,7 @@ func getConfig() (saramaConfig *sarama.Config) { InsecureSkipVerify: cluster.TLS.Insecure, } if cluster.TLS.Cafile != "" { - caCert, err := ioutil.ReadFile(cluster.TLS.Cafile) + caCert, err := os.ReadFile(cluster.TLS.Cafile) if err != nil { fmt.Println(err) os.Exit(1) diff --git a/cmd/kaf/main_test.go b/cmd/kaf/main_test.go index 9a72c294..26851076 100644 --- a/cmd/kaf/main_test.go +++ b/cmd/kaf/main_test.go @@ -4,7 +4,6 @@ import ( "bytes" "context" "io" - "io/ioutil" "os" "testing" "time" @@ -54,7 +53,7 @@ func runCmd(t *testing.T, in io.Reader, args ...string) string { require.NoError(t, rootCmd.ExecuteContext(ctx)) - bs, err := ioutil.ReadAll(b) + bs, err := io.ReadAll(b) require.NoError(t, err) return string(bs) diff --git a/cmd/kaf/produce.go b/cmd/kaf/produce.go index d07a92e7..ca138285 100644 --- a/cmd/kaf/produce.go +++ b/cmd/kaf/produce.go @@ -6,15 +6,14 @@ import ( "encoding/base64" "fmt" "io" - "io/ioutil" "os" "strings" "text/template" "time" - "github.com/Masterminds/sprig" "github.com/IBM/sarama" + "github.com/Masterminds/sprig" "github.com/birdayz/kaf/pkg/partitioner" pb "github.com/golang/protobuf/proto" "github.com/spf13/cobra" @@ -79,7 +78,7 @@ func readLines(reader io.Reader, out chan []byte) { } func readFull(reader io.Reader, out chan []byte) { - data, err := ioutil.ReadAll(inReader) + data, err := io.ReadAll(inReader) if err != nil { errorExit("Unable to read data\n") }