Skip to content

Commit 93fdc95

Browse files
authored
fix(slack)!: Remove usage of winston logger (#72)
1 parent 698c7c7 commit 93fdc95

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

plugins/slack-catalog-backend/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"postpack": "backstage-cli package postpack"
2727
},
2828
"dependencies": {
29-
"@backstage/backend-common": "^0.24.0",
3029
"@backstage/backend-plugin-api": "^0.8.0",
3130
"@backstage/catalog-model": "^1.6.0",
3231
"@backstage/config": "^1.2.0",

plugins/slack-catalog-backend/src/SlackUserProcessor.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright SeatGeek
33
* Licensed under the terms of the Apache-2.0 license. See LICENSE file in project root for terms.
44
*/
5+
import { LoggerService } from '@backstage/backend-plugin-api';
56
import { Entity, isUserEntity } from '@backstage/catalog-model';
67
import { Config } from '@backstage/config';
78
import { LocationSpec } from '@backstage/plugin-catalog-common';
@@ -11,7 +12,6 @@ import type {
1112
} from '@backstage/plugin-catalog-node';
1213
import { WebClient } from '@slack/web-api';
1314
import { Member } from '@slack/web-api/dist/types/response/UsersListResponse';
14-
import { Logger } from 'winston';
1515

1616
const SLACK_USER_LIMIT = 1000;
1717

@@ -23,7 +23,7 @@ const SLACK_USER_LIMIT = 1000;
2323
*/
2424
export class SlackUserProcessor implements CatalogProcessor {
2525
private readonly slack: WebClient;
26-
private readonly logger: Logger;
26+
private readonly logger: LoggerService;
2727
private cacheLoaded: boolean;
2828
private userLookup: Map<string, Member>;
2929
// guarantee that users are loaded only once
@@ -86,7 +86,10 @@ export class SlackUserProcessor implements CatalogProcessor {
8686
return this.userLookup;
8787
}
8888

89-
static fromConfig(config: Config, logger: Logger): SlackUserProcessor[] {
89+
static fromConfig(
90+
config: Config,
91+
logger: LoggerService,
92+
): SlackUserProcessor[] {
9093
const slackToken = config.getOptionalString('slackCatalog.token');
9194
if (!slackToken) {
9295
logger.warn(
@@ -97,7 +100,7 @@ export class SlackUserProcessor implements CatalogProcessor {
97100
return [new SlackUserProcessor(new WebClient(slackToken), logger)];
98101
}
99102

100-
constructor(slack: WebClient, logger: Logger) {
103+
constructor(slack: WebClient, logger: LoggerService) {
101104
this.slack = slack;
102105
this.logger = logger;
103106
this.userLookup = new Map();

plugins/slack-catalog-backend/src/module.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* Copyright SeatGeek
33
* Licensed under the terms of the Apache-2.0 license. See LICENSE file in project root for terms.
44
*/
5-
import { loggerToWinstonLogger } from '@backstage/backend-common';
65
import {
76
coreServices,
87
createBackendModule,
@@ -32,10 +31,7 @@ export const catalogModuleSlackUserProcessor = createBackendModule({
3231
return;
3332
}
3433
catalog.addProcessor(
35-
new SlackUserProcessor(
36-
new WebClient(slackToken),
37-
loggerToWinstonLogger(logger),
38-
),
34+
new SlackUserProcessor(new WebClient(slackToken), logger),
3935
);
4036
},
4137
});

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12267,7 +12267,7 @@
1226712267
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
1226812268
integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
1226912269

12270-
"@types/react-dom@*", "@types/react-dom@<18.0.0":
12270+
"@types/react-dom@*", "@types/react-dom@<18.0.0", "@types/react-dom@^17":
1227112271
version "17.0.25"
1227212272
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5"
1227312273
integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==

0 commit comments

Comments
 (0)