Merge branch 'stderr-process-response' into 'master'

fix(engine): ignore stderr buffer of the process while reading command response, consider exit code only

See merge request postgres-ai/database-lab!782

Author: agneum

engine/internal/retrieval/engine/postgres/snapshot/physical.go

@@ -902,8 +902,10 @@ func (p *PhysicalInitial) checkRecovery(ctx context.Context, containerID string)
 
 	log.Msg("Check recovery command", checkRecoveryCmd)
 
-	output, err := tools.ExecCommandWithOutput(ctx, p.dockerClient, containerID, types.ExecConfig{
-		Cmd: checkRecoveryCmd,
+	output, err := tools.ExecCommandWithResponse(ctx, p.dockerClient, containerID, types.ExecConfig{
+		Cmd:          checkRecoveryCmd,
+		AttachStderr: false,
+		AttachStdout: true,
 	})
 
 	return output, err

engine/internal/retrieval/engine/postgres/tools/tools.go

@@ -539,18 +539,27 @@ func inspectCommandExitCode(ctx context.Context, dockerClient *client.Client, co
 	return errors.Errorf("exit code: %d", inspect.ExitCode)
 }
 
-// ExecCommandWithOutput runs command in Docker container and returns the command output.
+// ExecCommandWithOutput runs command in Docker container, enables all stdout and stderr and returns the command output.
 func ExecCommandWithOutput(ctx context.Context, dockerClient *client.Client, containerID string, execCfg types.ExecConfig) (string, error) {
 	execCfg.AttachStdout = true
 	execCfg.AttachStderr = true
 
-	execCommand, err := dockerClient.ContainerExecCreate(ctx, containerID, execCfg)
+	return execCommandWithResponse(ctx, dockerClient, containerID, execCfg)
+}
+
+// ExecCommandWithResponse runs command in Docker container and returns the command output.
+func ExecCommandWithResponse(ctx context.Context, docker *client.Client, containerID string, execCfg types.ExecConfig) (string, error) {
+	return execCommandWithResponse(ctx, docker, containerID, execCfg)
+}
+
+func execCommandWithResponse(ctx context.Context, docker *client.Client, containerID string, execCfg types.ExecConfig) (string, error) {
+	execCommand, err := docker.ContainerExecCreate(ctx, containerID, execCfg)
 
 	if err != nil {
 		return "", errors.Wrap(err, "failed to create an exec command")
 	}
 
-	attachResponse, err := dockerClient.ContainerExecAttach(ctx, execCommand.ID, types.ExecStartCheck{})
+	attachResponse, err := docker.ContainerExecAttach(ctx, execCommand.ID, types.ExecStartCheck{})
 	if err != nil {
 		return "", errors.Wrap(err, "failed to attach to exec command")
 	}
@@ -562,7 +571,7 @@ func ExecCommandWithOutput(ctx context.Context, dockerClient *client.Client, con
 		return string(output), errors.Wrap(err, "failed to read response of exec command")
 	}
 
-	inspection, err := dockerClient.ContainerExecInspect(ctx, execCommand.ID)
+	inspection, err := docker.ContainerExecInspect(ctx, execCommand.ID)
 	if err != nil {
 		return "", fmt.Errorf("failed to inspect an exec process: %w", err)
 	}
@@ -599,7 +608,7 @@ func processAttachResponse(ctx context.Context, reader io.Reader) ([]byte, error
 	}
 
 	if errBuf.Len() > 0 {
-		return nil, errors.New(errBuf.String())
+		log.Dbg(errBuf.String())
 	}
 
 	return bytes.TrimSpace(outBuf.Bytes()), nil