fix api reports

Signed-off-by: Johan Haals <johan.haals@gmail.com>

packages/backend-common/api-report.md

@@ -51,11 +51,8 @@ import { SearchOptions } from '@backstage/backend-plugin-api';
 import { SearchResponse } from '@backstage/backend-plugin-api';
 import { SearchResponseFile } from '@backstage/backend-plugin-api';
 import { Server } from 'http';
-<<<<<<< HEAD
-import { TransportStreamOptions } from 'winston-transport';
-=======
 import { TokenManagerService as TokenManager } from '@backstage/backend-plugin-api';
->>>>>>> 24636656b5 (Migrate TokenManager types)
+import { TransportStreamOptions } from 'winston-transport';
 import { UrlReaderService as UrlReader } from '@backstage/backend-plugin-api';
 import { V1PodTemplateSpec } from '@kubernetes/client-node';
 import * as winston from 'winston';

packages/backend-plugin-api/api-report.md

@@ -7,16 +7,11 @@
 
 import { Config } from '@backstage/config';
 import { Handler } from 'express';
+import { JsonValue } from '@backstage/types';
+import { Knex } from 'knex';
 import { PermissionEvaluator } from '@backstage/plugin-permission-common';
-import { PluginCacheManager } from '@backstage/backend-common';
-import { PluginDatabaseManager } from '@backstage/backend-common';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
 import { Readable } from 'stream';
-<<<<<<< HEAD
-import { TokenManager } from '@backstage/backend-common';
-=======
-import { TransportStreamOptions } from 'winston-transport';
->>>>>>> 24636656b5 (Migrate TokenManager types)
 
 // @public (undocumented)
 export interface BackendFeature {
@@ -67,8 +62,31 @@ export interface BackendRegistrationPoints {
   }): void;
 }
 
-// @public (undocumented)
-export interface CacheService extends PluginCacheManager {}
+// @public
+export interface CacheClient {
+  delete(key: string): Promise<void>;
+  get(key: string): Promise<JsonValue | undefined>;
+  set(
+    key: string,
+    value: JsonValue,
+    options?: CacheClientSetOptions,
+  ): Promise<void>;
+}
+
+// @public
+export type CacheClientOptions = {
+  defaultTtl?: number;
+};
+
+// @public
+export type CacheClientSetOptions = {
+  ttl?: number;
+};
+
+// @public
+export interface CacheService {
+  getClient: (options?: CacheClientOptions) => CacheClient;
+}
 
 // @public (undocumented)
 export interface ConfigService extends Config {}
@@ -155,8 +173,13 @@ export function createServiceRef<T>(options: {
   ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>;
 }): ServiceRef<T, 'root'>;
 
-// @public (undocumented)
-export interface DatabaseService extends PluginDatabaseManager {}
+// @public
+export interface DatabaseService {
+  getClient(): Promise<Knex>;
+  migrations?: {
+    skip?: boolean;
+  };
+}
 
 // @public
 export interface DiscoveryService {