From 7c17e64090ff6ceec8fd8165d671ace6eccfd393 Mon Sep 17 00:00:00 2001 From: seydx Date: Mon, 26 May 2025 22:21:33 +0200 Subject: [PATCH] format --- internal/api/api.go | 6 +++--- pkg/shell/shell.go | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/internal/api/api.go b/internal/api/api.go index 241bedf3..f66f59f4 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -167,17 +167,17 @@ func ResponseJSON(w http.ResponseWriter, v any) { func ResponsePrettyJSON(w http.ResponseWriter, v any) { w.Header().Set("Content-Type", "application/json") - + var buf bytes.Buffer enc := json.NewEncoder(&buf) enc.SetIndent("", " ") err := enc.Encode(v) - + if err != nil { http.Error(w, "Internal Server Error", http.StatusInternalServerError) return } - + redactedJSON := shell.Redact(buf.String()) w.Write([]byte(redactedJSON)) } diff --git a/pkg/shell/shell.go b/pkg/shell/shell.go index 5388503a..c478b435 100644 --- a/pkg/shell/shell.go +++ b/pkg/shell/shell.go @@ -116,11 +116,11 @@ func RunUntilSignal() { func Redact(text string) string { secretMutex.RLock() defer secretMutex.RUnlock() - + if secretReplacer == nil { return text } - + return secretReplacer.Replace(text) } @@ -130,13 +130,13 @@ func buildSecretReplacer(cfg struct { }) { secretMutex.Lock() defer secretMutex.Unlock() - + if secretValues == nil { secretValues = make(map[string]bool) } - + var newSecrets []string - + if dir, ok := os.LookupEnv("CREDENTIALS_DIRECTORY"); ok { entries, err := os.ReadDir(dir) if err == nil { @@ -154,7 +154,7 @@ func buildSecretReplacer(cfg struct { } } } - + if cfg.Env != nil { for _, value := range cfg.Env { if len(value) > 0 && !secretValues[value] { @@ -163,7 +163,7 @@ func buildSecretReplacer(cfg struct { } } } - + if cfg.Secrets != nil { for _, secretMap := range cfg.Secrets { for _, value := range secretMap { @@ -174,7 +174,7 @@ func buildSecretReplacer(cfg struct { } } } - + if len(newSecrets) > 0 { rebuildReplacer() } @@ -182,14 +182,14 @@ func buildSecretReplacer(cfg struct { func rebuildReplacer() { var replacements []string - + for secret := range secretValues { replacements = append(replacements, secret, "*****") } - + if len(replacements) > 0 { secretReplacer = strings.NewReplacer(replacements...) } else { secretReplacer = nil } -} \ No newline at end of file +}