pass unprivileged flag to store migration (#4688) (#4700)

(cherry picked from commit 25c9efd)

Co-authored-by: Paolo Chilà <paolo.chila@elastic.co>

Author: mergify[bot]

internal/pkg/agent/storage/store/state_store.go

@@ -75,13 +75,13 @@ type stateSerializer struct {
 }
 
 // NewStateStoreWithMigration creates a new state store and migrates the old one.
-func NewStateStoreWithMigration(ctx context.Context, log *logger.Logger, actionStorePath, stateStorePath string) (*StateStore, error) {
-	err := migrateStateStore(ctx, log, actionStorePath, stateStorePath)
+func NewStateStoreWithMigration(ctx context.Context, log *logger.Logger, actionStorePath, stateStorePath string, storageOpts ...storage.EncryptedOptionFunc) (*StateStore, error) {
+	err := migrateStateStore(ctx, log, actionStorePath, stateStorePath, storageOpts...)
 	if err != nil {
 		return nil, err
 	}
 
-	encryptedDiskStore, err := storage.NewEncryptedDiskStore(ctx, stateStorePath)
+	encryptedDiskStore, err := storage.NewEncryptedDiskStore(ctx, stateStorePath, storageOpts...)
 	if err != nil {
 		return nil, fmt.Errorf("error instantiating encrypted disk store: %w", err)
 	}
@@ -147,14 +147,14 @@ func NewStateStore(log *logger.Logger, store storeLoad) (*StateStore, error) {
 	}, nil
 }
 
-func migrateStateStore(ctx context.Context, log *logger.Logger, actionStorePath, stateStorePath string) (err error) {
+func migrateStateStore(ctx context.Context, log *logger.Logger, actionStorePath, stateStorePath string, storageOpts ...storage.EncryptedOptionFunc) (err error) {
 	log = log.Named("state_migration")
 	actionDiskStore, err := storage.NewDiskStore(actionStorePath)
 	if err != nil {
 		return fmt.Errorf("error creating disk store: %w", err)
 	}
 
-	stateDiskStore, err := storage.NewEncryptedDiskStore(ctx, stateStorePath)
+	stateDiskStore, err := storage.NewEncryptedDiskStore(ctx, stateStorePath, storageOpts...)
 	if err != nil {
 		return fmt.Errorf("error instantiating encrypted disk store: %w", err)
 	}

internal/pkg/config/operations/inspector.go

@@ -55,7 +55,7 @@ func LoadFullAgentConfig(ctx context.Context, logger *logger.Logger, cfgPath str
 		return c, nil
 	}
 
-	fleetConfig, err := loadFleetConfig(ctx, logger)
+	fleetConfig, err := loadFleetConfig(ctx, logger, unprivileged)
 	if err != nil {
 		return nil, fmt.Errorf("error obtaining fleet config: %w", err)
 	} else if fleetConfig == nil {
@@ -115,8 +115,8 @@ func loadConfig(ctx context.Context, configPath string, unprivileged bool) (*con
 	return rawConfig, nil
 }
 
-func loadFleetConfig(ctx context.Context, l *logger.Logger) (map[string]interface{}, error) {
-	stateStore, err := store.NewStateStoreWithMigration(ctx, l, paths.AgentActionStoreFile(), paths.AgentStateStoreFile())
+func loadFleetConfig(ctx context.Context, l *logger.Logger, unprivileged bool) (map[string]interface{}, error) {
+	stateStore, err := store.NewStateStoreWithMigration(ctx, l, paths.AgentActionStoreFile(), paths.AgentStateStoreFile(), storage.WithUnprivileged(unprivileged))
 	if err != nil {
 		return nil, err
 	}