diff --git a/plugins/catalog-backend-module-incremental-ingestion/report.api.md b/plugins/catalog-backend-module-incremental-ingestion/report.api.md index 9fcb342c06..b4979b1e37 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/report.api.md +++ b/plugins/catalog-backend-module-incremental-ingestion/report.api.md @@ -7,7 +7,6 @@ import { BackendFeature } from '@backstage/backend-plugin-api'; import { CatalogBuilder } from '@backstage/plugin-catalog-backend'; -import type { Config } from '@backstage/config'; import { DatabaseService } from '@backstage/backend-plugin-api'; import type { DeferredEntity } from '@backstage/plugin-catalog-node'; import { EventParams } from '@backstage/plugin-events-node'; @@ -16,8 +15,9 @@ import { ExtensionPoint } from '@backstage/backend-plugin-api'; import { HumanDuration } from '@backstage/types'; import { IncrementalEntityProvider as IncrementalEntityProvider_2 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion'; import { IncrementalEntityProviderOptions as IncrementalEntityProviderOptions_2 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion'; -import type { Logger } from 'winston'; -import type { PermissionEvaluator } from '@backstage/plugin-permission-common'; +import { PermissionsService } from '@backstage/backend-plugin-api'; +import { RootConfigService } from '@backstage/backend-plugin-api'; +import { RootLoggerService } from '@backstage/backend-plugin-api'; import { Router } from 'express'; import { SchedulerService } from '@backstage/backend-plugin-api'; import { UrlReaderService } from '@backstage/backend-plugin-api'; @@ -106,11 +106,11 @@ export const incrementalIngestionProvidersExtensionPoint: ExtensionPoint { - return await new IncrementalProviderRouter( + adminRouter(): express.Router { + return new IncrementalProviderRouter( new IncrementalIngestionDatabaseManager({ client: this.options.client }), this.options.logger, this.options.config, diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts index 25ff33d6ba..9e931c11fd 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts @@ -133,7 +133,7 @@ export const catalogModuleIncrementalIngestionEntityProvider = catalog.addEntityProvider(wrapped); } - httpRouter.use(await providers.adminRouter()); + httpRouter.use(providers.adminRouter()); }, }); }, diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts b/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts index ea083b8044..ad8d6ce103 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts @@ -36,7 +36,7 @@ export class IncrementalProviderRouter { this.config = config; } - async createRouter() { + createRouter(): express.Router { const router = Router(); router.use(express.json()); diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/types.ts b/plugins/catalog-backend-module-incremental-ingestion/src/types.ts index f30d8349ed..2c951aea07 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/types.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/types.ts @@ -14,23 +14,23 @@ * limitations under the License. */ -import type { Config } from '@backstage/config'; +import { + DatabaseService, + LoggerService, + PermissionsService, + RootConfigService, + RootLoggerService, + SchedulerService, + SchedulerServiceTaskFunction, + UrlReaderService, +} from '@backstage/backend-plugin-api'; import type { DeferredEntity, EntityProviderConnection, } from '@backstage/plugin-catalog-node'; import { EventParams } from '@backstage/plugin-events-node'; -import type { PermissionEvaluator } from '@backstage/plugin-permission-common'; -import type { Logger } from 'winston'; -import { IncrementalIngestionDatabaseManager } from './database/IncrementalIngestionDatabaseManager'; -import { - LoggerService, - UrlReaderService, - SchedulerService, - SchedulerServiceTaskFunction, - DatabaseService, -} from '@backstage/backend-plugin-api'; import { HumanDuration } from '@backstage/types'; +import { IncrementalIngestionDatabaseManager } from './database/IncrementalIngestionDatabaseManager'; /** * Ingest entities into the catalog in bite-sized chunks. @@ -186,12 +186,12 @@ export interface IncrementalEntityProviderOptions { /** @public */ export type PluginEnvironment = { - logger: Logger; + logger: RootLoggerService; database: DatabaseService; scheduler: SchedulerService; - config: Config; + config: RootConfigService; reader: UrlReaderService; - permissions: PermissionEvaluator; + permissions: PermissionsService; }; export interface IterationEngine {