[Ingest Manager] Refactor: remove deadcode (elastic#24715)

[Ingest Manager] Refactor: remove deadcode (elastic#24715)

x-pack/elastic-agent/pkg/agent/application/config_test.go

@@ -5,12 +5,9 @@
 package application
 
 import (
-	"io/ioutil"
 	"testing"
 	"time"
 
-	"gopkg.in/yaml.v2"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -77,9 +74,3 @@ func mustWithConfigMode(standalone bool) *config.Config {
 		},
 	)
 }
-
-func dumpToYAML(t *testing.T, out string, in interface{}) {
-	b, err := yaml.Marshal(in)
-	require.NoError(t, err)
-	ioutil.WriteFile(out, b, 0600)
-}

x-pack/elastic-agent/pkg/agent/application/filters/stream_checker_test.go

@@ -16,8 +16,6 @@ import (
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/core/logger"
 )
 
-const semiLongString = ""
-
 func TestStreamCheck(t *testing.T) {
 	type testCase struct {
 		name      string

x-pack/elastic-agent/pkg/agent/application/gateway/fleet/fleet_gateway_test.go

@@ -164,7 +164,7 @@ func wrapStrToResp(code int, body string) *http.Response {
 		ProtoMinor:    1,
 		Body:          ioutil.NopCloser(bytes.NewBufferString(body)),
 		ContentLength: int64(len(body)),
-		Header:        make(http.Header, 0),
+		Header:        make(http.Header),
 	}
 }
 

x-pack/elastic-agent/pkg/agent/application/managed_mode.go

@@ -7,9 +7,6 @@ package application
 import (
 	"context"
 	"fmt"
-	"io"
-	"net/http"
-	"net/url"
 
 	"github.com/elastic/go-sysinfo"
 
@@ -48,16 +45,6 @@ import (
 	logreporter "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/reporter/log"
 )
 
-type apiClient interface {
-	Send(
-		method string,
-		path string,
-		params url.Values,
-		headers http.Header,
-		body io.Reader,
-	) (*http.Response, error)
-}
-
 type stateStore interface {
 	Add(fleetapi.Action)
 	AckToken() string
@@ -73,7 +60,6 @@ type Managed struct {
 	cancelCtxFn context.CancelFunc
 	log         *logger.Logger
 	Config      configuration.FleetAgentConfig
-	api         apiClient
 	agentInfo   *info.AgentInfo
 	gateway     gateway.FleetGateway
 	router      pipeline.Router

x-pack/elastic-agent/pkg/agent/application/pipeline/dispatcher/dispatcher_test.go

@@ -84,6 +84,7 @@ func TestActionDispatcher(t *testing.T) {
 		action := &mockActionUnknown{}
 		err = d.Dispatch(ack, action)
 
+		require.NoError(t, err)
 		require.True(t, def.called)
 		require.Equal(t, action, def.received)
 	})

x-pack/elastic-agent/pkg/agent/application/pipeline/emitter/modifiers/monitoring_decorator.go

@@ -42,7 +42,6 @@ func InjectMonitoring(agentInfo *info.AgentInfo, outputGroup string, rootAst *tr
 		},
 	}
 
-	config := make(map[string]interface{})
 	// if monitoring is not specified use default one where everything is enabled
 	if _, found := transpiler.Lookup(rootAst, monitoringKey); !found {
 		monitoringNode := transpiler.NewDict([]transpiler.Node{
@@ -72,7 +71,7 @@ func InjectMonitoring(agentInfo *info.AgentInfo, outputGroup string, rootAst *tr
 		return programsToRun, err
 	}
 
-	config, err = ast.Map()
+	config, err := ast.Map()
 	if err != nil {
 		return programsToRun, err
 	}

x-pack/elastic-agent/pkg/agent/application/pipeline/stream/operator_stream.go

@@ -8,13 +8,11 @@ import (
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/application/pipeline"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/configrequest"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/core/logger"
-	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/core/monitoring"
 )
 
 type operatorStream struct {
 	configHandler pipeline.ConfigHandler
 	log           *logger.Logger
-	monitor       monitoring.Monitor
 }
 
 func (b *operatorStream) Close() error {

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

@@ -181,7 +181,7 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, flags *globalFlags, args
 	}
 
 	// prompt only when it is not forced and is already enrolled
-	if !force && (cfg.Fleet != nil && cfg.Fleet.Enabled == true) {
+	if !force && (cfg.Fleet != nil && cfg.Fleet.Enabled) {
 		confirm, err := c.Confirm("This will replace your current settings. Do you want to continue?", true)
 		if err != nil {
 			return errors.New(err, "problem reading prompt response")

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

@@ -53,11 +53,6 @@ type saver interface {
 	Save(io.Reader) error
 }
 
-type storeLoad interface {
-	saver
-	Load() (io.ReadCloser, error)
-}
-
 // enrollCmd is an enroll subcommand that interacts between the Kibana API and the Agent.
 type enrollCmd struct {
 	log          *logger.Logger
@@ -218,6 +213,10 @@ func (c *enrollCmd) fleetServerBootstrap(ctx context.Context) error {
 		c.options.FleetServer.ConnStr, c.options.FleetServer.PolicyID,
 		c.options.FleetServer.Host, c.options.FleetServer.Port,
 		c.options.FleetServer.Cert, c.options.FleetServer.CertKey, c.options.FleetServer.ElasticsearchCA)
+	if err != nil {
+		return err
+	}
+
 	configToStore := map[string]interface{}{
 		"fleet": fleetConfig,
 	}

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

@@ -329,7 +329,7 @@ func exposeMetricsEndpoint(log *logger.Logger, config *common.Config, ns func(st
 			} else {
 				content = string(bytes)
 			}
-			fmt.Fprintf(w, content)
+			fmt.Fprint(w, content)
 		}
 	}
 

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

@@ -81,7 +81,7 @@ func watchCmd(streams *cli.IOStreams, cmd *cobra.Command, flags *globalFlags, ar
 
 	isWithinGrace, tilGrace := gracePeriod(marker)
 	if !isWithinGrace {
-		log.Debugf("not within grace [updatedOn %v] %v", marker.UpdatedOn.String(), time.Now().Sub(marker.UpdatedOn).String())
+		log.Debugf("not within grace [updatedOn %v] %v", marker.UpdatedOn.String(), time.Since(marker.UpdatedOn).String())
 		// if it is started outside of upgrade loop
 		// if we're not within grace and marker is still there it might mean
 		// that cleanup was not performed ok, cleanup everything except current version
@@ -172,7 +172,7 @@ WATCHLOOP:
 // gracePeriod returns true if it is within grace period and time until grace period ends.
 // otherwise it returns false and 0
 func gracePeriod(marker *upgrade.UpdateMarker) (bool, time.Duration) {
-	sinceUpdate := time.Now().Sub(marker.UpdatedOn)
+	sinceUpdate := time.Since(marker.UpdatedOn)
 
 	if 0 < sinceUpdate && sinceUpdate < gracePeriodDuration {
 		return true, gracePeriodDuration - sinceUpdate

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

@@ -78,12 +78,10 @@ type Client interface {
 
 // client manages the state and communication to the Elastic Agent.
 type client struct {
-	ctx     context.Context
-	cancel  context.CancelFunc
-	wg      sync.WaitGroup
-	client  proto.ElasticAgentControlClient
-	cfgLock sync.RWMutex
-	obsLock sync.RWMutex
+	ctx    context.Context
+	cancel context.CancelFunc
+	wg     sync.WaitGroup
+	client proto.ElasticAgentControlClient
 }
 
 // New creates a client connection to Elastic Agent.

x-pack/elastic-agent/pkg/agent/install/uninstall.go

@@ -176,6 +176,9 @@ func programsFromConfig(cfg *config.Config) ([]program.Program, error) {
 	}
 
 	ppMap, err := program.Programs(agentInfo, ast)
+	if err != nil {
+		return nil, errors.New("failed to get programs from config", err)
+	}
 
 	var pp []program.Program
 	check := make(map[string]bool)
@@ -196,6 +199,10 @@ func programsFromConfig(cfg *config.Config) ([]program.Program, error) {
 
 func applyDynamics(ctx context.Context, log *logger.Logger, cfg *config.Config) (*config.Config, error) {
 	cfgMap, err := cfg.ToMapStr()
+	if err != nil {
+		return nil, err
+	}
+
 	ast, err := transpiler.NewAST(cfgMap)
 	if err != nil {
 		return nil, err
@@ -204,7 +211,7 @@ func applyDynamics(ctx context.Context, log *logger.Logger, cfg *config.Config)
 	// apply dynamic inputs
 	inputs, ok := transpiler.Lookup(ast, "inputs")
 	if ok {
-		varsArray := make([]*transpiler.Vars, 0, 0)
+		varsArray := make([]*transpiler.Vars, 0)
 		var wg sync.WaitGroup
 		wg.Add(1)
 		varsCallback := func(vv []*transpiler.Vars) {
@@ -246,5 +253,9 @@ func applyDynamics(ctx context.Context, log *logger.Logger, cfg *config.Config)
 	}
 
 	finalConfig, err := newAst.Map()
+	if err != nil {
+		return nil, err
+	}
+
 	return config.NewConfigFrom(finalConfig)
 }

x-pack/elastic-agent/pkg/agent/operation/common_test.go

@@ -129,7 +129,7 @@ func waitFor(t *testing.T, check func() error) {
 		if err == nil {
 			return
 		}
-		if time.Now().Sub(started) >= 15*time.Second {
+		if time.Since(started) >= 15*time.Second {
 			t.Fatalf("check timed out after 15 second: %s", err)
 		}
 		time.Sleep(10 * time.Millisecond)

x-pack/elastic-agent/pkg/agent/operation/operator.go

@@ -152,7 +152,7 @@ func (o *Operator) HandleConfig(cfg configrequest.Request) error {
 	o.statusController.UpdateStateID(stateID)
 
 	for _, step := range steps {
-		if strings.ToLower(step.ProgramSpec.Cmd) != strings.ToLower(monitoringName) {
+		if !strings.EqualFold(step.ProgramSpec.Cmd, monitoringName) {
 			if _, isSupported := program.SupportedMap[strings.ToLower(step.ProgramSpec.Cmd)]; !isSupported {
 				// mark failed, new config cannot be run
 				msg := fmt.Sprintf("program '%s' is not supported", step.ProgramSpec.Cmd)
@@ -344,8 +344,3 @@ func (o *Operator) deleteApp(p Descriptor) {
 	o.logger.Debugf("operator is removing %s from app collection: %v", p.ID(), o.apps)
 	delete(o.apps, id)
 }
-
-func isMonitorable(descriptor Descriptor) bool {
-	isSidecar := app.IsSidecar(descriptor)
-	return !isSidecar // everything is monitorable except sidecar
-}

x-pack/elastic-agent/pkg/agent/stateresolver/resolve.go

@@ -27,8 +27,6 @@ const (
 	unchangedState                        // UNCHANGED
 )
 
-type id string
-
 // state represent the SHOULD state of the system, contains a reference to the actual bundle of
 // configuration received by the upstream call and keep track of the last change executed on a program.
 //

x-pack/elastic-agent/pkg/agent/stateresolver/stateresolver_test.go

@@ -38,7 +38,7 @@ func TestStateResolverAcking(t *testing.T) {
 		ack()
 
 		// Current sate is not empty lets try to resolve the same configuration.
-		_, _, steps, ack, err = r.Resolve(submit)
+		_, _, steps, _, err = r.Resolve(submit)
 		require.NoError(t, err)
 		require.Equal(t, 0, len(steps))
 	})

x-pack/elastic-agent/pkg/agent/storage/storage.go

@@ -26,10 +26,6 @@ type Store interface {
 	Save(io.Reader) error
 }
 
-type load interface {
-	Load() (io.ReadCloser, error)
-}
-
 // NullStore this is only use to split the work into multiples PRs.
 type NullStore struct{}
 

x-pack/elastic-agent/pkg/agent/transpiler/ast.go

@@ -611,7 +611,7 @@ func (s *BoolVal) Find(key string) (Node, bool) {
 }
 
 func (s *BoolVal) String() string {
-	if s.value == true {
+	if s.value {
 		return "true"
 	}
 	return "false"
@@ -1077,7 +1077,7 @@ func Insert(a *AST, node Node, to Selector) error {
 // to create 2 different sub AST and want to merge them together again.
 func Combine(a, b *AST) (*AST, error) {
 	newAST := &AST{}
-	if reflect.TypeOf(b.root) != reflect.TypeOf(b.root) {
+	if reflect.TypeOf(a.root) != reflect.TypeOf(b.root) {
 		return nil, fmt.Errorf("incompatible node type to combine, received %T and %T", a, b)
 	}
 

x-pack/elastic-agent/pkg/agent/transpiler/rules.go

@@ -953,7 +953,7 @@ func (r *TranslateWithRegexpRule) Apply(_ AgentInfo, ast *AST) error {
 		return fmt.Errorf("cannot rename, invalid type expected 'Key' received '%T'", node)
 	}
 
-	candidate, ok := n.value.(Node).Value().(string)
+	candidate, ok := n.value.Value().(string)
 	if !ok {
 		return fmt.Errorf("cannot filter on value expected 'string' and received %T", candidate)
 	}
@@ -1170,7 +1170,7 @@ func (r *FilterValuesRule) Apply(_ AgentInfo, ast *AST) error {
 		}
 
 		for _, v := range r.Values {
-			if v == n.value.(Node).Value() {
+			if v == n.value.Value() {
 				newNodes = append(newNodes, item)
 				break
 			}
@@ -1282,7 +1282,7 @@ func (r *FilterValuesWithRegexpRule) Apply(_ AgentInfo, ast *AST) error {
 			continue
 		}
 
-		candidate, ok := n.value.(Node).Value().(string)
+		candidate, ok := n.value.Value().(string)
 		if !ok {
 			return fmt.Errorf("cannot filter on value expected 'string' and received %T", candidate)
 		}

x-pack/elastic-agent/pkg/agent/transpiler/vars.go

@@ -97,7 +97,7 @@ func (v *Vars) Lookup(name string) (interface{}, bool) {
 func nodeToValue(node Node) Node {
 	switch n := node.(type) {
 	case *Key:
-		return n.value.(Node)
+		return n.value
 	}
 	return node
 }