mirror of
https://github.com/n8n-io/n8n.git
synced 2024-12-24 04:04:06 -08:00
refactor(core): Standardize filename casing for environments and eventbus (no-changelog) (#10527)
Some checks are pending
Test Master / install-and-build (push) Waiting to run
Test Master / Unit tests (18.x) (push) Blocked by required conditions
Test Master / Unit tests (20.x) (push) Blocked by required conditions
Test Master / Unit tests (22.4) (push) Blocked by required conditions
Test Master / Lint (push) Blocked by required conditions
Test Master / Notify Slack on failure (push) Blocked by required conditions
Some checks are pending
Test Master / install-and-build (push) Waiting to run
Test Master / Unit tests (18.x) (push) Blocked by required conditions
Test Master / Unit tests (20.x) (push) Blocked by required conditions
Test Master / Unit tests (22.4) (push) Blocked by required conditions
Test Master / Lint (push) Blocked by required conditions
Test Master / Notify Slack on failure (push) Blocked by required conditions
This commit is contained in:
parent
9d156d3703
commit
96e69ad5f2
|
@ -3,13 +3,13 @@ import { Container } from 'typedi';
|
|||
import type { StatusResult } from 'simple-git';
|
||||
import type { PublicSourceControlRequest } from '../../../types';
|
||||
import { globalScope } from '../../shared/middlewares/global.middleware';
|
||||
import type { ImportResult } from '@/environments/sourceControl/types/importResult';
|
||||
import { SourceControlService } from '@/environments/sourceControl/sourceControl.service.ee';
|
||||
import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
|
||||
import type { ImportResult } from '@/environments/source-control/types/import-result';
|
||||
import { SourceControlService } from '@/environments/source-control/source-control.service.ee';
|
||||
import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee';
|
||||
import {
|
||||
getTrackingInformationFromPullResult,
|
||||
isSourceControlLicensed,
|
||||
} from '@/environments/sourceControl/sourceControlHelper.ee';
|
||||
} from '@/environments/source-control/source-control-helper.ee';
|
||||
import { EventService } from '@/events/event.service';
|
||||
|
||||
export = {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { VariablesService } from '@/environments/variables/variables.service.ee';
|
||||
import { mockInstance } from '@test/mocking';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { getBase } from '@/workflow-execute-additional-data';
|
||||
import Container from 'typedi';
|
||||
import { CredentialsHelper } from '@/credentials-helper';
|
||||
|
|
|
@ -15,7 +15,7 @@ import { ActiveExecutions } from '@/active-executions';
|
|||
import { ActiveWorkflowManager } from '@/active-workflow-manager';
|
||||
import { Server } from '@/server';
|
||||
import { EDITOR_UI_DIST_DIR, LICENSE_FEATURES } from '@/constants';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { License } from '@/license';
|
||||
import { OrchestrationService } from '@/services/orchestration.service';
|
||||
import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service';
|
||||
|
|
|
@ -12,9 +12,9 @@ import { N8N_VERSION, inTest } from '@/constants';
|
|||
import type { ICredentialsOverwrite } from '@/Interfaces';
|
||||
import { CredentialsOverwrites } from '@/credentials-overwrites';
|
||||
import { rawBodyReader, bodyParser } from '@/middlewares';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import type { RedisServicePubSubSubscriber } from '@/services/redis/RedisServicePubSubSubscriber';
|
||||
import { EventMessageGeneric } from '@/eventbus/EventMessageClasses/EventMessageGeneric';
|
||||
import { EventMessageGeneric } from '@/eventbus/event-message-classes/event-message-generic';
|
||||
import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service';
|
||||
import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
|
||||
import { ServiceUnavailableError } from '@/errors/response-errors/service-unavailable.error';
|
||||
|
|
|
@ -4,7 +4,7 @@ import config from '@/config';
|
|||
import { SettingsRepository } from '@db/repositories/settings.repository';
|
||||
import { UserRepository } from '@db/repositories/user.repository';
|
||||
import { ActiveWorkflowManager } from '@/active-workflow-manager';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { License } from '@/license';
|
||||
import { LICENSE_FEATURES, LICENSE_QUOTAS, UNLIMITED_LICENSE_QUOTA, inE2ETests } from '@/constants';
|
||||
import { Patch, Post, RestController } from '@/decorators';
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import mock from 'jest-mock-extended/lib/Mock';
|
||||
import { SourceControlExportService } from '../sourceControlExport.service.ee';
|
||||
import type { SourceControlledFile } from '../types/sourceControlledFile';
|
||||
import { SourceControlExportService } from '../source-control-export.service.ee';
|
||||
import type { SourceControlledFile } from '../types/source-controlled-file';
|
||||
import { Cipher, type InstanceSettings } from 'n8n-core';
|
||||
import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
|
||||
import { mockInstance } from '@test/mocking';
|
|
@ -1,5 +1,5 @@
|
|||
import { mock } from 'jest-mock-extended';
|
||||
import { SourceControlGitService } from '../sourceControlGit.service.ee';
|
||||
import { SourceControlGitService } from '../source-control-git.service.ee';
|
||||
import { simpleGit } from 'simple-git';
|
||||
|
||||
const MOCK_BRANCHES = {
|
|
@ -6,18 +6,18 @@ import {
|
|||
getTrackingInformationFromPrePushResult,
|
||||
getTrackingInformationFromPullResult,
|
||||
sourceControlFoldersExistCheck,
|
||||
} from '@/environments/sourceControl/sourceControlHelper.ee';
|
||||
} from '@/environments/source-control/source-control-helper.ee';
|
||||
import { License } from '@/license';
|
||||
import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
|
||||
import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee';
|
||||
import { InstanceSettings } from 'n8n-core';
|
||||
import path from 'path';
|
||||
import {
|
||||
SOURCE_CONTROL_SSH_FOLDER,
|
||||
SOURCE_CONTROL_GIT_FOLDER,
|
||||
} from '@/environments/sourceControl/constants';
|
||||
} from '@/environments/source-control/constants';
|
||||
import { constants as fsConstants, accessSync } from 'fs';
|
||||
import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
|
||||
import type { SourceControlPreferences } from '@/environments/sourceControl/types/sourceControlPreferences';
|
||||
import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file';
|
||||
import type { SourceControlPreferences } from '@/environments/source-control/types/source-control-preferences';
|
||||
import { mockInstance } from '@test/mocking';
|
||||
|
||||
const pushResult: SourceControlledFile[] = [
|
|
@ -1,6 +1,6 @@
|
|||
import { SourceControlGitService } from '@/environments/sourceControl/sourceControlGit.service.ee';
|
||||
import { SourceControlGitService } from '@/environments/source-control/source-control-git.service.ee';
|
||||
import { mock } from 'jest-mock-extended';
|
||||
import type { SourceControlPreferences } from '@/environments/sourceControl/types/sourceControlPreferences';
|
||||
import type { SourceControlPreferences } from '@/environments/source-control/types/source-control-preferences';
|
||||
import type { User } from '@/databases/entities/User';
|
||||
import type { SimpleGit } from 'simple-git';
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import type { RequestHandler } from 'express';
|
||||
import { Container } from 'typedi';
|
||||
import { isSourceControlLicensed } from '../sourceControlHelper.ee';
|
||||
import { SourceControlPreferencesService } from '../sourceControlPreferences.service.ee';
|
||||
import { isSourceControlLicensed } from '../source-control-helper.ee';
|
||||
import { SourceControlPreferencesService } from '../source-control-preferences.service.ee';
|
||||
|
||||
export const sourceControlLicensedAndEnabledMiddleware: RequestHandler = (_req, res, next) => {
|
||||
const sourceControlPreferencesService = Container.get(SourceControlPreferencesService);
|
|
@ -10,18 +10,18 @@ import { ApplicationError, type ICredentialDataDecryptedObject } from 'n8n-workf
|
|||
import { writeFile as fsWriteFile, rm as fsRm } from 'fs/promises';
|
||||
import { rmSync } from 'fs';
|
||||
import { Credentials, InstanceSettings } from 'n8n-core';
|
||||
import type { ExportableWorkflow } from './types/exportableWorkflow';
|
||||
import type { ExportableCredential } from './types/exportableCredential';
|
||||
import type { ExportResult } from './types/exportResult';
|
||||
import type { ExportableWorkflow } from './types/exportable-workflow';
|
||||
import type { ExportableCredential } from './types/exportable-credential';
|
||||
import type { ExportResult } from './types/export-result';
|
||||
import {
|
||||
getCredentialExportPath,
|
||||
getVariablesPath,
|
||||
getWorkflowExportPath,
|
||||
sourceControlFoldersExistCheck,
|
||||
stringContainsExpression,
|
||||
} from './sourceControlHelper.ee';
|
||||
} from './source-control-helper.ee';
|
||||
import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
|
||||
import type { SourceControlledFile } from './types/sourceControlledFile';
|
||||
import type { SourceControlledFile } from './types/source-controlled-file';
|
||||
import { VariablesService } from '../variables/variables.service.ee';
|
||||
import { TagRepository } from '@db/repositories/tag.repository';
|
||||
import { WorkflowRepository } from '@db/repositories/workflow.repository';
|
||||
|
@ -29,7 +29,7 @@ import { Logger } from '@/logger';
|
|||
import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
|
||||
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
|
||||
import { WorkflowTagMappingRepository } from '@db/repositories/workflowTagMapping.repository';
|
||||
import type { ResourceOwner } from './types/resourceOwner';
|
||||
import type { ResourceOwner } from './types/resource-owner';
|
||||
|
||||
@Service()
|
||||
export class SourceControlExportService {
|
|
@ -11,19 +11,19 @@ import type {
|
|||
SimpleGitOptions,
|
||||
StatusResult,
|
||||
} from 'simple-git';
|
||||
import type { SourceControlPreferences } from './types/sourceControlPreferences';
|
||||
import type { SourceControlPreferences } from './types/source-control-preferences';
|
||||
import {
|
||||
SOURCE_CONTROL_DEFAULT_BRANCH,
|
||||
SOURCE_CONTROL_DEFAULT_EMAIL,
|
||||
SOURCE_CONTROL_DEFAULT_NAME,
|
||||
SOURCE_CONTROL_ORIGIN,
|
||||
} from './constants';
|
||||
import { sourceControlFoldersExistCheck } from './sourceControlHelper.ee';
|
||||
import { sourceControlFoldersExistCheck } from './source-control-helper.ee';
|
||||
import type { User } from '@db/entities/User';
|
||||
import { Logger } from '@/logger';
|
||||
import { ApplicationError } from 'n8n-workflow';
|
||||
import { OwnershipService } from '@/services/ownership.service';
|
||||
import { SourceControlPreferencesService } from './sourceControlPreferences.service.ee';
|
||||
import { SourceControlPreferencesService } from './source-control-preferences.service.ee';
|
||||
|
||||
@Service()
|
||||
export class SourceControlGitService {
|
|
@ -1,16 +1,16 @@
|
|||
import { Container } from 'typedi';
|
||||
import { License } from '@/license';
|
||||
import { generateKeyPairSync } from 'crypto';
|
||||
import type { KeyPair } from './types/keyPair';
|
||||
import type { KeyPair } from './types/key-pair';
|
||||
import { constants as fsConstants, mkdirSync, accessSync } from 'fs';
|
||||
import {
|
||||
SOURCE_CONTROL_GIT_KEY_COMMENT,
|
||||
SOURCE_CONTROL_TAGS_EXPORT_FILE,
|
||||
SOURCE_CONTROL_VARIABLES_EXPORT_FILE,
|
||||
} from './constants';
|
||||
import type { SourceControlledFile } from './types/sourceControlledFile';
|
||||
import type { SourceControlledFile } from './types/source-controlled-file';
|
||||
import path from 'path';
|
||||
import type { KeyPairType } from './types/keyPairType';
|
||||
import type { KeyPairType } from './types/key-pair-type';
|
||||
import { Logger } from '@/logger';
|
||||
|
||||
export function stringContainsExpression(testString: string): boolean {
|
|
@ -12,7 +12,7 @@ import { ApplicationError, jsonParse, ErrorReporterProxy as ErrorReporter } from
|
|||
import { readFile as fsReadFile } from 'fs/promises';
|
||||
import { Credentials, InstanceSettings } from 'n8n-core';
|
||||
import type { IWorkflowToImport } from '@/Interfaces';
|
||||
import type { ExportableCredential } from './types/exportableCredential';
|
||||
import type { ExportableCredential } from './types/exportable-credential';
|
||||
import type { Variables } from '@db/entities/Variables';
|
||||
import { SharedCredentials } from '@db/entities/SharedCredentials';
|
||||
import type { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping';
|
||||
|
@ -21,9 +21,9 @@ import { ActiveWorkflowManager } from '@/active-workflow-manager';
|
|||
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
|
||||
import { In } from '@n8n/typeorm';
|
||||
import { isUniqueConstraintError } from '@/response-helper';
|
||||
import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkflowVersionId';
|
||||
import { getCredentialExportPath, getWorkflowExportPath } from './sourceControlHelper.ee';
|
||||
import type { SourceControlledFile } from './types/sourceControlledFile';
|
||||
import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
|
||||
import { getCredentialExportPath, getWorkflowExportPath } from './source-control-helper.ee';
|
||||
import type { SourceControlledFile } from './types/source-controlled-file';
|
||||
import { VariablesService } from '../variables/variables.service.ee';
|
||||
import { TagRepository } from '@db/repositories/tag.repository';
|
||||
import { WorkflowRepository } from '@db/repositories/workflow.repository';
|
||||
|
@ -35,7 +35,7 @@ import { WorkflowTagMappingRepository } from '@db/repositories/workflowTagMappin
|
|||
import { VariablesRepository } from '@db/repositories/variables.repository';
|
||||
import { ProjectRepository } from '@/databases/repositories/project.repository';
|
||||
import type { Project } from '@/databases/entities/Project';
|
||||
import type { ResourceOwner } from './types/resourceOwner';
|
||||
import type { ResourceOwner } from './types/resource-owner';
|
||||
import { assertNever } from '@/utils';
|
||||
import { UserRepository } from '@/databases/repositories/user.repository';
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
import { writeFile, chmod, readFile } from 'node:fs/promises';
|
||||
import Container, { Service } from 'typedi';
|
||||
import { SourceControlPreferences } from './types/sourceControlPreferences';
|
||||
import { SourceControlPreferences } from './types/source-control-preferences';
|
||||
import type { ValidationError } from 'class-validator';
|
||||
import { validate } from 'class-validator';
|
||||
import { rm as fsRm } from 'fs/promises';
|
||||
import { generateSshKeyPair, isSourceControlLicensed } from './sourceControlHelper.ee';
|
||||
import { generateSshKeyPair, isSourceControlLicensed } from './source-control-helper.ee';
|
||||
import { Cipher, InstanceSettings } from 'n8n-core';
|
||||
import { ApplicationError, jsonParse } from 'n8n-workflow';
|
||||
import {
|
||||
|
@ -14,7 +14,7 @@ import {
|
|||
SOURCE_CONTROL_PREFERENCES_DB_KEY,
|
||||
} from './constants';
|
||||
import path from 'path';
|
||||
import type { KeyPairType } from './types/keyPairType';
|
||||
import type { KeyPairType } from './types/key-pair-type';
|
||||
import config from '@/config';
|
||||
import { Logger } from '@/logger';
|
||||
import { SettingsRepository } from '@db/repositories/settings.repository';
|
|
@ -4,17 +4,17 @@ import { Get, Post, Patch, RestController, GlobalScope } from '@/decorators';
|
|||
import {
|
||||
sourceControlLicensedMiddleware,
|
||||
sourceControlLicensedAndEnabledMiddleware,
|
||||
} from './middleware/sourceControlEnabledMiddleware.ee';
|
||||
import { SourceControlService } from './sourceControl.service.ee';
|
||||
} from './middleware/source-control-enabled-middleware.ee';
|
||||
import { SourceControlService } from './source-control.service.ee';
|
||||
import { SourceControlRequest } from './types/requests';
|
||||
import { SourceControlPreferencesService } from './sourceControlPreferences.service.ee';
|
||||
import type { SourceControlPreferences } from './types/sourceControlPreferences';
|
||||
import type { SourceControlledFile } from './types/sourceControlledFile';
|
||||
import { SourceControlPreferencesService } from './source-control-preferences.service.ee';
|
||||
import type { SourceControlPreferences } from './types/source-control-preferences';
|
||||
import type { SourceControlledFile } from './types/source-controlled-file';
|
||||
import { SOURCE_CONTROL_DEFAULT_BRANCH } from './constants';
|
||||
import type { ImportResult } from './types/importResult';
|
||||
import type { ImportResult } from './types/import-result';
|
||||
import { EventService } from '@/events/event.service';
|
||||
import { getRepoType } from './sourceControlHelper.ee';
|
||||
import { SourceControlGetStatus } from './types/sourceControlGetStatus';
|
||||
import { getRepoType } from './source-control-helper.ee';
|
||||
import { SourceControlGetStatus } from './types/source-control-get-status';
|
||||
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
|
||||
|
||||
@RestController('/source-control')
|
|
@ -7,29 +7,29 @@ import {
|
|||
getTrackingInformationFromPullResult,
|
||||
getVariablesPath,
|
||||
sourceControlFoldersExistCheck,
|
||||
} from './sourceControlHelper.ee';
|
||||
import type { SourceControlPreferences } from './types/sourceControlPreferences';
|
||||
} from './source-control-helper.ee';
|
||||
import type { SourceControlPreferences } from './types/source-control-preferences';
|
||||
import {
|
||||
SOURCE_CONTROL_DEFAULT_EMAIL,
|
||||
SOURCE_CONTROL_DEFAULT_NAME,
|
||||
SOURCE_CONTROL_README,
|
||||
} from './constants';
|
||||
import { SourceControlGitService } from './sourceControlGit.service.ee';
|
||||
import { SourceControlGitService } from './source-control-git.service.ee';
|
||||
import type { PushResult } from 'simple-git';
|
||||
import { SourceControlExportService } from './sourceControlExport.service.ee';
|
||||
import type { ImportResult } from './types/importResult';
|
||||
import type { SourceControlPushWorkFolder } from './types/sourceControlPushWorkFolder';
|
||||
import type { SourceControllPullOptions } from './types/sourceControlPullWorkFolder';
|
||||
import type { SourceControlledFile } from './types/sourceControlledFile';
|
||||
import { SourceControlPreferencesService } from './sourceControlPreferences.service.ee';
|
||||
import { SourceControlExportService } from './source-control-export.service.ee';
|
||||
import type { ImportResult } from './types/import-result';
|
||||
import type { SourceControlPushWorkFolder } from './types/source-control-push-work-folder';
|
||||
import type { SourceControllPullOptions } from './types/source-control-pull-work-folder';
|
||||
import type { SourceControlledFile } from './types/source-controlled-file';
|
||||
import { SourceControlPreferencesService } from './source-control-preferences.service.ee';
|
||||
import { writeFileSync } from 'fs';
|
||||
import { SourceControlImportService } from './sourceControlImport.service.ee';
|
||||
import { SourceControlImportService } from './source-control-import.service.ee';
|
||||
import type { User } from '@db/entities/User';
|
||||
import type { SourceControlGetStatus } from './types/sourceControlGetStatus';
|
||||
import type { SourceControlGetStatus } from './types/source-control-get-status';
|
||||
import type { TagEntity } from '@db/entities/TagEntity';
|
||||
import type { Variables } from '@db/entities/Variables';
|
||||
import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkflowVersionId';
|
||||
import type { ExportableCredential } from './types/exportableCredential';
|
||||
import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
|
||||
import type { ExportableCredential } from './types/exportable-credential';
|
||||
import { EventService } from '@/events/event.service';
|
||||
import { TagRepository } from '@db/repositories/tag.repository';
|
||||
import { Logger } from '@/logger';
|
|
@ -1,5 +1,5 @@
|
|||
import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
|
||||
import type { ResourceOwner } from './resourceOwner';
|
||||
import type { ResourceOwner } from './resource-owner';
|
||||
|
||||
export interface ExportableCredential {
|
||||
id: string;
|
|
@ -1,5 +1,5 @@
|
|||
import type { INode, IConnections, IWorkflowSettings } from 'n8n-workflow';
|
||||
import type { ResourceOwner } from './resourceOwner';
|
||||
import type { ResourceOwner } from './resource-owner';
|
||||
|
||||
export interface ExportableWorkflow {
|
||||
id: string;
|
|
@ -1,15 +1,15 @@
|
|||
import type { AuthenticatedRequest } from '@/requests';
|
||||
import type { SourceControlPreferences } from './sourceControlPreferences';
|
||||
import type { SourceControlSetBranch } from './sourceControlSetBranch';
|
||||
import type { SourceControlCommit } from './sourceControlCommit';
|
||||
import type { SourceControlStage } from './sourceControlStage';
|
||||
import type { SourceControlPush } from './sourceControlPush';
|
||||
import type { SourceControlPushWorkFolder } from './sourceControlPushWorkFolder';
|
||||
import type { SourceControlPullWorkFolder } from './sourceControlPullWorkFolder';
|
||||
import type { SourceControlDisconnect } from './sourceControlDisconnect';
|
||||
import type { SourceControlSetReadOnly } from './sourceControlSetReadOnly';
|
||||
import type { SourceControlGetStatus } from './sourceControlGetStatus';
|
||||
import type { SourceControlGenerateKeyPair } from './sourceControlGenerateKeyPair';
|
||||
import type { SourceControlPreferences } from './source-control-preferences';
|
||||
import type { SourceControlSetBranch } from './source-control-set-branch';
|
||||
import type { SourceControlCommit } from './source-control-commit';
|
||||
import type { SourceControlStage } from './source-control-stage';
|
||||
import type { SourceControlPush } from './source-control-push';
|
||||
import type { SourceControlPushWorkFolder } from './source-control-push-work-folder';
|
||||
import type { SourceControlPullWorkFolder } from './source-control-pull-work-folder';
|
||||
import type { SourceControlDisconnect } from './source-control-disconnect';
|
||||
import type { SourceControlSetReadOnly } from './source-control-set-read-only';
|
||||
import type { SourceControlGetStatus } from './source-control-get-status';
|
||||
import type { SourceControlGenerateKeyPair } from './source-control-generate-key-pair';
|
||||
|
||||
export declare namespace SourceControlRequest {
|
||||
type UpdatePreferences = AuthenticatedRequest<{}, {}, Partial<SourceControlPreferences>, {}>;
|
|
@ -1,5 +1,5 @@
|
|||
import { IsOptional, IsString } from 'class-validator';
|
||||
import { KeyPairType } from './keyPairType';
|
||||
import { KeyPairType } from './key-pair-type';
|
||||
|
||||
export class SourceControlGenerateKeyPair {
|
||||
@IsOptional()
|
|
@ -1,5 +1,5 @@
|
|||
import { IsBoolean, IsHexColor, IsOptional, IsString } from 'class-validator';
|
||||
import { KeyPairType } from './keyPairType';
|
||||
import { KeyPairType } from './key-pair-type';
|
||||
|
||||
export class SourceControlPreferences {
|
||||
constructor(preferences: Partial<SourceControlPreferences> | undefined = undefined) {
|
|
@ -1,5 +1,5 @@
|
|||
import { IsBoolean, IsOptional, IsString } from 'class-validator';
|
||||
import type { SourceControlledFile } from './sourceControlledFile';
|
||||
import type { SourceControlledFile } from './source-controlled-file';
|
||||
|
||||
export class SourceControlPushWorkFolder {
|
||||
@IsBoolean()
|
|
@ -1,7 +1,7 @@
|
|||
import { Container, Service } from 'typedi';
|
||||
import type { Variables } from '@db/entities/Variables';
|
||||
import { generateNanoId } from '@db/utils/generators';
|
||||
import { canCreateNewVariable } from './environmentHelpers';
|
||||
import { canCreateNewVariable } from './environment-helpers';
|
||||
import { CacheService } from '@/services/cache/cache.service';
|
||||
import { VariablesRepository } from '@db/repositories/variables.repository';
|
||||
import { VariableCountLimitReachedError } from '@/errors/variable-count-limit-reached.error';
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import type { DateTime } from 'luxon';
|
||||
import type { EventMessageTypeNames } from 'n8n-workflow';
|
||||
import type { EventNamesTypes } from '.';
|
||||
import type { AbstractEventPayload } from './AbstractEventPayload';
|
||||
import type { AbstractEventPayload } from './abstract-event-payload';
|
||||
|
||||
export interface AbstractEventMessageOptions {
|
||||
__type?: EventMessageTypeNames;
|
|
@ -2,8 +2,8 @@
|
|||
import { DateTime } from 'luxon';
|
||||
import type { EventMessageTypeNames, JsonObject } from 'n8n-workflow';
|
||||
import { v4 as uuid } from 'uuid';
|
||||
import type { AbstractEventPayload } from './AbstractEventPayload';
|
||||
import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
|
||||
import type { AbstractEventPayload } from './abstract-event-payload';
|
||||
import type { AbstractEventMessageOptions } from './abstract-event-message-options';
|
||||
import type { EventNamesTypes } from '.';
|
||||
|
||||
function modifyUnderscoredKeys(
|
|
@ -1,8 +1,8 @@
|
|||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './AbstractEventMessage';
|
||||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './abstract-event-message';
|
||||
import type { EventNamesAiNodesType, JsonObject } from 'n8n-workflow';
|
||||
import { EventMessageTypeNames } from 'n8n-workflow';
|
||||
import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
|
||||
import type { AbstractEventPayload } from './AbstractEventPayload';
|
||||
import type { AbstractEventMessageOptions } from './abstract-event-message-options';
|
||||
import type { AbstractEventPayload } from './abstract-event-payload';
|
||||
|
||||
// --------------------------------------
|
||||
// EventMessage class for Node events
|
|
@ -1,8 +1,8 @@
|
|||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './AbstractEventMessage';
|
||||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './abstract-event-message';
|
||||
import { EventMessageTypeNames } from 'n8n-workflow';
|
||||
import type { JsonObject, JsonValue } from 'n8n-workflow';
|
||||
import type { AbstractEventPayload } from './AbstractEventPayload';
|
||||
import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
|
||||
import type { AbstractEventPayload } from './abstract-event-payload';
|
||||
import type { AbstractEventMessageOptions } from './abstract-event-message-options';
|
||||
import type { EventNamesAuditType } from '.';
|
||||
|
||||
// --------------------------------------
|
|
@ -1,8 +1,8 @@
|
|||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './AbstractEventMessage';
|
||||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './abstract-event-message';
|
||||
import type { JsonObject } from 'n8n-workflow';
|
||||
import { EventMessageTypeNames } from 'n8n-workflow';
|
||||
import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
|
||||
import type { AbstractEventPayload } from './AbstractEventPayload';
|
||||
import type { AbstractEventMessageOptions } from './abstract-event-message-options';
|
||||
import type { AbstractEventPayload } from './abstract-event-payload';
|
||||
import type { EventNamesExecutionType } from '.';
|
||||
|
||||
export interface EventPayloadExecution extends AbstractEventPayload {
|
|
@ -1,8 +1,8 @@
|
|||
import type { JsonObject } from 'n8n-workflow';
|
||||
import { EventMessageTypeNames } from 'n8n-workflow';
|
||||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './AbstractEventMessage';
|
||||
import type { AbstractEventPayload } from './AbstractEventPayload';
|
||||
import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
|
||||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './abstract-event-message';
|
||||
import type { AbstractEventPayload } from './abstract-event-payload';
|
||||
import type { AbstractEventMessageOptions } from './abstract-event-message-options';
|
||||
|
||||
export const eventMessageGenericDestinationTestEvent = 'n8n.destination.test';
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './AbstractEventMessage';
|
||||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './abstract-event-message';
|
||||
import type { JsonObject } from 'n8n-workflow';
|
||||
import { EventMessageTypeNames } from 'n8n-workflow';
|
||||
import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
|
||||
import type { AbstractEventPayload } from './AbstractEventPayload';
|
||||
import type { AbstractEventMessageOptions } from './abstract-event-message-options';
|
||||
import type { AbstractEventPayload } from './abstract-event-payload';
|
||||
import type { EventNamesNodeType } from '.';
|
||||
|
||||
// --------------------------------------
|
|
@ -1,8 +1,8 @@
|
|||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './AbstractEventMessage';
|
||||
import { AbstractEventMessage, isEventMessageOptionsWithType } from './abstract-event-message';
|
||||
import type { IWorkflowBase, JsonObject } from 'n8n-workflow';
|
||||
import { EventMessageTypeNames } from 'n8n-workflow';
|
||||
import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
|
||||
import type { AbstractEventPayload } from './AbstractEventPayload';
|
||||
import type { AbstractEventMessageOptions } from './abstract-event-message-options';
|
||||
import type { AbstractEventPayload } from './abstract-event-payload';
|
||||
import type { IExecutionBase } from '@/Interfaces';
|
||||
import type { EventNamesWorkflowType } from '.';
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
import type { EventMessageAiNode } from './EventMessageAiNode';
|
||||
import type { EventMessageAudit } from './EventMessageAudit';
|
||||
import type { EventMessageExecution } from './EventMessageExecution';
|
||||
import type { EventMessageGeneric } from './EventMessageGeneric';
|
||||
import type { EventMessageNode } from './EventMessageNode';
|
||||
import type { EventMessageWorkflow } from './EventMessageWorkflow';
|
||||
import type { EventMessageAiNode } from './event-message-ai-node';
|
||||
import type { EventMessageAudit } from './event-message-audit';
|
||||
import type { EventMessageExecution } from './event-message-execution';
|
||||
import type { EventMessageGeneric } from './event-message-generic';
|
||||
import type { EventMessageNode } from './event-message-node';
|
||||
import type { EventMessageWorkflow } from './event-message-workflow';
|
||||
import { eventNamesAiNodes, type EventNamesAiNodesType } from 'n8n-workflow';
|
||||
|
||||
export const eventNamesWorkflow = [
|
|
@ -1,4 +1,4 @@
|
|||
import { eventNamesAll } from './EventMessageClasses';
|
||||
import { eventNamesAll } from './event-message-classes';
|
||||
import express from 'express';
|
||||
import type {
|
||||
MessageEventBusDestinationWebhookOptions,
|
||||
|
@ -10,17 +10,17 @@ import { RestController, Get, Post, Delete, GlobalScope, Licensed } from '@/deco
|
|||
import { AuthenticatedRequest } from '@/requests';
|
||||
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
|
||||
|
||||
import { MessageEventBus } from './MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from './message-event-bus/message-event-bus';
|
||||
import {
|
||||
isMessageEventBusDestinationSentryOptions,
|
||||
MessageEventBusDestinationSentry,
|
||||
} from './MessageEventBusDestination/MessageEventBusDestinationSentry.ee';
|
||||
} from './message-event-bus-destination/message-event-bus-destination-sentry.ee';
|
||||
import {
|
||||
isMessageEventBusDestinationSyslogOptions,
|
||||
MessageEventBusDestinationSyslog,
|
||||
} from './MessageEventBusDestination/MessageEventBusDestinationSyslog.ee';
|
||||
import { MessageEventBusDestinationWebhook } from './MessageEventBusDestination/MessageEventBusDestinationWebhook.ee';
|
||||
import type { MessageEventBusDestination } from './MessageEventBusDestination/MessageEventBusDestination.ee';
|
||||
} from './message-event-bus-destination/message-event-bus-destination-syslog.ee';
|
||||
import { MessageEventBusDestinationWebhook } from './message-event-bus-destination/message-event-bus-destination-webhook.ee';
|
||||
import type { MessageEventBusDestination } from './message-event-bus-destination/message-event-bus-destination.ee';
|
||||
|
||||
const isWithIdString = (candidate: unknown): candidate is { id: string } => {
|
||||
const o = candidate as { id: string };
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
export { EventMessageTypes } from './EventMessageClasses';
|
||||
export { EventPayloadWorkflow } from './EventMessageClasses/EventMessageWorkflow';
|
||||
export { EventMessageTypes } from './event-message-classes';
|
||||
export { EventPayloadWorkflow } from './event-message-classes/event-message-workflow';
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
|
||||
import type { EventDestinations } from '@db/entities/EventDestinations';
|
||||
import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
|
||||
import type { MessageEventBusDestination } from './MessageEventBusDestination.ee';
|
||||
import { MessageEventBusDestinationSentry } from './MessageEventBusDestinationSentry.ee';
|
||||
import { MessageEventBusDestinationSyslog } from './MessageEventBusDestinationSyslog.ee';
|
||||
import { MessageEventBusDestinationWebhook } from './MessageEventBusDestinationWebhook.ee';
|
||||
import type { MessageEventBus } from '../message-event-bus/message-event-bus';
|
||||
import type { MessageEventBusDestination } from './message-event-bus-destination.ee';
|
||||
import { MessageEventBusDestinationSentry } from './message-event-bus-destination-sentry.ee';
|
||||
import { MessageEventBusDestinationSyslog } from './message-event-bus-destination-syslog.ee';
|
||||
import { MessageEventBusDestinationWebhook } from './message-event-bus-destination-webhook.ee';
|
||||
import { Container } from 'typedi';
|
||||
import { Logger } from '@/logger';
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
||||
|
||||
import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
|
||||
import { MessageEventBusDestination } from './message-event-bus-destination.ee';
|
||||
import * as Sentry from '@sentry/node';
|
||||
import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
|
||||
import type {
|
||||
MessageEventBusDestinationOptions,
|
||||
MessageEventBusDestinationSentryOptions,
|
||||
} from 'n8n-workflow';
|
||||
import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
|
||||
import { eventMessageGenericDestinationTestEvent } from '../event-message-classes/event-message-generic';
|
||||
import { N8N_VERSION } from '@/constants';
|
||||
import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
|
||||
import type { MessageEventBus, MessageWithCallback } from '../message-event-bus/message-event-bus';
|
||||
|
||||
export const isMessageEventBusDestinationSentryOptions = (
|
||||
candidate: unknown,
|
|
@ -6,9 +6,9 @@ import type {
|
|||
MessageEventBusDestinationSyslogOptions,
|
||||
} from 'n8n-workflow';
|
||||
import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
|
||||
import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
|
||||
import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
|
||||
import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBusDestination } from './message-event-bus-destination.ee';
|
||||
import { eventMessageGenericDestinationTestEvent } from '../event-message-classes/event-message-generic';
|
||||
import type { MessageEventBus, MessageWithCallback } from '../message-event-bus/message-event-bus';
|
||||
import Container from 'typedi';
|
||||
import { Logger } from '@/logger';
|
||||
export const isMessageEventBusDestinationSyslogOptions = (
|
|
@ -1,6 +1,6 @@
|
|||
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
||||
|
||||
import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
|
||||
import { MessageEventBusDestination } from './message-event-bus-destination.ee';
|
||||
import axios from 'axios';
|
||||
import type { AxiosRequestConfig, Method } from 'axios';
|
||||
import { jsonParse, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
|
||||
|
@ -13,8 +13,8 @@ import type {
|
|||
} from 'n8n-workflow';
|
||||
import { CredentialsHelper } from '@/credentials-helper';
|
||||
import { Agent as HTTPSAgent } from 'https';
|
||||
import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
|
||||
import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
|
||||
import { eventMessageGenericDestinationTestEvent } from '../event-message-classes/event-message-generic';
|
||||
import type { MessageEventBus, MessageWithCallback } from '../message-event-bus/message-event-bus';
|
||||
import * as SecretsHelpers from '@/external-secrets/external-secrets-helper.ee';
|
||||
import Container from 'typedi';
|
||||
|
|
@ -3,10 +3,10 @@ import { Container } from 'typedi';
|
|||
import type { INodeCredentials, MessageEventBusDestinationOptions } from 'n8n-workflow';
|
||||
import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
|
||||
import { Logger } from '@/logger';
|
||||
import type { AbstractEventMessage } from '../EventMessageClasses/AbstractEventMessage';
|
||||
import type { EventMessageTypes } from '../EventMessageClasses';
|
||||
import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
|
||||
import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
|
||||
import type { AbstractEventMessage } from '../event-message-classes/abstract-event-message';
|
||||
import type { EventMessageTypes } from '../event-message-classes';
|
||||
import type { EventMessageConfirmSource } from '../event-message-classes/event-message-confirm';
|
||||
import type { MessageEventBus, MessageWithCallback } from '../message-event-bus/message-event-bus';
|
||||
import { EventDestinationsRepository } from '@db/repositories/eventDestinations.repository';
|
||||
import { License } from '@/license';
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import { appendFileSync, existsSync, rmSync, renameSync, openSync, closeSync } from 'fs';
|
||||
import { stat } from 'fs/promises';
|
||||
import { isMainThread, parentPort } from 'worker_threads';
|
||||
import type { MessageEventBusLogWriterOptions } from './MessageEventBusLogWriter';
|
||||
import type { MessageEventBusLogWriterOptions } from './message-event-bus-log-writer';
|
||||
|
||||
let logFileBasePath = '';
|
||||
let loggingPaused = true;
|
|
@ -1,29 +1,29 @@
|
|||
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
||||
|
||||
import { isEventMessageOptions } from '../EventMessageClasses/AbstractEventMessage';
|
||||
import { isEventMessageOptions } from '../event-message-classes/abstract-event-message';
|
||||
import { InstanceSettings } from 'n8n-core';
|
||||
import path, { parse } from 'path';
|
||||
import { Worker } from 'worker_threads';
|
||||
import { createReadStream, existsSync, rmSync } from 'fs';
|
||||
import readline from 'readline';
|
||||
import remove from 'lodash/remove';
|
||||
import type { EventMessageGenericOptions } from '../EventMessageClasses/EventMessageGeneric';
|
||||
import { EventMessageGeneric } from '../EventMessageClasses/EventMessageGeneric';
|
||||
import type { AbstractEventMessageOptions } from '../EventMessageClasses/AbstractEventMessageOptions';
|
||||
import type { EventMessageWorkflowOptions } from '../EventMessageClasses/EventMessageWorkflow';
|
||||
import { EventMessageWorkflow } from '../EventMessageClasses/EventMessageWorkflow';
|
||||
import type { EventMessageGenericOptions } from '../event-message-classes/event-message-generic';
|
||||
import { EventMessageGeneric } from '../event-message-classes/event-message-generic';
|
||||
import type { AbstractEventMessageOptions } from '../event-message-classes/abstract-event-message-options';
|
||||
import type { EventMessageWorkflowOptions } from '../event-message-classes/event-message-workflow';
|
||||
import { EventMessageWorkflow } from '../event-message-classes/event-message-workflow';
|
||||
import { EventMessageTypeNames, jsonParse } from 'n8n-workflow';
|
||||
import type { EventMessageAuditOptions } from '../EventMessageClasses/EventMessageAudit';
|
||||
import { EventMessageAudit } from '../EventMessageClasses/EventMessageAudit';
|
||||
import type { EventMessageNodeOptions } from '../EventMessageClasses/EventMessageNode';
|
||||
import { EventMessageNode } from '../EventMessageClasses/EventMessageNode';
|
||||
import type { EventMessageReturnMode } from '../MessageEventBus/MessageEventBus';
|
||||
import type { EventMessageTypes } from '../EventMessageClasses';
|
||||
import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
|
||||
import type { EventMessageAuditOptions } from '../event-message-classes/event-message-audit';
|
||||
import { EventMessageAudit } from '../event-message-classes/event-message-audit';
|
||||
import type { EventMessageNodeOptions } from '../event-message-classes/event-message-node';
|
||||
import { EventMessageNode } from '../event-message-classes/event-message-node';
|
||||
import type { EventMessageReturnMode } from '../message-event-bus/message-event-bus';
|
||||
import type { EventMessageTypes } from '../event-message-classes';
|
||||
import type { EventMessageConfirmSource } from '../event-message-classes/event-message-confirm';
|
||||
import {
|
||||
EventMessageConfirm,
|
||||
isEventMessageConfirm,
|
||||
} from '../EventMessageClasses/EventMessageConfirm';
|
||||
} from '../event-message-classes/event-message-confirm';
|
||||
import { once as eventOnce } from 'events';
|
||||
import { inTest } from '@/constants';
|
||||
import { Logger } from '@/logger';
|
||||
|
@ -139,9 +139,10 @@ export class MessageEventBusLogWriter {
|
|||
const parsedName = parse(__filename);
|
||||
let workerFileName;
|
||||
if (inTest) {
|
||||
workerFileName = './dist/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.js';
|
||||
workerFileName =
|
||||
'./dist/eventbus/message-event-bus-writer/message-event-bus-log-writer-worker.js';
|
||||
} else {
|
||||
workerFileName = path.join(parsedName.dir, `${parsedName.name}Worker${parsedName.ext}`);
|
||||
workerFileName = path.join(parsedName.dir, `${parsedName.name}-worker${parsedName.ext}`);
|
||||
}
|
||||
this._worker = new Worker(workerFileName);
|
||||
if (this.worker) {
|
|
@ -14,29 +14,29 @@ import { WorkflowRepository } from '@db/repositories/workflow.repository';
|
|||
import { OrchestrationService } from '@/services/orchestration.service';
|
||||
import { Logger } from '@/logger';
|
||||
|
||||
import type { EventMessageTypes } from '../EventMessageClasses/';
|
||||
import type { MessageEventBusDestination } from '../MessageEventBusDestination/MessageEventBusDestination.ee';
|
||||
import { MessageEventBusLogWriter } from '../MessageEventBusWriter/MessageEventBusLogWriter';
|
||||
import { messageEventBusDestinationFromDb } from '../MessageEventBusDestination/MessageEventBusDestinationFromDb';
|
||||
import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
|
||||
import type { EventMessageAuditOptions } from '../EventMessageClasses/EventMessageAudit';
|
||||
import { EventMessageAudit } from '../EventMessageClasses/EventMessageAudit';
|
||||
import type { EventMessageWorkflowOptions } from '../EventMessageClasses/EventMessageWorkflow';
|
||||
import { EventMessageWorkflow } from '../EventMessageClasses/EventMessageWorkflow';
|
||||
import type { EventMessageNodeOptions } from '../EventMessageClasses/EventMessageNode';
|
||||
import { EventMessageNode } from '../EventMessageClasses/EventMessageNode';
|
||||
import type { EventMessageTypes } from '../event-message-classes/';
|
||||
import type { MessageEventBusDestination } from '../message-event-bus-destination/message-event-bus-destination.ee';
|
||||
import { MessageEventBusLogWriter } from '../message-event-bus-writer/message-event-bus-log-writer';
|
||||
import { messageEventBusDestinationFromDb } from '../message-event-bus-destination/message-event-bus-destination-from-db';
|
||||
import type { EventMessageConfirmSource } from '../event-message-classes/event-message-confirm';
|
||||
import type { EventMessageAuditOptions } from '../event-message-classes/event-message-audit';
|
||||
import { EventMessageAudit } from '../event-message-classes/event-message-audit';
|
||||
import type { EventMessageWorkflowOptions } from '../event-message-classes/event-message-workflow';
|
||||
import { EventMessageWorkflow } from '../event-message-classes/event-message-workflow';
|
||||
import type { EventMessageNodeOptions } from '../event-message-classes/event-message-node';
|
||||
import { EventMessageNode } from '../event-message-classes/event-message-node';
|
||||
import {
|
||||
EventMessageGeneric,
|
||||
eventMessageGenericDestinationTestEvent,
|
||||
} from '../EventMessageClasses/EventMessageGeneric';
|
||||
} from '../event-message-classes/event-message-generic';
|
||||
import { ExecutionRecoveryService } from '../../executions/execution-recovery.service';
|
||||
import {
|
||||
EventMessageAiNode,
|
||||
type EventMessageAiNodeOptions,
|
||||
} from '../EventMessageClasses/EventMessageAiNode';
|
||||
} from '../event-message-classes/event-message-ai-node';
|
||||
import { License } from '@/license';
|
||||
import type { EventMessageExecutionOptions } from '../EventMessageClasses/EventMessageExecution';
|
||||
import { EventMessageExecution } from '../EventMessageClasses/EventMessageExecution';
|
||||
import type { EventMessageExecutionOptions } from '../event-message-classes/event-message-execution';
|
||||
import { EventMessageExecution } from '../event-message-classes/event-message-execution';
|
||||
import { GlobalConfig } from '@n8n/config';
|
||||
|
||||
export type EventMessageReturnMode = 'sent' | 'unsent' | 'all' | 'unfinished';
|
|
@ -3,7 +3,7 @@ import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
|
|||
import { EventService } from '@/events/event.service';
|
||||
import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
|
||||
import type { IWorkflowDb } from '@/Interfaces';
|
||||
import type { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import type { RelayEventMap } from '@/events/relay-event-map';
|
||||
|
||||
describe('LogStreamingEventRelay', () => {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { Service } from 'typedi';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { Redactable } from '@/decorators/redactable';
|
||||
import { EventRelay } from '@/events/event-relay';
|
||||
import type { RelayEventMap } from '@/events/relay-event-map';
|
||||
|
|
|
@ -15,11 +15,11 @@ import { Push } from '@/push';
|
|||
import { ARTIFICIAL_TASK_DATA } from '@/constants';
|
||||
import { NodeCrashedError } from '@/errors/node-crashed.error';
|
||||
import { WorkflowCrashedError } from '@/errors/workflow-crashed.error';
|
||||
import { EventMessageNode } from '@/eventbus/EventMessageClasses/EventMessageNode';
|
||||
import { EventMessageNode } from '@/eventbus/event-message-classes/event-message-node';
|
||||
import { IN_PROGRESS_EXECUTION_DATA, OOM_WORKFLOW } from './constants';
|
||||
import { setupMessages } from './utils';
|
||||
|
||||
import type { EventMessageTypes as EventMessage } from '@/eventbus/EventMessageClasses';
|
||||
import type { EventMessageTypes as EventMessage } from '@/eventbus/event-message-classes';
|
||||
|
||||
describe('ExecutionRecoveryService', () => {
|
||||
const push = mockInstance(Push);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import type { EventMessageTypes as EventMessage } from '@/eventbus/EventMessageClasses';
|
||||
import { EventMessageNode } from '@/eventbus/EventMessageClasses/EventMessageNode';
|
||||
import { EventMessageWorkflow } from '@/eventbus/EventMessageClasses/EventMessageWorkflow';
|
||||
import type { EventMessageTypes as EventMessage } from '@/eventbus/event-message-classes';
|
||||
import { EventMessageNode } from '@/eventbus/event-message-classes/event-message-node';
|
||||
import { EventMessageWorkflow } from '@/eventbus/event-message-classes/event-message-workflow';
|
||||
|
||||
export const setupMessages = (executionId: string, workflowName: string): EventMessage[] => {
|
||||
return [
|
||||
|
|
|
@ -6,7 +6,7 @@ import { getWorkflowHooksMain } from '@/workflow-execute-additional-data'; // @T
|
|||
import type { DateTime } from 'luxon';
|
||||
import type { IRun, ITaskData } from 'n8n-workflow';
|
||||
import { InstanceSettings } from 'n8n-core';
|
||||
import type { EventMessageTypes } from '../eventbus/EventMessageClasses';
|
||||
import type { EventMessageTypes } from '../eventbus/event-message-classes';
|
||||
import type { IExecutionResponse } from '@/Interfaces';
|
||||
import { NodeCrashedError } from '@/errors/node-crashed.error';
|
||||
import { WorkflowCrashedError } from '@/errors/workflow-crashed.error';
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { Service } from 'typedi';
|
||||
import { Telemetry } from '@/telemetry';
|
||||
import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from './eventbus/message-event-bus/message-event-bus';
|
||||
|
||||
/**
|
||||
* @deprecated Do not add to this class. It will be removed once we remove
|
||||
|
|
|
@ -4,7 +4,7 @@ import promBundle from 'express-prom-bundle';
|
|||
import { mock } from 'jest-mock-extended';
|
||||
import { PrometheusMetricsService } from '../prometheus-metrics.service';
|
||||
import type express from 'express';
|
||||
import type { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { mockInstance } from '@test/mocking';
|
||||
import { GlobalConfig } from '@n8n/config';
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import semverParse from 'semver/functions/parse';
|
|||
import { Service } from 'typedi';
|
||||
|
||||
import { CacheService } from '@/services/cache/cache.service';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { EventMessageTypeNames } from 'n8n-workflow';
|
||||
import type { EventMessageTypes } from '@/eventbus';
|
||||
import type { Includes, MetricCategory, MetricLabel } from './types';
|
||||
|
|
|
@ -31,7 +31,7 @@ import { setupPushServer, setupPushHandler } from '@/push';
|
|||
import { isLdapEnabled } from '@/ldap/helpers.ee';
|
||||
import { AbstractServer } from '@/abstract-server';
|
||||
import { PostHogClient } from '@/posthog';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { handleMfaDisable, isMfaFeatureEnabled } from '@/mfa/helpers';
|
||||
import type { FrontendService } from '@/services/frontend.service';
|
||||
import { OrchestrationService } from '@/services/orchestration.service';
|
||||
|
@ -155,10 +155,10 @@ export class Server extends AbstractServer {
|
|||
// ----------------------------------------
|
||||
try {
|
||||
const { SourceControlService } = await import(
|
||||
'@/environments/sourceControl/sourceControl.service.ee'
|
||||
'@/environments/source-control/source-control.service.ee'
|
||||
);
|
||||
await Container.get(SourceControlService).init();
|
||||
await import('@/environments/sourceControl/sourceControl.controller.ee');
|
||||
await import('@/environments/source-control/source-control.controller.ee');
|
||||
await import('@/environments/variables/variables.controller.ee');
|
||||
} catch (error) {
|
||||
this.logger.warn(`Source Control initialization failed: ${(error as Error).message}`);
|
||||
|
|
|
@ -7,7 +7,7 @@ import type { WorkflowActivateMode } from 'n8n-workflow';
|
|||
import config from '@/config';
|
||||
import { OrchestrationService } from '@/services/orchestration.service';
|
||||
import type { RedisServiceWorkerResponseObject } from '@/services/redis/RedisServiceCommands';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { RedisService } from '@/services/redis.service';
|
||||
import { handleWorkerResponseMessageMain } from '@/services/orchestration/main/handleWorkerResponseMessageMain';
|
||||
import { handleCommandMessageMain } from '@/services/orchestration/main/handleCommandMessageMain';
|
||||
|
|
|
@ -22,7 +22,7 @@ import { License } from '@/license';
|
|||
import { getCurrentAuthenticationMethod } from '@/sso/sso-helpers';
|
||||
import { getLdapLoginLabel } from '@/ldap/helpers.ee';
|
||||
import { getSamlLoginLabel } from '@/sso/saml/saml-helpers';
|
||||
import { getVariablesLimit } from '@/environments/variables/environmentHelpers';
|
||||
import { getVariablesLimit } from '@/environments/variables/environment-helpers';
|
||||
import {
|
||||
getWorkflowHistoryLicensePruneTime,
|
||||
getWorkflowHistoryPruneTime,
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { Container } from 'typedi';
|
||||
import { debounceMessageReceiver, messageToRedisServiceCommandObject } from '../helpers';
|
||||
import config from '@/config';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
|
||||
import { License } from '@/license';
|
||||
import { Logger } from '@/logger';
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
|
||||
import { License } from '@/license';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import Container from 'typedi';
|
||||
import { Logger } from 'winston';
|
||||
import { messageToRedisServiceCommandObject, debounceMessageReceiver } from '../helpers';
|
||||
|
|
|
@ -4,7 +4,7 @@ import type { RedisServiceCommandObject } from '@/services/redis/RedisServiceCom
|
|||
import { COMMAND_REDIS_CHANNEL } from '@/services/redis/RedisConstants';
|
||||
import * as os from 'os';
|
||||
import { License } from '@/license';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
|
||||
import { debounceMessageReceiver, getOsCpuString } from '../helpers';
|
||||
import type { WorkerCommandReceivedHandlerOptions } from './types';
|
||||
|
|
|
@ -11,7 +11,7 @@ import { Logger } from '@/logger';
|
|||
import { License } from '@/license';
|
||||
import { LOWEST_SHUTDOWN_PRIORITY, N8N_VERSION } from '@/constants';
|
||||
import { WorkflowRepository } from '@db/repositories/workflow.repository';
|
||||
import { SourceControlPreferencesService } from '../environments/sourceControl/sourceControlPreferences.service.ee';
|
||||
import { SourceControlPreferencesService } from '../environments/source-control/source-control-preferences.service.ee';
|
||||
import { UserRepository } from '@db/repositories/user.repository';
|
||||
import { ProjectRepository } from '@/databases/repositories/project.repository';
|
||||
import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
|
||||
|
|
|
@ -69,7 +69,7 @@ import { WorkflowStaticDataService } from './workflows/workflow-static-data.serv
|
|||
import { WorkflowRepository } from './databases/repositories/workflow.repository';
|
||||
import { UrlService } from './services/url.service';
|
||||
import { WorkflowExecutionService } from './workflows/workflow-execution.service';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { EventService } from './events/event.service';
|
||||
import { GlobalConfig } from '@n8n/config';
|
||||
import { SubworkflowPolicyChecker } from './subworkflows/subworkflow-policy-checker.service';
|
||||
|
|
|
@ -3,7 +3,7 @@ import { BinaryDataService } from 'n8n-core';
|
|||
import { Worker } from '@/commands/worker';
|
||||
import config from '@/config';
|
||||
import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
|
||||
import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service';
|
||||
import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
|
||||
|
|
|
@ -2,9 +2,9 @@ import { Container } from 'typedi';
|
|||
|
||||
import type { User } from '@db/entities/User';
|
||||
import config from '@/config';
|
||||
import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
|
||||
import { SourceControlService } from '@/environments/sourceControl/sourceControl.service.ee';
|
||||
import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
|
||||
import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee';
|
||||
import { SourceControlService } from '@/environments/source-control/source-control.service.ee';
|
||||
import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file';
|
||||
|
||||
import * as utils from '../shared/utils/';
|
||||
import { createUser } from '../shared/db/users';
|
||||
|
|
|
@ -7,12 +7,12 @@ import { nanoid } from 'nanoid';
|
|||
import type { InstanceSettings } from 'n8n-core';
|
||||
|
||||
import * as testDb from '../shared/testDb';
|
||||
import { SourceControlImportService } from '@/environments/sourceControl/sourceControlImport.service.ee';
|
||||
import { SourceControlImportService } from '@/environments/source-control/source-control-import.service.ee';
|
||||
import { createMember, getGlobalOwner } from '../shared/db/users';
|
||||
import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
|
||||
import { mockInstance } from '../../shared/mocking';
|
||||
import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
|
||||
import type { ExportableCredential } from '@/environments/sourceControl/types/exportableCredential';
|
||||
import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file';
|
||||
import type { ExportableCredential } from '@/environments/source-control/types/exportable-credential';
|
||||
import { createTeamProject, getPersonalProject } from '../shared/db/projects';
|
||||
import { ProjectRepository } from '@/databases/repositories/project.repository';
|
||||
import { saveCredential } from '../shared/db/credentials';
|
||||
|
|
|
@ -14,13 +14,13 @@ import {
|
|||
} from 'n8n-workflow';
|
||||
|
||||
import type { User } from '@db/entities/User';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { EventMessageGeneric } from '@/eventbus/EventMessageClasses/EventMessageGeneric';
|
||||
import type { MessageEventBusDestinationSyslog } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee';
|
||||
import type { MessageEventBusDestinationWebhook } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee';
|
||||
import type { MessageEventBusDestinationSentry } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee';
|
||||
import { EventMessageAudit } from '@/eventbus/EventMessageClasses/EventMessageAudit';
|
||||
import type { EventNamesTypes } from '@/eventbus/EventMessageClasses';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { EventMessageGeneric } from '@/eventbus/event-message-classes/event-message-generic';
|
||||
import type { MessageEventBusDestinationSyslog } from '@/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee';
|
||||
import type { MessageEventBusDestinationWebhook } from '@/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee';
|
||||
import type { MessageEventBusDestinationSentry } from '@/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee';
|
||||
import { EventMessageAudit } from '@/eventbus/event-message-classes/event-message-audit';
|
||||
import type { EventNamesTypes } from '@/eventbus/event-message-classes';
|
||||
import { ExecutionRecoveryService } from '@/executions/execution-recovery.service';
|
||||
|
||||
import * as utils from './shared/utils';
|
||||
|
@ -28,7 +28,7 @@ import { createUser } from './shared/db/users';
|
|||
import { mockInstance } from '../shared/mocking';
|
||||
import type { SuperAgentTest } from './shared/types';
|
||||
|
||||
jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
|
||||
jest.unmock('@/eventbus/message-event-bus/message-event-bus');
|
||||
jest.mock('axios');
|
||||
const mockedAxios = axios as jest.Mocked<typeof axios>;
|
||||
jest.mock('syslog-client');
|
||||
|
@ -96,7 +96,7 @@ beforeAll(async () => {
|
|||
});
|
||||
|
||||
afterAll(async () => {
|
||||
jest.mock('@/eventbus/MessageEventBus/MessageEventBus');
|
||||
jest.mock('@/eventbus/message-event-bus/message-event-bus');
|
||||
await eventBus?.close();
|
||||
});
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import type { User } from '@db/entities/User';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { ExecutionRecoveryService } from '@/executions/execution-recovery.service';
|
||||
|
||||
import * as utils from './shared/utils/';
|
||||
|
|
|
@ -7,7 +7,7 @@ import { PrometheusMetricsService } from '@/metrics/prometheus-metrics.service';
|
|||
import { setupTestServer } from './shared/utils';
|
||||
import { GlobalConfig } from '@n8n/config';
|
||||
|
||||
jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
|
||||
jest.unmock('@/eventbus/message-event-bus/message-event-bus');
|
||||
|
||||
const toLines = (response: Response) => response.text.trim().split('\n');
|
||||
|
||||
|
|
|
@ -179,7 +179,7 @@ export const setupTestServer = ({
|
|||
break;
|
||||
|
||||
case 'sourceControl':
|
||||
await import('@/environments/sourceControl/sourceControl.controller.ee');
|
||||
await import('@/environments/source-control/source-control.controller.ee');
|
||||
break;
|
||||
|
||||
case 'community-packages':
|
||||
|
|
|
@ -3,7 +3,7 @@ import { mock } from 'jest-mock-extended';
|
|||
import { ActiveWorkflowManager } from '@/active-workflow-manager';
|
||||
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
|
||||
import { WorkflowRepository } from '@db/repositories/workflow.repository';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
|
||||
import { Telemetry } from '@/telemetry';
|
||||
import { OrchestrationService } from '@/services/orchestration.service';
|
||||
import { WorkflowService } from '@/workflows/workflow.service';
|
||||
|
|
|
@ -3,5 +3,5 @@ import 'reflect-metadata';
|
|||
jest.mock('@sentry/node');
|
||||
jest.mock('@n8n_io/license-sdk');
|
||||
jest.mock('@/telemetry');
|
||||
jest.mock('@/eventbus/MessageEventBus/MessageEventBus');
|
||||
jest.mock('@/eventbus/message-event-bus/message-event-bus');
|
||||
jest.mock('@/push');
|
||||
|
|
Loading…
Reference in a new issue