[9.3](backport #49838) idxmgmt: remove redundant beatPaths parameter (#50249)

* idxmgmt: remove redundant beatPaths parameter (#49838)

NewESClientHandler and NewFileClientHandler accepted both beat.Info
and *paths.Path. Now that Info carries Paths, drop the separate
argument and pass info.Paths to the downstream template loaders.

(cherry picked from commit 8b7236f)

# Conflicts:
#	libbeat/cmd/export/ilm_policy.go
#	libbeat/cmd/export/template.go
#	libbeat/cmd/instance/beat.go

* Resolve backport conflicts in libbeat/cmd

---------

Co-authored-by: Orestis Floros <orestis.floros@elastic.co>

Author: mergify[bot]

libbeat/cmd/export/ilm_policy.go

@@ -45,7 +45,7 @@ func GenGetILMPolicyCmd(settings instance.Settings) *cobra.Command {
 			// the way this works, we decide to export ILM or DSL based on the user's config.
 			// This means that if a user has no index management config, we'll default to ILM, regardless of what the user
 			// is connected to. Might not be a problem since a user who doesn't have any custom lifecycle config has nothing to export?
-			clientHandler, err := idxmgmt.NewFileClientHandler(newIdxmgmtClient(dir, version), b.Info, b.Info.Paths, b.Config.LifecycleConfig)
+			clientHandler, err := idxmgmt.NewFileClientHandler(newIdxmgmtClient(dir, version), b.Info, b.Config.LifecycleConfig)
 			if err != nil {
 				fatalf("error creating file handler: %s", err)
 			}

libbeat/cmd/export/template.go

@@ -47,7 +47,7 @@ func GenTemplateConfigCmd(settings instance.Settings) *cobra.Command {
 				fatalfInitCmd(err)
 			}
 
-			clientHandler, err := idxmgmt.NewFileClientHandler(newIdxmgmtClient(dir, version), b.Info, b.Info.Paths, b.Config.LifecycleConfig)
+			clientHandler, err := idxmgmt.NewFileClientHandler(newIdxmgmtClient(dir, version), b.Info, b.Config.LifecycleConfig)
 			if err != nil {
 				fatalf("error creating file handler: %s", err)
 			}

libbeat/cmd/instance/beat.go

@@ -690,7 +690,7 @@ func (b *Beat) Setup(settings Settings, bt beat.Creator, setup SetupSettings) er
 				loadILM = idxmgmt.LoadModeEnabled
 			}
 
-			mgmtHandler, err := idxmgmt.NewESClientHandler(esClient, b.Info, b.Info.Paths, b.Config.LifecycleConfig)
+			mgmtHandler, err := idxmgmt.NewESClientHandler(esClient, b.Info, b.Config.LifecycleConfig)
 			if err != nil {
 				return fmt.Errorf("error creating index management handler: %w", err)
 			}
@@ -1134,7 +1134,7 @@ func (b *Beat) registerESIndexManagement() error {
 
 func (b *Beat) indexSetupCallback() elasticsearch.ConnectCallback {
 	return func(esClient *eslegclient.Connection, _ *logp.Logger) error {
-		mgmtHandler, err := idxmgmt.NewESClientHandler(esClient, b.Info, b.Info.Paths, b.Config.LifecycleConfig)
+		mgmtHandler, err := idxmgmt.NewESClientHandler(esClient, b.Info, b.Config.LifecycleConfig)
 		if err != nil {
 			return fmt.Errorf("error creating index management handler: %w", err)
 		}

libbeat/idxmgmt/client_handler.go

@@ -23,7 +23,6 @@ import (
 	"github.com/elastic/beats/v7/libbeat/beat"
 	"github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle"
 	"github.com/elastic/beats/v7/libbeat/template"
-	"github.com/elastic/elastic-agent-libs/paths"
 	"github.com/elastic/elastic-agent-libs/version"
 )
 
@@ -60,12 +59,12 @@ func NewClientHandler(ilm lifecycle.ClientHandler, template template.Loader) Cli
 
 // NewESClientHandler returns a new ESLoader instance,
 // initialized with an ilm and template client handler based on the passed in client.
-func NewESClientHandler(client ESClient, info beat.Info, beatPaths *paths.Path, cfg lifecycle.RawConfig) (ClientHandler, error) {
+func NewESClientHandler(client ESClient, info beat.Info, cfg lifecycle.RawConfig) (ClientHandler, error) {
 	esHandler, err := lifecycle.NewESClientHandler(client, info, cfg)
 	if err != nil {
 		return nil, fmt.Errorf("error creating ES handler: %w", err)
 	}
-	loader, err := template.NewESLoader(client, esHandler, info.Logger, beatPaths)
+	loader, err := template.NewESLoader(client, esHandler, info.Logger, info.Paths)
 	if err != nil {
 		return nil, fmt.Errorf("error creating ES loader: %w", err)
 	}
@@ -74,10 +73,10 @@ func NewESClientHandler(client ESClient, info beat.Info, beatPaths *paths.Path,
 
 // NewFileClientHandler returns a new ESLoader instance,
 // initialized with an ilm and template client handler based on the passed in client.
-func NewFileClientHandler(client FileClient, info beat.Info, beatPaths *paths.Path, cfg lifecycle.RawConfig) (ClientHandler, error) {
+func NewFileClientHandler(client FileClient, info beat.Info, cfg lifecycle.RawConfig) (ClientHandler, error) {
 	mgmt, err := lifecycle.NewFileClientHandler(client, info, cfg)
 	if err != nil {
 		return nil, fmt.Errorf("error creating client handler: %w", err)
 	}
-	return NewClientHandler(mgmt, template.NewFileLoader(client, mgmt.Mode() == lifecycle.DSL, info.Logger, beatPaths)), nil
+	return NewClientHandler(mgmt, template.NewFileLoader(client, mgmt.Mode() == lifecycle.DSL, info.Logger, info.Paths)), nil
 }