From c7c5efe6fa46320f0b2731c236a5ec488a958811 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 15 Nov 2023 12:39:32 +0100 Subject: [PATCH 1/2] fix: don't passthrough all of task Signed-off-by: blam --- .../src/scaffolder/tasks/NunjucksWorkflowRunner.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts index 58ea689260..139d91b7a2 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts @@ -290,14 +290,15 @@ export class NunjucksWorkflowRunner implements WorkflowRunner { input: step.input ? this.render( step.input, - { ...context, ...i, ...task }, + { ...context, secrets: task.secrets ?? {}, ...i }, renderTemplate, ) : {}, })); for (const iteration of iterations) { - const actionId = - action.id + (iteration.each ? `[${iteration.each.key}]` : ''); + const actionId = `${action.id}${ + iteration.each ? `[${iteration.each.key}]` : '' + }`; if (action.schema?.input) { const validateResult = validateJsonSchema( From aff34fcf23e0b23da5ba82cbefc0ccbfa4d91158 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 15 Nov 2023 12:40:43 +0100 Subject: [PATCH 2/2] chore: added changeset Signed-off-by: blam --- .changeset/nasty-tips-exercise.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nasty-tips-exercise.md diff --git a/.changeset/nasty-tips-exercise.md b/.changeset/nasty-tips-exercise.md new file mode 100644 index 0000000000..5dd38368d4 --- /dev/null +++ b/.changeset/nasty-tips-exercise.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend': patch +--- + +Fix issue with Circular JSON dependencies in templating