From bdaf4b9c34c261f0408391e58d78b26c177e87e7 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 18 Jan 2023 11:17:05 +0100
Subject: [PATCH] backend-test-utils: renamed service dir to services +
 internal renames

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/backend-test-utils/src/next/index.ts               | 2 +-
 .../MockIdentityService.ts}                                 | 0
 .../MockRootLoggerService.ts}                               | 4 ++--
 .../src/next/{implementations => services}/index.ts         | 0
 .../src/next/{implementations => services}/mockServices.ts  | 6 +++---
 packages/backend-test-utils/src/next/wiring/TestBackend.ts  | 3 +--
 6 files changed, 7 insertions(+), 8 deletions(-)
 rename packages/backend-test-utils/src/next/{implementations/mockIdentityService.ts => services/MockIdentityService.ts} (100%)
 rename packages/backend-test-utils/src/next/{implementations/mockRootLoggerService.ts => services/MockRootLoggerService.ts} (93%)
 rename packages/backend-test-utils/src/next/{implementations => services}/index.ts (100%)
 rename packages/backend-test-utils/src/next/{implementations => services}/mockServices.ts (95%)

diff --git a/packages/backend-test-utils/src/next/index.ts b/packages/backend-test-utils/src/next/index.ts
index 9f9edfd837..572fb3a9e7 100644
--- a/packages/backend-test-utils/src/next/index.ts
+++ b/packages/backend-test-utils/src/next/index.ts
@@ -15,4 +15,4 @@
  */
 
 export * from './wiring';
-export * from './implementations';
+export * from './services';
diff --git a/packages/backend-test-utils/src/next/implementations/mockIdentityService.ts b/packages/backend-test-utils/src/next/services/MockIdentityService.ts
similarity index 100%
rename from packages/backend-test-utils/src/next/implementations/mockIdentityService.ts
rename to packages/backend-test-utils/src/next/services/MockIdentityService.ts
diff --git a/packages/backend-test-utils/src/next/implementations/mockRootLoggerService.ts b/packages/backend-test-utils/src/next/services/MockRootLoggerService.ts
similarity index 93%
rename from packages/backend-test-utils/src/next/implementations/mockRootLoggerService.ts
rename to packages/backend-test-utils/src/next/services/MockRootLoggerService.ts
index e7450dfc9c..780d330bfb 100644
--- a/packages/backend-test-utils/src/next/implementations/mockRootLoggerService.ts
+++ b/packages/backend-test-utils/src/next/services/MockRootLoggerService.ts
@@ -21,7 +21,7 @@ import {
 } from '@backstage/backend-plugin-api';
 import type { mockServices } from './mockServices';
 
-export class MockLogger implements RootLoggerService {
+export class MockRootLoggerService implements RootLoggerService {
   #levels: Exclude<mockServices.rootLogger.Options['levels'], boolean>;
   #meta: LogMeta;
 
@@ -42,7 +42,7 @@ export class MockLogger implements RootLoggerService {
   }
 
   child(meta: LogMeta): LoggerService {
-    return new MockLogger(this.#levels, { ...this.#meta, ...meta });
+    return new MockRootLoggerService(this.#levels, { ...this.#meta, ...meta });
   }
 
   constructor(
diff --git a/packages/backend-test-utils/src/next/implementations/index.ts b/packages/backend-test-utils/src/next/services/index.ts
similarity index 100%
rename from packages/backend-test-utils/src/next/implementations/index.ts
rename to packages/backend-test-utils/src/next/services/index.ts
diff --git a/packages/backend-test-utils/src/next/implementations/mockServices.ts b/packages/backend-test-utils/src/next/services/mockServices.ts
similarity index 95%
rename from packages/backend-test-utils/src/next/implementations/mockServices.ts
rename to packages/backend-test-utils/src/next/services/mockServices.ts
index 5cb1371d95..f86d8bac55 100644
--- a/packages/backend-test-utils/src/next/implementations/mockServices.ts
+++ b/packages/backend-test-utils/src/next/services/mockServices.ts
@@ -36,8 +36,8 @@ import {
 } from '@backstage/backend-app-api';
 import { ConfigReader } from '@backstage/config';
 import { JsonObject } from '@backstage/types';
-import { MockIdentityService } from './mockIdentityService';
-import { MockLogger } from './mockRootLoggerService';
+import { MockIdentityService } from './MockIdentityService';
+import { MockRootLoggerService } from './MockRootLoggerService';
 
 function simpleFactory<TService, TOptions extends [options?: object] = []>(
   ref: ServiceRef<TService>,
@@ -67,7 +67,7 @@ export namespace mockServices {
   }
 
   export function rootLogger(options?: rootLogger.Options): LoggerService {
-    return new MockLogger(options?.levels ?? false, {});
+    return new MockRootLoggerService(options?.levels ?? false, {});
   }
   export namespace rootLogger {
     export type Options = {
diff --git a/packages/backend-test-utils/src/next/wiring/TestBackend.ts b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
index f87e0927e2..db1016fcb6 100644
--- a/packages/backend-test-utils/src/next/wiring/TestBackend.ts
+++ b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
@@ -31,8 +31,7 @@ import {
   ExtensionPoint,
   coreServices,
 } from '@backstage/backend-plugin-api';
-
-import { mockServices } from '../implementations';
+import { mockServices } from '../services';
 import { ConfigReader } from '@backstage/config';
 import express from 'express';