Go fmt, add expr to main

expr/Expr.go

@@ -1,15 +1,15 @@
-package expr 
+package expr
 
 import (
+	"fmt"
 	"github.com/SumoLogic/sumoshell/util"
-	"strings"
 	"os/exec"
-	"fmt"
+	"strings"
 )
 
 type ExprOperator struct {
-	lsh string
-	expr string
+	lsh    string
+	expr   string
 	output *util.JsonWriter
 }
 
@@ -38,7 +38,7 @@ func (w ExprOperator) Process(inp map[string]interface{}) {
 			} else {
 				s = fmt.Sprintf("%v=\"%v\"", k, v)
 			}
-	        	vars = append(vars, s)	
+			vars = append(vars, s)
 		}
 		varStr := strings.Join(vars, ";")
 		pythonCmd := varStr + "; print " + w.expr
@@ -55,7 +55,7 @@ func (w ExprOperator) Process(inp map[string]interface{}) {
 			inp[w.lsh] = numRep
 		} else {
 			inp[w.lsh] = strOut
-		}	
+		}
 		w.output.Write(inp)
 	}
 }

parse/Parse.go

@@ -52,13 +52,13 @@ func findNumExtractions(parseExpression string) int {
 }
 
 func regexFromPat(pat string) *regexp.Regexp {
-	regex := ".*?" + strings.Replace(regexp.QuoteMeta(pat), "\\*", "(.*?)", -1) 
+	regex := ".*?" + strings.Replace(regexp.QuoteMeta(pat), "\\*", "(.*?)", -1)
 	if strings.HasSuffix(pat, "*") {
 		regex += "$"
-	
+
 	} else {
 		regex += ".*$"
-	}	
+	}
 	return regexp.MustCompile(regex)
 }
 

ss/Main.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"github.com/SumoLogic/sumoshell/average"
 	"github.com/SumoLogic/sumoshell/count"
-	"github.com/SumoLogic/sumoshell/filter"
 	"github.com/SumoLogic/sumoshell/expr"
+	"github.com/SumoLogic/sumoshell/filter"
 	"github.com/SumoLogic/sumoshell/parse"
 	"github.com/SumoLogic/sumoshell/sum"
 	"github.com/SumoLogic/sumoshell/util"
@@ -20,7 +20,7 @@ func main() {
 	operators := map[string]Builder{
 		"parse":  parse.Build,
 		"filter": filter.Build,
-		"expr": expr.Build,
+		"expr":   expr.Build,
 	}
 
 	aggOperators := map[string]AggBuilder{

sumo/Main.go

@@ -19,6 +19,7 @@ type AggBuilder func([]string) (util.SumoAggOperator, error)
 var operators = map[string]Builder{
 	"parse":  parse.Build,
 	"filter": filter.Build,
+	"expr":   expr.Build,
 }
 
 var aggOperators = map[string]AggBuilder{

util/Raw.go

@@ -180,6 +180,6 @@ func (writer *JsonWriter) Write(inp map[string]interface{}) {
 	}
 }
 
-func CoerceNumber (v interface{}) (float64, error) {
+func CoerceNumber(v interface{}) (float64, error) {
 	return strconv.ParseFloat(fmt.Sprint(v), 64)
 }