@backstage/plugin-scaffolder-backend 1.22.8-next.3 → 1.22.9

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.22.9
+
+### Patch Changes
+
+- 78a0b08: Internal refactor to handle `BackendFeature` contract change.
+- 5c65785: Fixing issues with log redaction in the scaffolder logs
+- d44a20a: Added additional plugin metadata to `package.json`.
+- 7d30d95: Fixing issue with log meta fields possibly being circular refs
+- d617103: Updating the logger redaction message to something less dramatic
+- f4c8486: Increase max wait time in debug:wait action to 10 minutes
+- bcec60f: added the following new permissions to the scaffolder backend endpoints:
+
+  - `scaffolder.task.create`
+  - `scaffolder.task.cancel`
+  - `scaffolder.task.read`
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.0
+  - @backstage/backend-plugin-api@0.6.19
+  - @backstage/backend-tasks@0.5.24
+  - @backstage/plugin-auth-node@0.4.14
+  - @backstage/plugin-scaffolder-backend-module-github@0.3.0
+  - @backstage/integration@1.12.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.1.17
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.1.9
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.1.9
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.2.9
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.1.11
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.4.1
+  - @backstage/plugin-scaffolder-backend-module-azure@0.1.11
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.1.9
+  - @backstage/plugin-catalog-node@1.12.1
+  - @backstage/plugin-permission-node@0.7.30
+  - @backstage/plugin-permission-common@0.7.14
+  - @backstage/plugin-scaffolder-common@1.5.3
+  - @backstage/plugin-scaffolder-node@0.4.5
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 1.22.8-next.3
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "1.22.8-next.3",
+  "version": "1.22.9",
   "main": "../dist/alpha.cjs.js",
   "types": "../dist/alpha.d.ts"
 }

package/dist/alpha.cjs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var alpha = require('@backstage/plugin-scaffolder-common/alpha');
 var pluginPermissionNode = require('@backstage/plugin-permission-node');
-var router = require('./cjs/router-Be_L_ugX.cjs.js');
+var router = require('./cjs/router-BtUx0eIt.cjs.js');
 var backendPluginApi = require('@backstage/backend-plugin-api');
 var backendCommon = require('@backstage/backend-common');
 var integration = require('@backstage/integration');

package/dist/alpha.d.ts

@@ -94,6 +94,6 @@ declare const scaffolderActionConditions: _backstage_plugin_permission_node.Cond
  *
  * @alpha
  */
-declare const scaffolderPlugin: () => _backstage_backend_plugin_api.BackendFeature;
+declare const scaffolderPlugin: _backstage_backend_plugin_api.BackendFeatureCompat;
 
 export { createScaffolderActionConditionalDecision, createScaffolderTemplateConditionalDecision, scaffolderPlugin as default, scaffolderActionConditions, scaffolderTemplateConditions };

package/dist/cjs/{router-Be_L_ugX.cjs.js → router-BtUx0eIt.cjs.js}

@@ -2327,32 +2327,37 @@ const escapeRegExp = (text) => {
   return text.replace(/[.*+?^${}(\)|[\]\\]/g, "\\$&");
 };
 class BackstageLoggerTransport extends Transport__default.default {
-  constructor(backstageLogger, opts) {
+  constructor(backstageLogger, taskContext, stepId, opts) {
     super(opts);
     this.backstageLogger = backstageLogger;
+    this.taskContext = taskContext;
+    this.stepId = stepId;
   }
   log(info, callback) {
     if (typeof info !== "object" || info === null) {
       callback();
       return;
     }
-    const { level, message, ...meta } = info;
+    const message = info[tripleBeam.MESSAGE];
+    const level = info[tripleBeam.LEVEL];
+    const splat = info[tripleBeam.SPLAT];
     switch (level) {
       case "error":
-        this.backstageLogger.error(String(message), meta);
+        this.backstageLogger.error(String(message), ...splat);
         break;
       case "warn":
-        this.backstageLogger.warn(String(message), meta);
+        this.backstageLogger.warn(String(message), ...splat);
         break;
       case "info":
-        this.backstageLogger.info(String(message), meta);
+        this.backstageLogger.info(String(message), ...splat);
         break;
       case "debug":
-        this.backstageLogger.debug(String(message), meta);
+        this.backstageLogger.debug(String(message), ...splat);
         break;
       default:
-        this.backstageLogger.info(String(message), meta);
+        this.backstageLogger.info(String(message), ...splat);
     }
+    this.taskContext.emitLog(message, { stepId: this.stepId });
     callback();
   }
 }
@@ -2366,7 +2371,7 @@ class WinstonLogger {
     const redacter = WinstonLogger.redacter();
     let logger = winston.createLogger({
       level: options.level,
-      format: winston.format.combine(redacter.format, options.format),
+      format: winston.format.combine(options.format, redacter.format),
       transports: options.transports ?? new winston.transports.Console()
     });
     if (options.meta) {
@@ -2423,7 +2428,10 @@ class WinstonLogger {
         }
       }),
       winston.format.printf((info) => {
-        const { timestamp, level, message, plugin, service, ...fields } = info;
+        const { timestamp, plugin, service } = info;
+        const message = info[tripleBeam.MESSAGE];
+        const level = info[tripleBeam.LEVEL];
+        const fields = info[tripleBeam.SPLAT];
         const prefix = plugin || service;
         const timestampColor = colorizer.colorize("timestamp", timestamp);
         const prefixColor = colorizer.colorize("prefix", prefix);
@@ -2466,23 +2474,13 @@ const createStepLogger = ({
   step,
   rootLogger
 }) => {
-  const stepLogStream = new stream.PassThrough();
-  stepLogStream.on("data", async (data) => {
-    const message = data.toString().trim();
-    if (message?.length > 1) {
-      await task.emitLog(message, { stepId: step.id });
-    }
-  });
   const taskLogger = WinstonLogger.create({
     level: process.env.LOG_LEVEL || "info",
     format: winston__namespace.format.combine(
       winston__namespace.format.colorize(),
       winston__namespace.format.simple()
     ),
-    transports: [
-      new winston__namespace.transports.Stream({ stream: stepLogStream }),
-      new BackstageLoggerTransport(rootLogger)
-    ]
+    transports: [new BackstageLoggerTransport(rootLogger, task, step.id)]
   });
   taskLogger.addRedactions(Object.values(task.secrets ?? {}));
   const streamLogger = new stream.PassThrough();
@@ -3717,4 +3715,4 @@ exports.createRouter = createRouter;
 exports.createWaitAction = createWaitAction;
 exports.scaffolderActionRules = scaffolderActionRules;
 exports.scaffolderTemplateRules = scaffolderTemplateRules;
-//# sourceMappingURL=router-Be_L_ugX.cjs.js.map
+//# sourceMappingURL=router-BtUx0eIt.cjs.js.map