Support vertical print

Author: winebarrel

README.md

@@ -59,3 +59,28 @@ ap-northeast-1> source /aws/lambda/my-lambda start=2018/11/19 end=2019/11/21 | f
 $ cat output.jsonl
 {"@timestamp":"2019-04-09 09:38:19.455","@message":"2019-04-09T09:38:19.455Z\tab83228c-6af1-4c0b-a304-e043aecbe84a\tLogEC2InstanceStateChange\n"}
 ```
+
+### Print vertically
+
+```
+ap-northeast-1> source /aws/lambda/my-lambdaap-northeast-1> source /aws/lambda/test start=2018/11/19 end=2019/11/21 | field @timestamp, @message | limit 3 | vertically;
+*************************** 1. row ***************************
+@timestamp: 2019-04-09 09:38:19.455
+@message: REPORT RequestId: ab83228c-6af1-4c0b-a304-e043aecbe84a  Duration: 0.66 ms Billed Duration: 100 ms   Memory Size: 128 MB Max Memory Used: 48 MB
+
+*************************** 2. row ***************************
+@timestamp: 2019-04-09 09:38:19.455
+@message: 2019-04-09T09:38:19.455Z  ab83228c-6af1-4c0b-a304-e043aecbe84a  LogEC2InstanceStateChange
+
+*************************** 3. row ***************************
+@timestamp: 2019-04-09 09:38:19.455
+@message: 2019-04-09T09:38:19.455Z  ab83228c-6af1-4c0b-a304-e043aecbe84a  Received event: {
+  "version": "0",
+  "id": "4b22e040-e3dd-a0aa-84e0-a946526876a7",
+  "detail-type": "AWS API Call via CloudTrail",
+  "source": "aws.ec2",
+  "account": "822997939312",
+  "time": "2019-04-09T09:37:35Z",
+  "region": "ap-northeast-1",
+...
+```

exec/head.go

@@ -140,8 +140,8 @@ func (cmd *headCommand) Start(svc *cloudwatchlogs.CloudWatchLogs, flags *cli.Fla
 
 	for i, event := range events {
 		fmt.Fprintf(out, "*************************** %d. row ***************************\n", i+1)
-		fmt.Fprintf(out, "Timestamp: %d\n", *event.Timestamp)
-		fmt.Fprintf(out, "Message: %s\n", *event.Message)
+		fmt.Fprintf(out, "Timestamp:\t%d\n", *event.Timestamp)
+		fmt.Fprintf(out, "Message:\t%s\n", *event.Message)
 	}
 
 	return

exec/query.go

@@ -18,17 +18,19 @@ import (
 
 const queryWaitInterval = 1
 
-var regexpWuery = regexp.MustCompile(`(?i)^source\s+(\S+)\s+start=(\S+)\s+end=(\S+)\s*\|\s*(.+)$`)
+var regexpQuery = regexp.MustCompile(`(?i)^source\s+(\S+)\s+start=(\S+)\s+end=(\S+)\s*\|\s*(.+)$`)
+var regexpQueryVertically = regexp.MustCompile(`(?i)\|\s*vertically\s*$`)
 
 type queryCommand struct {
 	logGroupName string
 	queryString  string
 	startTime    int64
 	endTime      int64
+	vertically   bool
 }
 
 func parseQuery(str string) (cmd Executable, err error) {
-	submatch := regexpWuery.FindStringSubmatch(str)
+	submatch := regexpQuery.FindStringSubmatch(str)
 
 	if len(submatch) == 0 {
 		err = fmt.Errorf("Invalid query: %s", str)
@@ -37,6 +39,13 @@ func parseQuery(str string) (cmd Executable, err error) {
 
 	logGroupName := submatch[1]
 	queryString := strings.TrimSpace(submatch[4])
+	vertically := false
+
+	if regexpQueryVertically.MatchString(queryString) {
+		queryString = regexpQueryVertically.ReplaceAllString(queryString, "")
+		queryString = strings.TrimSpace(queryString)
+		vertically = true
+	}
 
 	var startTime, endTime time.Time
 	startTime, err = dateparse.ParseLocal(submatch[2])
@@ -58,6 +67,7 @@ func parseQuery(str string) (cmd Executable, err error) {
 		queryString:  queryString,
 		startTime:    startTime.Unix(),
 		endTime:      endTime.Unix(),
+		vertically:   vertically,
 	}
 
 	return
@@ -112,15 +122,31 @@ func escapeJson(str string) string {
 	return string(b)
 }
 
-func printQueryResult(result *cloudwatchlogs.GetQueryResultsOutput, showptr bool, out io.Writer) {
-	if len(result.Results) > 0 {
-		fieldLen := len(result.Results[0])
+func printResultsVertically(results [][]*cloudwatchlogs.ResultField, showptr bool, out io.Writer) {
+	if len(results) > 0 {
+		for i, result := range results {
+			fmt.Fprintf(out, "*************************** %d. row ***************************\n", i+1)
+
+			for _, field := range result {
+				if !showptr && *field.Field == "@ptr" {
+					continue
+				}
+
+				fmt.Fprintf(out, "%s:\t%s\n", *field.Field, *field.Value)
+			}
+		}
+	}
+}
+
+func printResultsHorizontally(results [][]*cloudwatchlogs.ResultField, showptr bool, out io.Writer) {
+	if len(results) > 0 {
+		fieldLen := len(results[0])
 
 		if !showptr {
 			fieldLen--
 		}
 
-		for _, result := range result.Results {
+		for _, result := range results {
 			fmt.Fprint(out, "{")
 
 			for i, field := range result {
@@ -140,16 +166,6 @@ func printQueryResult(result *cloudwatchlogs.GetQueryResultsOutput, showptr bool
 			fmt.Fprintln(out, "}")
 		}
 	}
-
-	fmt.Fprintf(out, "// Status: %s\n", *result.Status)
-
-	fmt.Fprintf(
-		out,
-		"// Statistics: BytesScanned=%.f RecordsMatched=%.f RecordsScanned=%.f\n",
-		*result.Statistics.BytesScanned,
-		*result.Statistics.RecordsMatched,
-		*result.Statistics.RecordsScanned,
-	)
 }
 
 func (cmd *queryCommand) Start(svc *cloudwatchlogs.CloudWatchLogs, flags *cli.Flags, out io.Writer) (err error) {
@@ -159,13 +175,27 @@ func (cmd *queryCommand) Start(svc *cloudwatchlogs.CloudWatchLogs, flags *cli.Fl
 		return
 	}
 
-	result, err := waitQueryResult(svc, queryId)
+	resp, err := waitQueryResult(svc, queryId)
 
 	if err != nil {
 		return
 	}
 
-	printQueryResult(result, flags.Showptr, out)
+	if cmd.vertically {
+		printResultsVertically(resp.Results, flags.Showptr, out)
+	} else {
+		printResultsHorizontally(resp.Results, flags.Showptr, out)
+	}
+
+	fmt.Fprintf(out, "// Status: %s\n", *resp.Status)
+
+	fmt.Fprintf(
+		out,
+		"// Statistics: BytesScanned=%.f RecordsMatched=%.f RecordsScanned=%.f\n",
+		*resp.Statistics.BytesScanned,
+		*resp.Statistics.RecordsMatched,
+		*resp.Statistics.RecordsScanned,
+	)
 
 	return
 }