"added ability to output curl command to multiple files"

Author: jr-frazier

.gitignore

@@ -2,6 +2,7 @@
 release
 .vscode
 .idea
+.history
 
 # Created by https://www.gitignore.io
 

cmd/curl.go

@@ -35,14 +35,15 @@ var (
 			if err != nil {
 				return err
 			}
-			return chkRunError(runCurl(c, args[0], curlHead, curlInsecure, curlHTTP2, from, nodeIDs, curlLimit))
+			return chkRunError(runCurl(c, args[0], curlHead, curlInsecure, curlHTTP2, from, nodeIDs, curlLimit, fileOut))
 		},
 	}
 
 	curlHead     bool
 	curlInsecure bool
 	curlHTTP2    bool
 	curlLimit    int
+	fileOut      string
 )
 
 func initCurlCmd(parentCmd *cobra.Command) {
@@ -52,11 +53,13 @@ func initCurlCmd(parentCmd *cobra.Command) {
 	curlCmd.Flags().BoolVarP(&curlInsecure, "insecure", "k", false, "Allow curl to proceed for server connections considered insecure")
 	curlCmd.Flags().BoolVarP(&curlHTTP2, "http2", "", false, "Use HTTP version 2")
 	curlCmd.Flags().IntVarP(&curlLimit, "limit", "L", 1, "The maximum number of nodes to use")
+	curlCmd.Flags().StringVarP(&fileOut, "file", "f", "", "output to file")
 
 	parentCmd.AddCommand(curlCmd)
 }
 
-func runCurl(c *perfops.Client, target string, head, insecure, http2 bool, from string, nodeIDs []int, limit int) error {
+func runCurl(c *perfops.Client, target string, head, insecure, http2 bool, from string, nodeIDs []int, limit int, fileOut string) error {
+
 	ctx := context.Background()
 	curlReq := &perfops.CurlRequest{
 		Target:   target,
@@ -100,6 +103,7 @@ func runCurl(c *perfops.Client, target string, head, insecure, http2 bool, from
 		if o, err = res.Output(); err != nil {
 			return err
 		}
+
 		if !outputJSON && o != nil {
 			f.StopSpinner()
 			internal.PrintOutput(f, o)
@@ -108,6 +112,10 @@ func runCurl(c *perfops.Client, target string, head, insecure, http2 bool, from
 			break
 		}
 	}
+	if len(fileOut) > 0 {
+		f.StopSpinner()
+		internal.OutputToFile(f, o, fileOut)
+	}
 	if outputJSON {
 		f.StopSpinner()
 		internal.PrintOutputJSON(o)

cmd/internal/runtest.go

@@ -14,11 +14,13 @@
 package internal
 
 import (
+	"bufio"
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"io"
+	"os"
 	"strings"
 	"sync"
 	"time"
@@ -110,6 +112,93 @@ func RunTest(ctx context.Context, target, location string, nodeIDs []int, limit
 	return nil
 }
 
+func formatFileName(name string, index int) string {
+	split := strings.Split(name, ".")
+
+	n := split[len(split)-2]
+	split[len(split)-2] = fmt.Sprintf("%v-%x", n, index+1)
+
+	return strings.Join(split, ".")
+
+}
+
+// Outputs perfops response to a file
+func OutputToFile(f *Formatter, output *perfops.RunOutput, fileOut string) {
+	if f.printID {
+		f.Printf("Test ID: %v\n", output.ID)
+	}
+	spinner := f.s.Step()
+	if !output.IsFinished() {
+		f.Printf("%s", spinner)
+		if len(output.Items) > 1 {
+			finished := 0
+			for _, item := range output.Items {
+				if item.Result.IsFinished() {
+					finished++
+				}
+			}
+			f.Printf(" %d/%d", finished, len(output.Items))
+		}
+		f.Printf("\n")
+	}
+	for i, item := range output.Items {
+		r := item.Result
+		n := r.Node
+		if item.Result.Message == "" {
+			o := r.Output
+			if o == "-2" {
+				o = "The command timed-out. It either took too long to execute or we could not connect to your target at all."
+			} else if a, ok := o.([]interface{}); ok {
+				sb := strings.Builder{}
+				for _, i := range a {
+					sb.WriteString(fmt.Sprintf("%s\n", i))
+				}
+				s := sb.String()
+				o = s[:len(s)-1]
+			}
+
+			fileName := ""
+
+			if len(output.Items) > 1 {
+				fileName = formatFileName(fileOut, i)
+			} else {
+				fileName = fileOut
+			}
+
+			file, _ := os.Create(fileName)
+			defer file.Close()
+
+			w := bufio.NewWriter(file)
+
+			fmt.Fprintf(w, "Node%d, AS%d, %s, %s\n%s\n", n.ID, n.AsNumber, n.City, n.Country.Name, o)
+
+			w.Flush()
+
+		} else if r.Message != "NO DATA" {
+			fileName := ""
+
+			if len(output.Items) > 1 {
+				fileName = formatFileName(fileOut, i)
+			} else {
+				fileName = fileOut
+			}
+
+			file, _ := os.Create(fileName)
+			defer file.Close()
+
+			w := bufio.NewWriter(file)
+
+			fmt.Fprintf(w, "Node%d, AS%d, %s, %s\n%s\n", n.ID, n.AsNumber, n.City, n.Country.Name, r.Message)
+
+			w.Flush()
+		}
+		if !item.Result.IsFinished() {
+			f.Printf("%s\n", spinner)
+		}
+	}
+	f.Flush(!output.IsFinished())
+}
+
 // PrintOutput prints run items that have been data.
 func PrintOutput(f *Formatter, output *perfops.RunOutput) {
 	if f.printID {
@@ -144,6 +233,9 @@ func PrintOutput(f *Formatter, output *perfops.RunOutput) {
 				s := sb.String()
 				o = s[:len(s)-1]
 			}
+			if len(output.Items) > 1 {
+				fmt.Println("Greater Than One")
+			}
 			f.Printf("Node%d, AS%d, %s, %s\n%s\n", n.ID, n.AsNumber, n.City, n.Country.Name, o)
 		} else if r.Message != "NO DATA" {
 			f.Printf("Node%d, AS%d, %s, %s\n%s\n", n.ID, n.AsNumber, n.City, n.Country.Name, r.Message)