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
+2 -2
View File
@@ -9,7 +9,7 @@ import { CatalogApi } from '@backstage/catalog-client';
import { Config } from '@backstage/config';
import express from 'express';
import { HttpAuthService } from '@backstage/backend-plugin-api';
import { Logger } from 'winston';
import { LoggerService } from '@backstage/backend-plugin-api';
import { PluginDatabaseManager } from '@backstage/backend-common';
import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { UrlReader } from '@backstage/backend-common';
@@ -36,7 +36,7 @@ export interface RouterOptions {
// (undocumented)
httpAuth?: HttpAuthService;
// (undocumented)
logger: Logger;
logger: LoggerService;
// (undocumented)
urlReader: UrlReader;
}
@@ -47,7 +47,6 @@
"express-promise-router": "^4.1.0",
"knex": "^3.0.0",
"uuid": "^9.0.0",
"winston": "^3.2.1",
"yn": "^4.0.0"
},
"devDependencies": {
+1 -2
View File
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { loggerToWinstonLogger } from '@backstage/backend-common';
import {
coreServices,
createBackendPlugin,
@@ -48,7 +47,7 @@ export const codeCoveragePlugin = createBackendPlugin({
httpRouter.use(
await createRouter({
config,
logger: loggerToWinstonLogger(logger),
logger,
urlReader,
discovery,
database,
@@ -15,11 +15,11 @@
*/
import { BranchHit, FileEntry } from '../types';
import { CoberturaXML, InnerClass, LineHit } from './types';
import { Logger } from 'winston';
import { Converter } from './Converter';
import { LoggerService } from '@backstage/backend-plugin-api';
export class Cobertura implements Converter {
constructor(readonly logger: Logger) {
constructor(readonly logger: LoggerService) {
this.logger = logger;
}
@@ -16,8 +16,8 @@
import { BranchHit, FileEntry } from '../types';
import { JacocoSourceFile, JacocoXML } from './types';
import { Logger } from 'winston';
import { Converter } from './Converter';
import { LoggerService } from '@backstage/backend-plugin-api';
type ParsedLine = {
number: number;
@@ -28,7 +28,7 @@ type ParsedLine = {
};
export class Jacoco implements Converter {
constructor(readonly logger: Logger) {
constructor(readonly logger: LoggerService) {
this.logger = logger;
}
@@ -14,11 +14,11 @@
* limitations under the License.
*/
import { FileEntry } from '../types';
import { Logger } from 'winston';
import { Converter } from './Converter';
import { LoggerService } from '@backstage/backend-plugin-api';
export class Lcov implements Converter {
constructor(readonly logger: Logger) {
constructor(readonly logger: LoggerService) {
this.logger = logger;
}
@@ -16,7 +16,6 @@
import express from 'express';
import Router from 'express-promise-router';
import { Logger } from 'winston';
import BodyParser from 'body-parser';
import bodyParserXml from 'body-parser-xml';
import { CatalogApi, CatalogClient } from '@backstage/catalog-client';
@@ -32,9 +31,13 @@ import { Config } from '@backstage/config';
import { ScmIntegrations } from '@backstage/integration';
import { CodeCoverageDatabase } from './CodeCoverageDatabase';
import { aggregateCoverage, CoverageUtils } from './CoverageUtils';
import { Converter, Jacoco, Cobertura, Lcov } from './converter';
import { Cobertura, Converter, Jacoco, Lcov } from './converter';
import { getEntitySourceLocation } from '@backstage/catalog-model';
import { AuthService, HttpAuthService } from '@backstage/backend-plugin-api';
import {
AuthService,
HttpAuthService,
LoggerService,
} from '@backstage/backend-plugin-api';
/**
* Options for {@link createRouter}.
@@ -46,7 +49,7 @@ export interface RouterOptions {
discovery: PluginEndpointDiscovery;
database: PluginDatabaseManager;
urlReader: UrlReader;
logger: Logger;
logger: LoggerService;
catalogApi?: CatalogApi;
auth?: AuthService;
httpAuth?: HttpAuthService;
@@ -24,14 +24,14 @@ import {
import { CatalogApi } from '@backstage/catalog-client';
import { CompoundEntityRef, parseEntityRef } from '@backstage/catalog-model';
import { Server } from 'http';
import { Logger } from 'winston';
import { createRouter } from './router';
import { ConfigReader } from '@backstage/config';
import { LoggerService } from '@backstage/backend-plugin-api';
export interface ServerOptions {
port: number;
enableCors: boolean;
logger: Logger;
logger: LoggerService;
}
export async function startStandaloneServer(