CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(lint): Enable mirror (#15510)

This commit is contained in:
Joshua Powers 2024-06-17 08:21:30 -06:00 committed by GitHub
parent df78bc23f0
commit 7037429e6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yml
View File

@ -21,6 +21,7 @@ linters:
- interfacebloat - interfacebloat
- lll - lll
- makezero - makezero
- mirror
- nakedret - nakedret
- nilerr - nilerr
- nolintlint - nolintlint

2
internal/content_coding_test.go
View File

@ -128,7 +128,7 @@ func TestIdentityEncodeDecode(t *testing.T) {
func TestStreamIdentityDecode(t *testing.T) { func TestStreamIdentityDecode(t *testing.T) {
var r bytes.Buffer var r bytes.Buffer
n, err := r.Write([]byte("howdy")) n, err := r.WriteString("howdy")
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 5, n) require.Equal(t, 5, n)

2
internal/internal_test.go
View File

@ -174,7 +174,7 @@ func TestRandomSleep(t *testing.T) {
func TestCompressWithGzip(t *testing.T) { func TestCompressWithGzip(t *testing.T) {
testData := "the quick brown fox jumps over the lazy dog" testData := "the quick brown fox jumps over the lazy dog"
inputBuffer := bytes.NewBuffer([]byte(testData)) inputBuffer := bytes.NewBufferString(testData)
outputBuffer := CompressWithGzip(inputBuffer) outputBuffer := CompressWithGzip(inputBuffer)
gzipReader, err := gzip.NewReader(outputBuffer) gzipReader, err := gzip.NewReader(outputBuffer)

2
internal/snmp/field.go
View File

@ -97,7 +97,7 @@ func (f *Field) Init(tr Translator) error {
func (f *Field) Convert(ent gosnmp.SnmpPDU) (interface{}, error) { func (f *Field) Convert(ent gosnmp.SnmpPDU) (interface{}, error) {
if f.Conversion == "" { if f.Conversion == "" {
// OctetStrings may contain hex data that needs its own conversion // OctetStrings may contain hex data that needs its own conversion
if ent.Type == gosnmp.OctetString && !utf8.ValidString(string(ent.Value.([]byte)[:])) { if ent.Type == gosnmp.OctetString && !utf8.Valid(ent.Value.([]byte)[:]) {
return hex.EncodeToString(ent.Value.([]byte)), nil return hex.EncodeToString(ent.Value.([]byte)), nil
} }
if bs, ok := ent.Value.([]byte); ok { if bs, ok := ent.Value.([]byte); ok {

4
plugins/inputs/cloudwatch_metric_streams/cloudwatch_metric_streams_test.go
View File

@ -275,7 +275,7 @@ func TestWriteHTTPInvalid(t *testing.T) {
defer metricStream.Stop() defer metricStream.Stop()
// post a badly formatted message to the metric stream listener // post a badly formatted message to the metric stream listener
resp, err := http.Post(createURL("http", "/write"), "", bytes.NewBuffer([]byte(badMsg))) resp, err := http.Post(createURL("http", "/write"), "", bytes.NewBufferString(badMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 400, resp.StatusCode) require.EqualValues(t, 400, resp.StatusCode)
@ -290,7 +290,7 @@ func TestWriteHTTPEmpty(t *testing.T) {
defer metricStream.Stop() defer metricStream.Stop()
// post empty message to the metric stream listener // post empty message to the metric stream listener
resp, err := http.Post(createURL("http", "/write"), "", bytes.NewBuffer([]byte(emptyMsg))) resp, err := http.Post(createURL("http", "/write"), "", bytes.NewBufferString(emptyMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 400, resp.StatusCode) require.EqualValues(t, 400, resp.StatusCode)

2
plugins/inputs/docker_log/docker_log_test.go
View File

@ -86,7 +86,7 @@ func Test(t *testing.T) {
}, nil }, nil
}, },
ContainerLogsF: func() (io.ReadCloser, error) { ContainerLogsF: func() (io.ReadCloser, error) {
return &Response{Reader: bytes.NewBuffer([]byte("2020-04-28T18:43:16.432691200Z hello\n"))}, nil return &Response{Reader: bytes.NewBufferString("2020-04-28T18:43:16.432691200Z hello\n")}, nil
}, },
}, },
expected: []telegraf.Metric{ expected: []telegraf.Metric{

38
plugins/inputs/http_listener_v2/http_listener_v2_test.go
View File

@ -161,7 +161,7 @@ func TestWriteHTTPSNoClientAuth(t *testing.T) {
} }
// post single message to listener // post single message to listener
resp, err := noClientAuthClient.Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := noClientAuthClient.Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -177,7 +177,7 @@ func TestWriteHTTPSWithClientAuth(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := getHTTPSClient().Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := getHTTPSClient().Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -194,7 +194,7 @@ func TestWriteHTTPBasicAuth(t *testing.T) {
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("POST", createURL(listener, "http", "/write", "db=mydb"), bytes.NewBuffer([]byte(testMsg))) req, err := http.NewRequest("POST", createURL(listener, "http", "/write", "db=mydb"), bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
req.SetBasicAuth(basicUsername, basicPassword) req.SetBasicAuth(basicUsername, basicPassword)
resp, err := client.Do(req) resp, err := client.Do(req)
@ -213,7 +213,7 @@ func TestWriteHTTP(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -225,7 +225,7 @@ func TestWriteHTTP(t *testing.T) {
) )
// post multiple message to listener // post multiple message to listener
resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs))) resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgs))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -265,7 +265,7 @@ func TestWriteHTTPWithPathTag(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgNoNewline))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -288,7 +288,7 @@ func TestWriteHTTPWithReturnCode(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgNoNewline))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 200, resp.StatusCode) require.EqualValues(t, 200, resp.StatusCode)
@ -307,13 +307,13 @@ func TestWriteHTTPWithMultiplePaths(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to /write // post single message to /write
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgNoNewline))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
// post single message to /alternative_write // post single message to /alternative_write
resp, err = http.Post(createURL(listener, "http", "/alternative_write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline))) resp, err = http.Post(createURL(listener, "http", "/alternative_write", "db=mydb"), "", bytes.NewBufferString(testMsgNoNewline))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -341,7 +341,7 @@ func TestWriteHTTPNoNewline(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgNoNewline))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -497,7 +497,7 @@ func TestWriteHTTPHighTraffic(t *testing.T) {
go func(innerwg *sync.WaitGroup) { go func(innerwg *sync.WaitGroup) {
defer innerwg.Done() defer innerwg.Done()
for i := 0; i < 500; i++ { for i := 0; i < 500; i++ {
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgs))
if err != nil { if err != nil {
return return
} }
@ -528,7 +528,7 @@ func TestReceive404ForInvalidEndpoint(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/foobar", ""), "", bytes.NewBuffer([]byte(testMsg))) resp, err := http.Post(createURL(listener, "http", "/foobar", ""), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 404, resp.StatusCode) require.EqualValues(t, 404, resp.StatusCode)
@ -544,7 +544,7 @@ func TestWriteHTTPInvalid(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(badMsg))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(badMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 400, resp.StatusCode) require.EqualValues(t, 400, resp.StatusCode)
@ -560,7 +560,7 @@ func TestWriteHTTPEmpty(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(emptyMsg))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(emptyMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -580,7 +580,7 @@ func TestWriteHTTPTransformHeaderValuesToTagsSingleWrite(t *testing.T) {
require.NoError(t, listener.Start(acc)) require.NoError(t, listener.Start(acc))
defer listener.Stop() defer listener.Stop()
req, err := http.NewRequest("POST", createURL(listener, "http", "/write", "db=mydb"), bytes.NewBuffer([]byte(testMsg))) req, err := http.NewRequest("POST", createURL(listener, "http", "/write", "db=mydb"), bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
req.Header.Set("Content-Type", "") req.Header.Set("Content-Type", "")
req.Header.Set("Present_http_header_1", "PRESENT_HTTP_VALUE_1") req.Header.Set("Present_http_header_1", "PRESENT_HTTP_VALUE_1")
@ -598,7 +598,7 @@ func TestWriteHTTPTransformHeaderValuesToTagsSingleWrite(t *testing.T) {
) )
// post single message to listener // post single message to listener
resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg))) resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -624,7 +624,7 @@ func TestWriteHTTPTransformHeaderValuesToTagsBulkWrite(t *testing.T) {
require.NoError(t, listener.Start(acc)) require.NoError(t, listener.Start(acc))
defer listener.Stop() defer listener.Stop()
req, err := http.NewRequest("POST", createURL(listener, "http", "/write", "db=mydb"), bytes.NewBuffer([]byte(testMsgs))) req, err := http.NewRequest("POST", createURL(listener, "http", "/write", "db=mydb"), bytes.NewBufferString(testMsgs))
require.NoError(t, err) require.NoError(t, err)
req.Header.Set("Content-Type", "") req.Header.Set("Content-Type", "")
req.Header.Set("Present_http_header_1", "PRESENT_HTTP_VALUE_1") req.Header.Set("Present_http_header_1", "PRESENT_HTTP_VALUE_1")
@ -661,7 +661,7 @@ func TestWriteHTTPQueryParams(t *testing.T) {
require.NoError(t, listener.Start(acc)) require.NoError(t, listener.Start(acc))
defer listener.Stop() defer listener.Stop()
resp, err := http.Post(createURL(listener, "http", "/write", "tagKey=tagValue&fieldKey=42"), "", bytes.NewBuffer([]byte(emptyMsg))) resp, err := http.Post(createURL(listener, "http", "/write", "tagKey=tagValue&fieldKey=42"), "", bytes.NewBufferString(emptyMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -717,7 +717,7 @@ func TestServerHeaders(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)

42
plugins/inputs/influxdb_listener/influxdb_listener_test.go
View File

@ -125,7 +125,7 @@ func TestWriteSecureNoClientAuth(t *testing.T) {
} }
// post single message to listener // post single message to listener
resp, err := noClientAuthClient.Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := noClientAuthClient.Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -140,7 +140,7 @@ func TestWriteSecureWithClientAuth(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := getSecureClient().Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := getSecureClient().Post(createURL(listener, "https", "/write", "db=mydb"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -156,7 +156,7 @@ func TestWriteBasicAuth(t *testing.T) {
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("POST", createURL(listener, "http", "/write", "db=mydb"), bytes.NewBuffer([]byte(testMsg))) req, err := http.NewRequest("POST", createURL(listener, "http", "/write", "db=mydb"), bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
req.SetBasicAuth(basicUsername, basicPassword) req.SetBasicAuth(basicUsername, basicPassword)
resp, err := client.Do(req) resp, err := client.Do(req)
@ -187,7 +187,7 @@ func TestWriteToken(t *testing.T) {
defer plugin.Stop() defer plugin.Stop()
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("POST", createURL(plugin, "http", "/write", "db=mydb"), bytes.NewBuffer([]byte(testMsg))) req, err := http.NewRequest("POST", createURL(plugin, "http", "/write", "db=mydb"), bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
req.Header.Add("Authentication", "Bearer "+token) req.Header.Add("Authentication", "Bearer "+token)
resp, err := client.Do(req) resp, err := client.Do(req)
@ -218,7 +218,7 @@ func TestWriteTokenInvalidUser(t *testing.T) {
defer plugin.Stop() defer plugin.Stop()
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("POST", createURL(plugin, "http", "/write", "db=mydb"), bytes.NewBuffer([]byte(testMsg))) req, err := http.NewRequest("POST", createURL(plugin, "http", "/write", "db=mydb"), bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
req.Header.Add("Authentication", "Bearer "+token) req.Header.Add("Authentication", "Bearer "+token)
resp, err := client.Do(req) resp, err := client.Do(req)
@ -249,7 +249,7 @@ func TestWriteTokenExpired(t *testing.T) {
defer plugin.Stop() defer plugin.Stop()
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("POST", createURL(plugin, "http", "/write", "db=mydb"), bytes.NewBuffer([]byte(testMsg))) req, err := http.NewRequest("POST", createURL(plugin, "http", "/write", "db=mydb"), bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
req.Header.Add("Authentication", "Bearer "+token) req.Header.Add("Authentication", "Bearer "+token)
resp, err := client.Do(req) resp, err := client.Do(req)
@ -276,7 +276,7 @@ func TestWriteKeepDatabase(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -288,7 +288,7 @@ func TestWriteKeepDatabase(t *testing.T) {
) )
// post single message to listener with a database tag in it already. It should be clobbered. // post single message to listener with a database tag in it already. It should be clobbered.
resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgWithDB))) resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgWithDB))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -300,7 +300,7 @@ func TestWriteKeepDatabase(t *testing.T) {
) )
// post multiple message to listener // post multiple message to listener
resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs))) resp, err = http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgs))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -327,7 +327,7 @@ func TestWriteRetentionPolicyTag(t *testing.T) {
require.NoError(t, listener.Start(acc)) require.NoError(t, listener.Start(acc))
defer listener.Stop() defer listener.Stop()
resp, err := http.Post(createURL(listener, "http", "/write", "rp=myrp"), "", bytes.NewBuffer([]byte("cpu time_idle=42"))) resp, err := http.Post(createURL(listener, "http", "/write", "rp=myrp"), "", bytes.NewBufferString("cpu time_idle=42"))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.Equal(t, 204, resp.StatusCode) require.Equal(t, 204, resp.StatusCode)
@ -362,7 +362,7 @@ func TestWriteNoNewline(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgNoNewline))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgNoNewline))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -388,7 +388,7 @@ func TestPartialWrite(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testPartial))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testPartial))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 400, resp.StatusCode) require.EqualValues(t, 400, resp.StatusCode)
@ -488,7 +488,7 @@ func TestWriteLargeLine(t *testing.T) {
require.NoError(t, listener.Start(acc)) require.NoError(t, listener.Start(acc))
defer listener.Stop() defer listener.Stop()
resp, err := http.Post(createURL(listener, "http", "/write", ""), "", bytes.NewBuffer([]byte(hugeMetricString+testMsgs))) resp, err := http.Post(createURL(listener, "http", "/write", ""), "", bytes.NewBufferString(hugeMetricString+testMsgs))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
//todo: with the new parser, long lines aren't a problem. Do we need to skip them? //todo: with the new parser, long lines aren't a problem. Do we need to skip them?
@ -611,7 +611,7 @@ func TestWriteHighTraffic(t *testing.T) {
go func(innerwg *sync.WaitGroup) { go func(innerwg *sync.WaitGroup) {
defer innerwg.Done() defer innerwg.Done()
for i := 0; i < 500; i++ { for i := 0; i < 500; i++ {
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(testMsgs))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(testMsgs))
if err != nil { if err != nil {
return return
} }
@ -644,7 +644,7 @@ func TestReceive404ForInvalidEndpoint(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/foobar", ""), "", bytes.NewBuffer([]byte(testMsg))) resp, err := http.Post(createURL(listener, "http", "/foobar", ""), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 404, resp.StatusCode) require.EqualValues(t, 404, resp.StatusCode)
@ -664,7 +664,7 @@ func TestWriteInvalid(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(badMsg))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(badMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 400, resp.StatusCode) require.EqualValues(t, 400, resp.StatusCode)
@ -684,7 +684,7 @@ func TestWriteEmpty(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBuffer([]byte(emptyMsg))) resp, err := http.Post(createURL(listener, "http", "/write", "db=mydb"), "", bytes.NewBufferString(emptyMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -770,7 +770,7 @@ func TestWriteWithPrecision(t *testing.T) {
msg := "xyzzy value=42 1422568543\n" msg := "xyzzy value=42 1422568543\n"
resp, err := http.Post( resp, err := http.Post(
createURL(listener, "http", "/write", "precision=s"), "", bytes.NewBuffer([]byte(msg))) createURL(listener, "http", "/write", "precision=s"), "", bytes.NewBufferString(msg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -800,7 +800,7 @@ func TestWriteWithPrecisionNoTimestamp(t *testing.T) {
msg := "xyzzy value=42\n" msg := "xyzzy value=42\n"
resp, err := http.Post( resp, err := http.Post(
createURL(listener, "http", "/write", "precision=s"), "", bytes.NewBuffer([]byte(msg))) createURL(listener, "http", "/write", "precision=s"), "", bytes.NewBufferString(msg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -848,7 +848,7 @@ func TestWriteUpstreamParseErrors(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", ""), "", bytes.NewBuffer([]byte(tt.input))) resp, err := http.Post(createURL(listener, "http", "/write", ""), "", bytes.NewBufferString(tt.input))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 400, resp.StatusCode) require.EqualValues(t, 400, resp.StatusCode)
@ -890,7 +890,7 @@ func TestWriteParseErrors(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/write", ""), "", bytes.NewBuffer([]byte(tt.input))) resp, err := http.Post(createURL(listener, "http", "/write", ""), "", bytes.NewBufferString(tt.input))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 400, resp.StatusCode) require.EqualValues(t, 400, resp.StatusCode)

40
plugins/inputs/influxdb_v2_listener/influxdb_v2_listener_test.go
View File

@ -126,7 +126,7 @@ func TestWriteSecureNoClientAuth(t *testing.T) {
} }
// post single message to listener // post single message to listener
resp, err := noClientAuthClient.Post(createURL(listener, "https", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := noClientAuthClient.Post(createURL(listener, "https", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -141,7 +141,7 @@ func TestWriteSecureWithClientAuth(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := getSecureClient().Post(createURL(listener, "https", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := getSecureClient().Post(createURL(listener, "https", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -157,7 +157,7 @@ func TestWriteTokenAuth(t *testing.T) {
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("POST", createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), bytes.NewBuffer([]byte(testMsg))) req, err := http.NewRequest("POST", createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
req.Header.Set("Authorization", "Token "+token) req.Header.Set("Authorization", "Token "+token)
resp, err := client.Do(req) resp, err := client.Do(req)
@ -178,7 +178,7 @@ func TestWriteKeepBucket(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(testMsg))) resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -190,7 +190,7 @@ func TestWriteKeepBucket(t *testing.T) {
) )
// post single message to listener with a database tag in it already. It should be clobbered. // post single message to listener with a database tag in it already. It should be clobbered.
resp, err = http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(testMsgWithDB))) resp, err = http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(testMsgWithDB))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -202,7 +202,7 @@ func TestWriteKeepBucket(t *testing.T) {
) )
// post multiple message to listener // post multiple message to listener
resp, err = http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(testMsgs))) resp, err = http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(testMsgs))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -231,7 +231,7 @@ func TestWriteNoNewline(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(testMsgNoNewline))) resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(testMsgNoNewline))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -256,7 +256,7 @@ func TestAllOrNothing(t *testing.T) {
require.NoError(t, listener.Start(acc)) require.NoError(t, listener.Start(acc))
defer listener.Stop() defer listener.Stop()
resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(testPartial))) resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(testPartial))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 400, resp.StatusCode) require.EqualValues(t, 400, resp.StatusCode)
@ -339,7 +339,7 @@ func TestWriteLargeLine(t *testing.T) {
require.NoError(t, listener.Start(acc)) require.NoError(t, listener.Start(acc))
defer listener.Stop() defer listener.Stop()
resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(hugeMetricString+testMsgs))) resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(hugeMetricString+testMsgs))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
//todo: with the new parser, long lines aren't a problem. Do we need to skip them? //todo: with the new parser, long lines aren't a problem. Do we need to skip them?
@ -451,7 +451,7 @@ func TestWriteHighTraffic(t *testing.T) {
go func(innerwg *sync.WaitGroup) { go func(innerwg *sync.WaitGroup) {
defer innerwg.Done() defer innerwg.Done()
for i := 0; i < 500; i++ { for i := 0; i < 500; i++ {
resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(testMsgs))) resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(testMsgs))
if err != nil { if err != nil {
return return
} }
@ -484,7 +484,7 @@ func TestReceive404ForInvalidEndpoint(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/foobar", ""), "", bytes.NewBuffer([]byte(testMsg))) resp, err := http.Post(createURL(listener, "http", "/foobar", ""), "", bytes.NewBufferString(testMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 404, resp.StatusCode) require.EqualValues(t, 404, resp.StatusCode)
@ -504,7 +504,7 @@ func TestWriteInvalid(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(badMsg))) resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(badMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 400, resp.StatusCode) require.EqualValues(t, 400, resp.StatusCode)
@ -524,7 +524,7 @@ func TestWriteEmpty(t *testing.T) {
defer listener.Stop() defer listener.Stop()
// post single message to listener // post single message to listener
resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBuffer([]byte(emptyMsg))) resp, err := http.Post(createURL(listener, "http", "/api/v2/write", "bucket=mybucket"), "", bytes.NewBufferString(emptyMsg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -566,7 +566,7 @@ func TestWriteWithPrecision(t *testing.T) {
msg := "xyzzy value=42 1422568543\n" msg := "xyzzy value=42 1422568543\n"
resp, err := http.Post( resp, err := http.Post(
createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s"), "", bytes.NewBuffer([]byte(msg))) createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s"), "", bytes.NewBufferString(msg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -592,7 +592,7 @@ func TestWriteWithPrecisionNoTimestamp(t *testing.T) {
msg := "xyzzy value=42\n" msg := "xyzzy value=42\n"
resp, err := http.Post( resp, err := http.Post(
createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s"), "", bytes.NewBuffer([]byte(msg))) createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s"), "", bytes.NewBufferString(msg))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -614,12 +614,12 @@ func TestRateLimitedConnectionDropsSecondRequest(t *testing.T) {
msg := "xyzzy value=42\n" msg := "xyzzy value=42\n"
postURL := createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s") postURL := createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s")
resp, err := http.Post(postURL, "", bytes.NewBuffer([]byte(msg))) // #nosec G107 -- url has to be dynamic due to dynamic port number resp, err := http.Post(postURL, "", bytes.NewBufferString(msg)) // #nosec G107 -- url has to be dynamic due to dynamic port number
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
resp, err = http.Post(postURL, "", bytes.NewBuffer([]byte(msg))) // #nosec G107 -- url has to be dynamic due to dynamic port number resp, err = http.Post(postURL, "", bytes.NewBufferString(msg)) // #nosec G107 -- url has to be dynamic due to dynamic port number
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 429, resp.StatusCode) require.EqualValues(t, 429, resp.StatusCode)
@ -634,7 +634,7 @@ func TestRateLimitedConnectionAcceptsNewRequestOnDelivery(t *testing.T) {
msg := "xyzzy value=42\n" msg := "xyzzy value=42\n"
postURL := createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s") postURL := createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s")
resp, err := http.Post(postURL, "", bytes.NewBuffer([]byte(msg))) // #nosec G107 -- url has to be dynamic due to dynamic port number resp, err := http.Post(postURL, "", bytes.NewBufferString(msg)) // #nosec G107 -- url has to be dynamic due to dynamic port number
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -644,7 +644,7 @@ func TestRateLimitedConnectionAcceptsNewRequestOnDelivery(t *testing.T) {
m.Accept() m.Accept()
} }
resp, err = http.Post(postURL, "", bytes.NewBuffer([]byte(msg))) // #nosec G107 -- url has to be dynamic due to dynamic port number resp, err = http.Post(postURL, "", bytes.NewBufferString(msg)) // #nosec G107 -- url has to be dynamic due to dynamic port number
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 204, resp.StatusCode) require.EqualValues(t, 204, resp.StatusCode)
@ -659,7 +659,7 @@ func TestRateLimitedConnectionRejectsBatchesLargerThanMaxUndeliveredMetrics(t *t
msg := "xyzzy value=42\nxyzzy value=43" msg := "xyzzy value=42\nxyzzy value=43"
postURL := createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s") postURL := createURL(listener, "http", "/api/v2/write", "bucket=mybucket&precision=s")
resp, err := http.Post(postURL, "", bytes.NewBuffer([]byte(msg))) // #nosec G107 -- url has to be dynamic due to dynamic port number resp, err := http.Post(postURL, "", bytes.NewBufferString(msg)) // #nosec G107 -- url has to be dynamic due to dynamic port number
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
require.EqualValues(t, 413, resp.StatusCode) require.EqualValues(t, 413, resp.StatusCode)

2
plugins/inputs/nsd/nsd_test.go
View File

@ -12,7 +12,7 @@ import (
func NSDControl(output string) func(string, config.Duration, bool, string, string) (*bytes.Buffer, error) { func NSDControl(output string) func(string, config.Duration, bool, string, string) (*bytes.Buffer, error) {
return func(string, config.Duration, bool, string, string) (*bytes.Buffer, error) { return func(string, config.Duration, bool, string, string) (*bytes.Buffer, error) {
return bytes.NewBuffer([]byte(output)), nil return bytes.NewBufferString(output), nil
} }
} }

2
plugins/inputs/openntpd/openntpd_test.go
View File

@ -12,7 +12,7 @@ import (
func OpenntpdCTL(output string) func(string, config.Duration, bool) (*bytes.Buffer, error) { func OpenntpdCTL(output string) func(string, config.Duration, bool) (*bytes.Buffer, error) {
return func(string, config.Duration, bool) (*bytes.Buffer, error) { return func(string, config.Duration, bool) (*bytes.Buffer, error) {
return bytes.NewBuffer([]byte(output)), nil return bytes.NewBufferString(output), nil
} }
} }

2
plugins/inputs/opensmtpd/opensmtpd_test.go
View File

@ -12,7 +12,7 @@ import (
func SMTPCTL(output string) func(string, config.Duration, bool) (*bytes.Buffer, error) { func SMTPCTL(output string) func(string, config.Duration, bool) (*bytes.Buffer, error) {
return func(string, config.Duration, bool) (*bytes.Buffer, error) { return func(string, config.Duration, bool) (*bytes.Buffer, error) {
return bytes.NewBuffer([]byte(output)), nil return bytes.NewBufferString(output), nil
} }
} }

2
plugins/inputs/snmp_trap/snmp_trap.go
View File

@ -348,7 +348,7 @@ func makeTrapHandler(s *SnmpTrap) gosnmp.TrapHandlerFunc {
} }
case gosnmp.OctetString: case gosnmp.OctetString:
// OctetStrings may contain hex data that needs its own conversion // OctetStrings may contain hex data that needs its own conversion
if !utf8.ValidString(string(v.Value.([]byte)[:])) { if !utf8.Valid(v.Value.([]byte)[:]) {
value = hex.EncodeToString(v.Value.([]byte)) value = hex.EncodeToString(v.Value.([]byte))
} else { } else {
value = v.Value value = v.Value

2
plugins/inputs/unbound/unbound_test.go
View File

@ -11,7 +11,7 @@ import (
func UnboundControl(output string) func(Unbound) (*bytes.Buffer, error) { func UnboundControl(output string) func(Unbound) (*bytes.Buffer, error) {
return func(Unbound) (*bytes.Buffer, error) { return func(Unbound) (*bytes.Buffer, error) {
return bytes.NewBuffer([]byte(output)), nil return bytes.NewBufferString(output), nil
} }
} }

2
plugins/inputs/varnish/varnish_test.go
View File

@ -17,7 +17,7 @@ import (
func fakeVarnishRunner(output string) func(string, bool, []string, config.Duration) (*bytes.Buffer, error) { func fakeVarnishRunner(output string) func(string, bool, []string, config.Duration) (*bytes.Buffer, error) {
return func(string, bool, []string, config.Duration) (*bytes.Buffer, error) { return func(string, bool, []string, config.Duration) (*bytes.Buffer, error) {
return bytes.NewBuffer([]byte(output)), nil return bytes.NewBufferString(output), nil
} }
} }

2
plugins/inputs/win_perf_counters/win_perf_counters.go
View File

@ -357,7 +357,7 @@ func (m *WinPerfCounters) ParseConfig() error {
m.Sources = []string{"localhost"} m.Sources = []string{"localhost"}
} }
if len(m.Object) <= 0 { if len(m.Object) == 0 {
err := errors.New("no performance objects configured") err := errors.New("no performance objects configured")
return err return err
} }

15
plugins/outputs/sql/sql_test.go
View File

@ -1,12 +1,12 @@
package sql package sql
import ( import (
"bytes"
"fmt" "fmt"
"io" "io"
"math/rand" "math/rand"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"testing" "testing"
"time" "time"
@ -230,11 +230,10 @@ func TestMysqlIntegration(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 0, rc) require.Equal(t, 0, rc)
bytes, err := io.ReadAll(out) b, err := io.ReadAll(out)
require.NoError(t, err) require.NoError(t, err)
fmt.Println(string(bytes)) return bytes.Contains(b, expected)
return strings.Contains(string(bytes), string(expected))
}, 10*time.Second, 500*time.Millisecond, tc.expectedFile) }, 10*time.Second, 500*time.Millisecond, tc.expectedFile)
} }
} }
@ -318,10 +317,10 @@ func TestPostgresIntegration(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 0, rc) require.Equal(t, 0, rc)
bytes, err := io.ReadAll(out) b, err := io.ReadAll(out)
require.NoError(t, err) require.NoError(t, err)
return strings.Contains(string(bytes), string(expected)) return bytes.Contains(b, expected)
}, 5*time.Second, 500*time.Millisecond) }, 5*time.Second, 500*time.Millisecond)
} }
@ -402,9 +401,9 @@ func TestClickHouseIntegration(t *testing.T) {
"SHOW CREATE TABLE \\\"" + tc.table + "\\\"\"", "SHOW CREATE TABLE \\\"" + tc.table + "\\\"\"",
}) })
require.NoError(t, err) require.NoError(t, err)
bytes, err := io.ReadAll(out) b, err := io.ReadAll(out)
require.NoError(t, err) require.NoError(t, err)
return strings.Contains(string(bytes), tc.expected) return bytes.Contains(b, []byte(tc.expected))
}, 5*time.Second, 500*time.Millisecond) }, 5*time.Second, 500*time.Millisecond)
} }
} }

2
plugins/serializers/prometheusremotewrite/prometheusremotewrite_test.go
View File

@ -707,7 +707,7 @@ func prompbToText(data []byte) ([]byte, error) {
} }
samples := protoToSamples(&req) samples := protoToSamples(&req)
for _, sample := range samples { for _, sample := range samples {
buf.Write([]byte(fmt.Sprintf("%s %s\n", sample.Metric.String(), sample.Value.String()))) buf.WriteString(fmt.Sprintf("%s %s\n", sample.Metric.String(), sample.Value.String()))
} }
return buf.Bytes(), nil return buf.Bytes(), nil

2
tools/readme_config_includer/generator.go
View File

@ -225,7 +225,7 @@ func main() {
// Copy everything up to the beginning of the block we want to replace and make sure we get a newline // Copy everything up to the beginning of the block we want to replace and make sure we get a newline
output.Write(readme[offset:b.Start]) output.Write(readme[offset:b.Start])
if !bytes.HasSuffix(output.Bytes(), []byte("\n")) { if !bytes.HasSuffix(output.Bytes(), []byte("\n")) {
output.Write([]byte("\n")) output.WriteString("\n")
} }
offset = b.Stop offset = b.Stop