Add pre-hook to load paths overrides in container (#1875)

Author: michalpristas

internal/pkg/agent/cmd/common.go

@@ -35,6 +35,9 @@ func NewCommand() *cobra.Command {
 func NewCommandWithArgs(args []string, streams *cli.IOStreams) *cobra.Command {
 	cmd := &cobra.Command{
 		Use: "elastic-agent [subcommand]",
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			return tryContainerLoadPaths()
+		},
 	}
 
 	// path flags

internal/pkg/agent/cmd/diagnostics.go

@@ -50,15 +50,10 @@ func diagnosticCmd(streams *cli.IOStreams, cmd *cobra.Command) error {
 		fileName = "elastic-agent-diagnostics-" + ts.Format("2006-01-02T15-04-05Z07-00") + ".zip" // RFC3339 format that replaces : with -, so it will work on Windows
 	}
 
-	err := tryContainerLoadPaths()
-	if err != nil {
-		return err
-	}
-
 	ctx := handleSignal(context.Background())
 
 	daemon := client.New()
-	err = daemon.Connect(ctx)
+	err := daemon.Connect(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to connect to daemon: %w", err)
 	}

internal/pkg/agent/cmd/inspect.go

@@ -126,11 +126,6 @@ type inspectConfigOpts struct {
 }
 
 func inspectConfig(ctx context.Context, cfgPath string, opts inspectConfigOpts, streams *cli.IOStreams) error {
-	err := tryContainerLoadPaths()
-	if err != nil {
-		return err
-	}
-
 	l, err := newErrorLogger()
 	if err != nil {
 		return err
@@ -236,12 +231,6 @@ func inspectComponents(ctx context.Context, cfgPath string, opts inspectComponen
 		return err
 	}
 
-	// Ensure that when running inside a container that the correct paths are used.
-	err = tryContainerLoadPaths()
-	if err != nil {
-		return err
-	}
-
 	// Load the requirements before trying to load the configuration. These should always load
 	// even if the configuration is wrong.
 	platform, err := component.LoadPlatformDetail()

internal/pkg/agent/cmd/status.go

@@ -49,11 +49,6 @@ func newStatusCommand(_ []string, streams *cli.IOStreams) *cobra.Command {
 }
 
 func statusCmd(streams *cli.IOStreams, cmd *cobra.Command, args []string) error {
-	err := tryContainerLoadPaths()
-	if err != nil {
-		return err
-	}
-
 	output, _ := cmd.Flags().GetString("output")
 	outputFunc, ok := statusOutputs[output]
 	if !ok {