chore: change most of plugins to use LoggerService

quite a big PR for this but the changes are pretty stright forward.
hopefully gets merged before most of these plugins move to the community
repository.

Signed-off-by: Heikki Hellgren <heikki.hellgren@op.fi>
This commit is contained in:
Heikki Hellgren
2024-04-13 01:35:47 +03:00
parent 16ef9e59e5
commit d5a1fe189b
285 changed files with 975 additions and 1050 deletions
+3 -3
View File
@@ -11,7 +11,7 @@ import { DiscoveryService } from '@backstage/backend-plugin-api';
import express from 'express';
import { ExternalDependency } from '@backstage/plugin-devtools-common';
import { HttpAuthService } from '@backstage/backend-plugin-api';
import { Logger } from 'winston';
import { LoggerService } from '@backstage/backend-plugin-api';
import { PermissionsService } from '@backstage/backend-plugin-api';
// @public (undocumented)
@@ -19,7 +19,7 @@ export function createRouter(options: RouterOptions): Promise<express.Router>;
// @public (undocumented)
export class DevToolsBackendApi {
constructor(logger: Logger, config: Config);
constructor(logger: LoggerService, config: Config);
// (undocumented)
listConfig(): Promise<ConfigInfo>;
// (undocumented)
@@ -43,7 +43,7 @@ export interface RouterOptions {
// (undocumented)
httpAuth?: HttpAuthService;
// (undocumented)
logger: Logger;
logger: LoggerService;
// (undocumented)
permissions: PermissionsService;
}
-1
View File
@@ -49,7 +49,6 @@
"node-fetch": "^2.6.7",
"ping": "^0.4.1",
"semver": "^7.5.3",
"winston": "^3.2.1",
"yn": "^4.0.0"
},
"devDependencies": {
@@ -26,7 +26,6 @@ import {
} from '@backstage/plugin-devtools-common';
import { JsonObject } from '@backstage/types';
import { Logger } from 'winston';
import fetch from 'node-fetch';
import { findPaths } from '@backstage/cli-common';
import { getPackages } from '@manypkg/get-packages';
@@ -36,11 +35,12 @@ import fs from 'fs-extra';
import { Lockfile } from '../util/Lockfile';
import { memoize } from 'lodash';
import { assertError } from '@backstage/errors';
import { LoggerService } from '@backstage/backend-plugin-api';
/** @public */
export class DevToolsBackendApi {
public constructor(
private readonly logger: Logger,
private readonly logger: LoggerService,
private readonly config: Config,
) {}
+1 -2
View File
@@ -14,7 +14,6 @@
* limitations under the License.
*/
import { loggerToWinstonLogger } from '@backstage/backend-common';
import {
coreServices,
createBackendPlugin,
@@ -49,7 +48,7 @@ export const devtoolsPlugin = createBackendPlugin({
httpRouter.use(
await createRouter({
config,
logger: loggerToWinstonLogger(logger),
logger,
permissions,
discovery,
httpAuth,
@@ -23,7 +23,6 @@ import {
import { Config } from '@backstage/config';
import { DevToolsBackendApi } from '../api';
import { Logger } from 'winston';
import { NotAllowedError } from '@backstage/errors';
import Router from 'express-promise-router';
import {
@@ -35,13 +34,14 @@ import { createPermissionIntegrationRouter } from '@backstage/plugin-permission-
import {
DiscoveryService,
HttpAuthService,
LoggerService,
PermissionsService,
} from '@backstage/backend-plugin-api';
/** @public */
export interface RouterOptions {
devToolsBackendApi?: DevToolsBackendApi;
logger: Logger;
logger: LoggerService;
config: Config;
permissions: PermissionsService;
discovery: DiscoveryService;
@@ -15,21 +15,21 @@
*/
import {
ServerTokenManager,
HostDiscovery,
createServiceBuilder,
HostDiscovery,
loadBackendConfig,
ServerTokenManager,
} from '@backstage/backend-common';
import { Logger } from 'winston';
import { Server } from 'http';
import { ServerPermissionClient } from '@backstage/plugin-permission-node';
import { createRouter } from './router';
import { LoggerService } from '@backstage/backend-plugin-api';
export interface ServerOptions {
port: number;
enableCors: boolean;
logger: Logger;
logger: LoggerService;
}
export async function startStandaloneServer(