From 014b3b777603575c2d3b04fda4749f39c674038e Mon Sep 17 00:00:00 2001
From: Trevor Hartman <trevorhartman@gmail.com>
Date: Thu, 21 Jul 2022 13:42:56 -0600
Subject: [PATCH] Add missing res.end in scaffolder backend EventStream usage

Signed-off-by: Trevor Hartman <trevorhartman@gmail.com>
---
 .changeset/strange-crabs-confess.md              | 5 +++++
 plugins/scaffolder-backend/src/service/router.ts | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/strange-crabs-confess.md

diff --git a/.changeset/strange-crabs-confess.md b/.changeset/strange-crabs-confess.md
new file mode 100644
index 0000000000..25cb7bbeac
--- /dev/null
+++ b/.changeset/strange-crabs-confess.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Add missing res.end() in scaffolder backend EventStream usage
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index b682ebdf25..c7d9af8e64 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -311,6 +311,7 @@ export async function createRouter(
           logger.error(
             `Received error from event stream when observing taskId '${taskId}', ${error}`,
           );
+          res.end();
         },
         next: ({ events }) => {
           let shouldUnsubscribe = false;
@@ -324,7 +325,10 @@ export async function createRouter(
           }
           // res.flush() is only available with the compression middleware
           res.flush?.();
-          if (shouldUnsubscribe) subscription.unsubscribe();
+          if (shouldUnsubscribe) {
+            subscription.unsubscribe();
+            res.end();
+          }
         },
       });