diff --git a/plugins/todo-backend/package.json b/plugins/todo-backend/package.json index 51c3f8ede8..e3e15e4f06 100644 --- a/plugins/todo-backend/package.json +++ b/plugins/todo-backend/package.json @@ -36,6 +36,7 @@ "@backstage/config": "workspace:^", "@backstage/errors": "workspace:^", "@backstage/integration": "workspace:^", + "@backstage/plugin-catalog-node": "workspace:^", "@types/express": "^4.17.6", "express": "^4.17.1", "express-promise-router": "^4.1.0", diff --git a/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts b/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts index d364316ae1..2804da98cc 100644 --- a/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts +++ b/plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts @@ -176,8 +176,8 @@ export class TodoScmReader implements TodoReader { /** * @alpha */ -export const todoScmReaderRef = createServiceRef({ - id: 'todoScmReaderFactory', +export const todoReaderServiceRef = createServiceRef({ + id: 'todo.todoReader', defaultFactory: async service => createServiceFactory({ service, diff --git a/plugins/todo-backend/src/lib/TodoReader/index.ts b/plugins/todo-backend/src/lib/TodoReader/index.ts index a56d5805d5..a325fcbe65 100644 --- a/plugins/todo-backend/src/lib/TodoReader/index.ts +++ b/plugins/todo-backend/src/lib/TodoReader/index.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -export { TodoScmReader, todoScmReaderRef } from './TodoScmReader'; +export { TodoScmReader, todoReaderServiceRef } from './TodoScmReader'; export type { TodoScmReaderOptions } from './TodoScmReader'; export { createTodoParser } from './createTodoParser'; export type { TodoParserOptions } from './createTodoParser'; diff --git a/plugins/todo-backend/src/plugin.ts b/plugins/todo-backend/src/plugin.ts index cb25d3ddf0..cbb581f336 100644 --- a/plugins/todo-backend/src/plugin.ts +++ b/plugins/todo-backend/src/plugin.ts @@ -19,7 +19,7 @@ import { coreServices, } from '@backstage/backend-plugin-api'; -import { todoReaderServiceRef } from './service/TodoReaderService'; +import { todoServiceRef } from './service/TodoReaderService'; import { createRouter } from './service/router'; /** @@ -31,7 +31,7 @@ export const todoPlugin = createBackendPlugin({ register(env) { env.registerInit({ deps: { - todoReader: todoReaderServiceRef, + todoReader: todoServiceRef, http: coreServices.httpRouter, }, async init({ http, todoReader }) { diff --git a/plugins/todo-backend/src/service/TodoReaderService.ts b/plugins/todo-backend/src/service/TodoReaderService.ts index b3ed793d38..c5fa0aa70b 100644 --- a/plugins/todo-backend/src/service/TodoReaderService.ts +++ b/plugins/todo-backend/src/service/TodoReaderService.ts @@ -27,7 +27,7 @@ import { } from '@backstage/backend-plugin-api'; import { catalogServiceRef } from '@backstage/plugin-catalog-node'; -import { TodoReader, todoScmReaderRef } from '../lib'; +import { TodoReader, todoReaderServiceRef } from '../lib'; import { ListTodosRequest, ListTodosResponse, TodoService } from './types'; const DEFAULT_DEFAULT_PAGE_SIZE = 10; @@ -138,7 +138,7 @@ export class TodoReaderService implements TodoService { } } -export const todoReaderServiceRef: ServiceRef = +export const todoServiceRef: ServiceRef = createServiceRef({ id: 'todo.client', defaultFactory: async service => @@ -146,7 +146,7 @@ export const todoReaderServiceRef: ServiceRef = service, deps: { catalogApi: catalogServiceRef, - todoReader: todoScmReaderRef, + todoReader: todoReaderServiceRef, }, async factory({ catalogApi, todoReader }) { const todoReaderService = new TodoReaderService({ diff --git a/plugins/todo-backend/src/service/types.ts b/plugins/todo-backend/src/service/types.ts index 6b56487605..a6c54b9d87 100644 --- a/plugins/todo-backend/src/service/types.ts +++ b/plugins/todo-backend/src/service/types.ts @@ -57,11 +57,3 @@ export const TODO_FIELDS = [ 'viewUrl', 'repoFilePath', ] as const; - -/** - * @alpha - */ -export type TodosPluginDependencies = { - todoReader: TodoService; - http: HttpRouterService; -}; diff --git a/yarn.lock b/yarn.lock index 8404d7958f..b0ccfe6ec2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8383,6 +8383,7 @@ __metadata: "@backstage/config": "workspace:^" "@backstage/errors": "workspace:^" "@backstage/integration": "workspace:^" + "@backstage/plugin-catalog-node": "workspace:^" "@types/express": ^4.17.6 "@types/supertest": ^2.0.8 express: ^4.17.1