testing simplified logic

gauntlet/gauntlet.go

@@ -2,7 +2,6 @@
 package gauntlet
 
 import (
-	"bufio"
 	"errors"
 	"fmt"
 	"os"
@@ -73,7 +72,6 @@ type ExecCommandOptions struct {
 //
 //	It will also check for any errors you specify in the output via the errHandling slice.
 func (g *Gauntlet) ExecCommand(args []string, options ExecCommandOptions) (string, error) {
-	output := ""
 	var updatedArgs []string
 	if g.Command == "gauntlet" {
 		updatedArgs = append([]string{g.Command}, args...)
@@ -89,39 +87,16 @@ func (g *Gauntlet) ExecCommand(args []string, options ExecCommandOptions) (strin
 	if execDir != "" {
 		cmd.Dir = execDir
 	}
-	stdout, _ := cmd.StdoutPipe()
-	stderr, _ := cmd.StderrPipe()
-	cmdErr := cmd.Start()
-
-	reader := bufio.NewReader(stdout)
-	line, err := reader.ReadString('\n')
-	for err == nil {
-		log.Info().Str("stdout", line).Msg(g.Command)
-		output = fmt.Sprintf("%s%s", output, line)
-
-		log.Info().Str("stdout buffer", fmt.Sprintf("%d %d", reader.Buffered(), reader.Size())).Msg(g.Command)
-		if reader.Buffered() == 0 {
-			break
-		}
-		line, err = reader.ReadString('\n')
-	}
-
-	reader = bufio.NewReader(stderr)
-	line, err = reader.ReadString('\n')
-	for err == nil {
-		log.Info().Str("stderr", line).Msg(g.Command)
-		output = fmt.Sprintf("%s%s", output, line)
+	stdoutStdErr, err := cmd.CombinedOutput()
+	output := string(stdoutStdErr)
 
-		log.Info().Str("stderr buffer", fmt.Sprintf("%d %d", reader.Buffered(), reader.Size())).Msg(g.Command)
-		if reader.Buffered() == 0 {
-			break
-		}
-		line, err = reader.ReadString('\n')
+	for _, line := range strings.Split(output, "\n") {
+		log.Info().Str("stdoutStdErr", line)
 	}
 
 	// return cmdErr from before, after stdout + stderr logging
-	if cmdErr != nil {
-		return output, cmdErr
+	if err != nil {
+		return output, err
 	}
 
 	if options.CheckErrorsInRead {
@@ -131,13 +106,6 @@ func (g *Gauntlet) ExecCommand(args []string, options ExecCommandOptions) (strin
 		}
 	}
 
-	if strings.Compare("EOF", err.Error()) > 0 {
-		return output, err
-	}
-
-	// catch any exit codes
-	err = cmd.Wait()
-
 	log.Debug().Str("Command", g.Command).Msg("command Completed")
 	return output, err
 }