Make Go linter happy (#47106) (#47207)

* Use calls with context

* Replace io/ioutil uses

* Mark type conversion as safe

* Remove unnecessary loops

* Added missing import

* Pass parent context

* Simplify logic

* Bumping up Node.js command timeout to 30s

* Use calls with context

* Pass parent context

(cherry picked from commit d319703)

Co-authored-by: Shaunak Kashyap <[email protected]>

Author: mergify[bot]

dev-tools/mage/gotest.go

@@ -164,15 +164,18 @@ func DefaultGoWindowsTestIntegrationArgs() GoTestArgs {
 
 // DefaultGoTestIntegrationArgs returns a default set of arguments for running
 // all integration tests. We tag integration test files with 'integration'.
-func DefaultGoTestIntegrationArgs() GoTestArgs {
+func DefaultGoTestIntegrationArgs(ctx context.Context) GoTestArgs {
 	args := makeGoTestArgs("Integration")
 	args.Tags = append(args.Tags, "integration")
 
-	synth := exec.Command("npx", "@elastic/synthetics", "-h")
+	cmdCtx, cmdCancel := context.WithTimeout(ctx, 5*time.Second)
+	defer cmdCancel()
+
+	synth := exec.CommandContext(cmdCtx, "npx", "@elastic/synthetics", "-h")
 	if synth.Run() == nil {
 		// Run an empty journey to ensure playwright can be loaded
 		// catches situations like missing playwright deps
-		cmd := exec.Command("sh", "-c", "echo 'step(\"t\", () => { })' | elastic-synthetics --inline")
+		cmd := exec.CommandContext(cmdCtx, "sh", "-c", "echo 'step(\"t\", () => { })' | elastic-synthetics --inline")
 		var out strings.Builder
 		cmd.Stdout = &out
 		cmd.Stderr = &out
@@ -195,17 +198,17 @@ func DefaultGoTestIntegrationArgs() GoTestArgs {
 
 // DefaultGoTestIntegrationFromHostArgs returns a default set of arguments for running
 // all integration tests from the host system (outside the docker network).
-func DefaultGoTestIntegrationFromHostArgs() GoTestArgs {
-	args := DefaultGoTestIntegrationArgs()
+func DefaultGoTestIntegrationFromHostArgs(ctx context.Context) GoTestArgs {
+	args := DefaultGoTestIntegrationArgs(ctx)
 	args.Env = WithGoIntegTestHostEnv(args.Env)
 	return args
 }
 
 // FIPSOnlyGoTestIngrationFromHostArgs returns a default set of arguments for running
 // all integration tests from the host system (outside the docker network) along
 // with the GODEBUG=fips140=only arg set.
-func FIPSOnlyGoTestIntegrationFromHostArgs() GoTestArgs {
-	args := DefaultGoTestIntegrationArgs()
+func FIPSOnlyGoTestIntegrationFromHostArgs(ctx context.Context) GoTestArgs {
+	args := DefaultGoTestIntegrationArgs(ctx)
 	args.Tags = append(args.Tags, "requirefips")
 	args.Env = WithGoIntegTestHostEnv(args.Env)
 	args.Env["GODEBUG"] = "fips140=only"

dev-tools/mage/target/integtest/integtest.go

@@ -70,7 +70,7 @@ func GoIntegTest(ctx context.Context) error {
 		return err
 	}
 	return runner.Test("goIntegTest", func() error {
-		return devtools.GoTest(ctx, devtools.DefaultGoTestIntegrationArgs())
+		return devtools.GoTest(ctx, devtools.DefaultGoTestIntegrationArgs(ctx))
 	})
 }
 

filebeat/magefile.go

@@ -196,13 +196,13 @@ func IntegTest() {
 // GoIntegTest starts the docker containers and executes the Go integration tests.
 func GoIntegTest(ctx context.Context) error {
 	mg.Deps(BuildSystemTestBinary)
-	return devtools.GoIntegTestFromHost(ctx, devtools.DefaultGoTestIntegrationFromHostArgs())
+	return devtools.GoIntegTestFromHost(ctx, devtools.DefaultGoTestIntegrationFromHostArgs(ctx))
 }
 
 // GoFIPSOnlyIntegTest starts the docker containers and executes the Go integration tests with GODEBUG=fips140=only set.
 func GoFIPSOnlyIntegTest(ctx context.Context) error {
 	mg.Deps(BuildSystemTestBinary)
-	return devtools.GoIntegTestFromHost(ctx, devtools.FIPSOnlyGoTestIntegrationFromHostArgs())
+	return devtools.GoIntegTestFromHost(ctx, devtools.FIPSOnlyGoTestIntegrationFromHostArgs(ctx))
 }
 
 // PythonIntegTest starts the docker containers and executes the Python integration tests.

heartbeat/hbtest/hbtestutil.go

@@ -22,7 +22,6 @@ import (
 	"crypto/x509"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/bits"
 	"net"
 	"net/http"
@@ -128,7 +127,7 @@ func ServerPort(server *httptest.Server) (uint16, error) {
 	if err != nil {
 		return 0, err
 	}
-	return uint16(p), nil
+	return uint16(p), nil //nolint:gosec // G115 Conversion from int to unit16 is safe here.
 }
 
 // TLSChecks validates the given x509 cert at the given position.
@@ -277,7 +276,7 @@ func RespondingTCPChecks() validator.Validator {
 func CertToTempFile(t *testing.T, cert *x509.Certificate) *os.File {
 	// Write the certificate to a tempFile. Heartbeat would normally read certs from
 	// disk, not memory, so this little bit of extra work is worthwhile
-	certFile, err := ioutil.TempFile("", "sslcert")
+	certFile, err := os.CreateTemp("", "sslcert")
 	require.NoError(t, err)
 	_, _ = certFile.WriteString(x509util.CertToPEMString(cert))
 	return certFile

heartbeat/magefile.go

@@ -98,7 +98,7 @@ func IntegTest() {
 
 func GoIntegTest(ctx context.Context) error {
 	if runtime.GOOS != "windows" {
-		return devtools.GoIntegTestFromHost(ctx, devtools.DefaultGoTestIntegrationFromHostArgs())
+		return devtools.GoIntegTestFromHost(ctx, devtools.DefaultGoTestIntegrationFromHostArgs(ctx))
 	}
 	return nil
 }

heartbeat/monitors/active/http/http_test.go

@@ -20,11 +20,11 @@ package http
 import (
 	"bytes"
 	"compress/gzip"
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -579,7 +579,7 @@ func TestHTTPSx509Auth(t *testing.T) {
 	certReader, err := file.ReadOpen(clientCertPath)
 	require.NoError(t, err)
 
-	clientCertBytes, err := ioutil.ReadAll(certReader)
+	clientCertBytes, err := io.ReadAll(certReader)
 	require.NoError(t, err)
 
 	clientCerts := x509.NewCertPool()
@@ -762,7 +762,12 @@ func httpConnectTunnel(writer http.ResponseWriter, request *http.Request) {
 		http.Error(writer, "Only CONNECT method is supported", http.StatusMethodNotAllowed)
 		return
 	}
-	destConn, err := net.DialTimeout("tcp", request.Host, 10*time.Second)
+
+	dialCtx, dialCancel := context.WithTimeout(request.Context(), 10*time.Second)
+	defer dialCancel()
+
+	dialer := &net.Dialer{}
+	destConn, err := dialer.DialContext(dialCtx, "tcp", request.Host)
 	if err != nil {
 		http.Error(writer, err.Error(), http.StatusServiceUnavailable)
 		return

libbeat/magefile.go

@@ -76,7 +76,7 @@ func IntegTest() {
 // GoIntegTest starts the docker containers and executes the Go integration tests.
 func GoIntegTest(ctx context.Context) error {
 	mg.Deps(Fields, devtools.BuildSystemTestBinary)
-	args := devtools.DefaultGoTestIntegrationFromHostArgs()
+	args := devtools.DefaultGoTestIntegrationFromHostArgs(ctx)
 	// ES_USER must be admin in order for the Go Integration tests to function because they require
 	// indices:data/read/search
 	args.Env["ES_USER"] = args.Env["ES_SUPERUSER_USER"]

libbeat/processors/add_kubernetes_metadata/indexers.go

@@ -90,9 +90,7 @@ func NewIndexers(configs PluginConfig, metaGen metadata.MetaGen) *Indexers {
 func (i *Indexers) GetIndexes(pod *kubernetes.Pod) []string {
 	var indexes []string
 	for _, indexer := range i.indexers {
-		for _, i := range indexer.GetIndexes(pod) {
-			indexes = append(indexes, i)
-		}
+		indexes = append(indexes, indexer.GetIndexes(pod)...)
 	}
 	return indexes
 }
@@ -101,20 +99,14 @@ func (i *Indexers) GetIndexes(pod *kubernetes.Pod) []string {
 func (i *Indexers) GetMetadata(pod *kubernetes.Pod) []MetadataIndex {
 	var metadata []MetadataIndex
 	for _, indexer := range i.indexers {
-		for _, m := range indexer.GetMetadata(pod) {
-			metadata = append(metadata, m)
-		}
+		metadata = append(metadata, indexer.GetMetadata(pod)...)
 	}
 	return metadata
 }
 
 // Empty returns true if indexers list is empty
 func (i *Indexers) Empty() bool {
-	if len(i.indexers) == 0 {
-		return true
-	}
-
-	return false
+	return len(i.indexers) == 0
 }
 
 // PodNameIndexer implements default indexer based on pod name

x-pack/agentbeat/magefile.go

@@ -215,7 +215,7 @@ func IntegTest() {
 // GoIntegTest starts the docker containers and executes the Go integration tests.
 func GoIntegTest(ctx context.Context) error {
 	mg.Deps(BuildSystemTestBinary)
-	args := devtools.DefaultGoTestIntegrationFromHostArgs()
+	args := devtools.DefaultGoTestIntegrationFromHostArgs(ctx)
 	args.Tags = append(args.Tags, "agentbeat")
 	for _, beat := range getIncludedBeats() {
 		// matricbeat integration test TestIndexTotalFieldsLimitNotReached fails with
@@ -237,7 +237,7 @@ func SystemTest(ctx context.Context) error {
 	if slices.Contains(getIncludedBeats(), "packetbeat") {
 		mg.SerialDeps(xpacketbeat.GetNpcapInstallerFn("../packetbeat"), Update, devtools.BuildSystemTestBinary)
 
-		args := devtools.DefaultGoTestIntegrationArgs()
+		args := devtools.DefaultGoTestIntegrationArgs(ctx)
 		args.Packages = []string{"../packetbeat/tests/system/..."}
 		args.Tags = append(args.Tags, "agentbeat")
 

x-pack/filebeat/magefile.go

@@ -175,7 +175,7 @@ func IntegTest() {
 func GoIntegTest(ctx context.Context) error {
 	// build integration test binary with otel sub command
 	devtools.BuildSystemTestOTelBinary()
-	args := devtools.DefaultGoTestIntegrationFromHostArgs()
+	args := devtools.DefaultGoTestIntegrationFromHostArgs(ctx)
 	// ES_USER must be admin in order for the Go Integration tests to function because they require
 	// indices:data/read/search
 	args.Env["ES_USER"] = args.Env["ES_SUPERUSER_USER"]
@@ -187,7 +187,7 @@ func GoIntegTest(ctx context.Context) error {
 func GoFIPSOnlyIntegTest(ctx context.Context) error {
 	// build integration test binary with otel sub command
 	devtools.BuildSystemTestOTelBinary()
-	args := devtools.DefaultGoTestIntegrationFromHostArgs()
+	args := devtools.DefaultGoTestIntegrationFromHostArgs(ctx)
 	// ES_USER must be admin in order for the Go Integration tests to function because they require
 	// indices:data/read/search
 	args.Env["ES_USER"] = args.Env["ES_SUPERUSER_USER"]