From 1602cac02474c1213154f21e79e53afa76234188 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 14:47:42 +0000
Subject: [PATCH 1/2] chore(deps): update dependency logform to v2.7.0

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4391f774fc..401389bf55 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -37087,8 +37087,8 @@ __metadata:
   linkType: hard
 
 "logform@npm:^2.3.2, logform@npm:^2.6.0, logform@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "logform@npm:2.6.1"
+  version: 2.7.0
+  resolution: "logform@npm:2.7.0"
   dependencies:
     "@colors/colors": "npm:1.6.0"
     "@types/triple-beam": "npm:^1.3.2"
@@ -37096,7 +37096,7 @@ __metadata:
     ms: "npm:^2.1.1"
     safe-stable-stringify: "npm:^2.3.1"
     triple-beam: "npm:^1.3.0"
-  checksum: 10/e67f414787fbfe1e6a997f4c84300c7e06bee3d0bd579778af667e24b36db3ea200ed195d41b61311ff738dab7faabc615a07b174b22fe69e0b2f39e985be64b
+  checksum: 10/4b861bfd67efe599ab41113ae3ffe92b1873bf86793fb442f58971852430d8f416f9904da69e5043071fb3725690e2499a13acbfe92a57ba7d21690004f9edc0
   languageName: node
   linkType: hard
 

From 25b560e8c0b92194b6dd387d1ff1e936aa52e21c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 5 Dec 2025 14:44:45 +0100
Subject: [PATCH 2/2] fixup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/nice-humans-cry.md                    |  6 ++++++
 .../src/entrypoints/rootLogger/WinstonLogger.ts  | 11 ++++++++---
 .../src/scaffolder/tasks/logger.ts               | 16 +++++++++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/nice-humans-cry.md

diff --git a/.changeset/nice-humans-cry.md b/.changeset/nice-humans-cry.md
new file mode 100644
index 0000000000..c6119702b4
--- /dev/null
+++ b/.changeset/nice-humans-cry.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/backend-defaults': patch
+---
+
+Internal change to support new versions of the `logform` library
diff --git a/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.ts b/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.ts
index c48cef2f1f..0455912ca9 100644
--- a/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.ts
+++ b/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.ts
@@ -102,7 +102,9 @@ export class WinstonLogger implements RootLoggerService {
           return obj;
         }
 
-        obj[MESSAGE] = obj[MESSAGE]?.replace?.(redactionPattern, '***');
+        if (typeof obj[MESSAGE] === 'string') {
+          obj[MESSAGE] = obj[MESSAGE].replace(redactionPattern, '***');
+        }
 
         return obj;
       })(),
@@ -157,8 +159,11 @@ export class WinstonLogger implements RootLoggerService {
       format.printf((info: TransformableInfo) => {
         const { timestamp, level, message, plugin, service, ...fields } = info;
         const prefix = plugin || service;
-        const timestampColor = colorizer.colorize('timestamp', timestamp);
-        const prefixColor = colorizer.colorize('prefix', prefix);
+        const timestampColor = colorizer.colorize(
+          'timestamp',
+          String(timestamp),
+        );
+        const prefixColor = colorizer.colorize('prefix', String(prefix));
 
         const extraFields = Object.entries(fields)
           .map(([key, value]) => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts
index 6ca24663b6..5958aacf41 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts
@@ -84,9 +84,10 @@ export class BackstageLoggerTransport extends Transport {
         break;
       default:
         this.backstageLogger.info(String(message));
+        break;
     }
 
-    this.taskContext.emitLog(message, { stepId: this.stepId });
+    this.taskContext.emitLog(String(message), { stepId: this.stepId });
     callback();
   }
 }
@@ -131,7 +132,9 @@ export class WinstonLogger implements RootLoggerService {
           return obj;
         }
 
-        obj[MESSAGE] = obj[MESSAGE]?.replace?.(redactionPattern, '***');
+        if (typeof obj[MESSAGE] === 'string') {
+          obj[MESSAGE] = obj[MESSAGE].replace(redactionPattern, '***');
+        }
 
         return obj;
       })(),
@@ -189,10 +192,13 @@ export class WinstonLogger implements RootLoggerService {
         const level = info[LEVEL];
         const fields = info[SPLAT];
         const prefix = plugin || service;
-        const timestampColor = colorizer.colorize('timestamp', timestamp);
-        const prefixColor = colorizer.colorize('prefix', prefix);
+        const timestampColor = colorizer.colorize(
+          'timestamp',
+          String(timestamp),
+        );
+        const prefixColor = colorizer.colorize('prefix', String(prefix));
 
-        const extraFields = Object.entries(fields)
+        const extraFields = Object.entries(fields as any)
           .map(
             ([key, value]) =>
               `${colorizer.colorize('field', `${key}`)}=${value}`,