Merge pull request #2881 from Marvin9/chore/use-catalog-api

chore: use catalog API to fetch entity in scaffolder-backend

packages/backend/src/plugins/scaffolder.ts

@@ -21,7 +21,9 @@ import {
   Publishers,
   CreateReactAppTemplater,
   Templaters,
+  CatalogEntityClient,
 } from '@backstage/plugin-scaffolder-backend';
+import { SingleHostDiscovery } from '@backstage/backend-common';
 import type { PluginEnvironment } from '../types';
 import Docker from 'dockerode';
 
@@ -40,6 +42,9 @@ export default async function createPlugin({
 
   const dockerClient = new Docker();
 
+  const discovery = SingleHostDiscovery.fromConfig(config);
+  const entityClient = new CatalogEntityClient({ discovery });
+
   return await createRouter({
     preparers,
     templaters,
@@ -47,5 +52,6 @@ export default async function createPlugin({
     logger,
     config,
     dockerClient,
+    entityClient,
   });
 }

packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts

@@ -11,7 +11,9 @@ import {
   CreateReactAppTemplater,
   Templaters,
   RepoVisibilityOptions,
+  CatalogEntityClient,
 } from '@backstage/plugin-scaffolder-backend';
+import { SingleHostDiscovery } from '@backstage/backend-common';
 import { Octokit } from '@octokit/rest';
 import { Gitlab } from '@gitbeaker/node';
 import type { PluginEnvironment } from '../types';
@@ -97,6 +99,10 @@ export default async function createPlugin({
   }
 
   const dockerClient = new Docker();
+
+  const discovery = SingleHostDiscovery.fromConfig(config);
+  const entityClient = new CatalogEntityClient({ discovery });
+
   return await createRouter({
     preparers,
     templaters,
@@ -104,5 +110,6 @@ export default async function createPlugin({
     logger,
     config,
     dockerClient,
+    entityClient,
   });
 }