Merge branch 'backstage:master' into auth-okta-provider

.changeset/nasty-tips-exercise.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Fix issue with Circular JSON dependencies in templating

.changeset/renovate-6c0fb81.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-bitbucket-cloud-common': patch
+---
+
+Updated dependency `ts-morph` to `^20.0.0`.

plugins/bitbucket-cloud-common/package.json

@@ -41,7 +41,7 @@
     "@backstage/cli": "workspace:^",
     "@openapitools/openapi-generator-cli": "^2.4.26",
     "msw": "^1.0.0",
-    "ts-morph": "^17.0.0"
+    "ts-morph": "^20.0.0"
   },
   "files": [
     "dist"

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(