fix(mediactl): Print the JSON results to the command's output

Author: rg0now

cmd/mediactl/main.go

@@ -31,11 +31,12 @@ import (
 const env = "MEDIACTL"
 
 // app is one run of mediactl: its settings, from the flags, the environment and the config file in
-// this order, its logger, and the resolver of its k8s:// addresses.
+// this order, its logger, its output, and the resolver of its k8s:// addresses.
 type app struct {
 	v   *viper.Viper
 	lf  logger.LoggerFactory
 	log logging.LeveledLogger
+	out io.Writer
 	k8s k8s.Resolver
 }
 
@@ -82,6 +83,7 @@ func newRootCmd() *cobra.Command {
 			}
 			a.log = a.lf.NewLogger("mediactl")
 			a.k8s.Log = a.lf.NewLogger("k8s")
+			a.out = cmd.OutOrStdout()
 			return nil
 		},
 	}
@@ -186,7 +188,9 @@ func (a *app) send(ctx context.Context, d mediactl.Dialer, network, address stri
 		if err != nil {
 			return err
 		}
-		fmt.Println(string(b))
+		if _, err := fmt.Fprintln(a.out, string(b)); err != nil {
+			return err
+		}
 	}
 
 	if err := errors.Join(errs...); err != nil {

cmd/mediactl/main_test.go

@@ -1,9 +1,9 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
-	"io"
 	"os"
 	"path/filepath"
 	"sync"
@@ -104,15 +104,16 @@ func TestParallelJSON(t *testing.T) {
 	// the echo may not be up yet: wait for one stream through it first
 	eventually(t, "udp", "send", "127.0.0.1:27011")
 
-	out := captureStdout(t, func() {
-		require.NoError(t, run(context.Background(), "udp", "send", "127.0.0.1:27011", "-P", "3", "-o", "json",
-			"-k", "100", "-t", "300ms"))
-	})
+	cmd, out := newRootCmd(), &bytes.Buffer{}
+	cmd.SetOut(out)
+	cmd.SetArgs([]string{"udp", "send", "127.0.0.1:27011", "-P", "3", "-o", "json", "-k", "100", "-t",
+		"300ms", "--log", "all:WARN"})
+	require.NoError(t, cmd.ExecuteContext(context.Background()))
 	var res struct {
 		Streams []map[string]any `json:"streams"`
 		Total   map[string]any   `json:"total"`
 	}
-	require.NoError(t, json.Unmarshal([]byte(out), &res), out)
+	require.NoError(t, json.Unmarshal(out.Bytes(), &res), out.String())
 	assert.Len(t, res.Streams, 3)
 	assert.Positive(t, res.Total["received"])
 	assert.NotEmpty(t, res.Total["rtt_avg"])
@@ -141,18 +142,3 @@ func TestK8sAddress(t *testing.T) {
 	err = run(context.Background(), "turn", "send", "turn:127.0.0.1:3478", "k8s://ns/svc", "-t", "100ms")
 	assert.ErrorContains(t, err, "invalid Service address")
 }
-
-// captureStdout returns what f prints on the standard output.
-func captureStdout(t *testing.T, f func()) string {
-	t.Helper()
-	r, w, err := os.Pipe()
-	require.NoError(t, err)
-	stdout := os.Stdout
-	os.Stdout = w
-	f()
-	os.Stdout = stdout
-	require.NoError(t, w.Close())
-	b, err := io.ReadAll(r)
-	require.NoError(t, err)
-	return string(b)
-}