paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 25 Packages Projects Releases Wiki Activity

Merge pull request #31955 from backstage/renovate/logform-2.x-lockfile

Browse Source 
chore(deps): update dependency logform to v2.7.0
This commit is contained in:
Fredrik Adelöw
2025-12-05 16:35:44 +01:00
committed by GitHub
parent fd28eff59e 25b560e8c0
commit 8d237d6d53
4 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/nice-humans-cry.md
+6
View File
@@ -0,0 +1,6 @@
---
'@backstage/plugin-scaffolder-backend': patch
'@backstage/backend-defaults': patch
---
Internal change to support new versions of the `logform` library
packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.ts
+8 -3
View File
@@ -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]) => {
plugins/scaffolder-backend/src/scaffolder/tasks/logger.ts
+11 -5
View File
@@ -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}`,
yarn.lock
+3 -3
View File
@@ -37379,8 +37379,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"
@@ -37388,7 +37388,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