From ac64f0ad049dbadfcf0c61a1528312923aeecae1 Mon Sep 17 00:00:00 2001
From: Justin Bryant <justintbry@gmail.com>
Date: Fri, 17 Apr 2026 17:44:35 -0400
Subject: [PATCH] fix(SecureTemplater): implement PR suggestions

Signed-off-by: Justin Bryant <justintbry@gmail.com>
---
 .../src/lib/templating/SecureTemplater.ts                 | 8 ++++++--
 .../actions/builtin/fetch/templateFileActionHandler.ts    | 4 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/scaffolder-backend/src/lib/templating/SecureTemplater.ts b/plugins/scaffolder-backend/src/lib/templating/SecureTemplater.ts
index e230dba184..72815fbd89 100644
--- a/plugins/scaffolder-backend/src/lib/templating/SecureTemplater.ts
+++ b/plugins/scaffolder-backend/src/lib/templating/SecureTemplater.ts
@@ -222,8 +222,12 @@ export class SecureTemplater {
       render,
       dispose: () => {
         if (context && !isolate.isDisposed) {
-          context.release();
-          isolate.dispose();
+          try {
+            context.release();
+            isolate.dispose();
+          } catch (error) {
+            // Ignore errors during dispose, as there's not much we can do about it
+          }
         }
       },
     };
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/templateFileActionHandler.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/templateFileActionHandler.ts
index ceaeb9b984..ab85070fa3 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/templateFileActionHandler.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/templateFileActionHandler.ts
@@ -21,10 +21,8 @@ import {
   TemplateGlobal,
 } from '@backstage/plugin-scaffolder-node';
 import fs from 'fs-extra';
-import { createDefaultFilters } from '../../../../lib/templating/filters/createDefaultFilters';
-import { convertFiltersToRecord } from '../../../../util/templating';
-import { resolveSafeChildPath } from '@backstage/backend-plugin-api';
 import path from 'node:path';
+import { createDefaultFilters } from '../../../../lib/templating/filters/createDefaultFilters';
 import { SecureTemplater } from '../../../../lib/templating/SecureTemplater';
 import { convertFiltersToRecord } from '../../../../util/templating';