From 05a928e296ca0d855bc7710288412cf29eaa8478 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 14 Dec 2022 14:39:39 +0100 Subject: [PATCH] fix breakages from Service interface renames Signed-off-by: Patrik Oldsberg --- .changeset/seven-tomatoes-deny.md | 6 ++++++ .../services/implementations/lifecycleService.ts | 12 ++++++------ .../src/module/WrapperProviders.ts | 15 +++++++++------ 3 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 .changeset/seven-tomatoes-deny.md diff --git a/.changeset/seven-tomatoes-deny.md b/.changeset/seven-tomatoes-deny.md new file mode 100644 index 0000000000..f94c97f847 --- /dev/null +++ b/.changeset/seven-tomatoes-deny.md @@ -0,0 +1,6 @@ +--- +'@backstage/backend-app-api': patch +'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch +--- + +Updated usages of types from `@backstage/backend-plugin-api`. diff --git a/packages/backend-app-api/src/services/implementations/lifecycleService.ts b/packages/backend-app-api/src/services/implementations/lifecycleService.ts index 5616296e93..317a2e45b8 100644 --- a/packages/backend-app-api/src/services/implementations/lifecycleService.ts +++ b/packages/backend-app-api/src/services/implementations/lifecycleService.ts @@ -14,11 +14,11 @@ * limitations under the License. */ import { - BackendLifecycle, + LifecycleService, createServiceFactory, coreServices, loggerToWinstonLogger, - BackendLifecycleShutdownHook, + LifecycleServiceShutdownHook, } from '@backstage/backend-plugin-api'; import { Logger } from 'winston'; @@ -29,11 +29,11 @@ export class BackendLifecycleImpl { } #isCalled = false; - #shutdownTasks: Array = + #shutdownTasks: Array = []; addShutdownHook( - options: BackendLifecycleShutdownHook & { pluginId: string }, + options: LifecycleServiceShutdownHook & { pluginId: string }, ): void { this.#shutdownTasks.push(options); } @@ -64,12 +64,12 @@ export class BackendLifecycleImpl { } } -class PluginScopedLifecycleImpl implements BackendLifecycle { +class PluginScopedLifecycleImpl implements LifecycleService { constructor( private readonly lifecycle: BackendLifecycleImpl, private readonly pluginId: string, ) {} - addShutdownHook(options: BackendLifecycleShutdownHook): void { + addShutdownHook(options: LifecycleServiceShutdownHook): void { this.lifecycle.addShutdownHook({ ...options, pluginId: this.pluginId }); } } diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts index 44da5067fd..a6cfe14df2 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts @@ -14,9 +14,12 @@ * limitations under the License. */ -import { Logger, loggerToWinstonLogger } from '@backstage/backend-plugin-api'; -import { PluginTaskScheduler } from '@backstage/backend-tasks'; -import { Config } from '@backstage/config'; +import { + ConfigService, + LoggerService, + SchedulerService, + loggerToWinstonLogger, +} from '@backstage/backend-plugin-api'; import { stringifyError } from '@backstage/errors'; import { EntityProvider, @@ -46,10 +49,10 @@ export class WrapperProviders { constructor( private readonly options: { - config: Config; - logger: Logger; + config: ConfigService; + logger: LoggerService; client: Knex; - scheduler: PluginTaskScheduler; + scheduler: SchedulerService; applyDatabaseMigrations?: typeof applyDatabaseMigrations; }, ) {}