Merge pull request #16 from ctrf-io/fix/log-output

reporter: add build failure handling and output collection

Author: Ma11hewThomas

cmd/go-ctrf-json-reporter/main.go

@@ -8,11 +8,16 @@ import (
 	"os"
 )
 
+var buildFailed bool
+
 func main() {
 	var outputFile string
 	var verbose bool
+	var quiet bool
 	flag.BoolVar(&verbose, "verbose", false, "Enable verbose output")
 	flag.BoolVar(&verbose, "v", false, "Enable verbose output (shorthand)")
+	flag.BoolVar(&quiet, "quiet", false, "Disable all log output")
+	flag.BoolVar(&quiet, "q", false, "Disable all log output (shorthand)")
 	flag.StringVar(&outputFile, "output", "ctrf-report.json", "The output file for the test results")
 	flag.StringVar(&outputFile, "o", "ctrf-report.json", "The output file for the test results (shorthand)")
 
@@ -57,15 +62,44 @@ func main() {
 		}
 	}
 
-	report, err := reporter.ParseTestResults(os.Stdin, verbose, env)
+	effectiveVerbose := verbose && !quiet
+
+	report, err := reporter.ParseTestResults(os.Stdin, effectiveVerbose, env)
 	if err != nil {
-		_, _ = fmt.Fprintf(os.Stderr, "Error parsing test results: %v\n", err)
+		if !quiet {
+			_, _ = fmt.Fprintf(os.Stderr, "Error parsing test results: %v\n", err)
+		}
 		os.Exit(1)
 	}
 
 	err = reporter.WriteReportToFile(outputFile, report)
 	if err != nil {
-		_, _ = fmt.Fprintf(os.Stderr, "Error writing the report to file: %v\n", err)
+		if !quiet {
+			_, _ = fmt.Fprintf(os.Stderr, "Error writing the report to file: %v\n", err)
+		}
+		os.Exit(1)
+	}
+
+	if !verbose && !quiet {
+		buildOutput := reporter.GetBuildOutput()
+		fmt.Println(buildOutput)
+	}
+
+	if report.Results.Extra != nil {
+		extraMap := report.Results.Extra.(map[string]interface{})
+		if _, ok := extraMap["buildFail"]; ok {
+			buildFailed = true
+		}
+		if _, ok := extraMap["FailedBuild"]; ok {
+			buildFailed = true
+		}
+	}
+
+	if report.Results.Summary.Failed > 0 {
+		buildFailed = true
+	}
+
+	if buildFailed {
 		os.Exit(1)
 	}
 }

reporter/reporter.go

@@ -23,6 +23,8 @@ type TestEvent struct {
 	Output  string
 }
 
+var buildOutput []string
+
 func ParseTestResults(r io.Reader, verbose bool, env *ctrf.Environment) (*ctrf.Report, error) {
 	var testEvents []TestEvent
 	decoder := json.NewDecoder(r)
@@ -47,6 +49,43 @@ func ParseTestResults(r io.Reader, verbose bool, env *ctrf.Environment) (*ctrf.R
 			}
 			fmt.Println(string(jsonEvent))
 		}
+
+		if event.Action == "build-output" || event.Action == "build-fail" || event.Action == "fail" {
+			if report.Results.Extra == nil {
+				report.Results.Extra = make(map[string]interface{})
+			}
+			extraMap := report.Results.Extra.(map[string]interface{})
+
+			if event.Action == "fail" {
+				if _, ok := extraMap["FailedBuild"]; !ok {
+					extraMap["FailedBuild"] = true
+				}
+			}
+
+			if event.Action == "build-output" {
+				if _, ok := extraMap["buildOutput"]; !ok {
+					extraMap["buildOutput"] = []TestEvent{}
+				}
+				buildOutputEvents := extraMap["buildOutput"].([]TestEvent)
+				extraMap["buildOutput"] = append(buildOutputEvents, event)
+				buildOutput = append(buildOutput, event.Output)
+				continue
+			}
+
+			if event.Action == "build-fail" {
+				if _, ok := extraMap["buildFail"]; !ok {
+					extraMap["buildFail"] = []TestEvent{}
+				}
+				buildFailEvents := extraMap["buildFail"].([]TestEvent)
+				extraMap["buildFail"] = append(buildFailEvents, event)
+				break
+			}
+		}
+
+		if event.Action == "output" {
+			buildOutput = append(buildOutput, event.Output)
+		}
+
 		if event.Test == "" {
 			continue
 		}
@@ -162,6 +201,10 @@ func WriteReportToFile(filename string, report *ctrf.Report) error {
 	return nil
 }
 
+func GetBuildOutput() string {
+	return strings.Join(buildOutput, "")
+}
+
 func secondsToMillis(seconds float64) int64 {
 	return int64(seconds * 1000)
 }