From a46a0887a3ebe09cb90709bcb55a6de27adf7d38 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 2 Dec 2022 14:48:15 +0100 Subject: [PATCH] refactor all the things to use coreServices Co-authored-by: Johan Haals Signed-off-by: Patrik Oldsberg --- .../services/implementations/cacheService.ts | 10 ++++----- .../services/implementations/configService.ts | 7 +++--- .../implementations/databaseService.ts | 10 ++++----- .../implementations/discoveryService.ts | 7 +++--- .../implementations/httpRouterService.ts | 10 ++++----- .../implementations/lifecycleService.ts | 10 ++++----- .../services/implementations/loggerService.ts | 10 ++++----- .../implementations/permissionsService.ts | 13 +++++------ .../implementations/rootLoggerService.ts | 4 ++-- .../implementations/schedulerService.ts | 10 ++++----- .../implementations/tokenManagerService.ts | 10 ++++----- .../implementations/urlReaderService.ts | 10 ++++----- .../src/wiring/ServiceRegistry.test.ts | 4 ++-- .../src/wiring/ServiceRegistry.ts | 8 +++---- .../app-backend/src/service/appPlugin.test.ts | 4 ++-- plugins/app-backend/src/service/appPlugin.ts | 13 +++++------ .../AwsS3EntityProviderCatalogModule.test.ts | 12 ++++------ .../AwsS3EntityProviderCatalogModule.ts | 10 ++++----- ...eDevOpsEntityProviderCatalogModule.test.ts | 12 ++++------ .../AzureDevOpsEntityProviderCatalogModule.ts | 10 ++++----- ...etCloudEntityProviderCatalogModule.test.ts | 18 +++++---------- ...tbucketCloudEntityProviderCatalogModule.ts | 13 +++++------ ...tServerEntityProviderCatalogModule.test.ts | 12 ++++------ ...bucketServerEntityProviderCatalogModule.ts | 10 ++++----- .../GerritEntityProviderCatalogModule.test.ts | 12 ++++------ .../GerritEntityProviderCatalogModule.ts | 10 ++++----- .../GithubEntityProviderCatalogModule.test.ts | 12 ++++------ .../GithubEntityProviderCatalogModule.ts | 10 ++++----- ...scoveryEntityProviderCatalogModule.test.ts | 12 ++++------ ...labDiscoveryEntityProviderCatalogModule.ts | 10 ++++----- ...gestionEntityProviderCatalogModule.test.ts | 18 +++++---------- ...talIngestionEntityProviderCatalogModule.ts | 16 +++++--------- .../src/run.ts | 4 ++-- ...raphOrgEntityProviderCatalogModule.test.ts | 12 ++++------ ...softGraphOrgEntityProviderCatalogModule.ts | 10 ++++----- .../src/service/CatalogPlugin.ts | 22 +++++++------------ .../catalog-node/src/catalogService.test.ts | 4 ++-- plugins/catalog-node/src/catalogService.ts | 4 ++-- ...onsumingEventPublisherEventsModule.test.ts | 12 ++++------ ...sSqsConsumingEventPublisherEventsModule.ts | 10 ++++----- .../service/GithubWebhookEventsModule.test.ts | 4 ++-- .../src/service/GithubWebhookEventsModule.ts | 4 ++-- .../service/GitlabWebhookEventsModule.test.ts | 4 ++-- .../src/service/GitlabWebhookEventsModule.ts | 4 ++-- .../src/service/EventsPlugin.test.ts | 10 ++++----- .../src/service/EventsPlugin.ts | 10 ++++----- .../src/ScaffolderPlugin.ts | 19 ++++++---------- 47 files changed, 182 insertions(+), 288 deletions(-) diff --git a/packages/backend-app-api/src/services/implementations/cacheService.ts b/packages/backend-app-api/src/services/implementations/cacheService.ts index 7e15f031c6..df4a782a46 100644 --- a/packages/backend-app-api/src/services/implementations/cacheService.ts +++ b/packages/backend-app-api/src/services/implementations/cacheService.ts @@ -16,18 +16,16 @@ import { CacheManager } from '@backstage/backend-common'; import { - configServiceRef, + coreServices, createServiceFactory, - pluginMetadataServiceRef, - cacheServiceRef, } from '@backstage/backend-plugin-api'; /** @public */ export const cacheFactory = createServiceFactory({ - service: cacheServiceRef, + service: coreServices.cache, deps: { - config: configServiceRef, - plugin: pluginMetadataServiceRef, + config: coreServices.config, + plugin: coreServices.pluginMetadata, }, async factory({ config }) { const cacheManager = CacheManager.fromConfig(config); diff --git a/packages/backend-app-api/src/services/implementations/configService.ts b/packages/backend-app-api/src/services/implementations/configService.ts index 91327289df..f58a756c64 100644 --- a/packages/backend-app-api/src/services/implementations/configService.ts +++ b/packages/backend-app-api/src/services/implementations/configService.ts @@ -16,17 +16,16 @@ import { loadBackendConfig } from '@backstage/backend-common'; import { - configServiceRef, + coreServices, createServiceFactory, loggerToWinstonLogger, - rootLoggerServiceRef, } from '@backstage/backend-plugin-api'; /** @public */ export const configFactory = createServiceFactory({ - service: configServiceRef, + service: coreServices.config, deps: { - logger: rootLoggerServiceRef, + logger: coreServices.rootLogger, }, async factory({ logger }) { const config = await loadBackendConfig({ diff --git a/packages/backend-app-api/src/services/implementations/databaseService.ts b/packages/backend-app-api/src/services/implementations/databaseService.ts index f6401528e6..f33e825c9b 100644 --- a/packages/backend-app-api/src/services/implementations/databaseService.ts +++ b/packages/backend-app-api/src/services/implementations/databaseService.ts @@ -16,18 +16,16 @@ import { DatabaseManager } from '@backstage/backend-common'; import { - configServiceRef, + coreServices, createServiceFactory, - databaseServiceRef, - pluginMetadataServiceRef, } from '@backstage/backend-plugin-api'; /** @public */ export const databaseFactory = createServiceFactory({ - service: databaseServiceRef, + service: coreServices.database, deps: { - config: configServiceRef, - plugin: pluginMetadataServiceRef, + config: coreServices.config, + plugin: coreServices.pluginMetadata, }, async factory({ config }) { const databaseManager = DatabaseManager.fromConfig(config); diff --git a/packages/backend-app-api/src/services/implementations/discoveryService.ts b/packages/backend-app-api/src/services/implementations/discoveryService.ts index 7f35bf2447..0c04ec6bf0 100644 --- a/packages/backend-app-api/src/services/implementations/discoveryService.ts +++ b/packages/backend-app-api/src/services/implementations/discoveryService.ts @@ -16,16 +16,15 @@ import { SingleHostDiscovery } from '@backstage/backend-common'; import { - configServiceRef, + coreServices, createServiceFactory, - discoveryServiceRef, } from '@backstage/backend-plugin-api'; /** @public */ export const discoveryFactory = createServiceFactory({ - service: discoveryServiceRef, + service: coreServices.discovery, deps: { - config: configServiceRef, + config: coreServices.config, }, async factory({ config }) { const discovery = SingleHostDiscovery.fromConfig(config); diff --git a/packages/backend-app-api/src/services/implementations/httpRouterService.ts b/packages/backend-app-api/src/services/implementations/httpRouterService.ts index d9fc807b1a..2021589a50 100644 --- a/packages/backend-app-api/src/services/implementations/httpRouterService.ts +++ b/packages/backend-app-api/src/services/implementations/httpRouterService.ts @@ -16,9 +16,7 @@ import { createServiceFactory, - httpRouterServiceRef, - configServiceRef, - pluginMetadataServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; import Router from 'express-promise-router'; import { Handler } from 'express'; @@ -36,10 +34,10 @@ export type HttpRouterFactoryOptions = { /** @public */ export const httpRouterFactory = createServiceFactory({ - service: httpRouterServiceRef, + service: coreServices.httpRouter, deps: { - config: configServiceRef, - plugin: pluginMetadataServiceRef, + config: coreServices.config, + plugin: coreServices.pluginMetadata, }, async factory({ config }, options?: HttpRouterFactoryOptions) { const defaultPluginId = options?.indexPlugin ?? 'app'; diff --git a/packages/backend-app-api/src/services/implementations/lifecycleService.ts b/packages/backend-app-api/src/services/implementations/lifecycleService.ts index 7d41a7a276..5616296e93 100644 --- a/packages/backend-app-api/src/services/implementations/lifecycleService.ts +++ b/packages/backend-app-api/src/services/implementations/lifecycleService.ts @@ -16,10 +16,8 @@ import { BackendLifecycle, createServiceFactory, - lifecycleServiceRef, + coreServices, loggerToWinstonLogger, - pluginMetadataServiceRef, - rootLoggerServiceRef, BackendLifecycleShutdownHook, } from '@backstage/backend-plugin-api'; import { Logger } from 'winston'; @@ -80,10 +78,10 @@ class PluginScopedLifecycleImpl implements BackendLifecycle { * Allows plugins to register shutdown hooks that are run when the process is about to exit. * @public */ export const lifecycleFactory = createServiceFactory({ - service: lifecycleServiceRef, + service: coreServices.lifecycle, deps: { - logger: rootLoggerServiceRef, - plugin: pluginMetadataServiceRef, + logger: coreServices.rootLogger, + plugin: coreServices.pluginMetadata, }, async factory({ logger }) { const rootLifecycle = new BackendLifecycleImpl( diff --git a/packages/backend-app-api/src/services/implementations/loggerService.ts b/packages/backend-app-api/src/services/implementations/loggerService.ts index ff72020140..52b391249d 100644 --- a/packages/backend-app-api/src/services/implementations/loggerService.ts +++ b/packages/backend-app-api/src/services/implementations/loggerService.ts @@ -16,17 +16,15 @@ import { createServiceFactory, - loggerServiceRef, - pluginMetadataServiceRef, - rootLoggerServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; /** @public */ export const loggerFactory = createServiceFactory({ - service: loggerServiceRef, + service: coreServices.logger, deps: { - rootLogger: rootLoggerServiceRef, - plugin: pluginMetadataServiceRef, + rootLogger: coreServices.rootLogger, + plugin: coreServices.pluginMetadata, }, async factory({ rootLogger }) { return async ({ plugin }) => { diff --git a/packages/backend-app-api/src/services/implementations/permissionsService.ts b/packages/backend-app-api/src/services/implementations/permissionsService.ts index 32e8a1a9f9..d3f8d5783c 100644 --- a/packages/backend-app-api/src/services/implementations/permissionsService.ts +++ b/packages/backend-app-api/src/services/implementations/permissionsService.ts @@ -15,21 +15,18 @@ */ import { - configServiceRef, + coreServices, createServiceFactory, - discoveryServiceRef, - permissionsServiceRef, - tokenManagerServiceRef, } from '@backstage/backend-plugin-api'; import { ServerPermissionClient } from '@backstage/plugin-permission-node'; /** @public */ export const permissionsFactory = createServiceFactory({ - service: permissionsServiceRef, + service: coreServices.permissions, deps: { - config: configServiceRef, - discovery: discoveryServiceRef, - tokenManager: tokenManagerServiceRef, + config: coreServices.config, + discovery: coreServices.discovery, + tokenManager: coreServices.tokenManager, }, async factory({ config }) { return async ({ discovery, tokenManager }) => { diff --git a/packages/backend-app-api/src/services/implementations/rootLoggerService.ts b/packages/backend-app-api/src/services/implementations/rootLoggerService.ts index a65a8d9126..d2bb406adb 100644 --- a/packages/backend-app-api/src/services/implementations/rootLoggerService.ts +++ b/packages/backend-app-api/src/services/implementations/rootLoggerService.ts @@ -18,7 +18,7 @@ import { createRootLogger } from '@backstage/backend-common'; import { createServiceFactory, Logger, - rootLoggerServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; import { Logger as WinstonLogger } from 'winston'; @@ -40,7 +40,7 @@ class BackstageLogger implements Logger { /** @public */ export const rootLoggerFactory = createServiceFactory({ - service: rootLoggerServiceRef, + service: coreServices.rootLogger, deps: {}, async factory() { return BackstageLogger.fromWinston(createRootLogger()); diff --git a/packages/backend-app-api/src/services/implementations/schedulerService.ts b/packages/backend-app-api/src/services/implementations/schedulerService.ts index 40676344ec..a6edec868a 100644 --- a/packages/backend-app-api/src/services/implementations/schedulerService.ts +++ b/packages/backend-app-api/src/services/implementations/schedulerService.ts @@ -15,19 +15,17 @@ */ import { - configServiceRef, + coreServices, createServiceFactory, - pluginMetadataServiceRef, - schedulerServiceRef, } from '@backstage/backend-plugin-api'; import { TaskScheduler } from '@backstage/backend-tasks'; /** @public */ export const schedulerFactory = createServiceFactory({ - service: schedulerServiceRef, + service: coreServices.scheduler, deps: { - config: configServiceRef, - plugin: pluginMetadataServiceRef, + config: coreServices.config, + plugin: coreServices.pluginMetadata, }, async factory({ config }) { const taskScheduler = TaskScheduler.fromConfig(config); diff --git a/packages/backend-app-api/src/services/implementations/tokenManagerService.ts b/packages/backend-app-api/src/services/implementations/tokenManagerService.ts index 92f42c10db..6a2d47ae14 100644 --- a/packages/backend-app-api/src/services/implementations/tokenManagerService.ts +++ b/packages/backend-app-api/src/services/implementations/tokenManagerService.ts @@ -15,20 +15,18 @@ */ import { - configServiceRef, - loggerServiceRef, + coreServices, createServiceFactory, - tokenManagerServiceRef, loggerToWinstonLogger, } from '@backstage/backend-plugin-api'; import { ServerTokenManager } from '@backstage/backend-common'; /** @public */ export const tokenManagerFactory = createServiceFactory({ - service: tokenManagerServiceRef, + service: coreServices.tokenManager, deps: { - config: configServiceRef, - logger: loggerServiceRef, + config: coreServices.config, + logger: coreServices.logger, }, async factory() { return async ({ config, logger }) => { diff --git a/packages/backend-app-api/src/services/implementations/urlReaderService.ts b/packages/backend-app-api/src/services/implementations/urlReaderService.ts index d7d7502a08..b68be74d8c 100644 --- a/packages/backend-app-api/src/services/implementations/urlReaderService.ts +++ b/packages/backend-app-api/src/services/implementations/urlReaderService.ts @@ -16,19 +16,17 @@ import { UrlReaders } from '@backstage/backend-common'; import { - configServiceRef, + coreServices, createServiceFactory, - loggerServiceRef, loggerToWinstonLogger, - urlReaderServiceRef, } from '@backstage/backend-plugin-api'; /** @public */ export const urlReaderFactory = createServiceFactory({ - service: urlReaderServiceRef, + service: coreServices.urlReader, deps: { - config: configServiceRef, - logger: loggerServiceRef, + config: coreServices.config, + logger: coreServices.logger, }, async factory() { return async ({ config, logger }) => { diff --git a/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts b/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts index 897ed4e3cd..b878a6a75d 100644 --- a/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts +++ b/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts @@ -18,7 +18,7 @@ import { createServiceRef, createServiceFactory, ServiceRef, - pluginMetadataServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; import { ServiceRegistry } from './ServiceRegistry'; @@ -172,7 +172,7 @@ describe('ServiceRegistry', () => { const ref = createServiceRef<{ pluginId: string }>({ id: 'x' }); const factory = createServiceFactory({ service: ref, - deps: { meta: pluginMetadataServiceRef }, + deps: { meta: coreServices.pluginMetadata }, async factory() { return async ({ meta }) => ({ pluginId: meta.getId() }); }, diff --git a/packages/backend-app-api/src/wiring/ServiceRegistry.ts b/packages/backend-app-api/src/wiring/ServiceRegistry.ts index 007ca00c88..9ff73f4270 100644 --- a/packages/backend-app-api/src/wiring/ServiceRegistry.ts +++ b/packages/backend-app-api/src/wiring/ServiceRegistry.ts @@ -17,7 +17,7 @@ import { ServiceFactory, ServiceRef, - pluginMetadataServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; import { stringifyError } from '@backstage/errors'; @@ -65,10 +65,10 @@ export class ServiceRegistry { pluginId: string, ): Promise | undefined { // Special case handling of the plugin metadata service, generating a custom factory for it each time - if (ref.id === pluginMetadataServiceRef.id) { + if (ref.id === coreServices.pluginMetadata.id) { return Promise.resolve({ scope: 'plugin', - service: pluginMetadataServiceRef, + service: coreServices.pluginMetadata, deps: {}, factory: async () => async () => ({ getId() { @@ -114,7 +114,7 @@ export class ServiceRegistry { #checkForMissingDeps(factory: ServiceFactory, pluginId: string) { const missingDeps = Object.values(factory.deps).filter(ref => { - if (ref.id === pluginMetadataServiceRef.id) { + if (ref.id === coreServices.pluginMetadata.id) { return false; } if (this.#providedFactories.get(ref.id)) { diff --git a/plugins/app-backend/src/service/appPlugin.test.ts b/plugins/app-backend/src/service/appPlugin.test.ts index f4a2b142e8..8583726287 100644 --- a/plugins/app-backend/src/service/appPlugin.test.ts +++ b/plugins/app-backend/src/service/appPlugin.test.ts @@ -17,7 +17,7 @@ import mockFs from 'mock-fs'; import { resolve as resolvePath } from 'path'; import fetch from 'node-fetch'; -import { configServiceRef } from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { appPlugin } from './appPlugin'; import { @@ -51,7 +51,7 @@ describe('appPlugin', () => { await startTestBackend({ services: [ [ - configServiceRef, + coreServices.config, new ConfigReader({ backend: { listen: { port }, diff --git a/plugins/app-backend/src/service/appPlugin.ts b/plugins/app-backend/src/service/appPlugin.ts index f88bcb14f1..bfccf3cc02 100644 --- a/plugins/app-backend/src/service/appPlugin.ts +++ b/plugins/app-backend/src/service/appPlugin.ts @@ -16,12 +16,9 @@ import express from 'express'; import { - configServiceRef, + coreServices, createBackendPlugin, - databaseServiceRef, - loggerServiceRef, loggerToWinstonLogger, - httpRouterServiceRef, } from '@backstage/backend-plugin-api'; import { createRouter } from './router'; @@ -78,10 +75,10 @@ export const appPlugin = createBackendPlugin({ register(env, options: AppPluginOptions) { env.registerInit({ deps: { - logger: loggerServiceRef, - config: configServiceRef, - database: databaseServiceRef, - httpRouter: httpRouterServiceRef, + logger: coreServices.logger, + config: coreServices.config, + database: coreServices.database, + httpRouter: coreServices.httpRouter, }, async init({ logger, config, database, httpRouter }) { const { diff --git a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.test.ts index 3167291bca..c0d36ad3c2 100644 --- a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.test.ts +++ b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.test.ts @@ -15,11 +15,7 @@ */ import { getVoidLogger } from '@backstage/backend-common'; -import { - configServiceRef, - loggerServiceRef, - schedulerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { PluginTaskScheduler, TaskScheduleDefinition, @@ -66,9 +62,9 @@ describe('awsS3EntityProviderCatalogModule', () => { await startTestBackend({ extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]], services: [ - [configServiceRef, config], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], + [coreServices.config, config], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], ], features: [awsS3EntityProviderCatalogModule()], }); diff --git a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts index 79269ad53a..fa49d1e4c7 100644 --- a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts +++ b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts @@ -15,11 +15,9 @@ */ import { + coreServices, createBackendModule, loggerToWinstonLogger, - configServiceRef, - loggerServiceRef, - schedulerServiceRef, } from '@backstage/backend-plugin-api'; import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { AwsS3EntityProvider } from '../providers'; @@ -35,10 +33,10 @@ export const awsS3EntityProviderCatalogModule = createBackendModule({ register(env) { env.registerInit({ deps: { - config: configServiceRef, + config: coreServices.config, catalog: catalogProcessingExtensionPoint, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, + logger: coreServices.logger, + scheduler: coreServices.scheduler, }, async init({ config, catalog, logger, scheduler }) { catalog.addEntityProvider( diff --git a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.test.ts index e3a0449a8e..a11e6b14f2 100644 --- a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.test.ts +++ b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.test.ts @@ -15,11 +15,7 @@ */ import { getVoidLogger } from '@backstage/backend-common'; -import { - configServiceRef, - loggerServiceRef, - schedulerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { PluginTaskScheduler, TaskScheduleDefinition, @@ -69,9 +65,9 @@ describe('azureDevOpsEntityProviderCatalogModule', () => { await startTestBackend({ extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]], services: [ - [configServiceRef, config], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], + [coreServices.config, config], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], ], features: [azureDevOpsEntityProviderCatalogModule()], }); diff --git a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts index f3621bee23..0d0ebdb591 100644 --- a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts +++ b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts @@ -17,9 +17,7 @@ import { createBackendModule, loggerToWinstonLogger, - configServiceRef, - loggerServiceRef, - schedulerServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { AzureDevOpsEntityProvider } from '../providers'; @@ -35,10 +33,10 @@ export const azureDevOpsEntityProviderCatalogModule = createBackendModule({ register(env) { env.registerInit({ deps: { - config: configServiceRef, + config: coreServices.config, catalog: catalogProcessingExtensionPoint, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, + logger: coreServices.logger, + scheduler: coreServices.scheduler, }, async init({ config, catalog, logger, scheduler }) { catalog.addEntityProvider( diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts index 3fcc39fdd0..83e657bcfe 100644 --- a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts +++ b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts @@ -20,13 +20,7 @@ import { PluginEndpointDiscovery, TokenManager, } from '@backstage/backend-common'; -import { - configServiceRef, - discoveryServiceRef, - loggerServiceRef, - schedulerServiceRef, - tokenManagerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { PluginTaskScheduler, TaskScheduleDefinition, @@ -84,11 +78,11 @@ describe('bitbucketCloudEntityProviderCatalogModule', () => { [eventsExtensionPoint, eventsExtensionPointImpl], ], services: [ - [configServiceRef, config], - [discoveryServiceRef, discovery], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], - [tokenManagerServiceRef, tokenManager], + [coreServices.config, config], + [coreServices.discovery, discovery], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], + [coreServices.tokenManager, tokenManager], ], features: [bitbucketCloudEntityProviderCatalogModule()], }); diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts index 1c005991a6..19b83b92b6 100644 --- a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts +++ b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts @@ -15,12 +15,9 @@ */ import { - configServiceRef, + coreServices, createBackendModule, - loggerServiceRef, loggerToWinstonLogger, - schedulerServiceRef, - tokenManagerServiceRef, } from '@backstage/backend-plugin-api'; import { catalogProcessingExtensionPoint, @@ -40,13 +37,13 @@ export const bitbucketCloudEntityProviderCatalogModule = createBackendModule({ deps: { catalog: catalogProcessingExtensionPoint, catalogApi: catalogServiceRef, - config: configServiceRef, + config: coreServices.config, // TODO(pjungermann): How to make this optional for those which only want the provider without event support? // Do we even want to support this? events: eventsExtensionPoint, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, - tokenManager: tokenManagerServiceRef, + logger: coreServices.logger, + scheduler: coreServices.scheduler, + tokenManager: coreServices.tokenManager, }, async init({ catalog, diff --git a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.test.ts index d2ce4dbd3d..474431dc7a 100644 --- a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.test.ts +++ b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.test.ts @@ -16,11 +16,7 @@ import { ConfigReader } from '@backstage/config'; import { getVoidLogger } from '@backstage/backend-common'; -import { - configServiceRef, - loggerServiceRef, - schedulerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { PluginTaskScheduler, TaskScheduleDefinition, @@ -73,9 +69,9 @@ describe('bitbucketServerEntityProviderCatalogModule', () => { await startTestBackend({ extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]], services: [ - [configServiceRef, config], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], + [coreServices.config, config], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], ], features: [bitbucketServerEntityProviderCatalogModule()], }); diff --git a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts index e89eee7b45..e0f5a21ff9 100644 --- a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts +++ b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts @@ -15,11 +15,9 @@ */ import { - configServiceRef, + coreServices, createBackendModule, - loggerServiceRef, loggerToWinstonLogger, - schedulerServiceRef, } from '@backstage/backend-plugin-api'; import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { BitbucketServerEntityProvider } from '../providers'; @@ -34,9 +32,9 @@ export const bitbucketServerEntityProviderCatalogModule = createBackendModule({ env.registerInit({ deps: { catalog: catalogProcessingExtensionPoint, - config: configServiceRef, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, + config: coreServices.config, + logger: coreServices.logger, + scheduler: coreServices.scheduler, }, async init({ catalog, config, logger, scheduler }) { const winstonLogger = loggerToWinstonLogger(logger); diff --git a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.test.ts index 53e012209b..9d61cabdb9 100644 --- a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.test.ts +++ b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.test.ts @@ -15,11 +15,7 @@ */ import { getVoidLogger } from '@backstage/backend-common'; -import { - configServiceRef, - loggerServiceRef, - schedulerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { PluginTaskScheduler, TaskScheduleDefinition, @@ -79,9 +75,9 @@ describe('gerritEntityProviderCatalogModule', () => { await startTestBackend({ extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]], services: [ - [configServiceRef, config], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], + [coreServices.config, config], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], ], features: [gerritEntityProviderCatalogModule()], }); diff --git a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts index 32d582e397..674845862f 100644 --- a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts +++ b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts @@ -15,11 +15,9 @@ */ import { - configServiceRef, + coreServices, createBackendModule, - loggerServiceRef, loggerToWinstonLogger, - schedulerServiceRef, } from '@backstage/backend-plugin-api'; import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { GerritEntityProvider } from '../providers/GerritEntityProvider'; @@ -34,9 +32,9 @@ export const gerritEntityProviderCatalogModule = createBackendModule({ env.registerInit({ deps: { catalog: catalogProcessingExtensionPoint, - config: configServiceRef, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, + config: coreServices.config, + logger: coreServices.logger, + scheduler: coreServices.scheduler, }, async init({ catalog, config, logger, scheduler }) { const winstonLogger = loggerToWinstonLogger(logger); diff --git a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.test.ts index b555927d2c..d8ebc8d0ad 100644 --- a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.test.ts +++ b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.test.ts @@ -15,11 +15,7 @@ */ import { getVoidLogger } from '@backstage/backend-common'; -import { - configServiceRef, - loggerServiceRef, - schedulerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { PluginTaskScheduler, TaskScheduleDefinition, @@ -66,9 +62,9 @@ describe('githubEntityProviderCatalogModule', () => { await startTestBackend({ extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]], services: [ - [configServiceRef, config], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], + [coreServices.config, config], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], ], features: [githubEntityProviderCatalogModule()], }); diff --git a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts index 8fdee886a3..e61543ea13 100644 --- a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts +++ b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts @@ -17,9 +17,7 @@ import { createBackendModule, loggerToWinstonLogger, - configServiceRef, - loggerServiceRef, - schedulerServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { GithubEntityProvider } from '../providers/GithubEntityProvider'; @@ -36,9 +34,9 @@ export const githubEntityProviderCatalogModule = createBackendModule({ env.registerInit({ deps: { catalog: catalogProcessingExtensionPoint, - config: configServiceRef, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, + config: coreServices.config, + logger: coreServices.logger, + scheduler: coreServices.scheduler, }, async init({ catalog, config, logger, scheduler }) { catalog.addEntityProvider( diff --git a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.test.ts index 0b803734b1..ca8d86f555 100644 --- a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.test.ts +++ b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.test.ts @@ -15,11 +15,7 @@ */ import { getVoidLogger } from '@backstage/backend-common'; -import { - configServiceRef, - loggerServiceRef, - schedulerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { PluginTaskScheduler, TaskScheduleDefinition, @@ -78,9 +74,9 @@ describe('gitlabDiscoveryEntityProviderCatalogModule', () => { await startTestBackend({ extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]], services: [ - [configServiceRef, config], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], + [coreServices.config, config], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], ], features: [gitlabDiscoveryEntityProviderCatalogModule()], }); diff --git a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts index dc11841e20..75a8de263f 100644 --- a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts +++ b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts @@ -17,9 +17,7 @@ import { createBackendModule, loggerToWinstonLogger, - configServiceRef, - loggerServiceRef, - schedulerServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { GitlabDiscoveryEntityProvider } from '../providers'; @@ -35,10 +33,10 @@ export const gitlabDiscoveryEntityProviderCatalogModule = createBackendModule({ register(env) { env.registerInit({ deps: { - config: configServiceRef, + config: coreServices.config, catalog: catalogProcessingExtensionPoint, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, + logger: coreServices.logger, + scheduler: coreServices.scheduler, }, async init({ config, catalog, logger, scheduler }) { catalog.addEntityProvider( diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.test.ts index 95452c9caf..06cbcb010e 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.test.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.test.ts @@ -15,13 +15,7 @@ */ import { getVoidLogger } from '@backstage/backend-common'; -import { - configServiceRef, - databaseServiceRef, - httpRouterServiceRef, - loggerServiceRef, - schedulerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { ConfigReader } from '@backstage/config'; import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; @@ -56,11 +50,11 @@ describe('bitbucketServerEntityProviderCatalogModule', () => { [catalogProcessingExtensionPoint, { addEntityProvider }], ], services: [ - [configServiceRef, new ConfigReader({})], - [databaseServiceRef, database], - [httpRouterServiceRef, httpRouter], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], + [coreServices.config, new ConfigReader({})], + [coreServices.database, database], + [coreServices.httpRouter, httpRouter], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], ], features: [ incrementalIngestionEntityProviderCatalogModule({ diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts index 08e9653688..0ecb45292c 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts @@ -15,12 +15,8 @@ */ import { - configServiceRef, + coreServices, createBackendModule, - databaseServiceRef, - httpRouterServiceRef, - loggerServiceRef, - schedulerServiceRef, } from '@backstage/backend-plugin-api'; import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { @@ -50,11 +46,11 @@ export const incrementalIngestionEntityProviderCatalogModule = env.registerInit({ deps: { catalog: catalogProcessingExtensionPoint, - config: configServiceRef, - database: databaseServiceRef, - httpRouter: httpRouterServiceRef, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, + config: coreServices.config, + database: coreServices.database, + httpRouter: coreServices.httpRouter, + logger: coreServices.logger, + scheduler: coreServices.scheduler, }, async init({ catalog, diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts b/plugins/catalog-backend-module-incremental-ingestion/src/run.ts index 22dc0c97a2..08d95f4417 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/run.ts @@ -27,7 +27,7 @@ import { tokenManagerFactory, urlReaderFactory, } from '@backstage/backend-app-api'; -import { configServiceRef } from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { ConfigReader } from '@backstage/config'; import { catalogPlugin } from '@backstage/plugin-catalog-backend'; @@ -62,7 +62,7 @@ async function main() { await startTestBackend({ services: [ - [configServiceRef, new ConfigReader(config)], + [coreServices.config, new ConfigReader(config)], databaseFactory(), discoveryFactory(), httpRouterFactory(), diff --git a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.test.ts index 764f504898..27ae5b9dd8 100644 --- a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.test.ts +++ b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.test.ts @@ -15,11 +15,7 @@ */ import { getVoidLogger } from '@backstage/backend-common'; -import { - configServiceRef, - loggerServiceRef, - schedulerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { PluginTaskScheduler, TaskScheduleDefinition, @@ -71,9 +67,9 @@ describe('awsS3EntityProviderCatalogModule', () => { await startTestBackend({ extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]], services: [ - [configServiceRef, config], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], + [coreServices.config, config], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], ], features: [microsoftGraphOrgEntityProviderCatalogModule()], }); diff --git a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts index 9e817636fa..2643e6e937 100644 --- a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts +++ b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts @@ -15,11 +15,9 @@ */ import { - configServiceRef, + coreServices, createBackendModule, - loggerServiceRef, loggerToWinstonLogger, - schedulerServiceRef, } from '@backstage/backend-plugin-api'; import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { @@ -72,9 +70,9 @@ export const microsoftGraphOrgEntityProviderCatalogModule = createBackendModule( env.registerInit({ deps: { catalog: catalogProcessingExtensionPoint, - config: configServiceRef, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, + config: coreServices.config, + logger: coreServices.logger, + scheduler: coreServices.scheduler, }, async init({ catalog, config, logger, scheduler }) { catalog.addEntityProvider( diff --git a/plugins/catalog-backend/src/service/CatalogPlugin.ts b/plugins/catalog-backend/src/service/CatalogPlugin.ts index 84cad86d9a..6db54ed4fa 100644 --- a/plugins/catalog-backend/src/service/CatalogPlugin.ts +++ b/plugins/catalog-backend/src/service/CatalogPlugin.ts @@ -14,15 +14,9 @@ * limitations under the License. */ import { - configServiceRef, createBackendPlugin, - databaseServiceRef, - loggerServiceRef, + coreServices, loggerToWinstonLogger, - permissionsServiceRef, - urlReaderServiceRef, - httpRouterServiceRef, - lifecycleServiceRef, } from '@backstage/backend-plugin-api'; import { CatalogBuilder } from './CatalogBuilder'; import { @@ -73,13 +67,13 @@ export const catalogPlugin = createBackendPlugin({ env.registerInit({ deps: { - logger: loggerServiceRef, - config: configServiceRef, - reader: urlReaderServiceRef, - permissions: permissionsServiceRef, - database: databaseServiceRef, - httpRouter: httpRouterServiceRef, - lifecycle: lifecycleServiceRef, + logger: coreServices.logger, + config: coreServices.config, + reader: coreServices.urlReader, + permissions: coreServices.permissions, + database: coreServices.database, + httpRouter: coreServices.httpRouter, + lifecycle: coreServices.lifecycle, }, async init({ logger, diff --git a/plugins/catalog-node/src/catalogService.test.ts b/plugins/catalog-node/src/catalogService.test.ts index 9ecf08b30e..593f5bd59c 100644 --- a/plugins/catalog-node/src/catalogService.test.ts +++ b/plugins/catalog-node/src/catalogService.test.ts @@ -18,7 +18,7 @@ import { PluginEndpointDiscovery } from '@backstage/backend-common'; import { createBackendModule, createServiceFactory, - discoveryServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { CatalogClient } from '@backstage/catalog-client'; @@ -29,7 +29,7 @@ describe('catalogServiceRef', () => { expect.assertions(1); const mockDiscoveryFactory = createServiceFactory({ - service: discoveryServiceRef, + service: coreServices.discovery, deps: {}, factory: async ({}) => { return async () => jest.fn() as unknown as PluginEndpointDiscovery; diff --git a/plugins/catalog-node/src/catalogService.ts b/plugins/catalog-node/src/catalogService.ts index c6a8fb44f5..0c54bd2d9d 100644 --- a/plugins/catalog-node/src/catalogService.ts +++ b/plugins/catalog-node/src/catalogService.ts @@ -17,7 +17,7 @@ import { createServiceFactory, createServiceRef, - discoveryServiceRef, + coreServices, } from '@backstage/backend-plugin-api'; import { CatalogApi, CatalogClient } from '@backstage/catalog-client'; @@ -31,7 +31,7 @@ export const catalogServiceRef = createServiceRef({ createServiceFactory({ service, deps: { - discoveryApi: discoveryServiceRef, + discoveryApi: coreServices.discovery, }, async factory() { return async ({ discoveryApi }) => { diff --git a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.test.ts b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.test.ts index 584b62a2c6..589b8c93fa 100644 --- a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.test.ts +++ b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.test.ts @@ -15,11 +15,7 @@ */ import { getVoidLogger } from '@backstage/backend-common'; -import { - configServiceRef, - loggerServiceRef, - schedulerServiceRef, -} from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { ConfigReader } from '@backstage/config'; import { eventsExtensionPoint } from '@backstage/plugin-events-node'; @@ -68,9 +64,9 @@ describe('awsSqsEventsModule', () => { await startTestBackend({ extensionPoints: [[eventsExtensionPoint, extensionPoint]], services: [ - [configServiceRef, config], - [loggerServiceRef, getVoidLogger()], - [schedulerServiceRef, scheduler], + [coreServices.config, config], + [coreServices.logger, getVoidLogger()], + [coreServices.scheduler, scheduler], ], features: [awsSqsConsumingEventPublisherEventsModule()], }); diff --git a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts index 7c33d7baae..a6c43d4046 100644 --- a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts +++ b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts @@ -15,11 +15,9 @@ */ import { - configServiceRef, + coreServices, createBackendModule, - loggerServiceRef, loggerToWinstonLogger, - schedulerServiceRef, } from '@backstage/backend-plugin-api'; import { eventsExtensionPoint } from '@backstage/plugin-events-node'; import { AwsSqsConsumingEventPublisher } from '../publisher/AwsSqsConsumingEventPublisher'; @@ -35,10 +33,10 @@ export const awsSqsConsumingEventPublisherEventsModule = createBackendModule({ register(env) { env.registerInit({ deps: { - config: configServiceRef, + config: coreServices.config, events: eventsExtensionPoint, - logger: loggerServiceRef, - scheduler: schedulerServiceRef, + logger: coreServices.logger, + scheduler: coreServices.scheduler, }, async init({ config, events, logger, scheduler }) { const winstonLogger = loggerToWinstonLogger(logger); diff --git a/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.test.ts b/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.test.ts index d02afb125d..84233eedee 100644 --- a/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.test.ts +++ b/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { configServiceRef } from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { ConfigReader } from '@backstage/config'; import { @@ -59,7 +59,7 @@ describe('githubWebhookEventsModule', () => { await startTestBackend({ extensionPoints: [[eventsExtensionPoint, extensionPoint]], - services: [[configServiceRef, config]], + services: [[coreServices.config, config]], features: [githubWebhookEventsModule()], }); diff --git a/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.ts b/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.ts index d9f4046a5e..9a3202cb97 100644 --- a/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.ts +++ b/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.ts @@ -15,7 +15,7 @@ */ import { - configServiceRef, + coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; import { eventsExtensionPoint } from '@backstage/plugin-events-node'; @@ -34,7 +34,7 @@ export const githubWebhookEventsModule = createBackendModule({ register(env) { env.registerInit({ deps: { - config: configServiceRef, + config: coreServices.config, events: eventsExtensionPoint, }, async init({ config, events }) { diff --git a/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.test.ts b/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.test.ts index 594be74ab8..b139f46f55 100644 --- a/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.test.ts +++ b/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { configServiceRef } from '@backstage/backend-plugin-api'; +import { coreServices } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { ConfigReader } from '@backstage/config'; import { @@ -54,7 +54,7 @@ describe('gitlabWebhookEventsModule', () => { await startTestBackend({ extensionPoints: [[eventsExtensionPoint, extensionPoint]], - services: [[configServiceRef, config]], + services: [[coreServices.config, config]], features: [gitlabWebhookEventsModule()], }); diff --git a/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.ts b/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.ts index 562fdb9cf5..44f13f31ef 100644 --- a/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.ts +++ b/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.ts @@ -15,7 +15,7 @@ */ import { - configServiceRef, + coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; import { eventsExtensionPoint } from '@backstage/plugin-events-node'; @@ -36,7 +36,7 @@ export const gitlabWebhookEventsModule = createBackendModule({ register(env) { env.registerInit({ deps: { - config: configServiceRef, + config: coreServices.config, events: eventsExtensionPoint, }, async init({ config, events }) { diff --git a/plugins/events-backend/src/service/EventsPlugin.test.ts b/plugins/events-backend/src/service/EventsPlugin.test.ts index f58f081742..b08364600f 100644 --- a/plugins/events-backend/src/service/EventsPlugin.test.ts +++ b/plugins/events-backend/src/service/EventsPlugin.test.ts @@ -17,10 +17,8 @@ import { errorHandler, getVoidLogger } from '@backstage/backend-common'; import { ConfigReader } from '@backstage/config'; import { - configServiceRef, + coreServices, createBackendModule, - httpRouterServiceRef, - loggerServiceRef, } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { eventsExtensionPoint } from '@backstage/plugin-events-node'; @@ -73,9 +71,9 @@ describe('eventPlugin', () => { await startTestBackend({ extensionPoints: [], services: [ - [configServiceRef, config], - [httpRouterServiceRef, httpRouter], - [loggerServiceRef, getVoidLogger()], + [coreServices.config, config], + [coreServices.httpRouter, httpRouter], + [coreServices.logger, getVoidLogger()], ], features: [eventsPlugin(), testModule()], }); diff --git a/plugins/events-backend/src/service/EventsPlugin.ts b/plugins/events-backend/src/service/EventsPlugin.ts index 65e7770d87..63d0d0b02a 100644 --- a/plugins/events-backend/src/service/EventsPlugin.ts +++ b/plugins/events-backend/src/service/EventsPlugin.ts @@ -15,10 +15,8 @@ */ import { - configServiceRef, createBackendPlugin, - httpRouterServiceRef, - loggerServiceRef, + coreServices, loggerToWinstonLogger, } from '@backstage/backend-plugin-api'; import { @@ -89,9 +87,9 @@ export const eventsPlugin = createBackendPlugin({ env.registerInit({ deps: { - config: configServiceRef, - logger: loggerServiceRef, - router: httpRouterServiceRef, + config: coreServices.config, + logger: coreServices.logger, + router: coreServices.httpRouter, }, async init({ config, logger, router }) { const winstonLogger = loggerToWinstonLogger(logger); diff --git a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts index 09d7bdcbb2..8a9da38bf2 100644 --- a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts +++ b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts @@ -14,14 +14,9 @@ * limitations under the License. */ import { - configServiceRef, createBackendPlugin, - databaseServiceRef, - loggerServiceRef, + coreServices, loggerToWinstonLogger, - permissionsServiceRef, - urlReaderServiceRef, - httpRouterServiceRef, createExtensionPoint, } from '@backstage/backend-plugin-api'; import { ScmIntegrations } from '@backstage/integration'; @@ -86,12 +81,12 @@ export const scaffolderPlugin = createBackendPlugin({ env.registerInit({ deps: { - logger: loggerServiceRef, - config: configServiceRef, - reader: urlReaderServiceRef, - permissions: permissionsServiceRef, - database: databaseServiceRef, - httpRouter: httpRouterServiceRef, + logger: coreServices.logger, + config: coreServices.config, + reader: coreServices.urlReader, + permissions: coreServices.permissions, + database: coreServices.database, + httpRouter: coreServices.httpRouter, catalogClient: catalogServiceRef, }, async init({