Fix linter

x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go

@@ -7,9 +7,9 @@ package cmd
 import (
 	"bytes"
 	"context"
+	stderror "errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"os/exec"
@@ -269,7 +269,7 @@ func (c *enrollCmd) writeDelayEnroll(streams *cli.IOStreams) error {
 			errors.TypeConfig,
 			errors.M("path", enrollPath))
 	}
-	err = ioutil.WriteFile(enrollPath, data, 0600)
+	err = os.WriteFile(enrollPath, data, 0600)
 	if err != nil {
 		return errors.New(
 			err,
@@ -602,7 +602,7 @@ func (c *enrollCmd) startAgent(ctx context.Context) (<-chan *os.ProcessState, er
 
 func (c *enrollCmd) stopAgent() {
 	if c.agentProc != nil {
-		c.agentProc.StopWait()
+		c.agentProc.StopWait() //nolint:errcheck // no error check here
 		c.agentProc = nil
 	}
 }
@@ -664,7 +664,7 @@ func waitForAgent(ctx context.Context, timeout time.Duration) error {
 		for {
 			backOff.Wait()
 			_, err := getDaemonStatus(innerCtx)
-			if err == context.Canceled {
+			if stderror.Is(err, context.Canceled) {
 				resChan <- waitResult{err: err}
 				return
 			}
@@ -714,7 +714,7 @@ func waitForFleetServer(ctx context.Context, agentSubproc <-chan *os.ProcessStat
 		for {
 			backExp.Wait()
 			status, err := getDaemonStatus(innerCtx)
-			if err == context.Canceled {
+			if stderror.Is(err, context.Canceled) {
 				resChan <- waitResult{err: err}
 				return
 			}
@@ -827,7 +827,7 @@ func safelyStoreAgentInfo(s saver, reader io.Reader) error {
 	for i := 0; i <= maxRetriesstoreAgentInfo; i++ {
 		backExp.Wait()
 		err = storeAgentInfo(s, reader)
-		if err != filelock.ErrAppAlreadyRunning {
+		if stderror.Is(err, filelock.ErrAppAlreadyRunning) {
 			break
 		}
 	}
@@ -841,7 +841,7 @@ func storeAgentInfo(s saver, reader io.Reader) error {
 	if err := fileLock.TryLock(); err != nil {
 		return err
 	}
-	defer fileLock.Unlock()
+	defer fileLock.Unlock() //nolint:errcheck // defered call
 
 	if err := s.Save(reader); err != nil {
 		return errors.New(err, "could not save enrollment information", errors.TypeFilesystem)

x-pack/elastic-agent/pkg/agent/control/server/server.go

@@ -152,7 +152,7 @@ func (s *Server) Upgrade(ctx context.Context, request *cproto.UpgradeRequest) (*
 	}
 	cb, err := u.Upgrade(ctx, &upgradeRequest{request}, false, request.SkipVerify, request.PgpBytes...)
 	if err != nil {
-		return &cproto.UpgradeResponse{
+		return &cproto.UpgradeResponse{ //nolint:nilerr // error is wrapped in response
 			Status: cproto.ActionStatus_FAILURE,
 			Error:  err.Error(),
 		}, nil
@@ -235,7 +235,13 @@ func (s *Server) ProcMeta(ctx context.Context, _ *cproto.Empty) (*cproto.ProcMet
 				endpoint = "npipe"
 			}
 
-			res, err := client.Get("http://" + endpoint + "/")
+			req, err := http.NewRequestWithContext(ctx, "GET", "http://"+endpoint+"/", nil)
+			if err != nil {
+				procMeta.Error = err.Error()
+				resp.Procs = append(resp.Procs, procMeta)
+				continue
+			}
+			res, err := client.Do(req)
 			if err != nil {
 				procMeta.Error = err.Error()
 				resp.Procs = append(resp.Procs, procMeta)