refactor(core): Make Logger a service (no-changelog) (#7494)

This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-10-25 16:35:22 +02:00
committed by GitHub
parent db4e61ba24
commit 05586a900d
131 changed files with 761 additions and 919 deletions

View File

@@ -1,7 +1,6 @@
import { Container } from 'typedi';
import cookieParser from 'cookie-parser';
import express from 'express';
import { LoggerProxy } from 'n8n-workflow';
import type superagent from 'superagent';
import request from 'supertest';
import { URL } from 'url';
@@ -13,7 +12,6 @@ import { workflowsController } from '@/workflows/workflows.controller';
import { AUTH_COOKIE_NAME } from '@/constants';
import { credentialsController } from '@/credentials/credentials.controller';
import type { User } from '@db/entities/User';
import { getLogger } from '@/Logger';
import { loadPublicApiVersions } from '@/PublicApi/';
import { issueJWT } from '@/auth/jwt';
import { UserManagementMailer } from '@/UserManagement/email/UserManagementMailer';
@@ -61,6 +59,7 @@ import { UserService } from '@/services/user.service';
import { executionsController } from '@/executions/executions.controller';
import { WorkflowHistoryController } from '@/workflows/workflowHistory/workflowHistory.controller.ee';
import { BinaryDataController } from '@/controllers/binaryData.controller';
import { Logger } from '@/Logger';
/**
* Plugin to prefix a path segment into a request URL pathname.
@@ -137,8 +136,10 @@ export const setupTestServer = ({
app.use(rawBodyReader);
app.use(cookieParser());
const logger = getLogger();
LoggerProxy.init(logger);
// Mock all telemetry and logging
const logger = mockInstance(Logger);
mockInstance(InternalHooks);
mockInstance(PostHogClient);
const testServer: TestServer = {
app,
@@ -151,10 +152,6 @@ export const setupTestServer = ({
beforeAll(async () => {
await testDb.init();
// Mock all telemetry.
mockInstance(InternalHooks);
mockInstance(PostHogClient);
config.set('userManagement.jwtSecret', 'My JWT secret');
config.set('userManagement.isInstanceOwnerSetUp', true);
@@ -213,11 +210,7 @@ export const setupTestServer = ({
registerController(app, config, new EventBusControllerEE());
break;
case 'auth':
registerController(
app,
config,
new AuthController(config, logger, internalHooks, mfaService, userService),
);
registerController(app, config, Container.get(AuthController));
break;
case 'mfa':
registerController(app, config, new MFAController(mfaService));
@@ -240,11 +233,7 @@ export const setupTestServer = ({
);
registerController(app, config, Container.get(CommunityPackagesController));
case 'me':
registerController(
app,
config,
new MeController(logger, externalHooks, internalHooks, userService),
);
registerController(app, config, Container.get(MeController));
break;
case 'passwordReset':
registerController(