update serviceRef names to adhere to naming convention

Signed-off-by: Oleg S <97077423+RobotSail@users.noreply.github.com>

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",

plugins/todo-backend/src/lib/TodoReader/TodoScmReader.ts

@@ -176,8 +176,8 @@ export class TodoScmReader implements TodoReader {
 /**
  * @alpha
  */
-export const todoScmReaderRef = createServiceRef<TodoScmReader>({
-  id: 'todoScmReaderFactory',
+export const todoReaderServiceRef = createServiceRef<TodoReader>({
+  id: 'todo.todoReader',
   defaultFactory: async service =>
     createServiceFactory({
       service,

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';

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 }) {

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<TodoService> =
+export const todoServiceRef: ServiceRef<TodoService> =
   createServiceRef<TodoService>({
     id: 'todo.client',
     defaultFactory: async service =>
@@ -146,7 +146,7 @@ export const todoReaderServiceRef: ServiceRef<TodoService> =
         service,
         deps: {
           catalogApi: catalogServiceRef,
-          todoReader: todoScmReaderRef,
+          todoReader: todoReaderServiceRef,
         },
         async factory({ catalogApi, todoReader }) {
           const todoReaderService = new TodoReaderService({

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;
-};

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