Do not redact the empty string

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
backstage · Nov 16, 2021 · 26b5da1 · 26b5da1
1 parent eaeac8f
commit 26b5da1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.changeset/spicy-rice-build.md b/.changeset/spicy-rice-build.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Do not redact the empty string, destroying all logs
diff --git a/packages/backend-common/src/logging/rootLogger.ts b/packages/backend-common/src/logging/rootLogger.ts
@@ -21,7 +21,7 @@ import { coloredFormat } from './formats';
 import { escapeRegExp } from '../util/escapeRegExp';
 
 let rootLogger: winston.Logger;
-let redactionRegExp: RegExp;
+let redactionRegExp: RegExp | undefined;
 
 /** @public */
 export function getRootLogger(): winston.Logger {
@@ -34,11 +34,14 @@ export function setRootLogger(newLogger: winston.Logger) {
 }
 
 export function setRootLoggerRedactionList(redactionList: string[]) {
-  if (redactionList.length) {
+  const filtered = redactionList.filter(Boolean);
+  if (filtered.length) {
     redactionRegExp = new RegExp(
-      `(${redactionList.map(escapeRegExp).join('|')})`,
+      `(${filtered.map(escapeRegExp).join('|')})`,
       'g',
     );
+  } else {
+    redactionRegExp = undefined;
   }
 }