From 30136d47879f426b0dfd3abc9db81289c955cda7 Mon Sep 17 00:00:00 2001
From: aramissennyeydd <aramis.sennyey@doordash.com>
Date: Sun, 9 Nov 2025 18:54:23 -0500
Subject: [PATCH] fix: explicitly mark instance metadata as a root service

Signed-off-by: aramissennyeydd <aramis.sennyey@doordash.com>
---
 .../instanceMetadataServiceFactory.test.ts    | 58 +++++++++++++++++++
 .../src/services/definitions/coreServices.ts  |  1 +
 2 files changed, 59 insertions(+)
 create mode 100644 packages/backend-defaults/src/alpha/entrypoints/instanceMetadata/instanceMetadataServiceFactory.test.ts

diff --git a/packages/backend-defaults/src/alpha/entrypoints/instanceMetadata/instanceMetadataServiceFactory.test.ts b/packages/backend-defaults/src/alpha/entrypoints/instanceMetadata/instanceMetadataServiceFactory.test.ts
new file mode 100644
index 0000000000..2368ea74e8
--- /dev/null
+++ b/packages/backend-defaults/src/alpha/entrypoints/instanceMetadata/instanceMetadataServiceFactory.test.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { instanceMetadataServiceFactory } from './instanceMetadataServiceFactory';
+import { startTestBackend } from '@backstage/backend-test-utils';
+import { instanceMetadataServiceRef } from '@backstage/backend-plugin-api/alpha';
+import Router from 'express-promise-router';
+import request from 'supertest';
+
+describe('instanceMetadataServiceFactory', () => {
+  it('should create an instance metadata service', async () => {
+    const pluginSubject = createBackendPlugin({
+      pluginId: 'my-plugin',
+      register(reg) {
+        reg.registerInit({
+          deps: {
+            instanceMetadata: instanceMetadataServiceRef,
+            httpRouter: coreServices.httpRouter,
+          },
+          async init({ instanceMetadata, httpRouter }) {
+            const router = Router();
+            router.get('/instance-metadata', async (_, res) => {
+              const metadata = await instanceMetadata.getInstalledFeatures();
+              res.json(metadata);
+            });
+            httpRouter.use(router);
+          },
+        });
+      },
+    });
+
+    const { server } = await startTestBackend({
+      features: [pluginSubject, instanceMetadataServiceFactory],
+    });
+
+    const response = await request(server)
+      .get('/api/my-plugin/instance-metadata')
+      .expect(200);
+    expect(response.body).toEqual([{ pluginId: 'my-plugin', type: 'plugin' }]);
+  });
+});
diff --git a/packages/backend-plugin-api/src/services/definitions/coreServices.ts b/packages/backend-plugin-api/src/services/definitions/coreServices.ts
index 62f2f848fc..887b05ee4e 100644
--- a/packages/backend-plugin-api/src/services/definitions/coreServices.ts
+++ b/packages/backend-plugin-api/src/services/definitions/coreServices.ts
@@ -287,5 +287,6 @@ export namespace coreServices {
     import('./RootInstanceMetadataService').RootInstanceMetadataService
   >({
     id: 'core.rootInstanceMetadata',
+    scope: 'root',
   });
 }