fix: Unmarshal error on meroxa api --json (#171)

* Revert "Allow output JSON only for `meroxa api` (#169)" This reverts commit 7540b0c. * fix(api): Unmarhal arrays with —json Co-authored-by: Lovro Mažgon <[email protected]> Co-authored-by: Lovro Mažgon <[email protected]>
meroxa · Aug 2, 2021 · bf7673b · bf7673b
1 parent d977ca0
commit bf7673b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/cmd/meroxa/root/api/api.go b/cmd/meroxa/root/api/api.go
@@ -53,10 +53,6 @@ type API struct {
 		Path   string
 		Body   string
 	}
-
-	flags struct {
-		JSON bool `long:"json" short:"" usage:"output json"`
-	}
 }
 
 func (a *API) Usage() string {
@@ -112,20 +108,14 @@ func (a *API) Execute(ctx context.Context) error {
 		prettyJSON.Write(b)
 	}
 
-	// Print headers unless JSON only
-	if !a.flags.JSON {
-		a.logger.Infof(ctx, "> %s %s", a.args.Method, a.args.Path)
-		a.logger.Infof(ctx, "< %s %s", resp.Status, resp.Proto)
-		for k, v := range resp.Header {
-			a.logger.Infof(ctx, "< %s %s", k, strings.Join(v, " "))
-		}
+	a.logger.Infof(ctx, "> %s %s", a.args.Method, a.args.Path)
+	a.logger.Infof(ctx, "< %s %s", resp.Status, resp.Proto)
+	for k, v := range resp.Header {
+		a.logger.Infof(ctx, "< %s %s", k, strings.Join(v, " "))
 	}
 
 	a.logger.Info(ctx, prettyJSON.String())
+	a.logger.JSON(ctx, prettyJSON.String())
 
 	return nil
 }
-
-func (a *API) Flags() []builder.Flag {
-	return builder.BuildFlags(&a.flags)
-}
diff --git a/log/json.go b/log/json.go
@@ -20,6 +20,11 @@ type jsonLogger struct {
 }
 
 func (l *jsonLogger) JSON(ctx context.Context, data interface{}) {
+	if raw, ok := data.(string); ok {
+		l.l.Print(raw)
+		return
+	}
+
 	p, err := json.MarshalIndent(data, "", "\t")
 	if err != nil {
 		l.l.Printf("could not marshal JSON: %s", err.Error())