[NBS 1.0] move more implementations from app-api to defaults

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

packages/backend-test-utils/api-report.md

@@ -22,7 +22,7 @@ import { EventsService } from '@backstage/plugin-events-node';
 import { ExtendedHttpServer } from '@backstage/backend-app-api';
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { HttpAuthService } from '@backstage/backend-plugin-api';
-import { HttpRouterFactoryOptions } from '@backstage/backend-app-api';
+import { HttpRouterFactoryOptions } from '@backstage/backend-defaults/httpRouter';
 import { HttpRouterService } from '@backstage/backend-plugin-api';
 import { IdentityService } from '@backstage/backend-plugin-api';
 import { JsonObject } from '@backstage/types';
@@ -32,7 +32,7 @@ import { LifecycleService } from '@backstage/backend-plugin-api';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { PermissionsService } from '@backstage/backend-plugin-api';
 import { RootConfigService } from '@backstage/backend-plugin-api';
-import { RootHttpRouterFactoryOptions } from '@backstage/backend-app-api';
+import { RootHttpRouterFactoryOptions } from '@backstage/backend-defaults/rootHttpRouter';
 import { RootHttpRouterService } from '@backstage/backend-plugin-api';
 import { RootLifecycleService } from '@backstage/backend-plugin-api';
 import { RootLoggerService } from '@backstage/backend-plugin-api';

packages/backend-test-utils/package.json

@@ -46,6 +46,7 @@
   },
   "dependencies": {
     "@backstage/backend-app-api": "workspace:^",
+    "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",

packages/backend-test-utils/src/next/services/mockServices.ts

@@ -14,48 +14,48 @@
  * limitations under the License.
  */
 
+import { cacheServiceFactory } from '@backstage/backend-defaults/cache';
+import { databaseServiceFactory } from '@backstage/backend-defaults/database';
 import {
-  RootConfigService,
-  coreServices,
-  createServiceFactory,
+  HostDiscovery,
+  discoveryServiceFactory,
+} from '@backstage/backend-defaults/discovery';
+import { httpRouterServiceFactory } from '@backstage/backend-defaults/httpRouter';
+import { lifecycleServiceFactory } from '@backstage/backend-defaults/lifecycle';
+import { loggerServiceFactory } from '@backstage/backend-defaults/logger';
+import { permissionsServiceFactory } from '@backstage/backend-defaults/permissions';
+import { rootHttpRouterServiceFactory } from '@backstage/backend-defaults/rootHttpRouter';
+import { rootLifecycleServiceFactory } from '@backstage/backend-defaults/rootLifecycle';
+import { schedulerServiceFactory } from '@backstage/backend-defaults/scheduler';
+import { urlReaderServiceFactory } from '@backstage/backend-defaults/urlReader';
+import {
+  AuthService,
+  BackstageCredentials,
+  BackstageUserInfo,
+  DiscoveryService,
+  HttpAuthService,
   IdentityService,
   LoggerService,
+  RootConfigService,
   ServiceFactory,
   ServiceRef,
   TokenManagerService,
-  AuthService,
-  DiscoveryService,
-  HttpAuthService,
-  BackstageCredentials,
-  BackstageUserInfo,
   UserInfoService,
+  coreServices,
+  createServiceFactory,
 } from '@backstage/backend-plugin-api';
-import {
-  cacheServiceFactory,
-  databaseServiceFactory,
-  httpRouterServiceFactory,
-  lifecycleServiceFactory,
-  loggerServiceFactory,
-  permissionsServiceFactory,
-  rootHttpRouterServiceFactory,
-  rootLifecycleServiceFactory,
-  schedulerServiceFactory,
-  urlReaderServiceFactory,
-  discoveryServiceFactory,
-  HostDiscovery,
-} from '@backstage/backend-app-api';
 import { ConfigReader } from '@backstage/config';
-import { JsonObject } from '@backstage/types';
-import { MockIdentityService } from './MockIdentityService';
-import { MockRootLoggerService } from './MockRootLoggerService';
-import { MockAuthService } from './MockAuthService';
-import { MockHttpAuthService } from './MockHttpAuthService';
-import { mockCredentials } from './mockCredentials';
-import { MockUserInfoService } from './MockUserInfoService';
 import {
   eventsServiceFactory,
   eventsServiceRef,
 } from '@backstage/plugin-events-node';
+import { JsonObject } from '@backstage/types';
+import { MockAuthService } from './MockAuthService';
+import { MockHttpAuthService } from './MockHttpAuthService';
+import { MockIdentityService } from './MockIdentityService';
+import { MockRootLoggerService } from './MockRootLoggerService';
+import { MockUserInfoService } from './MockUserInfoService';
+import { mockCredentials } from './mockCredentials';
 
 /** @internal */
 function createLoggerMock() {