Support --indent flag on Query() command

Signed-off-by: Matt Rutkowski <[email protected]>
CycloneDX · Nov 16, 2023 · b4ca844 · b4ca844
1 parent 685cf78
commit b4ca844
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 22 deletions.
diff --git a/cmd/query.go b/cmd/query.go
@@ -207,16 +207,11 @@ func Query(writer io.Writer, request *common.QueryRequest, response *common.Quer
 		return
 	}
 
-	// Convert query results to formatted JSON for output
-	// TODO: we MAY want to use a JSON Encoder to avoid unicode encoding
-	var formattedResult string
-	if formattedResult, err = utils.MarshalAnyToFormattedJsonString(resultJson); err != nil {
-		getLogger().Debugf("unhandled error: %s, QueryRequest: %s", err, request.String())
-		return
-	}
-
+	// Convert query results to encoded JSON for output
+	indent := utils.GenerateIndentString(int(utils.GlobalFlags.PersistentFlags.OutputIndent))
+	buffer, err := utils.EncodeAnyToIndentedJSON(resultJson, indent)
 	// Use the selected output device (e.g., default stdout or the specified --output-file)
-	fmt.Fprintf(writer, "%s\n", formattedResult)
+	writer.Write(buffer.Bytes())
 
 	return
 }

diff --git a/cmd/query_test.go b/cmd/query_test.go
@@ -60,8 +60,14 @@ func innerQuery(t *testing.T, filename string, queryRequest *common.QueryRequest
 		return
 	}
 
-	// This will print results ONLY if --quiet mode is `false`
-	printMarshaledResultOnlyIfNotQuiet(result)
+	// Log results if trace enabled
+	var buffer bytes.Buffer
+	buffer, err = utils.EncodeAnyToIndentedJSON(
+		result, utils.DEFAULT_JSON_INDENT_STRING)
+	if err != nil {
+		// Output the JSON data directly to stdout (not subject to log-level)
+		getLogger().Tracef("%s\n", buffer.String())
+	}
 	return
 }
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -190,7 +190,7 @@ func init() {
 	rootCmd.PersistentFlags().BoolVarP(&utils.GlobalFlags.LogOutputIndentCallstack, FLAG_LOG_OUTPUT_INDENT, "", false, MSG_FLAG_LOG_INDENT)
 
 	// Output (JSON) indent
-	rootCmd.Flags().Uint8VarP(&utils.GlobalFlags.PersistentFlags.OutputIndent, FLAG_OUTPUT_INDENT, "", DEFAULT_OUTPUT_INDENT_LENGTH, MSG_FLAG_OUTPUT_INDENT)
+	rootCmd.PersistentFlags().Uint8VarP(&utils.GlobalFlags.PersistentFlags.OutputIndent, FLAG_OUTPUT_INDENT, "", DEFAULT_OUTPUT_INDENT_LENGTH, MSG_FLAG_OUTPUT_INDENT)
 
 	// Add root commands
 	rootCmd.AddCommand(NewCommandVersion())

diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -284,13 +284,3 @@ func bufferContainsValues(buffer bytes.Buffer, values ...string) bool {
 	}
 	return true
 }
-
-// TODO: find a better way using some log package feature
-func printMarshaledResultOnlyIfNotQuiet(iResult interface{}) {
-	if !*TestLogQuiet {
-		// Format results in JSON
-		fResult, _ := utils.MarshalAnyToFormattedJsonString(iResult)
-		// Output the JSON data directly to stdout (not subject to log-level)
-		fmt.Printf("%s\n", fResult)
-	}
-}