From 37cab1de7adc8fa6ea6382529c43c7da647a3f98 Mon Sep 17 00:00:00 2001
From: Mark Bestavros <mbestavr@redhat.com>
Date: Thu, 5 Oct 2023 18:25:23 -0400
Subject: [PATCH] ec test: implement option to write output to a file

Signed-off-by: Mark Bestavros <mbestavr@redhat.com>
---
 cmd/test/test.go | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/cmd/test/test.go b/cmd/test/test.go
index f017fbeee..cb1d3c6dc 100644
--- a/cmd/test/test.go
+++ b/cmd/test/test.go
@@ -118,6 +118,7 @@ func newTestCommand() *cobra.Command {
 				"no-fail",
 				"suppress-exceptions",
 				"output",
+				"file",
 				"parser",
 				"policy",
 				"proto-file-dirs",
@@ -150,6 +151,11 @@ func newTestCommand() *cobra.Command {
 				return fmt.Errorf("unmarshal parameters: %w", err)
 			}
 
+			outputFilePath, err := cmd.Flags().GetString("file")
+			if err != nil {
+				return fmt.Errorf("reading flag: %w", err)
+			}
+
 			results, resultsErr := runner.Run(ctx, fileList)
 			var exitCode int
 			if runner.FailOnWarn {
@@ -171,7 +177,14 @@ func newTestCommand() *cobra.Command {
 					if err != nil {
 						return appstudioErrorHandler(runner.NoFail, "output results", err)
 					}
-					fmt.Printf("%s\n", reportOutput)
+
+					if outputFilePath != "" {
+						err := os.WriteFile(outputFilePath, reportOutput, 0600)
+						if err != nil {
+							return fmt.Errorf("creating output file: %w", err)
+						}
+					}
+					fmt.Fprintln(cmd.OutOrStdout(), string(reportOutput))
 
 				} else {
 					// Conftest handles the output
@@ -180,15 +193,33 @@ func newTestCommand() *cobra.Command {
 						return fmt.Errorf("running test: %w", resultsErr)
 					}
 
+					var outputFile *os.File
+					if outputFilePath != "" {
+						outputFile, err = os.Create(outputFilePath)
+						if err != nil {
+							return fmt.Errorf("creating output file: %w", err)
+						}
+						defer outputFile.Close()
+					}
+
 					outputter := output.Get(runner.Output, output.Options{
 						NoColor:            runner.NoColor,
 						SuppressExceptions: runner.SuppressExceptions,
 						Tracing:            runner.Trace,
 						JUnitHideMessage:   viper.GetBool("junit-hide-message"),
+						File:               outputFile,
 					})
 					if err := outputter.Output(results); err != nil {
 						return fmt.Errorf("output results: %w", err)
 					}
+
+					if outputFilePath != "" {
+						contents, err := os.ReadFile(outputFile.Name())
+						if err != nil {
+							return fmt.Errorf("copying output file to stdout: %w", err)
+						}
+						fmt.Fprintln(cmd.OutOrStdout(), string(contents))
+					}
 				}
 
 				// When the no-fail parameter is set, there is no need to figure out the error code
@@ -219,6 +250,7 @@ func newTestCommand() *cobra.Command {
 	cmd.Flags().String("capabilities", "", "Path to JSON file that can restrict opa functionality against a given policy. Default: all operations allowed")
 
 	cmd.Flags().StringP("output", "o", output.OutputStandard, fmt.Sprintf("Output format for conftest results - valid options are: %s", append(output.Outputs(), OutputAppstudio)))
+	cmd.Flags().String("file", "", "File path to write output to")
 	cmd.Flags().Bool("junit-hide-message", false, "Do not include the violation message in the JUnit test name")
 
 	cmd.Flags().StringSliceP("policy", "p", []string{"policy"}, "Path to the Rego policy files directory")