From 849c0bcda45b36b955bd0b316d0b2bfab3b6e5b0 Mon Sep 17 00:00:00 2001
From: Rogerio Angeliski <angeliski@hotmail.com>
Date: Thu, 13 Nov 2025 08:52:01 -0300
Subject: [PATCH] chore: apply revision

Signed-off-by: Rogerio Angeliski <angeliski@hotmail.com>
---
 .changeset/fruity-rivers-arrive.md                 |  1 -
 .../src/scaffolder/tasks/NunjucksWorkflowRunner.ts | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.changeset/fruity-rivers-arrive.md b/.changeset/fruity-rivers-arrive.md
index 3e391ae789..a816946bcc 100644
--- a/.changeset/fruity-rivers-arrive.md
+++ b/.changeset/fruity-rivers-arrive.md
@@ -1,6 +1,5 @@
 ---
 '@backstage/plugin-scaffolder-backend': minor
-'@backstage/plugin-scaffolder-node': patch
 ---
 
 Add `defaultEnvironment` config to scaffolder to enable more flexible and custom templates. Now it's possible enable access to default parameters and secrets in templates, improving security and reducing complexity.
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index cd17c1b169..1a51b3ddf6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -108,12 +108,12 @@ const createStepLogger = ({
   task,
   step,
   rootLogger,
-  secretsForRedaction,
+  redactions,
 }: {
   task: TaskContext;
   step: TaskStep;
   rootLogger: LoggerService;
-  secretsForRedaction?: string[];
+  redactions?: Record<string, string>;
 }) => {
   const taskLogger = WinstonLogger.create({
     level: process.env.LOG_LEVEL || 'info',
@@ -124,8 +124,7 @@ const createStepLogger = ({
     transports: [new BackstageLoggerTransport(rootLogger, task, step.id)],
   });
 
-  taskLogger.addRedactions(Object.values(task.secrets ?? {}));
-  taskLogger.addRedactions(Object.values(secretsForRedaction ?? {}));
+  taskLogger.addRedactions(Object.values(redactions ?? {}));
 
   return { taskLogger };
 };
@@ -280,9 +279,10 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
         task,
         step,
         rootLogger: this.options.logger,
-        secretsForRedaction: this.environment?.secrets
-          ? Object.values(this.environment.secrets)
-          : [],
+        redactions: {
+          ...task.secrets,
+          ...this.environment?.secrets,
+        },
       });
 
       if (task.isDryRun) {