fortify: move json indent call

Signed-off-by: Ophestra <cat@gensokyo.uk>

main.go

@@ -106,12 +106,7 @@ func main() {
 		fmt.Println(license)
 		fmsg.Exit(0)
 	case "template": // print full template configuration
-		if s, err := json.MarshalIndent(fst.Template(), "", "  "); err != nil {
+		printJSON(fst.Template())
-			fmsg.Fatalf("cannot generate template: %v", err)
-			panic("unreachable")
-		} else {
-			fmt.Println(string(s))
-		}
 		fmsg.Exit(0)
 	case "help": // print help message
 		flag.CommandLine.Usage()

print.go

@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	direct "os"
 	"strings"
 	"text/tabwriter"
 	"time"
@@ -15,25 +16,22 @@ import (
 
 func printShow(instance *state.State, config *fst.Config) {
 	if flagJSON {
-		v := interface{}(config)
+		v := any(config)
 		if instance != nil {
 			v = instance
 		}
 
-		if s, err := json.MarshalIndent(v, "", "  "); err != nil {
+		printJSON(v)
-			fmsg.Fatalf("cannot serialise as JSON: %v", err)
+		return
-			panic("unreachable")
-		} else {
-			fmt.Println(string(s))
 	}
-	} else {
+
-		buf := new(strings.Builder)
+	now := time.Now().UTC()
-		w := tabwriter.NewWriter(buf, 0, 1, 4, ' ', 0)
+	w := tabwriter.NewWriter(direct.Stdout, 0, 1, 4, ' ', 0)
 
 	if instance != nil {
 		fmt.Fprintf(w, "State\n")
 		fmt.Fprintf(w, " Instance:\t%s (%d)\n", instance.ID.String(), instance.PID)
-			fmt.Fprintf(w, " Uptime:\t%s\n", time.Now().Sub(instance.Time).Round(time.Second).String())
+		fmt.Fprintf(w, " Uptime:\t%s\n", now.Sub(instance.Time).Round(time.Second).String())
 		fmt.Fprintf(w, "\n")
 	}
 
@@ -138,6 +136,13 @@ func printShow(instance *state.State, config *fst.Config) {
 	if err := w.Flush(); err != nil {
 		fmsg.Fatalf("cannot flush tabwriter: %v", err)
 	}
-		fmt.Print(buf.String())
+}
+
+func printJSON(v any) {
+	encoder := json.NewEncoder(direct.Stdout)
+	encoder.SetIndent("", "  ")
+	if err := encoder.Encode(v); err != nil {
+		fmsg.Fatalf("cannot serialise as JSON: %v", err)
+		panic("unreachable")
 	}
 }