From f38c9f2a4557ae4d4a4f162cf9138fa52614de0f Mon Sep 17 00:00:00 2001 From: Sebastian Spaink <3441183+sspaink@users.noreply.github.com> Date: Wed, 19 Oct 2022 11:32:53 -0500 Subject: [PATCH] chore: Resolve deprecated linter issues (#12051) --- plugins/common/tls/config.go | 1 - plugins/inputs/gnmi/gnmi.go | 2 -- plugins/inputs/gnmi/gnmi_test.go | 12 ------------ plugins/outputs/amqp/client.go | 4 +++- plugins/outputs/socket_writer/socket_writer.go | 2 +- plugins/outputs/syslog/syslog.go | 2 +- plugins/processors/strings/strings.go | 6 +++++- 7 files changed, 10 insertions(+), 19 deletions(-) diff --git a/plugins/common/tls/config.go b/plugins/common/tls/config.go index 0f2c40028..36a5f485e 100644 --- a/plugins/common/tls/config.go +++ b/plugins/common/tls/config.go @@ -199,7 +199,6 @@ func loadCertificate(config *tls.Config, certFile, keyFile string) error { } config.Certificates = []tls.Certificate{cert} - config.BuildNameToCertificate() return nil } diff --git a/plugins/inputs/gnmi/gnmi.go b/plugins/inputs/gnmi/gnmi.go index e9f57d983..d0a9de410 100644 --- a/plugins/inputs/gnmi/gnmi.go +++ b/plugins/inputs/gnmi/gnmi.go @@ -316,8 +316,6 @@ func (c *GNMI) handleSubscribeResponse(worker *Worker, reply *gnmiLib.SubscribeR switch response := reply.Response.(type) { case *gnmiLib.SubscribeResponse_Update: c.handleSubscribeResponseUpdate(worker, response) - case *gnmiLib.SubscribeResponse_Error: - c.Log.Errorf("Subscribe error (%d), %q", response.Error.Code, response.Error.Message) } } diff --git a/plugins/inputs/gnmi/gnmi_test.go b/plugins/inputs/gnmi/gnmi_test.go index 6e3fcac86..fa1c1706f 100644 --- a/plugins/inputs/gnmi/gnmi_test.go +++ b/plugins/inputs/gnmi/gnmi_test.go @@ -695,18 +695,6 @@ func (l *MockLogger) Errorf(format string, args ...interface{}) { l.lastArgs = args } -func TestSubscribeResponseError(t *testing.T) { - me := "mock error message" - var mc uint32 = 7 - ml := &MockLogger{} - plugin := &GNMI{Log: ml} - // TODO: FIX SA1019: gnmi.Error is deprecated: Do not use. - errorResponse := &gnmiLib.SubscribeResponse_Error{Error: &gnmiLib.Error{Message: me, Code: mc}} - plugin.handleSubscribeResponse(&Worker{address: "127.0.0.1:0"}, &gnmiLib.SubscribeResponse{Response: errorResponse}) - require.NotEmpty(t, ml.lastFormat) - require.Equal(t, []interface{}{mc, me}, ml.lastArgs) -} - func TestRedial(t *testing.T) { listener, err := net.Listen("tcp", "127.0.0.1:0") require.NoError(t, err) diff --git a/plugins/outputs/amqp/client.go b/plugins/outputs/amqp/client.go index b7df04d6d..6a49a178a 100644 --- a/plugins/outputs/amqp/client.go +++ b/plugins/outputs/amqp/client.go @@ -1,6 +1,7 @@ package amqp import ( + "context" "crypto/tls" "errors" "fmt" @@ -117,7 +118,8 @@ func (c *client) DeclareExchange() error { func (c *client) Publish(key string, body []byte) error { // Note that since the channel is not in confirm mode, the absence of // an error does not indicate successful delivery. - return c.channel.Publish( + return c.channel.PublishWithContext( + context.Background(), c.config.exchange, // exchange key, // routing key false, // mandatory diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go index d73ad11d9..541245484 100644 --- a/plugins/outputs/socket_writer/socket_writer.go +++ b/plugins/outputs/socket_writer/socket_writer.go @@ -119,7 +119,7 @@ func (sw *SocketWriter) Write(metrics []telegraf.Metric) error { if _, err := sw.Conn.Write(bs); err != nil { //TODO log & keep going with remaining strings - if err, ok := err.(net.Error); !ok || !err.Temporary() { + if err, ok := err.(net.Error); ok { // permanent error. close the connection sw.Close() //nolint:revive // There is another error which will be returned here sw.Conn = nil diff --git a/plugins/outputs/syslog/syslog.go b/plugins/outputs/syslog/syslog.go index 89d2b69d8..8e2bd4ce8 100644 --- a/plugins/outputs/syslog/syslog.go +++ b/plugins/outputs/syslog/syslog.go @@ -120,7 +120,7 @@ func (s *Syslog) Write(metrics []telegraf.Metric) (err error) { continue } if _, err = s.Conn.Write(msgBytesWithFraming); err != nil { - if netErr, ok := err.(net.Error); !ok || !netErr.Temporary() { + if netErr, ok := err.(net.Error); ok { s.Close() //nolint:revive // There is another error which will be returned here s.Conn = nil return fmt.Errorf("closing connection: %v", netErr) diff --git a/plugins/processors/strings/strings.go b/plugins/processors/strings/strings.go index dd929af22..48c0bcc51 100644 --- a/plugins/processors/strings/strings.go +++ b/plugins/processors/strings/strings.go @@ -10,6 +10,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/processors" + "golang.org/x/text/cases" + "golang.org/x/text/language" ) //go:embed sample.conf @@ -186,7 +188,9 @@ func (s *Strings) initOnce() { s.converters = append(s.converters, c) } for _, c := range s.Titlecase { - c.fn = strings.Title + c.fn = func(s string) string { + return cases.Title(language.Und, cases.NoLower).String(s) + } s.converters = append(s.converters, c) } for _, c := range s.Trim {