chore: Resolve deprecated linter issues (#12051)
This commit is contained in:
parent
13a020f491
commit
f38c9f2a45
|
|
@ -199,7 +199,6 @@ func loadCertificate(config *tls.Config, certFile, keyFile string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
config.Certificates = []tls.Certificate{cert}
|
config.Certificates = []tls.Certificate{cert}
|
||||||
config.BuildNameToCertificate()
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -316,8 +316,6 @@ func (c *GNMI) handleSubscribeResponse(worker *Worker, reply *gnmiLib.SubscribeR
|
||||||
switch response := reply.Response.(type) {
|
switch response := reply.Response.(type) {
|
||||||
case *gnmiLib.SubscribeResponse_Update:
|
case *gnmiLib.SubscribeResponse_Update:
|
||||||
c.handleSubscribeResponseUpdate(worker, response)
|
c.handleSubscribeResponseUpdate(worker, response)
|
||||||
case *gnmiLib.SubscribeResponse_Error:
|
|
||||||
c.Log.Errorf("Subscribe error (%d), %q", response.Error.Code, response.Error.Message)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -695,18 +695,6 @@ func (l *MockLogger) Errorf(format string, args ...interface{}) {
|
||||||
l.lastArgs = args
|
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) {
|
func TestRedial(t *testing.T) {
|
||||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package amqp
|
package amqp
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
@ -117,7 +118,8 @@ func (c *client) DeclareExchange() error {
|
||||||
func (c *client) Publish(key string, body []byte) error {
|
func (c *client) Publish(key string, body []byte) error {
|
||||||
// Note that since the channel is not in confirm mode, the absence of
|
// Note that since the channel is not in confirm mode, the absence of
|
||||||
// an error does not indicate successful delivery.
|
// an error does not indicate successful delivery.
|
||||||
return c.channel.Publish(
|
return c.channel.PublishWithContext(
|
||||||
|
context.Background(),
|
||||||
c.config.exchange, // exchange
|
c.config.exchange, // exchange
|
||||||
key, // routing key
|
key, // routing key
|
||||||
false, // mandatory
|
false, // mandatory
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,7 @@ func (sw *SocketWriter) Write(metrics []telegraf.Metric) error {
|
||||||
|
|
||||||
if _, err := sw.Conn.Write(bs); err != nil {
|
if _, err := sw.Conn.Write(bs); err != nil {
|
||||||
//TODO log & keep going with remaining strings
|
//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
|
// permanent error. close the connection
|
||||||
sw.Close() //nolint:revive // There is another error which will be returned here
|
sw.Close() //nolint:revive // There is another error which will be returned here
|
||||||
sw.Conn = nil
|
sw.Conn = nil
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ func (s *Syslog) Write(metrics []telegraf.Metric) (err error) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if _, err = s.Conn.Write(msgBytesWithFraming); err != nil {
|
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.Close() //nolint:revive // There is another error which will be returned here
|
||||||
s.Conn = nil
|
s.Conn = nil
|
||||||
return fmt.Errorf("closing connection: %v", netErr)
|
return fmt.Errorf("closing connection: %v", netErr)
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ import (
|
||||||
|
|
||||||
"github.com/influxdata/telegraf"
|
"github.com/influxdata/telegraf"
|
||||||
"github.com/influxdata/telegraf/plugins/processors"
|
"github.com/influxdata/telegraf/plugins/processors"
|
||||||
|
"golang.org/x/text/cases"
|
||||||
|
"golang.org/x/text/language"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed sample.conf
|
//go:embed sample.conf
|
||||||
|
|
@ -186,7 +188,9 @@ func (s *Strings) initOnce() {
|
||||||
s.converters = append(s.converters, c)
|
s.converters = append(s.converters, c)
|
||||||
}
|
}
|
||||||
for _, c := range s.Titlecase {
|
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)
|
s.converters = append(s.converters, c)
|
||||||
}
|
}
|
||||||
for _, c := range s.Trim {
|
for _, c := range s.Trim {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue