Cherry-pick #18161 to 7.x: Follow home path for all config files

x-pack/elastic-agent/CHANGELOG.asciidoc

@@ -42,4 +42,5 @@
 - Allow CLI overrides of paths {pull}17781[17781]
 - Enable Filebeat input: S3, Azureeventhub, cloudfoundry, httpjson, netflow, o365audit. {pull}17909[17909]
 - Use data subfolder as default for process logs {pull}17960[17960]
+- Follow home path for all config files {pull}18161[18161]
 - Do not require unnecessary configuration {pull}18003[18003]

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

@@ -8,24 +8,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/application/info"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/errors"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/config"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/kibana"
 	fleetreporter "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/reporter/fleet"
 	logreporter "github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/reporter/log"
 )
 
-// TODO(ph) correctly setup global path.
-func fleetAgentConfigPath() string {
-	return info.AgentConfigFile
-}
-
-// TODO(ph) correctly setup with global path.
-func fleetActionStoreFile() string {
-	return info.AgentActionStoreFile
-}
-
 // Config define the configuration of the Agent.
 type Config struct {
 	Management *config.Config `config:"management"`

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

@@ -91,7 +91,7 @@ func NewEnrollCmd(
 	store := storage.NewReplaceOnSuccessStore(
 		configPath,
 		DefaultAgentFleetConfig,
-		storage.NewEncryptedDiskStore(fleetAgentConfigPath(), []byte("")),
+		storage.NewEncryptedDiskStore(info.AgentConfigFile(), []byte("")),
 	)
 
 	return NewEnrollCmdWithStore(

x-pack/elastic-agent/pkg/agent/application/info/agent_id.go

@@ -8,21 +8,23 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"path/filepath"
 
 	"github.com/gofrs/uuid"
 	"gopkg.in/yaml.v2"
 
+	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/application/paths"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/errors"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/storage"
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/config"
 )
 
-// AgentConfigFile is a name of file used to store agent information
-const AgentConfigFile = "fleet.yml"
+// defaultAgentConfigFile is a name of file used to store agent information
+const defaultAgentConfigFile = "fleet.yml"
 const agentInfoKey = "agent_info"
 
-// AgentActionStoreFile is the file that will contains the action that can be replayed after restart.
-const AgentActionStoreFile = "action_store.yml"
+// defaultAgentActionStoreFile is the file that will contains the action that can be replayed after restart.
+const defaultAgentActionStoreFile = "action_store.yml"
 
 type persistentAgentInfo struct {
 	ID string `json:"ID" yaml:"ID" config:"ID"`
@@ -33,6 +35,16 @@ type ioStore interface {
 	Load() (io.ReadCloser, error)
 }
 
+// AgentConfigFile is a name of file used to store agent information
+func AgentConfigFile() string {
+	return filepath.Join(paths.Home(), defaultAgentConfigFile)
+}
+
+// AgentActionStoreFile is the file that will contains the action that can be replayed after restart.
+func AgentActionStoreFile() string {
+	return filepath.Join(paths.Home(), defaultAgentActionStoreFile)
+}
+
 func generateAgentID() (string, error) {
 	uid, err := uuid.NewV4()
 	if err != nil {
@@ -43,7 +55,8 @@ func generateAgentID() (string, error) {
 }
 
 func loadAgentInfo(forceUpdate bool) (*persistentAgentInfo, error) {
-	s := storage.NewEncryptedDiskStore(AgentConfigFile, []byte(""))
+	agentConfigFile := AgentConfigFile()
+	s := storage.NewEncryptedDiskStore(agentConfigFile, []byte(""))
 
 	agentinfo, err := getInfoFromStore(s)
 	if err != nil {
@@ -67,6 +80,7 @@ func loadAgentInfo(forceUpdate bool) (*persistentAgentInfo, error) {
 }
 
 func getInfoFromStore(s ioStore) (*persistentAgentInfo, error) {
+	agentConfigFile := AgentConfigFile()
 	reader, err := s.Load()
 	if err != nil {
 		return nil, err
@@ -75,9 +89,9 @@ func getInfoFromStore(s ioStore) (*persistentAgentInfo, error) {
 	cfg, err := config.NewConfigFrom(reader)
 	if err != nil {
 		return nil, errors.New(err,
-			fmt.Sprintf("fail to read configuration %s for the agent", AgentConfigFile),
+			fmt.Sprintf("fail to read configuration %s for the agent", agentConfigFile),
 			errors.TypeFilesystem,
-			errors.M(errors.MetaKeyPath, AgentConfigFile))
+			errors.M(errors.MetaKeyPath, agentConfigFile))
 	}
 
 	if err := reader.Close(); err != nil {
@@ -110,16 +124,17 @@ func getInfoFromStore(s ioStore) (*persistentAgentInfo, error) {
 }
 
 func updateAgentInfo(s ioStore, agentInfo *persistentAgentInfo) error {
+	agentConfigFile := AgentConfigFile()
 	reader, err := s.Load()
 	if err != nil {
 		return err
 	}
 
 	cfg, err := config.NewConfigFrom(reader)
 	if err != nil {
-		return errors.New(err, fmt.Sprintf("fail to read configuration %s for the agent", AgentConfigFile),
+		return errors.New(err, fmt.Sprintf("fail to read configuration %s for the agent", agentConfigFile),
 			errors.TypeFilesystem,
-			errors.M(errors.MetaKeyPath, AgentConfigFile))
+			errors.M(errors.MetaKeyPath, agentConfigFile))
 	}
 
 	if err := reader.Close(); err != nil {

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

@@ -68,7 +68,7 @@ func newManaged(
 		return nil, err
 	}
 
-	path := fleetAgentConfigPath()
+	path := info.AgentConfigFile()
 
 	// TODO(ph): Define the encryption password.
 	store := storage.NewEncryptedDiskStore(path, []byte(""))
@@ -138,9 +138,9 @@ func newManaged(
 	batchedAcker := newLazyAcker(acker)
 
 	// Create the action store that will persist the last good policy change on disk.
-	actionStore, err := newActionStore(log, storage.NewDiskStore(fleetActionStoreFile()))
+	actionStore, err := newActionStore(log, storage.NewDiskStore(info.AgentActionStoreFile()))
 	if err != nil {
-		return nil, errors.New(err, fmt.Sprintf("fail to read action store '%s'", fleetActionStoreFile()))
+		return nil, errors.New(err, fmt.Sprintf("fail to read action store '%s'", info.AgentActionStoreFile()))
 	}
 	actionAcker := newActionStoreAcker(batchedAcker, actionStore)