fix secret redaction error logs

michel-laterman · michel-laterman · commit 04e80a1d8498 · 2025-02-06T16:21:52.000-08:00
diff --git a/internal/pkg/diagnostics/diagnostics.go b/internal/pkg/diagnostics/diagnostics.go
@@ -602,13 +602,15 @@ func RedactSecretPaths(mapStr map[string]any, errOut io.Writer) map[string]any {
 			continue
 		}
 
-		if ok, err := cfg.Has(key, -1, ucfg.PathSep(".")); ok {
+		if ok, err := cfg.Has(key, -1, ucfg.PathSep(".")); err != nil {
+			fmt.Fprintf(errOut, "Error redacting secret path %q: %v.\n", key, err)
+		} else if ok {
 			err := cfg.SetString(key, -1, REDACTED, ucfg.PathSep("."))
 			if err != nil {
 				fmt.Fprintf(errOut, "No output redaction for %q: %v.\n", key, err)
 			}
 		} else {
-			fmt.Fprintf(errOut, "Unable to find secret path %q for redaction: %v.\n", key, err)
+			fmt.Fprintf(errOut, "Unable to find secret path %q for redaction.\n", key)
 		}
 	}
 	result, err := config.MustNewConfigFrom(cfg).ToMapStr()

Original file line number	Diff line number	Diff line change
`@@ -602,13 +602,15 @@ func RedactSecretPaths(mapStr map[string]any, errOut io.Writer) map[string]any {`
`602`	`602`	`continue`
`603`	`603`	`}`
`604`	`604`
`605`		`- if ok, err := cfg.Has(key, -1, ucfg.PathSep(".")); ok {`
	`605`	`+ if ok, err := cfg.Has(key, -1, ucfg.PathSep(".")); err != nil {`
	`606`	`+ fmt.Fprintf(errOut, "Error redacting secret path %q: %v.\n", key, err)`
	`607`	`+ } else if ok {`
`606`	`608`	`err := cfg.SetString(key, -1, REDACTED, ucfg.PathSep("."))`
`607`	`609`	`if err != nil {`
`608`	`610`	`fmt.Fprintf(errOut, "No output redaction for %q: %v.\n", key, err)`
`609`	`611`	`}`
`610`	`612`	`} else {`
`611`		`- fmt.Fprintf(errOut, "Unable to find secret path %q for redaction: %v.\n", key, err)`
	`613`	`+ fmt.Fprintf(errOut, "Unable to find secret path %q for redaction.\n", key)`
`612`	`614`	`}`
`613`	`615`	`}`
`614`	`616`	`result, err := config.MustNewConfigFrom(cfg).ToMapStr()`