chore: fixing usages

Signed-off-by: blam <ben@blam.sh>

packages/backend-defaults/src/CreateBackend.ts

@@ -16,22 +16,22 @@
 
 import {
   Backend,
-  cacheFactory,
-  configFactory,
+  cacheServiceFactory,
+  configServiceFactory,
   createSpecializedBackend,
-  databaseFactory,
-  discoveryFactory,
-  httpRouterFactory,
-  rootHttpRouterFactory,
-  lifecycleFactory,
-  rootLifecycleFactory,
-  loggerFactory,
-  permissionsFactory,
-  rootLoggerFactory,
-  schedulerFactory,
-  tokenManagerFactory,
-  urlReaderFactory,
-  identityFactory,
+  databaseServiceFactory,
+  discoveryServiceFactory,
+  httpRouterServiceFactory,
+  rootHttpRouterServiceFactory,
+  lifecycleServiceFactory,
+  rootLifecycleServiceFactory,
+  loggerServiceFactory,
+  permissionsServiceFactory,
+  rootLoggerServiceFactory,
+  schedulerServiceFactory,
+  tokenManagerServiceFactory,
+  urlReaderServiceFactory,
+  identityServiceFactory,
 } from '@backstage/backend-app-api';
 import {
   ServiceFactory,
@@ -44,21 +44,21 @@ import {
 import type { InternalSharedBackendEnvironment } from '@backstage/backend-plugin-api/src/wiring/createSharedEnvironment';
 
 export const defaultServiceFactories = [
-  cacheFactory(),
-  configFactory(),
-  databaseFactory(),
-  discoveryFactory(),
-  httpRouterFactory(),
-  identityFactory(),
-  lifecycleFactory(),
-  loggerFactory(),
-  permissionsFactory(),
-  rootHttpRouterFactory(),
-  rootLifecycleFactory(),
-  rootLoggerFactory(),
-  schedulerFactory(),
-  tokenManagerFactory(),
-  urlReaderFactory(),
+  cacheServiceFactory(),
+  configServiceFactory(),
+  databaseServiceFactory(),
+  discoveryServiceFactory(),
+  httpRouterServiceFactory(),
+  identityServiceFactory(),
+  lifecycleServiceFactory(),
+  loggerServiceFactory(),
+  permissionsServiceFactory(),
+  rootHttpRouterServiceFactory(),
+  rootLifecycleServiceFactory(),
+  rootLoggerServiceFactory(),
+  schedulerServiceFactory(),
+  tokenManagerServiceFactory(),
+  urlReaderServiceFactory(),
 ];
 
 /**

packages/backend-test-utils/src/next/services/mockServices.ts

@@ -25,15 +25,15 @@ import {
   TokenManagerService,
 } from '@backstage/backend-plugin-api';
 import {
-  cacheFactory,
-  databaseFactory,
-  httpRouterFactory,
-  lifecycleFactory,
-  loggerFactory,
-  permissionsFactory,
-  rootLifecycleFactory,
-  schedulerFactory,
-  urlReaderFactory,
+  cacheServiceFactory,
+  databaseServiceFactory,
+  httpRouterServiceFactory,
+  lifecycleServiceFactory,
+  loggerServiceFactory,
+  permissionsServiceFactory,
+  rootLifecycleServiceFactory,
+  schedulerServiceFactory,
+  urlReaderServiceFactory,
 } from '@backstage/backend-app-api';
 import { ConfigReader } from '@backstage/config';
 import { JsonObject } from '@backstage/types';
@@ -109,30 +109,30 @@ export namespace mockServices {
   //               some may need a bit more refactoring for it to be simpler to
   //               re-implement functioning mock versions here.
   export namespace cache {
-    export const factory = cacheFactory;
+    export const factory = cacheServiceFactory;
   }
   export namespace database {
-    export const factory = databaseFactory;
+    export const factory = databaseServiceFactory;
   }
   export namespace httpRouter {
-    export const factory = httpRouterFactory;
+    export const factory = httpRouterServiceFactory;
   }
   export namespace lifecycle {
-    export const factory = lifecycleFactory;
+    export const factory = lifecycleServiceFactory;
   }
   export namespace logger {
-    export const factory = loggerFactory;
+    export const factory = loggerServiceFactory;
   }
   export namespace permissions {
-    export const factory = permissionsFactory;
+    export const factory = permissionsServiceFactory;
   }
   export namespace rootLifecycle {
-    export const factory = rootLifecycleFactory;
+    export const factory = rootLifecycleServiceFactory;
   }
   export namespace scheduler {
-    export const factory = schedulerFactory;
+    export const factory = schedulerServiceFactory;
   }
   export namespace urlReader {
-    export const factory = urlReaderFactory;
+    export const factory = urlReaderServiceFactory;
   }
 }

plugins/catalog-backend-module-incremental-ingestion/src/run.ts

@@ -16,16 +16,16 @@
 
 // eslint-disable-next-line @backstage/no-undeclared-imports
 import {
-  databaseFactory,
-  discoveryFactory,
-  httpRouterFactory,
-  lifecycleFactory,
-  loggerFactory,
-  permissionsFactory,
-  rootLoggerFactory,
-  schedulerFactory,
-  tokenManagerFactory,
-  urlReaderFactory,
+  databaseServiceFactory,
+  discoveryServiceFactory,
+  httpRouterServiceFactory,
+  lifecycleServiceFactory,
+  loggerServiceFactory,
+  permissionsServiceFactory,
+  rootLoggerServiceFactory,
+  schedulerServiceFactory,
+  tokenManagerServiceFactory,
+  urlReaderServiceFactory,
 } from '@backstage/backend-app-api';
 import { coreServices } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
@@ -63,16 +63,16 @@ async function main() {
   await startTestBackend({
     services: [
       [coreServices.config, new ConfigReader(config)],
-      databaseFactory(),
-      discoveryFactory(),
-      httpRouterFactory(),
-      lifecycleFactory(),
-      loggerFactory(),
-      permissionsFactory(),
-      rootLoggerFactory(),
-      schedulerFactory(),
-      tokenManagerFactory(),
-      urlReaderFactory(),
+      databaseServiceFactory(),
+      discoveryServiceFactory(),
+      httpRouterServiceFactory(),
+      lifecycleServiceFactory(),
+      loggerServiceFactory(),
+      permissionsServiceFactory(),
+      rootLoggerServiceFactory(),
+      schedulerServiceFactory(),
+      tokenManagerServiceFactory(),
+      urlReaderServiceFactory(),
     ],
     extensionPoints: [],
     features: [