Merge pull request #8155 from dokku/8147-sanitize-vector-sink

Sanitize vector sink values in report output

plugins/logs/report.go

@@ -1,6 +1,9 @@
 package logs
 
 import (
+	"fmt"
+	"os"
+
 	"github.com/dokku/dokku/plugins/common"
 )
 
@@ -10,6 +13,8 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
 		return err
 	}
 
+	os.Setenv("DOKKU_REPORT_FORMAT", format)
+	os.Setenv("DOKKU_REPORT_FLAG", infoFlag)
 	flags := map[string]common.ReportFunc{
 		"--logs-computed-app-label-alias": reportComputedAppLabelAlias,
 		"--logs-computed-max-size":        reportComputedMaxSize,
@@ -68,7 +73,26 @@ func reportVectorGlobalImage(appName string) string {
 }
 
 func reportGlobalVectorSink(appName string) string {
-	return common.PropertyGet("logs", "--global", "vector-sink")
+	value := common.PropertyGet("logs", "--global", "vector-sink")
+	if value == "" {
+		return value
+	}
+
+	if os.Getenv("DOKKU_REPORT_FORMAT") != "stdout" {
+		return value
+	}
+
+	if os.Getenv("DOKKU_REPORT_FLAG") == "--logs-global-vector-sink" {
+		return value
+	}
+
+	// only show the schema and sanitize the rest
+	sink, err := SinkValueToConfig("--global", value)
+	if err != nil {
+		return ""
+	}
+
+	return fmt.Sprintf("%s://redacted", sink["type"])
 }
 
 func reportMaxSize(appName string) string {
@@ -76,5 +100,24 @@ func reportMaxSize(appName string) string {
 }
 
 func reportVectorSink(appName string) string {
-	return common.PropertyGet("logs", appName, "vector-sink")
+	value := common.PropertyGet("logs", appName, "vector-sink")
+	if value == "" {
+		return value
+	}
+
+	if os.Getenv("DOKKU_REPORT_FORMAT") != "stdout" {
+		return value
+	}
+
+	if os.Getenv("DOKKU_REPORT_FLAG") == "--logs-vector-sink" {
+		return value
+	}
+
+	// only show the schema and sanitize the rest
+	sink, err := SinkValueToConfig(appName, value)
+	if err != nil {
+		return ""
+	}
+
+	return fmt.Sprintf("%s://redacted", sink["type"])
 }