From 5f98a682bb18c4b5607ff84ea7c2be0ae56f9ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 7 Feb 2023 11:15:21 +0100
Subject: [PATCH] root htt router too
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/silent-peas-fly.md                 |  2 +-
 packages/backend-app-api/api-report.md        |  4 +-
 .../rootHttpRouter/rootHttpRouterFactory.ts   | 69 +++++++++----------
 3 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/.changeset/silent-peas-fly.md b/.changeset/silent-peas-fly.md
index 68dd6dfe47..8148cb5d12 100644
--- a/.changeset/silent-peas-fly.md
+++ b/.changeset/silent-peas-fly.md
@@ -2,4 +2,4 @@
 '@backstage/backend-app-api': patch
 ---
 
-Moved the options of the config service out to the factory itself, where it belongs
+Moved the options of the `config` and `rootHttpRouter` services out to the factories themselves, where they belong
diff --git a/packages/backend-app-api/api-report.md b/packages/backend-app-api/api-report.md
index e7bdc40da5..8dc85d1728 100644
--- a/packages/backend-app-api/api-report.md
+++ b/packages/backend-app-api/api-report.md
@@ -232,7 +232,9 @@ export interface RootHttpRouterConfigureOptions {
 }
 
 // @public (undocumented)
-export const rootHttpRouterFactory: () => ServiceFactory<RootHttpRouterService>;
+export const rootHttpRouterFactory: (
+  options?: RootHttpRouterFactoryOptions | undefined,
+) => ServiceFactory<RootHttpRouterService>;
 
 // @public (undocumented)
 export type RootHttpRouterFactoryOptions = {
diff --git a/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts b/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts
index f46f92741b..816c615817 100644
--- a/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts
@@ -69,45 +69,42 @@ function defaultConfigure({
 }
 
 /** @public */
-export const rootHttpRouterFactory = createServiceFactory({
-  service: coreServices.rootHttpRouter,
-  deps: {
-    config: coreServices.config,
-    rootLogger: coreServices.rootLogger,
-    lifecycle: coreServices.rootLifecycle,
-  },
-  async factory(
-    { config, rootLogger, lifecycle },
-    {
-      indexPath,
-      configure = defaultConfigure,
-    }: RootHttpRouterFactoryOptions = {},
-  ) {
-    const logger = rootLogger.child({ service: 'rootHttpRouter' });
-    const app = express();
+export const rootHttpRouterFactory = createServiceFactory(
+  (options?: RootHttpRouterFactoryOptions) => ({
+    service: coreServices.rootHttpRouter,
+    deps: {
+      config: coreServices.config,
+      rootLogger: coreServices.rootLogger,
+      lifecycle: coreServices.rootLifecycle,
+    },
+    async factory({ config, rootLogger, lifecycle }) {
+      const { indexPath, configure = defaultConfigure } = options ?? {};
+      const logger = rootLogger.child({ service: 'rootHttpRouter' });
+      const app = express();
 
-    const router = DefaultRootHttpRouter.create({ indexPath });
-    const middleware = MiddlewareFactory.create({ config, logger });
+      const router = DefaultRootHttpRouter.create({ indexPath });
+      const middleware = MiddlewareFactory.create({ config, logger });
 
-    configure({
-      app,
-      routes: router.handler(),
-      middleware,
-      config,
-      logger,
-      lifecycle,
-    });
+      configure({
+        app,
+        routes: router.handler(),
+        middleware,
+        config,
+        logger,
+        lifecycle,
+      });
 
-    const server = await createHttpServer(
-      app,
-      readHttpServerOptions(config.getOptionalConfig('backend')),
-      { logger },
-    );
+      const server = await createHttpServer(
+        app,
+        readHttpServerOptions(config.getOptionalConfig('backend')),
+        { logger },
+      );
 
-    lifecycle.addShutdownHook(() => server.stop());
+      lifecycle.addShutdownHook(() => server.stop());
 
-    await server.start();
+      await server.start();
 
-    return router;
-  },
-});
+      return router;
+    },
+  }),
+);