diff --git a/LICENSE.md b/LICENSE.md index aab68b6d93..f85f59baa9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -3,9 +3,11 @@ Portions of this software are licensed as follows: - Content of branches other than the main branch (i.e. "master") are not licensed. -- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License. - To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License - specifically allowing you access to such source code files and as defined in "LICENSE_EE.md". +- Source code files that contain ".ee." in their filename or ".ee" in their dirname are NOT licensed under + the Sustainable Use License. + To use source code files that contain ".ee." in their filename or ".ee" in their dirname you must hold a + valid n8n Enterprise License specifically allowing you access to such source code files and as defined + in "LICENSE_EE.md". - All third party components incorporated into the n8n Software are licensed under the original license provided by the owner of the applicable component. - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use diff --git a/packages/@n8n/permissions/src/combineScopes.ts b/packages/@n8n/permissions/src/combineScopes.ee.ts similarity index 98% rename from packages/@n8n/permissions/src/combineScopes.ts rename to packages/@n8n/permissions/src/combineScopes.ee.ts index 23da64d837..96a43b940c 100644 --- a/packages/@n8n/permissions/src/combineScopes.ts +++ b/packages/@n8n/permissions/src/combineScopes.ee.ts @@ -1,4 +1,4 @@ -import type { Scope, ScopeLevels, GlobalScopes, MaskLevels } from './types'; +import type { Scope, ScopeLevels, GlobalScopes, MaskLevels } from './types.ee'; export function combineScopes(userScopes: GlobalScopes, masks?: MaskLevels): Set; export function combineScopes(userScopes: ScopeLevels, masks?: MaskLevels): Set; diff --git a/packages/@n8n/permissions/src/constants.ts b/packages/@n8n/permissions/src/constants.ee.ts similarity index 100% rename from packages/@n8n/permissions/src/constants.ts rename to packages/@n8n/permissions/src/constants.ee.ts diff --git a/packages/@n8n/permissions/src/hasScope.ts b/packages/@n8n/permissions/src/hasScope.ee.ts similarity index 90% rename from packages/@n8n/permissions/src/hasScope.ts rename to packages/@n8n/permissions/src/hasScope.ee.ts index d449283490..81bcbc5175 100644 --- a/packages/@n8n/permissions/src/hasScope.ts +++ b/packages/@n8n/permissions/src/hasScope.ee.ts @@ -1,5 +1,5 @@ -import { combineScopes } from './combineScopes'; -import type { Scope, ScopeLevels, GlobalScopes, ScopeOptions, MaskLevels } from './types'; +import { combineScopes } from './combineScopes.ee'; +import type { Scope, ScopeLevels, GlobalScopes, ScopeOptions, MaskLevels } from './types.ee'; export function hasScope( scope: Scope | Scope[], diff --git a/packages/@n8n/permissions/src/index.ts b/packages/@n8n/permissions/src/index.ts index f04f2e4ef6..ae20358303 100644 --- a/packages/@n8n/permissions/src/index.ts +++ b/packages/@n8n/permissions/src/index.ts @@ -1,4 +1,4 @@ -export type * from './types'; -export * from './constants'; -export * from './hasScope'; -export * from './combineScopes'; +export type * from './types.ee'; +export * from './constants.ee'; +export * from './hasScope.ee'; +export * from './combineScopes.ee'; diff --git a/packages/@n8n/permissions/src/types.ts b/packages/@n8n/permissions/src/types.ee.ts similarity index 96% rename from packages/@n8n/permissions/src/types.ts rename to packages/@n8n/permissions/src/types.ee.ts index b36fb792ae..db74668fbe 100644 --- a/packages/@n8n/permissions/src/types.ts +++ b/packages/@n8n/permissions/src/types.ee.ts @@ -1,4 +1,4 @@ -import type { RESOURCES } from './constants'; +import type { RESOURCES } from './constants.ee'; export type Resource = keyof typeof RESOURCES; diff --git a/packages/@n8n/permissions/test/hasScope.test.ts b/packages/@n8n/permissions/test/hasScope.test.ts index 0e43bc8dc6..b3362e4ea6 100644 --- a/packages/@n8n/permissions/test/hasScope.test.ts +++ b/packages/@n8n/permissions/test/hasScope.test.ts @@ -1,5 +1,5 @@ -import { hasScope } from '@/hasScope'; -import type { Scope } from '@/types'; +import { hasScope } from '@/hasScope.ee'; +import type { Scope } from '@/types.ee'; const ownerPermissions: Scope[] = [ 'workflow:create', diff --git a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts index e7d94d3e34..641e239393 100644 --- a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts +++ b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts @@ -15,10 +15,10 @@ import { CredentialsHelper } from '@/credentials-helper'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; -import { VariablesService } from '@/environments/variables/variables.service.ee'; +import { VariablesService } from '@/environments.ee/variables/variables.service.ee'; import { EventService } from '@/events/event.service'; import { ExternalHooks } from '@/external-hooks'; -import { SecretsHelper } from '@/secrets-helpers'; +import { SecretsHelper } from '@/secrets-helpers.ee'; import { WorkflowStatisticsService } from '@/services/workflow-statistics.service'; import { SubworkflowPolicyChecker } from '@/subworkflows/subworkflow-policy-checker.service'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/src/auth/methods/email.ts b/packages/cli/src/auth/methods/email.ts index 723365057f..6f378e4357 100644 --- a/packages/cli/src/auth/methods/email.ts +++ b/packages/cli/src/auth/methods/email.ts @@ -4,7 +4,7 @@ import type { User } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; import { AuthError } from '@/errors/response-errors/auth.error'; import { EventService } from '@/events/event.service'; -import { isLdapLoginEnabled } from '@/ldap/helpers.ee'; +import { isLdapLoginEnabled } from '@/ldap.ee/helpers.ee'; import { PasswordUtility } from '@/services/password.utility'; export const handleEmailLogin = async ( diff --git a/packages/cli/src/auth/methods/ldap.ts b/packages/cli/src/auth/methods/ldap.ts index b8fea25989..f067994215 100644 --- a/packages/cli/src/auth/methods/ldap.ts +++ b/packages/cli/src/auth/methods/ldap.ts @@ -10,8 +10,8 @@ import { mapLdapAttributesToUser, createLdapAuthIdentity, updateLdapUserOnLocalDb, -} from '@/ldap/helpers.ee'; -import { LdapService } from '@/ldap/ldap.service.ee'; +} from '@/ldap.ee/helpers.ee'; +import { LdapService } from '@/ldap.ee/ldap.service.ee'; export const handleLdapLogin = async ( loginId: string, diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts index a10c386f42..7692ef79be 100644 --- a/packages/cli/src/commands/base-command.ts +++ b/packages/cli/src/commands/base-command.ts @@ -23,13 +23,13 @@ import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus' import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay'; import { initExpressionEvaluator } from '@/expression-evaluator'; import { ExternalHooks } from '@/external-hooks'; -import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; +import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee'; import { License } from '@/license'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { NodeTypes } from '@/node-types'; import { PostHogClient } from '@/posthog'; import { ShutdownService } from '@/shutdown/shutdown.service'; -import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee'; +import { WorkflowHistoryManager } from '@/workflows/workflow-history.ee/workflow-history-manager.ee'; export abstract class BaseCommand extends Command { protected logger = Container.get(Logger); diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts index f9f1f3d0bb..6aaaa217d6 100644 --- a/packages/cli/src/commands/ldap/reset.ts +++ b/packages/cli/src/commands/ldap/reset.ts @@ -14,7 +14,7 @@ import { SettingsRepository } from '@/databases/repositories/settings.repository import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { UserRepository } from '@/databases/repositories/user.repository'; -import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap/constants'; +import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants'; import { WorkflowService } from '@/workflows/workflow.service'; import { BaseCommand } from '../base-command'; diff --git a/packages/cli/src/controllers/__tests__/users.controller.test.ts b/packages/cli/src/controllers/__tests__/users.controller.test.ts index 91ad6bd28b..5eaaca5840 100644 --- a/packages/cli/src/controllers/__tests__/users.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/users.controller.test.ts @@ -4,7 +4,7 @@ import type { User } from '@/databases/entities/user'; import type { UserRepository } from '@/databases/repositories/user.repository'; import type { EventService } from '@/events/event.service'; import type { AuthenticatedRequest } from '@/requests'; -import type { ProjectService } from '@/services/project.service'; +import type { ProjectService } from '@/services/project.service.ee'; import { UsersController } from '../users.controller'; diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts index faf24ed669..b012e57131 100644 --- a/packages/cli/src/controllers/auth.controller.ts +++ b/packages/cli/src/controllers/auth.controller.ts @@ -23,7 +23,7 @@ import { getCurrentAuthenticationMethod, isLdapCurrentAuthenticationMethod, isSamlCurrentAuthenticationMethod, -} from '@/sso/sso-helpers'; +} from '@/sso.ee/sso-helpers'; @RestController() export class AuthController { diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts index 24cff10c64..d28b0671e0 100644 --- a/packages/cli/src/controllers/invitation.controller.ts +++ b/packages/cli/src/controllers/invitation.controller.ts @@ -17,7 +17,7 @@ import { PostHogClient } from '@/posthog'; import { UserRequest } from '@/requests'; import { PasswordUtility } from '@/services/password.utility'; import { UserService } from '@/services/user.service'; -import { isSamlLicensedAndEnabled } from '@/sso/saml/saml-helpers'; +import { isSamlLicensedAndEnabled } from '@/sso.ee/saml/saml-helpers'; @RestController('/invitations') export class InvitationController { diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts index f56d62aebd..5de2e49e96 100644 --- a/packages/cli/src/controllers/me.controller.ts +++ b/packages/cli/src/controllers/me.controller.ts @@ -21,7 +21,7 @@ import { MfaService } from '@/mfa/mfa.service'; import { AuthenticatedRequest, MeRequest } from '@/requests'; import { PasswordUtility } from '@/services/password.utility'; import { UserService } from '@/services/user.service'; -import { isSamlLicensedAndEnabled } from '@/sso/saml/saml-helpers'; +import { isSamlLicensedAndEnabled } from '@/sso.ee/saml/saml-helpers'; import { PersonalizationSurveyAnswersV4 } from './survey-answers.dto'; @RestController('/me') diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts index c7990ddbfd..0c51f29f22 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts @@ -13,12 +13,12 @@ import type { CredentialsEntity } from '@/databases/entities/credentials-entity' import type { User } from '@/databases/entities/user'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; -import { VariablesService } from '@/environments/variables/variables.service.ee'; +import { VariablesService } from '@/environments.ee/variables/variables.service.ee'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { ExternalHooks } from '@/external-hooks'; import type { OAuthRequest } from '@/requests'; -import { SecretsHelper } from '@/secrets-helpers'; +import { SecretsHelper } from '@/secrets-helpers.ee'; import { mockInstance } from '@test/mocking'; describe('OAuth1CredentialController', () => { diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts index ca9e4db5c6..c1c240425e 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts @@ -13,12 +13,12 @@ import type { CredentialsEntity } from '@/databases/entities/credentials-entity' import type { User } from '@/databases/entities/user'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; -import { VariablesService } from '@/environments/variables/variables.service.ee'; +import { VariablesService } from '@/environments.ee/variables/variables.service.ee'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { ExternalHooks } from '@/external-hooks'; import type { OAuthRequest } from '@/requests'; -import { SecretsHelper } from '@/secrets-helpers'; +import { SecretsHelper } from '@/secrets-helpers.ee'; import { mockInstance } from '@test/mocking'; describe('OAuth2CredentialController', () => { diff --git a/packages/cli/src/controllers/password-reset.controller.ts b/packages/cli/src/controllers/password-reset.controller.ts index cb5e2c6f8b..7fc266c8e8 100644 --- a/packages/cli/src/controllers/password-reset.controller.ts +++ b/packages/cli/src/controllers/password-reset.controller.ts @@ -18,7 +18,7 @@ import { MfaService } from '@/mfa/mfa.service'; import { PasswordResetRequest } from '@/requests'; import { PasswordUtility } from '@/services/password.utility'; import { UserService } from '@/services/user.service'; -import { isSamlCurrentAuthenticationMethod } from '@/sso/sso-helpers'; +import { isSamlCurrentAuthenticationMethod } from '@/sso.ee/sso-helpers'; import { UserManagementMailer } from '@/user-management/email'; @RestController() diff --git a/packages/cli/src/controllers/project.controller.ts b/packages/cli/src/controllers/project.controller.ts index 415e0e9519..d16883f3dd 100644 --- a/packages/cli/src/controllers/project.controller.ts +++ b/packages/cli/src/controllers/project.controller.ts @@ -23,7 +23,7 @@ import { ProjectService, TeamProjectOverQuotaError, UnlicensedProjectRoleError, -} from '@/services/project.service'; +} from '@/services/project.service.ee'; import { RoleService } from '@/services/role.service'; @RestController('/projects') diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts index 4cfa18a1e3..e290d29463 100644 --- a/packages/cli/src/controllers/users.controller.ts +++ b/packages/cli/src/controllers/users.controller.ts @@ -21,7 +21,7 @@ import { ExternalHooks } from '@/external-hooks'; import type { PublicUser } from '@/interfaces'; import { listQueryMiddleware } from '@/middlewares'; import { AuthenticatedRequest, ListQuery, UserRequest } from '@/requests'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { UserService } from '@/services/user.service'; import { WorkflowService } from '@/workflows/workflow.service'; diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts index aad78fe7b7..274feff81b 100644 --- a/packages/cli/src/credentials/credentials.service.ee.ts +++ b/packages/cli/src/credentials/credentials.service.ee.ts @@ -11,7 +11,7 @@ import { SharedCredentialsRepository } from '@/databases/repositories/shared-cre import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { TransferCredentialError } from '@/errors/response-errors/transfer-credential.error'; import { OwnershipService } from '@/services/ownership.service'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { RoleService } from '@/services/role.service'; import { CredentialsService } from './credentials.service'; diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts index 8261b13649..3525aecbe9 100644 --- a/packages/cli/src/credentials/credentials.service.ts +++ b/packages/cli/src/credentials/credentials.service.ts @@ -33,11 +33,11 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { ExternalHooks } from '@/external-hooks'; import { validateEntity } from '@/generic-helpers'; import type { ICredentialsDb } from '@/interfaces'; -import { userHasScopes } from '@/permissions/check-access'; +import { userHasScopes } from '@/permissions.ee/check-access'; import type { CredentialRequest, ListQuery } from '@/requests'; import { CredentialsTester } from '@/services/credentials-tester.service'; import { OwnershipService } from '@/services/ownership.service'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { RoleService } from '@/services/role.service'; export type CredentialsGetSharedOptions = diff --git a/packages/cli/src/databases/entities/user.ts b/packages/cli/src/databases/entities/user.ts index b75bec757c..5aae21d003 100644 --- a/packages/cli/src/databases/entities/user.ts +++ b/packages/cli/src/databases/entities/user.ts @@ -18,7 +18,7 @@ import { GLOBAL_OWNER_SCOPES, GLOBAL_MEMBER_SCOPES, GLOBAL_ADMIN_SCOPES, -} from '@/permissions/global-roles'; +} from '@/permissions.ee/global-roles'; import { NoUrl } from '@/validators/no-url.validator'; import { NoXss } from '@/validators/no-xss.validator'; diff --git a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts index 5ccd0c40a4..95a2c11a51 100644 --- a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts +++ b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts @@ -1,5 +1,5 @@ import type { MigrationContext, ReversibleMigration } from '@/databases/types'; -import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap/constants'; +import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants'; export class CreateLdapEntities1674509946020 implements ReversibleMigration { async up({ escape, dbType, isMysql, runQuery }: MigrationContext) { diff --git a/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts index afaca2206f..5f8b441235 100644 --- a/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts +++ b/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts @@ -7,7 +7,7 @@ import type { CredentialsEntity } from '@/databases/entities/credentials-entity' import { SharedCredentials } from '@/databases/entities/shared-credentials'; import type { User } from '@/databases/entities/user'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; -import { GLOBAL_MEMBER_SCOPES, GLOBAL_OWNER_SCOPES } from '@/permissions/global-roles'; +import { GLOBAL_MEMBER_SCOPES, GLOBAL_OWNER_SCOPES } from '@/permissions.ee/global-roles'; import { mockEntityManager } from '@test/mocking'; describe('SharedCredentialsRepository', () => { diff --git a/packages/cli/src/databases/repositories/settings.repository.ts b/packages/cli/src/databases/repositories/settings.repository.ts index aa4410d6d4..a00f52b4e7 100644 --- a/packages/cli/src/databases/repositories/settings.repository.ts +++ b/packages/cli/src/databases/repositories/settings.repository.ts @@ -3,7 +3,7 @@ import { ErrorReporter } from 'n8n-core'; import { Service } from 'typedi'; import config from '@/config'; -import { EXTERNAL_SECRETS_DB_KEY } from '@/external-secrets/constants'; +import { EXTERNAL_SECRETS_DB_KEY } from '@/external-secrets.ee/constants'; import { Settings } from '../entities/settings'; diff --git a/packages/cli/src/decorators/controller.registry.ts b/packages/cli/src/decorators/controller.registry.ts index 3a22090db1..fd0cbf4eec 100644 --- a/packages/cli/src/decorators/controller.registry.ts +++ b/packages/cli/src/decorators/controller.registry.ts @@ -11,7 +11,7 @@ import { inProduction, RESPONSE_ERROR_MESSAGES } from '@/constants'; import { UnauthenticatedError } from '@/errors/response-errors/unauthenticated.error'; import type { BooleanLicenseFeature } from '@/interfaces'; import { License } from '@/license'; -import { userHasScopes } from '@/permissions/check-access'; +import { userHasScopes } from '@/permissions.ee/check-access'; import type { AuthenticatedRequest } from '@/requests'; import { send } from '@/response-helper'; // TODO: move `ResponseHelper.send` to this file diff --git a/packages/cli/src/environments/source-control/__tests__/source-control-export.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts similarity index 100% rename from packages/cli/src/environments/source-control/__tests__/source-control-export.service.test.ts rename to packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts diff --git a/packages/cli/src/environments/source-control/__tests__/source-control-git.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-git.service.test.ts similarity index 100% rename from packages/cli/src/environments/source-control/__tests__/source-control-git.service.test.ts rename to packages/cli/src/environments.ee/source-control/__tests__/source-control-git.service.test.ts diff --git a/packages/cli/src/environments/source-control/__tests__/source-control-helper.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts similarity index 93% rename from packages/cli/src/environments/source-control/__tests__/source-control-helper.ee.test.ts rename to packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts index 508d1eb49a..5ecb04cf8a 100644 --- a/packages/cli/src/environments/source-control/__tests__/source-control-helper.ee.test.ts +++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts @@ -6,7 +6,7 @@ import Container from 'typedi'; import { SOURCE_CONTROL_SSH_FOLDER, SOURCE_CONTROL_GIT_FOLDER, -} from '@/environments/source-control/constants'; +} from '@/environments.ee/source-control/constants'; import { generateSshKeyPair, getRepoType, @@ -14,10 +14,10 @@ import { getTrackingInformationFromPrePushResult, getTrackingInformationFromPullResult, sourceControlFoldersExistCheck, -} from '@/environments/source-control/source-control-helper.ee'; -import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee'; -import type { SourceControlPreferences } from '@/environments/source-control/types/source-control-preferences'; -import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file'; +} from '@/environments.ee/source-control/source-control-helper.ee'; +import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee'; +import type { SourceControlPreferences } from '@/environments.ee/source-control/types/source-control-preferences'; +import type { SourceControlledFile } from '@/environments.ee/source-control/types/source-controlled-file'; import { License } from '@/license'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/environments/source-control/__tests__/source-control.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts similarity index 82% rename from packages/cli/src/environments/source-control/__tests__/source-control.service.test.ts rename to packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts index 1599f7b4bd..8b32062d55 100644 --- a/packages/cli/src/environments/source-control/__tests__/source-control.service.test.ts +++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts @@ -2,8 +2,8 @@ import { mock } from 'jest-mock-extended'; import { InstanceSettings } from 'n8n-core'; import { Container } from 'typedi'; -import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee'; -import { SourceControlService } from '@/environments/source-control/source-control.service.ee'; +import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee'; +import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee'; describe('SourceControlService', () => { const preferencesService = new SourceControlPreferencesService( diff --git a/packages/cli/src/environments/source-control/constants.ts b/packages/cli/src/environments.ee/source-control/constants.ts similarity index 100% rename from packages/cli/src/environments/source-control/constants.ts rename to packages/cli/src/environments.ee/source-control/constants.ts diff --git a/packages/cli/src/environments/source-control/middleware/source-control-enabled-middleware.ee.ts b/packages/cli/src/environments.ee/source-control/middleware/source-control-enabled-middleware.ee.ts similarity index 100% rename from packages/cli/src/environments/source-control/middleware/source-control-enabled-middleware.ee.ts rename to packages/cli/src/environments.ee/source-control/middleware/source-control-enabled-middleware.ee.ts diff --git a/packages/cli/src/environments/source-control/source-control-export.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts similarity index 100% rename from packages/cli/src/environments/source-control/source-control-export.service.ee.ts rename to packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts diff --git a/packages/cli/src/environments/source-control/source-control-git.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts similarity index 100% rename from packages/cli/src/environments/source-control/source-control-git.service.ee.ts rename to packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts diff --git a/packages/cli/src/environments/source-control/source-control-helper.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts similarity index 100% rename from packages/cli/src/environments/source-control/source-control-helper.ee.ts rename to packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts diff --git a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts similarity index 100% rename from packages/cli/src/environments/source-control/source-control-import.service.ee.ts rename to packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts diff --git a/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts similarity index 100% rename from packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts rename to packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts diff --git a/packages/cli/src/environments/source-control/source-control.controller.ee.ts b/packages/cli/src/environments.ee/source-control/source-control.controller.ee.ts similarity index 100% rename from packages/cli/src/environments/source-control/source-control.controller.ee.ts rename to packages/cli/src/environments.ee/source-control/source-control.controller.ee.ts diff --git a/packages/cli/src/environments/source-control/source-control.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts similarity index 100% rename from packages/cli/src/environments/source-control/source-control.service.ee.ts rename to packages/cli/src/environments.ee/source-control/source-control.service.ee.ts diff --git a/packages/cli/src/environments/source-control/types/export-result.ts b/packages/cli/src/environments.ee/source-control/types/export-result.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/export-result.ts rename to packages/cli/src/environments.ee/source-control/types/export-result.ts diff --git a/packages/cli/src/environments/source-control/types/exportable-credential.ts b/packages/cli/src/environments.ee/source-control/types/exportable-credential.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/exportable-credential.ts rename to packages/cli/src/environments.ee/source-control/types/exportable-credential.ts diff --git a/packages/cli/src/environments/source-control/types/exportable-workflow.ts b/packages/cli/src/environments.ee/source-control/types/exportable-workflow.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/exportable-workflow.ts rename to packages/cli/src/environments.ee/source-control/types/exportable-workflow.ts diff --git a/packages/cli/src/environments/source-control/types/import-result.ts b/packages/cli/src/environments.ee/source-control/types/import-result.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/import-result.ts rename to packages/cli/src/environments.ee/source-control/types/import-result.ts diff --git a/packages/cli/src/environments/source-control/types/key-pair-type.ts b/packages/cli/src/environments.ee/source-control/types/key-pair-type.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/key-pair-type.ts rename to packages/cli/src/environments.ee/source-control/types/key-pair-type.ts diff --git a/packages/cli/src/environments/source-control/types/key-pair.ts b/packages/cli/src/environments.ee/source-control/types/key-pair.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/key-pair.ts rename to packages/cli/src/environments.ee/source-control/types/key-pair.ts diff --git a/packages/cli/src/environments/source-control/types/requests.ts b/packages/cli/src/environments.ee/source-control/types/requests.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/requests.ts rename to packages/cli/src/environments.ee/source-control/types/requests.ts diff --git a/packages/cli/src/environments/source-control/types/resource-owner.ts b/packages/cli/src/environments.ee/source-control/types/resource-owner.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/resource-owner.ts rename to packages/cli/src/environments.ee/source-control/types/resource-owner.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-commit.ts b/packages/cli/src/environments.ee/source-control/types/source-control-commit.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-commit.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-commit.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-disconnect.ts b/packages/cli/src/environments.ee/source-control/types/source-control-disconnect.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-disconnect.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-disconnect.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-generate-key-pair.ts b/packages/cli/src/environments.ee/source-control/types/source-control-generate-key-pair.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-generate-key-pair.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-generate-key-pair.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-get-status.ts b/packages/cli/src/environments.ee/source-control/types/source-control-get-status.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-get-status.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-get-status.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-preferences.ts b/packages/cli/src/environments.ee/source-control/types/source-control-preferences.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-preferences.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-preferences.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-pull-work-folder.ts b/packages/cli/src/environments.ee/source-control/types/source-control-pull-work-folder.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-pull-work-folder.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-pull-work-folder.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-push-work-folder.ts b/packages/cli/src/environments.ee/source-control/types/source-control-push-work-folder.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-push-work-folder.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-push-work-folder.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-push.ts b/packages/cli/src/environments.ee/source-control/types/source-control-push.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-push.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-push.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-set-branch.ts b/packages/cli/src/environments.ee/source-control/types/source-control-set-branch.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-set-branch.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-set-branch.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-set-read-only.ts b/packages/cli/src/environments.ee/source-control/types/source-control-set-read-only.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-set-read-only.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-set-read-only.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-stage.ts b/packages/cli/src/environments.ee/source-control/types/source-control-stage.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-stage.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-stage.ts diff --git a/packages/cli/src/environments/source-control/types/source-control-workflow-version-id.ts b/packages/cli/src/environments.ee/source-control/types/source-control-workflow-version-id.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-control-workflow-version-id.ts rename to packages/cli/src/environments.ee/source-control/types/source-control-workflow-version-id.ts diff --git a/packages/cli/src/environments/source-control/types/source-controlled-file.ts b/packages/cli/src/environments.ee/source-control/types/source-controlled-file.ts similarity index 100% rename from packages/cli/src/environments/source-control/types/source-controlled-file.ts rename to packages/cli/src/environments.ee/source-control/types/source-controlled-file.ts diff --git a/packages/cli/src/environments/variables/environment-helpers.ts b/packages/cli/src/environments.ee/variables/environment-helpers.ts similarity index 100% rename from packages/cli/src/environments/variables/environment-helpers.ts rename to packages/cli/src/environments.ee/variables/environment-helpers.ts diff --git a/packages/cli/src/environments/variables/variables.controller.ee.ts b/packages/cli/src/environments.ee/variables/variables.controller.ee.ts similarity index 100% rename from packages/cli/src/environments/variables/variables.controller.ee.ts rename to packages/cli/src/environments.ee/variables/variables.controller.ee.ts diff --git a/packages/cli/src/environments/variables/variables.service.ee.ts b/packages/cli/src/environments.ee/variables/variables.service.ee.ts similarity index 100% rename from packages/cli/src/environments/variables/variables.service.ee.ts rename to packages/cli/src/environments.ee/variables/variables.service.ee.ts diff --git a/packages/cli/src/evaluation/metric.schema.ts b/packages/cli/src/evaluation.ee/metric.schema.ts similarity index 100% rename from packages/cli/src/evaluation/metric.schema.ts rename to packages/cli/src/evaluation.ee/metric.schema.ts diff --git a/packages/cli/src/evaluation/metrics.controller.ts b/packages/cli/src/evaluation.ee/metrics.controller.ts similarity index 99% rename from packages/cli/src/evaluation/metrics.controller.ts rename to packages/cli/src/evaluation.ee/metrics.controller.ts index 816228bf13..2072b978b1 100644 --- a/packages/cli/src/evaluation/metrics.controller.ts +++ b/packages/cli/src/evaluation.ee/metrics.controller.ts @@ -6,7 +6,7 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { testMetricCreateRequestBodySchema, testMetricPatchRequestBodySchema, -} from '@/evaluation/metric.schema'; +} from '@/evaluation.ee/metric.schema'; import { getSharedWorkflowIds } from '@/public-api/v1/handlers/workflows/workflows.service'; import { TestDefinitionService } from './test-definition.service.ee'; diff --git a/packages/cli/src/evaluation/test-definition.schema.ts b/packages/cli/src/evaluation.ee/test-definition.schema.ts similarity index 100% rename from packages/cli/src/evaluation/test-definition.schema.ts rename to packages/cli/src/evaluation.ee/test-definition.schema.ts diff --git a/packages/cli/src/evaluation/test-definition.service.ee.ts b/packages/cli/src/evaluation.ee/test-definition.service.ee.ts similarity index 100% rename from packages/cli/src/evaluation/test-definition.service.ee.ts rename to packages/cli/src/evaluation.ee/test-definition.service.ee.ts diff --git a/packages/cli/src/evaluation/test-definitions.controller.ee.ts b/packages/cli/src/evaluation.ee/test-definitions.controller.ee.ts similarity index 97% rename from packages/cli/src/evaluation/test-definitions.controller.ee.ts rename to packages/cli/src/evaluation.ee/test-definitions.controller.ee.ts index ef4a3ed461..bd4a841948 100644 --- a/packages/cli/src/evaluation/test-definitions.controller.ee.ts +++ b/packages/cli/src/evaluation.ee/test-definitions.controller.ee.ts @@ -7,8 +7,8 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { testDefinitionCreateRequestBodySchema, testDefinitionPatchRequestBodySchema, -} from '@/evaluation/test-definition.schema'; -import { TestRunnerService } from '@/evaluation/test-runner/test-runner.service.ee'; +} from '@/evaluation.ee/test-definition.schema'; +import { TestRunnerService } from '@/evaluation.ee/test-runner/test-runner.service.ee'; import { listQueryMiddleware } from '@/middlewares'; import { getSharedWorkflowIds } from '@/public-api/v1/handlers/workflows/workflows.service'; diff --git a/packages/cli/src/evaluation/test-definitions.types.ee.ts b/packages/cli/src/evaluation.ee/test-definitions.types.ee.ts similarity index 100% rename from packages/cli/src/evaluation/test-definitions.types.ee.ts rename to packages/cli/src/evaluation.ee/test-definitions.types.ee.ts diff --git a/packages/cli/src/evaluation/test-runner/__tests__/create-pin-data.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/create-pin-data.ee.test.ts similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/create-pin-data.ee.test.ts rename to packages/cli/src/evaluation.ee/test-runner/__tests__/create-pin-data.ee.test.ts diff --git a/packages/cli/src/evaluation/test-runner/__tests__/evaluation-metrics.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/evaluation-metrics.ee.test.ts similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/evaluation-metrics.ee.test.ts rename to packages/cli/src/evaluation.ee/test-runner/__tests__/evaluation-metrics.ee.test.ts diff --git a/packages/cli/src/evaluation/test-runner/__tests__/get-start-node.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/get-start-node.ee.test.ts similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/get-start-node.ee.test.ts rename to packages/cli/src/evaluation.ee/test-runner/__tests__/get-start-node.ee.test.ts diff --git a/packages/cli/src/evaluation/test-runner/__tests__/mock-data/execution-data.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.json similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/mock-data/execution-data.json rename to packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.json diff --git a/packages/cli/src/evaluation/test-runner/__tests__/mock-data/execution-data.multiple-triggers-2.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers-2.json similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/mock-data/execution-data.multiple-triggers-2.json rename to packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers-2.json diff --git a/packages/cli/src/evaluation/test-runner/__tests__/mock-data/execution-data.multiple-triggers.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers.json similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/mock-data/execution-data.multiple-triggers.json rename to packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers.json diff --git a/packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.evaluation.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.evaluation.json similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.evaluation.json rename to packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.evaluation.json diff --git a/packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.multiple-triggers.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.multiple-triggers.json similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.multiple-triggers.json rename to packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.multiple-triggers.json diff --git a/packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.under-test.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.under-test.json similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.under-test.json rename to packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.under-test.json diff --git a/packages/cli/src/evaluation/test-runner/__tests__/test-runner.service.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts similarity index 100% rename from packages/cli/src/evaluation/test-runner/__tests__/test-runner.service.ee.test.ts rename to packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts diff --git a/packages/cli/src/evaluation/test-runner/evaluation-metrics.ee.ts b/packages/cli/src/evaluation.ee/test-runner/evaluation-metrics.ee.ts similarity index 100% rename from packages/cli/src/evaluation/test-runner/evaluation-metrics.ee.ts rename to packages/cli/src/evaluation.ee/test-runner/evaluation-metrics.ee.ts diff --git a/packages/cli/src/evaluation/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts similarity index 100% rename from packages/cli/src/evaluation/test-runner/test-runner.service.ee.ts rename to packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts diff --git a/packages/cli/src/evaluation/test-runner/utils.ee.ts b/packages/cli/src/evaluation.ee/test-runner/utils.ee.ts similarity index 100% rename from packages/cli/src/evaluation/test-runner/utils.ee.ts rename to packages/cli/src/evaluation.ee/test-runner/utils.ee.ts diff --git a/packages/cli/src/evaluation/test-runs.controller.ee.ts b/packages/cli/src/evaluation.ee/test-runs.controller.ee.ts similarity index 96% rename from packages/cli/src/evaluation/test-runs.controller.ee.ts rename to packages/cli/src/evaluation.ee/test-runs.controller.ee.ts index 744c420fc0..aae71376e4 100644 --- a/packages/cli/src/evaluation/test-runs.controller.ee.ts +++ b/packages/cli/src/evaluation.ee/test-runs.controller.ee.ts @@ -1,7 +1,7 @@ import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee'; import { Delete, Get, RestController } from '@/decorators'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; -import { TestRunsRequest } from '@/evaluation/test-definitions.types.ee'; +import { TestRunsRequest } from '@/evaluation.ee/test-definitions.types.ee'; import { listQueryMiddleware } from '@/middlewares'; import { getSharedWorkflowIds } from '@/public-api/v1/handlers/workflows/workflows.service'; diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts index a5373d0cc5..8bc967e789 100644 --- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts +++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts @@ -14,7 +14,7 @@ import type { import Container from 'typedi'; import { CredentialsHelper } from '@/credentials-helper'; -import * as SecretsHelpers from '@/external-secrets/external-secrets-helper.ee'; +import * as SecretsHelpers from '@/external-secrets.ee/external-secrets-helper.ee'; import { MessageEventBusDestination } from './message-event-bus-destination.ee'; import { eventMessageGenericDestinationTestEvent } from '../event-message-classes/event-message-generic'; diff --git a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts b/packages/cli/src/external-secrets.ee/__tests__/external-secrets-manager.ee.test.ts similarity index 95% rename from packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts rename to packages/cli/src/external-secrets.ee/__tests__/external-secrets-manager.ee.test.ts index 05eabd104f..341558a5fe 100644 --- a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts +++ b/packages/cli/src/external-secrets.ee/__tests__/external-secrets-manager.ee.test.ts @@ -3,8 +3,8 @@ import { Cipher } from 'n8n-core'; import { Container } from 'typedi'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; -import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; -import { ExternalSecretsProviders } from '@/external-secrets/external-secrets-providers.ee'; +import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee'; +import { ExternalSecretsProviders } from '@/external-secrets.ee/external-secrets-providers.ee'; import type { ExternalSecretsSettings } from '@/interfaces'; import { License } from '@/license'; import { diff --git a/packages/cli/src/external-secrets/constants.ts b/packages/cli/src/external-secrets.ee/constants.ts similarity index 100% rename from packages/cli/src/external-secrets/constants.ts rename to packages/cli/src/external-secrets.ee/constants.ts diff --git a/packages/cli/src/external-secrets/external-secrets-helper.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets-helper.ee.ts similarity index 100% rename from packages/cli/src/external-secrets/external-secrets-helper.ee.ts rename to packages/cli/src/external-secrets.ee/external-secrets-helper.ee.ts diff --git a/packages/cli/src/external-secrets/external-secrets-manager.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts similarity index 100% rename from packages/cli/src/external-secrets/external-secrets-manager.ee.ts rename to packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts diff --git a/packages/cli/src/external-secrets/external-secrets-providers.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets-providers.ee.ts similarity index 100% rename from packages/cli/src/external-secrets/external-secrets-providers.ee.ts rename to packages/cli/src/external-secrets.ee/external-secrets-providers.ee.ts diff --git a/packages/cli/src/external-secrets/external-secrets.controller.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets.controller.ee.ts similarity index 100% rename from packages/cli/src/external-secrets/external-secrets.controller.ee.ts rename to packages/cli/src/external-secrets.ee/external-secrets.controller.ee.ts diff --git a/packages/cli/src/external-secrets/external-secrets.service.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets.service.ee.ts similarity index 100% rename from packages/cli/src/external-secrets/external-secrets.service.ee.ts rename to packages/cli/src/external-secrets.ee/external-secrets.service.ee.ts diff --git a/packages/cli/src/external-secrets/providers/__tests__/azure-key-vault.test.ts b/packages/cli/src/external-secrets.ee/providers/__tests__/azure-key-vault.test.ts similarity index 100% rename from packages/cli/src/external-secrets/providers/__tests__/azure-key-vault.test.ts rename to packages/cli/src/external-secrets.ee/providers/__tests__/azure-key-vault.test.ts diff --git a/packages/cli/src/external-secrets/providers/__tests__/gcp-secrets-manager.test.ts b/packages/cli/src/external-secrets.ee/providers/__tests__/gcp-secrets-manager.test.ts similarity index 100% rename from packages/cli/src/external-secrets/providers/__tests__/gcp-secrets-manager.test.ts rename to packages/cli/src/external-secrets.ee/providers/__tests__/gcp-secrets-manager.test.ts diff --git a/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-client.ts b/packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-client.ts similarity index 100% rename from packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-client.ts rename to packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-client.ts diff --git a/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts b/packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-manager.ts similarity index 99% rename from packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts rename to packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-manager.ts index 629b3ad626..b22c2f2436 100644 --- a/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts +++ b/packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-manager.ts @@ -3,7 +3,7 @@ import type { INodeProperties } from 'n8n-workflow'; import Container from 'typedi'; import { UnknownAuthTypeError } from '@/errors/unknown-auth-type.error'; -import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets/constants'; +import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets.ee/constants'; import type { SecretsProvider, SecretsProviderState } from '@/interfaces'; import { AwsSecretsClient } from './aws-secrets-client'; diff --git a/packages/cli/src/external-secrets/providers/aws-secrets/types.ts b/packages/cli/src/external-secrets.ee/providers/aws-secrets/types.ts similarity index 100% rename from packages/cli/src/external-secrets/providers/aws-secrets/types.ts rename to packages/cli/src/external-secrets.ee/providers/aws-secrets/types.ts diff --git a/packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts b/packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts similarity index 99% rename from packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts rename to packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts index 01995d6990..a03ef468b6 100644 --- a/packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts +++ b/packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts @@ -4,7 +4,7 @@ import { ensureError } from 'n8n-workflow'; import type { INodeProperties } from 'n8n-workflow'; import Container from 'typedi'; -import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets/constants'; +import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets.ee/constants'; import type { SecretsProvider, SecretsProviderState } from '@/interfaces'; import type { AzureKeyVaultContext } from './types'; diff --git a/packages/cli/src/external-secrets/providers/azure-key-vault/types.ts b/packages/cli/src/external-secrets.ee/providers/azure-key-vault/types.ts similarity index 100% rename from packages/cli/src/external-secrets/providers/azure-key-vault/types.ts rename to packages/cli/src/external-secrets.ee/providers/azure-key-vault/types.ts diff --git a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts b/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts similarity index 99% rename from packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts rename to packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts index ec29a28198..fe039fd50a 100644 --- a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts +++ b/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts @@ -3,7 +3,7 @@ import { Logger } from 'n8n-core'; import { ensureError, jsonParse, type INodeProperties } from 'n8n-workflow'; import Container from 'typedi'; -import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets/constants'; +import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets.ee/constants'; import type { SecretsProvider, SecretsProviderState } from '@/interfaces'; import type { diff --git a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/types.ts b/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/types.ts similarity index 100% rename from packages/cli/src/external-secrets/providers/gcp-secrets-manager/types.ts rename to packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/types.ts diff --git a/packages/cli/src/external-secrets/providers/infisical.ts b/packages/cli/src/external-secrets.ee/providers/infisical.ts similarity index 100% rename from packages/cli/src/external-secrets/providers/infisical.ts rename to packages/cli/src/external-secrets.ee/providers/infisical.ts diff --git a/packages/cli/src/external-secrets/providers/vault.ts b/packages/cli/src/external-secrets.ee/providers/vault.ts similarity index 100% rename from packages/cli/src/external-secrets/providers/vault.ts rename to packages/cli/src/external-secrets.ee/providers/vault.ts diff --git a/packages/cli/src/ldap/__tests__/helpers.test.ts b/packages/cli/src/ldap.ee/__tests__/helpers.test.ts similarity index 96% rename from packages/cli/src/ldap/__tests__/helpers.test.ts rename to packages/cli/src/ldap.ee/__tests__/helpers.test.ts index 5d38c58e1a..3e7a9c4b4b 100644 --- a/packages/cli/src/ldap/__tests__/helpers.test.ts +++ b/packages/cli/src/ldap.ee/__tests__/helpers.test.ts @@ -2,7 +2,7 @@ import { AuthIdentity } from '@/databases/entities/auth-identity'; import { User } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; import { generateNanoId } from '@/databases/utils/generators'; -import * as helpers from '@/ldap/helpers.ee'; +import * as helpers from '@/ldap.ee/helpers.ee'; import { mockInstance } from '@test/mocking'; const userRepository = mockInstance(UserRepository); diff --git a/packages/cli/src/ldap/constants.ts b/packages/cli/src/ldap.ee/constants.ts similarity index 100% rename from packages/cli/src/ldap/constants.ts rename to packages/cli/src/ldap.ee/constants.ts diff --git a/packages/cli/src/ldap/helpers.ee.ts b/packages/cli/src/ldap.ee/helpers.ee.ts similarity index 100% rename from packages/cli/src/ldap/helpers.ee.ts rename to packages/cli/src/ldap.ee/helpers.ee.ts diff --git a/packages/cli/src/ldap/ldap.controller.ee.ts b/packages/cli/src/ldap.ee/ldap.controller.ee.ts similarity index 100% rename from packages/cli/src/ldap/ldap.controller.ee.ts rename to packages/cli/src/ldap.ee/ldap.controller.ee.ts diff --git a/packages/cli/src/ldap/ldap.service.ee.ts b/packages/cli/src/ldap.ee/ldap.service.ee.ts similarity index 99% rename from packages/cli/src/ldap/ldap.service.ee.ts rename to packages/cli/src/ldap.ee/ldap.service.ee.ts index 1445f56f13..9a794bd5fc 100644 --- a/packages/cli/src/ldap/ldap.service.ee.ts +++ b/packages/cli/src/ldap.ee/ldap.service.ee.ts @@ -19,7 +19,7 @@ import { isEmailCurrentAuthenticationMethod, isLdapCurrentAuthenticationMethod, setCurrentAuthenticationMethod, -} from '@/sso/sso-helpers'; +} from '@/sso.ee/sso-helpers'; import { BINARY_AD_ATTRIBUTES, diff --git a/packages/cli/src/ldap/types.ts b/packages/cli/src/ldap.ee/types.ts similarity index 100% rename from packages/cli/src/ldap/types.ts rename to packages/cli/src/ldap.ee/types.ts diff --git a/packages/cli/src/permissions/check-access.ts b/packages/cli/src/permissions.ee/check-access.ts similarity index 100% rename from packages/cli/src/permissions/check-access.ts rename to packages/cli/src/permissions.ee/check-access.ts diff --git a/packages/cli/src/permissions/global-roles.ts b/packages/cli/src/permissions.ee/global-roles.ts similarity index 100% rename from packages/cli/src/permissions/global-roles.ts rename to packages/cli/src/permissions.ee/global-roles.ts diff --git a/packages/cli/src/permissions/project-roles.ts b/packages/cli/src/permissions.ee/project-roles.ts similarity index 100% rename from packages/cli/src/permissions/project-roles.ts rename to packages/cli/src/permissions.ee/project-roles.ts diff --git a/packages/cli/src/permissions/resource-roles.ts b/packages/cli/src/permissions.ee/resource-roles.ts similarity index 100% rename from packages/cli/src/permissions/resource-roles.ts rename to packages/cli/src/permissions.ee/resource-roles.ts diff --git a/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts b/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts index fdcb2f16ba..6f960980ca 100644 --- a/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts +++ b/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts @@ -5,10 +5,10 @@ import { Container } from 'typedi'; import { getTrackingInformationFromPullResult, isSourceControlLicensed, -} from '@/environments/source-control/source-control-helper.ee'; -import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee'; -import { SourceControlService } from '@/environments/source-control/source-control.service.ee'; -import type { ImportResult } from '@/environments/source-control/types/import-result'; +} from '@/environments.ee/source-control/source-control-helper.ee'; +import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee'; +import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee'; +import type { ImportResult } from '@/environments.ee/source-control/types/import-result'; import { EventService } from '@/events/event.service'; import type { PublicSourceControlRequest } from '../../../types'; diff --git a/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts b/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts index 65fb1daab5..9e5b6dabe6 100644 --- a/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts +++ b/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts @@ -2,7 +2,7 @@ import type { Response } from 'express'; import Container from 'typedi'; import { VariablesRepository } from '@/databases/repositories/variables.repository'; -import { VariablesController } from '@/environments/variables/variables.controller.ee'; +import { VariablesController } from '@/environments.ee/variables/variables.controller.ee'; import type { PaginatedRequest } from '@/public-api/types'; import type { VariablesRequest } from '@/requests'; diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts index 7a9003dc28..500eaf0d13 100644 --- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts +++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts @@ -17,7 +17,7 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository import { EventService } from '@/events/event.service'; import { ExternalHooks } from '@/external-hooks'; import { addNodeIds, replaceInvalidCredentials } from '@/workflow-helpers'; -import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service.ee'; +import { WorkflowHistoryService } from '@/workflows/workflow-history.ee/workflow-history.service.ee'; import { WorkflowService } from '@/workflows/workflow.service'; import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee'; diff --git a/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts b/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts index ed68d4761c..ace75ef610 100644 --- a/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts +++ b/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts @@ -6,7 +6,7 @@ import { Container } from 'typedi'; import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error'; import type { BooleanLicenseFeature } from '@/interfaces'; import { License } from '@/license'; -import { userHasScopes } from '@/permissions/check-access'; +import { userHasScopes } from '@/permissions.ee/check-access'; import type { AuthenticatedRequest } from '@/requests'; import type { PaginatedRequest } from '../../../types'; diff --git a/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts index 4f8c8af859..b92c18c885 100644 --- a/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts +++ b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts @@ -7,7 +7,7 @@ import type { ActiveWorkflowManager } from '@/active-workflow-manager'; import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { EventService } from '@/events/event.service'; -import type { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; +import type { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee'; import type { IWorkflowDb } from '@/interfaces'; import type { License } from '@/license'; import type { Push } from '@/push'; @@ -17,7 +17,7 @@ import type { TestWebhooks } from '@/webhooks/test-webhooks'; import type { Publisher } from '../pubsub/publisher.service'; import { PubSubHandler } from '../pubsub/pubsub-handler'; -import type { WorkerStatusService } from '../worker-status.service'; +import type { WorkerStatusService } from '../worker-status.service.ee'; const flushPromises = async () => await new Promise((resolve) => setImmediate(resolve)); diff --git a/packages/cli/src/scaling/pubsub/pubsub-handler.ts b/packages/cli/src/scaling/pubsub/pubsub-handler.ts index 70b5f67f72..10a763f8f1 100644 --- a/packages/cli/src/scaling/pubsub/pubsub-handler.ts +++ b/packages/cli/src/scaling/pubsub/pubsub-handler.ts @@ -7,7 +7,7 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { EventService } from '@/events/event.service'; import type { PubSubEventMap } from '@/events/maps/pub-sub.event-map'; -import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; +import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee'; import { License } from '@/license'; import { Push } from '@/push'; import { Publisher } from '@/scaling/pubsub/publisher.service'; @@ -16,7 +16,7 @@ import { assertNever } from '@/utils'; import { TestWebhooks } from '@/webhooks/test-webhooks'; import type { PubSub } from './pubsub.types'; -import { WorkerStatusService } from '../worker-status.service'; +import { WorkerStatusService } from '../worker-status.service.ee'; /** * Responsible for handling events emitted from messages received via a pubsub channel. diff --git a/packages/cli/src/scaling/worker-status.service.ts b/packages/cli/src/scaling/worker-status.service.ee.ts similarity index 100% rename from packages/cli/src/scaling/worker-status.service.ts rename to packages/cli/src/scaling/worker-status.service.ee.ts diff --git a/packages/cli/src/secrets-helpers.ts b/packages/cli/src/secrets-helpers.ee.ts similarity index 90% rename from packages/cli/src/secrets-helpers.ts rename to packages/cli/src/secrets-helpers.ee.ts index 88a75ae3da..fdc18c4b85 100644 --- a/packages/cli/src/secrets-helpers.ts +++ b/packages/cli/src/secrets-helpers.ee.ts @@ -1,7 +1,7 @@ import type { SecretsHelpersBase } from 'n8n-workflow'; import { Service } from 'typedi'; -import { ExternalSecretsManager } from './external-secrets/external-secrets-manager.ee'; +import { ExternalSecretsManager } from './external-secrets.ee/external-secrets-manager.ee'; @Service() export class SecretsHelper implements SecretsHelpersBase { diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts index 74a1311444..b2b1c3a1c8 100644 --- a/packages/cli/src/server.ts +++ b/packages/cli/src/server.ts @@ -23,7 +23,7 @@ import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus' import { EventService } from '@/events/event.service'; import { LogStreamingEventRelay } from '@/events/relays/log-streaming.event-relay'; import type { ICredentialsOverwrite } from '@/interfaces'; -import { isLdapEnabled } from '@/ldap/helpers.ee'; +import { isLdapEnabled } from '@/ldap.ee/helpers.ee'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { handleMfaDisable, isMfaFeatureEnabled } from '@/mfa/helpers'; import { PostHogClient } from '@/posthog'; @@ -60,12 +60,12 @@ import '@/credentials/credentials.controller'; import '@/eventbus/event-bus.controller'; import '@/events/events.controller'; import '@/executions/executions.controller'; -import '@/external-secrets/external-secrets.controller.ee'; +import '@/external-secrets.ee/external-secrets.controller.ee'; import '@/license/license.controller'; -import '@/evaluation/test-definitions.controller.ee'; -import '@/evaluation/metrics.controller'; -import '@/evaluation/test-runs.controller.ee'; -import '@/workflows/workflow-history/workflow-history.controller.ee'; +import '@/evaluation.ee/test-definitions.controller.ee'; +import '@/evaluation.ee/metrics.controller'; +import '@/evaluation.ee/test-runs.controller.ee'; +import '@/workflows/workflow-history.ee/workflow-history.controller.ee'; import '@/workflows/workflows.controller'; @Service() @@ -114,8 +114,8 @@ export class Server extends AbstractServer { } if (isLdapEnabled()) { - const { LdapService } = await import('@/ldap/ldap.service.ee'); - await import('@/ldap/ldap.controller.ee'); + const { LdapService } = await import('@/ldap.ee/ldap.service.ee'); + await import('@/ldap.ee/ldap.controller.ee'); await Container.get(LdapService).init(); } @@ -142,9 +142,9 @@ export class Server extends AbstractServer { // initialize SamlService if it is licensed, even if not enabled, to // set up the initial environment try { - const { SamlService } = await import('@/sso/saml/saml.service.ee'); + const { SamlService } = await import('@/sso.ee/saml/saml.service.ee'); await Container.get(SamlService).init(); - await import('@/sso/saml/routes/saml.controller.ee'); + await import('@/sso.ee/saml/routes/saml.controller.ee'); } catch (error) { this.logger.warn(`SAML initialization failed: ${(error as Error).message}`); } @@ -154,11 +154,11 @@ export class Server extends AbstractServer { // ---------------------------------------- try { const { SourceControlService } = await import( - '@/environments/source-control/source-control.service.ee' + '@/environments.ee/source-control/source-control.service.ee' ); await Container.get(SourceControlService).init(); - await import('@/environments/source-control/source-control.controller.ee'); - await import('@/environments/variables/variables.controller.ee'); + await import('@/environments.ee/source-control/source-control.controller.ee'); + await import('@/environments.ee/variables/variables.controller.ee'); } catch (error) { this.logger.warn(`Source Control initialization failed: ${(error as Error).message}`); } diff --git a/packages/cli/src/services/__tests__/orchestration.service.test.ts b/packages/cli/src/services/__tests__/orchestration.service.test.ts index a8e72c49bf..45e79036ac 100644 --- a/packages/cli/src/services/__tests__/orchestration.service.test.ts +++ b/packages/cli/src/services/__tests__/orchestration.service.test.ts @@ -5,7 +5,7 @@ import Container from 'typedi'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import config from '@/config'; -import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; +import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee'; import { Push } from '@/push'; import { OrchestrationService } from '@/services/orchestration.service'; import { RedisClientService } from '@/services/redis-client.service'; diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts index 75fe36358f..ae7a596005 100644 --- a/packages/cli/src/services/frontend.service.ts +++ b/packages/cli/src/services/frontend.service.ts @@ -12,19 +12,19 @@ import config from '@/config'; import { inE2ETests, LICENSE_FEATURES, N8N_VERSION } from '@/constants'; import { CredentialTypes } from '@/credential-types'; import { CredentialsOverwrites } from '@/credentials-overwrites'; -import { getVariablesLimit } from '@/environments/variables/environment-helpers'; -import { getLdapLoginLabel } from '@/ldap/helpers.ee'; +import { getVariablesLimit } from '@/environments.ee/variables/environment-helpers'; +import { getLdapLoginLabel } from '@/ldap.ee/helpers.ee'; import { License } from '@/license'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { isApiEnabled } from '@/public-api'; import type { CommunityPackagesService } from '@/services/community-packages.service'; -import { getSamlLoginLabel } from '@/sso/saml/saml-helpers'; -import { getCurrentAuthenticationMethod } from '@/sso/sso-helpers'; +import { getSamlLoginLabel } from '@/sso.ee/saml/saml-helpers'; +import { getCurrentAuthenticationMethod } from '@/sso.ee/sso-helpers'; import { UserManagementMailer } from '@/user-management/email'; import { getWorkflowHistoryLicensePruneTime, getWorkflowHistoryPruneTime, -} from '@/workflows/workflow-history/workflow-history-helper.ee'; +} from '@/workflows/workflow-history.ee/workflow-history-helper.ee'; import { UrlService } from './url.service'; diff --git a/packages/cli/src/services/project.service.ts b/packages/cli/src/services/project.service.ee.ts similarity index 100% rename from packages/cli/src/services/project.service.ts rename to packages/cli/src/services/project.service.ee.ts diff --git a/packages/cli/src/services/role.service.ts b/packages/cli/src/services/role.service.ts index 97adbbfb7d..a4fd5daee1 100644 --- a/packages/cli/src/services/role.service.ts +++ b/packages/cli/src/services/role.service.ts @@ -15,19 +15,19 @@ import { GLOBAL_ADMIN_SCOPES, GLOBAL_MEMBER_SCOPES, GLOBAL_OWNER_SCOPES, -} from '@/permissions/global-roles'; +} from '@/permissions.ee/global-roles'; import { PERSONAL_PROJECT_OWNER_SCOPES, PROJECT_EDITOR_SCOPES, PROJECT_VIEWER_SCOPES, REGULAR_PROJECT_ADMIN_SCOPES, -} from '@/permissions/project-roles'; +} from '@/permissions.ee/project-roles'; import { CREDENTIALS_SHARING_OWNER_SCOPES, CREDENTIALS_SHARING_USER_SCOPES, WORKFLOW_SHARING_EDITOR_SCOPES, WORKFLOW_SHARING_OWNER_SCOPES, -} from '@/permissions/resource-roles'; +} from '@/permissions.ee/resource-roles'; import type { ListQuery } from '@/requests'; export type RoleNamespace = 'global' | 'project' | 'credential' | 'workflow'; diff --git a/packages/cli/src/sso/saml/__tests__/saml-helpers.test.ts b/packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts similarity index 92% rename from packages/cli/src/sso/saml/__tests__/saml-helpers.test.ts rename to packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts index 76ae2e4d50..f544e050ed 100644 --- a/packages/cli/src/sso/saml/__tests__/saml-helpers.test.ts +++ b/packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts @@ -3,8 +3,8 @@ import { User } from '@/databases/entities/user'; import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository'; import { UserRepository } from '@/databases/repositories/user.repository'; import { generateNanoId } from '@/databases/utils/generators'; -import * as helpers from '@/sso/saml/saml-helpers'; -import type { SamlUserAttributes } from '@/sso/saml/types/saml-user-attributes'; +import * as helpers from '@/sso.ee/saml/saml-helpers'; +import type { SamlUserAttributes } from '@/sso.ee/saml/types/saml-user-attributes'; import { mockInstance } from '@test/mocking'; const userRepository = mockInstance(UserRepository); diff --git a/packages/cli/src/sso/saml/__tests__/saml-validator.test.ts b/packages/cli/src/sso.ee/saml/__tests__/saml-validator.test.ts similarity index 100% rename from packages/cli/src/sso/saml/__tests__/saml-validator.test.ts rename to packages/cli/src/sso.ee/saml/__tests__/saml-validator.test.ts diff --git a/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts b/packages/cli/src/sso.ee/saml/__tests__/saml.service.ee.test.ts similarity index 97% rename from packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts rename to packages/cli/src/sso.ee/saml/__tests__/saml.service.ee.test.ts index 708592e8e7..6070104571 100644 --- a/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts +++ b/packages/cli/src/sso.ee/saml/__tests__/saml.service.ee.test.ts @@ -5,8 +5,8 @@ import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify' import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { UrlService } from '@/services/url.service'; -import * as samlHelpers from '@/sso/saml/saml-helpers'; -import { SamlService } from '@/sso/saml/saml.service.ee'; +import * as samlHelpers from '@/sso.ee/saml/saml-helpers'; +import { SamlService } from '@/sso.ee/saml/saml.service.ee'; import { mockInstance } from '@test/mocking'; import { SAML_PREFERENCES_DB_KEY } from '../constants'; diff --git a/packages/cli/src/sso/saml/constants.ts b/packages/cli/src/sso.ee/saml/constants.ts similarity index 100% rename from packages/cli/src/sso/saml/constants.ts rename to packages/cli/src/sso.ee/saml/constants.ts diff --git a/packages/cli/src/sso/saml/errors/invalid-saml-metadata.error.ts b/packages/cli/src/sso.ee/saml/errors/invalid-saml-metadata.error.ts similarity index 100% rename from packages/cli/src/sso/saml/errors/invalid-saml-metadata.error.ts rename to packages/cli/src/sso.ee/saml/errors/invalid-saml-metadata.error.ts diff --git a/packages/cli/src/sso/saml/middleware/saml-enabled-middleware.ts b/packages/cli/src/sso.ee/saml/middleware/saml-enabled-middleware.ts similarity index 100% rename from packages/cli/src/sso/saml/middleware/saml-enabled-middleware.ts rename to packages/cli/src/sso.ee/saml/middleware/saml-enabled-middleware.ts diff --git a/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts b/packages/cli/src/sso.ee/saml/routes/__tests__/saml.controller.ee.test.ts similarity index 100% rename from packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts rename to packages/cli/src/sso.ee/saml/routes/__tests__/saml.controller.ee.test.ts diff --git a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts b/packages/cli/src/sso.ee/saml/routes/saml.controller.ee.ts similarity index 100% rename from packages/cli/src/sso/saml/routes/saml.controller.ee.ts rename to packages/cli/src/sso.ee/saml/routes/saml.controller.ee.ts diff --git a/packages/cli/src/sso/saml/saml-helpers.ts b/packages/cli/src/sso.ee/saml/saml-helpers.ts similarity index 100% rename from packages/cli/src/sso/saml/saml-helpers.ts rename to packages/cli/src/sso.ee/saml/saml-helpers.ts diff --git a/packages/cli/src/sso/saml/saml-validator.ts b/packages/cli/src/sso.ee/saml/saml-validator.ts similarity index 100% rename from packages/cli/src/sso/saml/saml-validator.ts rename to packages/cli/src/sso.ee/saml/saml-validator.ts diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso.ee/saml/saml.service.ee.ts similarity index 100% rename from packages/cli/src/sso/saml/saml.service.ee.ts rename to packages/cli/src/sso.ee/saml/saml.service.ee.ts diff --git a/packages/cli/src/sso/saml/schema/metadata-exchange.xsd.ts b/packages/cli/src/sso.ee/saml/schema/metadata-exchange.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/metadata-exchange.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/metadata-exchange.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/saml-schema-assertion-2.0.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/saml-schema-assertion-2.0.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/saml-schema-metadata-2.0.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/saml-schema-metadata-2.0.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/saml-schema-protocol-2.0.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/saml-schema-protocol-2.0.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/ws-addr.xsd.ts b/packages/cli/src/sso.ee/saml/schema/ws-addr.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/ws-addr.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/ws-addr.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/ws-authorization.xsd.ts b/packages/cli/src/sso.ee/saml/schema/ws-authorization.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/ws-authorization.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/ws-authorization.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/ws-federation.xsd.ts b/packages/cli/src/sso.ee/saml/schema/ws-federation.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/ws-federation.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/ws-federation.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/ws-securitypolicy-1.2.xsd.ts b/packages/cli/src/sso.ee/saml/schema/ws-securitypolicy-1.2.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/ws-securitypolicy-1.2.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/ws-securitypolicy-1.2.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/xenc-schema.xsd.ts b/packages/cli/src/sso.ee/saml/schema/xenc-schema.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/xenc-schema.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/xenc-schema.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/xml.xsd.ts b/packages/cli/src/sso.ee/saml/schema/xml.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/xml.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/xml.xsd.ts diff --git a/packages/cli/src/sso/saml/schema/xmldsig-core-schema.xsd.ts b/packages/cli/src/sso.ee/saml/schema/xmldsig-core-schema.xsd.ts similarity index 100% rename from packages/cli/src/sso/saml/schema/xmldsig-core-schema.xsd.ts rename to packages/cli/src/sso.ee/saml/schema/xmldsig-core-schema.xsd.ts diff --git a/packages/cli/src/sso/saml/service-provider.ee.ts b/packages/cli/src/sso.ee/saml/service-provider.ee.ts similarity index 100% rename from packages/cli/src/sso/saml/service-provider.ee.ts rename to packages/cli/src/sso.ee/saml/service-provider.ee.ts diff --git a/packages/cli/src/sso/saml/types/index.ts b/packages/cli/src/sso.ee/saml/types/index.ts similarity index 100% rename from packages/cli/src/sso/saml/types/index.ts rename to packages/cli/src/sso.ee/saml/types/index.ts diff --git a/packages/cli/src/sso/saml/types/requests.ts b/packages/cli/src/sso.ee/saml/types/requests.ts similarity index 100% rename from packages/cli/src/sso/saml/types/requests.ts rename to packages/cli/src/sso.ee/saml/types/requests.ts diff --git a/packages/cli/src/sso/saml/types/saml-attribute-mapping.ts b/packages/cli/src/sso.ee/saml/types/saml-attribute-mapping.ts similarity index 100% rename from packages/cli/src/sso/saml/types/saml-attribute-mapping.ts rename to packages/cli/src/sso.ee/saml/types/saml-attribute-mapping.ts diff --git a/packages/cli/src/sso/saml/types/saml-preferences.ts b/packages/cli/src/sso.ee/saml/types/saml-preferences.ts similarity index 100% rename from packages/cli/src/sso/saml/types/saml-preferences.ts rename to packages/cli/src/sso.ee/saml/types/saml-preferences.ts diff --git a/packages/cli/src/sso/saml/types/saml-user-attributes.ts b/packages/cli/src/sso.ee/saml/types/saml-user-attributes.ts similarity index 100% rename from packages/cli/src/sso/saml/types/saml-user-attributes.ts rename to packages/cli/src/sso.ee/saml/types/saml-user-attributes.ts diff --git a/packages/cli/src/sso/saml/views/init-sso-post.ts b/packages/cli/src/sso.ee/saml/views/init-sso-post.ts similarity index 100% rename from packages/cli/src/sso/saml/views/init-sso-post.ts rename to packages/cli/src/sso.ee/saml/views/init-sso-post.ts diff --git a/packages/cli/src/sso/sso-helpers.ts b/packages/cli/src/sso.ee/sso-helpers.ts similarity index 100% rename from packages/cli/src/sso/sso-helpers.ts rename to packages/cli/src/sso.ee/sso-helpers.ts diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts index e8099e32cb..051ae4cf25 100644 --- a/packages/cli/src/telemetry/index.ts +++ b/packages/cli/src/telemetry/index.ts @@ -15,7 +15,7 @@ import type { IExecutionTrackProperties } from '@/interfaces'; import { License } from '@/license'; import { PostHogClient } from '@/posthog'; -import { SourceControlPreferencesService } from '../environments/source-control/source-control-preferences.service.ee'; +import { SourceControlPreferencesService } from '../environments.ee/source-control/source-control-preferences.service.ee'; type ExecutionTrackDataKey = 'manual_error' | 'manual_success' | 'prod_error' | 'prod_success'; diff --git a/packages/cli/src/user-management/permission-checker.ts b/packages/cli/src/user-management/permission-checker.ts index c93d2acf91..51a6e8c6a3 100644 --- a/packages/cli/src/user-management/permission-checker.ts +++ b/packages/cli/src/user-management/permission-checker.ts @@ -4,7 +4,7 @@ import { Service } from 'typedi'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { OwnershipService } from '@/services/ownership.service'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; @Service() export class PermissionChecker { diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts index bf97ce0a3f..69395b4ec8 100644 --- a/packages/cli/src/workflow-execute-additional-data.ts +++ b/packages/cli/src/workflow-execute-additional-data.ts @@ -59,7 +59,7 @@ import { } from './execution-lifecycle-hooks/shared/shared-hook-functions'; import { toSaveSettings } from './execution-lifecycle-hooks/to-save-settings'; import { TaskManager } from './runners/task-managers/task-manager'; -import { SecretsHelper } from './secrets-helpers'; +import { SecretsHelper } from './secrets-helpers.ee'; import { OwnershipService } from './services/ownership.service'; import { UrlService } from './services/url.service'; import { SubworkflowPolicyChecker } from './subworkflows/subworkflow-policy-checker.service'; diff --git a/packages/cli/src/workflow-helpers.ts b/packages/cli/src/workflow-helpers.ts index addae4e290..b49e1ae556 100644 --- a/packages/cli/src/workflow-helpers.ts +++ b/packages/cli/src/workflow-helpers.ts @@ -14,7 +14,7 @@ import { v4 as uuid } from 'uuid'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; -import { VariablesService } from '@/environments/variables/variables.service.ee'; +import { VariablesService } from '@/environments.ee/variables/variables.service.ee'; export function generateFailedExecutionFromError( mode: WorkflowExecuteMode, diff --git a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history-helper.ee.test.ts b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history-helper.ee.test.ts similarity index 97% rename from packages/cli/src/workflows/workflow-history/__tests__/workflow-history-helper.ee.test.ts rename to packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history-helper.ee.test.ts index ce3927f730..70e00d2c6d 100644 --- a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history-helper.ee.test.ts +++ b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history-helper.ee.test.ts @@ -1,6 +1,6 @@ import config from '@/config'; import { License } from '@/license'; -import { getWorkflowHistoryPruneTime } from '@/workflows/workflow-history/workflow-history-helper.ee'; +import { getWorkflowHistoryPruneTime } from '@/workflows/workflow-history.ee/workflow-history-helper.ee'; import { mockInstance } from '@test/mocking'; let licensePruneTime = -1; diff --git a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts similarity index 96% rename from packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts rename to packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts index a2a48587f0..b80b38eb9e 100644 --- a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts +++ b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts @@ -3,7 +3,7 @@ import { mockClear } from 'jest-mock-extended'; import { User } from '@/databases/entities/user'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; -import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service.ee'; +import { WorkflowHistoryService } from '@/workflows/workflow-history.ee/workflow-history.service.ee'; import { mockInstance, mockLogger } from '@test/mocking'; import { getWorkflow } from '@test-integration/workflow'; @@ -24,7 +24,7 @@ const testUser = Object.assign(new User(), { }); let isWorkflowHistoryEnabled = true; -jest.mock('@/workflows/workflow-history/workflow-history-helper.ee', () => { +jest.mock('@/workflows/workflow-history.ee/workflow-history-helper.ee', () => { return { isWorkflowHistoryEnabled: jest.fn(() => isWorkflowHistoryEnabled), }; diff --git a/packages/cli/src/workflows/workflow-history/workflow-history-helper.ee.ts b/packages/cli/src/workflows/workflow-history.ee/workflow-history-helper.ee.ts similarity index 100% rename from packages/cli/src/workflows/workflow-history/workflow-history-helper.ee.ts rename to packages/cli/src/workflows/workflow-history.ee/workflow-history-helper.ee.ts diff --git a/packages/cli/src/workflows/workflow-history/workflow-history-manager.ee.ts b/packages/cli/src/workflows/workflow-history.ee/workflow-history-manager.ee.ts similarity index 100% rename from packages/cli/src/workflows/workflow-history/workflow-history-manager.ee.ts rename to packages/cli/src/workflows/workflow-history.ee/workflow-history-manager.ee.ts diff --git a/packages/cli/src/workflows/workflow-history/workflow-history.controller.ee.ts b/packages/cli/src/workflows/workflow-history.ee/workflow-history.controller.ee.ts similarity index 100% rename from packages/cli/src/workflows/workflow-history/workflow-history.controller.ee.ts rename to packages/cli/src/workflows/workflow-history.ee/workflow-history.controller.ee.ts diff --git a/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts b/packages/cli/src/workflows/workflow-history.ee/workflow-history.service.ee.ts similarity index 100% rename from packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts rename to packages/cli/src/workflows/workflow-history.ee/workflow-history.service.ee.ts diff --git a/packages/cli/src/workflows/workflow.service.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts index debaf85073..830a3d2f98 100644 --- a/packages/cli/src/workflows/workflow.service.ee.ts +++ b/packages/cli/src/workflows/workflow.service.ee.ts @@ -19,7 +19,7 @@ import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { TransferWorkflowError } from '@/errors/response-errors/transfer-workflow.error'; import { OwnershipService } from '@/services/ownership.service'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import type { WorkflowWithSharingsAndCredentials, diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts index facd372656..21f792747e 100644 --- a/packages/cli/src/workflows/workflow.service.ts +++ b/packages/cli/src/workflows/workflow.service.ts @@ -27,12 +27,12 @@ import { validateEntity } from '@/generic-helpers'; import { hasSharing, type ListQuery } from '@/requests'; import { OrchestrationService } from '@/services/orchestration.service'; import { OwnershipService } from '@/services/ownership.service'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { RoleService } from '@/services/role.service'; import { TagService } from '@/services/tag.service'; import * as WorkflowHelpers from '@/workflow-helpers'; -import { WorkflowHistoryService } from './workflow-history/workflow-history.service.ee'; +import { WorkflowHistoryService } from './workflow-history.ee/workflow-history.service.ee'; import { WorkflowSharingService } from './workflow-sharing.service'; @Service() diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts index f097b3cab6..b12dfdce5a 100644 --- a/packages/cli/src/workflows/workflows.controller.ts +++ b/packages/cli/src/workflows/workflows.controller.ts @@ -31,14 +31,14 @@ import { License } from '@/license'; import { listQueryMiddleware } from '@/middlewares'; import * as ResponseHelper from '@/response-helper'; import { NamingService } from '@/services/naming.service'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { TagService } from '@/services/tag.service'; import { UserManagementMailer } from '@/user-management/email'; import * as utils from '@/utils'; import * as WorkflowHelpers from '@/workflow-helpers'; import { WorkflowExecutionService } from './workflow-execution.service'; -import { WorkflowHistoryService } from './workflow-history/workflow-history.service.ee'; +import { WorkflowHistoryService } from './workflow-history.ee/workflow-history.service.ee'; import { WorkflowRequest } from './workflow.request'; import { WorkflowService } from './workflow.service'; import { EnterpriseWorkflowService } from './workflow.service.ee'; diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts index f724d156a8..f965efe709 100644 --- a/packages/cli/test/integration/active-workflow-manager.test.ts +++ b/packages/cli/test/integration/active-workflow-manager.test.ts @@ -12,7 +12,7 @@ import { ExecutionService } from '@/executions/execution.service'; import { ExternalHooks } from '@/external-hooks'; import { NodeTypes } from '@/node-types'; import { Push } from '@/push'; -import { SecretsHelper } from '@/secrets-helpers'; +import { SecretsHelper } from '@/secrets-helpers.ee'; import * as WebhookHelpers from '@/webhooks/webhook-helpers'; import { WebhookService } from '@/webhooks/webhook.service'; import * as AdditionalData from '@/workflow-execute-additional-data'; diff --git a/packages/cli/test/integration/commands/ldap/reset.test.ts b/packages/cli/test/integration/commands/ldap/reset.test.ts index ef0ab2c0d6..a199310f9c 100644 --- a/packages/cli/test/integration/commands/ldap/reset.test.ts +++ b/packages/cli/test/integration/commands/ldap/reset.test.ts @@ -7,8 +7,8 @@ import { CredentialsRepository } from '@/databases/repositories/credentials.repo import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; -import { getLdapSynchronizations, saveLdapSynchronization } from '@/ldap/helpers.ee'; -import { LdapService } from '@/ldap/ldap.service.ee'; +import { getLdapSynchronizations, saveLdapSynchronization } from '@/ldap.ee/helpers.ee'; +import { LdapService } from '@/ldap.ee/ldap.service.ee'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { Push } from '@/push'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts index e17a8d2279..f91c001e08 100644 --- a/packages/cli/test/integration/commands/worker.cmd.test.ts +++ b/packages/cli/test/integration/commands/worker.cmd.test.ts @@ -9,7 +9,7 @@ import config from '@/config'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { LogStreamingEventRelay } from '@/events/relays/log-streaming.event-relay'; import { ExternalHooks } from '@/external-hooks'; -import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; +import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee'; import { License } from '@/license'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { Push } from '@/push'; diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts index 5428cafbd4..1606de934d 100644 --- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts +++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts @@ -8,7 +8,7 @@ import type { User } from '@/databases/entities/user'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import type { ListQuery } from '@/requests'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { UserManagementMailer } from '@/user-management/email'; import { createWorkflow, shareWorkflowWithUsers } from '@test-integration/db/workflows'; diff --git a/packages/cli/test/integration/environments/source-control-import.service.test.ts b/packages/cli/test/integration/environments/source-control-import.service.test.ts index 4d2a3d668a..3faa84b675 100644 --- a/packages/cli/test/integration/environments/source-control-import.service.test.ts +++ b/packages/cli/test/integration/environments/source-control-import.service.test.ts @@ -9,9 +9,9 @@ import Container from 'typedi'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; -import { SourceControlImportService } from '@/environments/source-control/source-control-import.service.ee'; -import type { ExportableCredential } from '@/environments/source-control/types/exportable-credential'; -import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file'; +import { SourceControlImportService } from '@/environments.ee/source-control/source-control-import.service.ee'; +import type { ExportableCredential } from '@/environments.ee/source-control/types/exportable-credential'; +import type { SourceControlledFile } from '@/environments.ee/source-control/types/source-controlled-file'; import { mockInstance } from '../../shared/mocking'; import { saveCredential } from '../shared/db/credentials'; diff --git a/packages/cli/test/integration/environments/source-control.test.ts b/packages/cli/test/integration/environments/source-control.test.ts index f983b899aa..7e474e1f9a 100644 --- a/packages/cli/test/integration/environments/source-control.test.ts +++ b/packages/cli/test/integration/environments/source-control.test.ts @@ -2,9 +2,9 @@ import { Container } from 'typedi'; import config from '@/config'; import type { User } from '@/databases/entities/user'; -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 { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee'; +import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee'; +import type { SourceControlledFile } from '@/environments.ee/source-control/types/source-controlled-file'; import { Telemetry } from '@/telemetry'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/test/integration/evaluation/test-definitions.api.test.ts b/packages/cli/test/integration/evaluation/test-definitions.api.test.ts index fe977fbfd3..8dd778289d 100644 --- a/packages/cli/test/integration/evaluation/test-definitions.api.test.ts +++ b/packages/cli/test/integration/evaluation/test-definitions.api.test.ts @@ -5,7 +5,7 @@ import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-en import type { User } from '@/databases/entities/user'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { TestDefinitionRepository } from '@/databases/repositories/test-definition.repository.ee'; -import { TestRunnerService } from '@/evaluation/test-runner/test-runner.service.ee'; +import { TestRunnerService } from '@/evaluation.ee/test-runner/test-runner.service.ee'; import { createAnnotationTags } from '@test-integration/db/executions'; import { createUserShell } from './../shared/db/users'; diff --git a/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts index c36340108e..7e01941c80 100644 --- a/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts +++ b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts @@ -7,8 +7,8 @@ import config from '@/config'; import { CREDENTIAL_BLANKING_VALUE } from '@/constants'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; import type { EventService } from '@/events/event.service'; -import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; -import { ExternalSecretsProviders } from '@/external-secrets/external-secrets-providers.ee'; +import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee'; +import { ExternalSecretsProviders } from '@/external-secrets.ee/external-secrets-providers.ee'; import type { ExternalSecretsSettings, SecretsProviderState } from '@/interfaces'; import { License } from '@/license'; diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts index 17573f49f5..884f72315c 100644 --- a/packages/cli/test/integration/ldap/ldap.api.test.ts +++ b/packages/cli/test/integration/ldap/ldap.api.test.ts @@ -7,10 +7,13 @@ import config from '@/config'; import type { User } from '@/databases/entities/user'; import { AuthProviderSyncHistoryRepository } from '@/databases/repositories/auth-provider-sync-history.repository'; import { UserRepository } from '@/databases/repositories/user.repository'; -import { LDAP_DEFAULT_CONFIGURATION } from '@/ldap/constants'; -import { saveLdapSynchronization } from '@/ldap/helpers.ee'; -import { LdapService } from '@/ldap/ldap.service.ee'; -import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/sso-helpers'; +import { LDAP_DEFAULT_CONFIGURATION } from '@/ldap.ee/constants'; +import { saveLdapSynchronization } from '@/ldap.ee/helpers.ee'; +import { LdapService } from '@/ldap.ee/ldap.service.ee'; +import { + getCurrentAuthenticationMethod, + setCurrentAuthenticationMethod, +} from '@/sso.ee/sso-helpers'; import { randomEmail, randomName, uniqueId } from './../shared/random'; import { getPersonalProject } from '../shared/db/projects'; diff --git a/packages/cli/test/integration/password-reset.api.test.ts b/packages/cli/test/integration/password-reset.api.test.ts index 89d66c3f21..2be4c0f030 100644 --- a/packages/cli/test/integration/password-reset.api.test.ts +++ b/packages/cli/test/integration/password-reset.api.test.ts @@ -12,7 +12,7 @@ import { ExternalHooks } from '@/external-hooks'; import { License } from '@/license'; import { JwtService } from '@/services/jwt.service'; import { PasswordUtility } from '@/services/password.utility'; -import { setCurrentAuthenticationMethod } from '@/sso/sso-helpers'; +import { setCurrentAuthenticationMethod } from '@/sso.ee/sso-helpers'; import { UserManagementMailer } from '@/user-management/email'; import { createUser } from './shared/db/users'; diff --git a/packages/cli/test/integration/project.service.integration.test.ts b/packages/cli/test/integration/project.service.integration.test.ts index 5d425d17ee..4c4ad6be5d 100644 --- a/packages/cli/test/integration/project.service.integration.test.ts +++ b/packages/cli/test/integration/project.service.integration.test.ts @@ -1,7 +1,7 @@ import Container from 'typedi'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { linkUserToProject, createTeamProject } from './shared/db/projects'; import { createUser } from './shared/db/users'; diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts index 28f9d444da..51da846b5b 100644 --- a/packages/cli/test/integration/public-api/workflows.test.ts +++ b/packages/cli/test/integration/public-api/workflows.test.ts @@ -11,7 +11,7 @@ import { ProjectRepository } from '@/databases/repositories/project.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { ExecutionService } from '@/executions/execution.service'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { Telemetry } from '@/telemetry'; import { createTeamProject } from '@test-integration/db/projects'; diff --git a/packages/cli/test/integration/saml/saml-helpers.test.ts b/packages/cli/test/integration/saml/saml-helpers.test.ts index 6ac48ee93b..3396c0edc7 100644 --- a/packages/cli/test/integration/saml/saml-helpers.test.ts +++ b/packages/cli/test/integration/saml/saml-helpers.test.ts @@ -1,5 +1,5 @@ -import * as helpers from '@/sso/saml/saml-helpers'; -import type { SamlUserAttributes } from '@/sso/saml/types/saml-user-attributes'; +import * as helpers from '@/sso.ee/saml/saml-helpers'; +import type { SamlUserAttributes } from '@/sso.ee/saml/types/saml-user-attributes'; import { getPersonalProject } from '../shared/db/projects'; import * as testDb from '../shared/test-db'; diff --git a/packages/cli/test/integration/saml/saml.api.test.ts b/packages/cli/test/integration/saml/saml.api.test.ts index d30d57356a..247faaacba 100644 --- a/packages/cli/test/integration/saml/saml.api.test.ts +++ b/packages/cli/test/integration/saml/saml.api.test.ts @@ -1,6 +1,9 @@ import type { User } from '@/databases/entities/user'; -import { setSamlLoginEnabled } from '@/sso/saml/saml-helpers'; -import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/sso-helpers'; +import { setSamlLoginEnabled } from '@/sso.ee/saml/saml-helpers'; +import { + getCurrentAuthenticationMethod, + setCurrentAuthenticationMethod, +} from '@/sso.ee/sso-helpers'; import { sampleConfig } from './sample-metadata'; import { createOwner, createUser } from '../shared/db/users'; diff --git a/packages/cli/test/integration/services/project.service.test.ts b/packages/cli/test/integration/services/project.service.test.ts index 85393a4013..b475bc83eb 100644 --- a/packages/cli/test/integration/services/project.service.test.ts +++ b/packages/cli/test/integration/services/project.service.test.ts @@ -4,7 +4,7 @@ import Container from 'typedi'; import type { ProjectRole } from '@/databases/entities/project-relation'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; import { ProjectRepository } from '@/databases/repositories/project.repository'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { createMember } from '../shared/db/users'; import * as testDb from '../shared/test-db'; diff --git a/packages/cli/test/integration/shared/ldap.ts b/packages/cli/test/integration/shared/ldap.ts index 3f48cf2e3c..9f87bd9962 100644 --- a/packages/cli/test/integration/shared/ldap.ts +++ b/packages/cli/test/integration/shared/ldap.ts @@ -2,8 +2,8 @@ import { jsonParse } from 'n8n-workflow'; import Container from 'typedi'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; -import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap/constants'; -import type { LdapConfig } from '@/ldap/types'; +import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants'; +import type { LdapConfig } from '@/ldap.ee/types'; export const defaultLdapConfig = { ...LDAP_DEFAULT_CONFIGURATION, diff --git a/packages/cli/test/integration/shared/utils/test-server.ts b/packages/cli/test/integration/shared/utils/test-server.ts index f99e093854..8b63320008 100644 --- a/packages/cli/test/integration/shared/utils/test-server.ts +++ b/packages/cli/test/integration/shared/utils/test-server.ts @@ -171,7 +171,7 @@ export const setupTestServer = ({ break; case 'variables': - await import('@/environments/variables/variables.controller.ee'); + await import('@/environments.ee/variables/variables.controller.ee'); break; case 'license': @@ -202,20 +202,20 @@ export const setupTestServer = ({ break; case 'ldap': - const { LdapService } = await import('@/ldap/ldap.service.ee'); - await import('@/ldap/ldap.controller.ee'); + const { LdapService } = await import('@/ldap.ee/ldap.service.ee'); + await import('@/ldap.ee/ldap.controller.ee'); testServer.license.enable('feat:ldap'); await Container.get(LdapService).init(); break; case 'saml': - const { setSamlLoginEnabled } = await import('@/sso/saml/saml-helpers'); - await import('@/sso/saml/routes/saml.controller.ee'); + const { setSamlLoginEnabled } = await import('@/sso.ee/saml/saml-helpers'); + await import('@/sso.ee/saml/routes/saml.controller.ee'); await setSamlLoginEnabled(true); break; case 'sourceControl': - await import('@/environments/source-control/source-control.controller.ee'); + await import('@/environments.ee/source-control/source-control.controller.ee'); break; case 'community-packages': @@ -247,11 +247,11 @@ export const setupTestServer = ({ break; case 'externalSecrets': - await import('@/external-secrets/external-secrets.controller.ee'); + await import('@/external-secrets.ee/external-secrets.controller.ee'); break; case 'workflowHistory': - await import('@/workflows/workflow-history/workflow-history.controller.ee'); + await import('@/workflows/workflow-history.ee/workflow-history.controller.ee'); break; case 'binaryData': @@ -279,9 +279,9 @@ export const setupTestServer = ({ break; case 'evaluation': - await import('@/evaluation/metrics.controller'); - await import('@/evaluation/test-definitions.controller.ee'); - await import('@/evaluation/test-runs.controller.ee'); + await import('@/evaluation.ee/metrics.controller'); + await import('@/evaluation.ee/test-definitions.controller.ee'); + await import('@/evaluation.ee/test-runs.controller.ee'); break; } } diff --git a/packages/cli/test/integration/variables.test.ts b/packages/cli/test/integration/variables.test.ts index 7dd8d00aae..c331da8e99 100644 --- a/packages/cli/test/integration/variables.test.ts +++ b/packages/cli/test/integration/variables.test.ts @@ -3,7 +3,7 @@ import { Container } from 'typedi'; import type { Variables } from '@/databases/entities/variables'; import { VariablesRepository } from '@/databases/repositories/variables.repository'; import { generateNanoId } from '@/databases/utils/generators'; -import { VariablesService } from '@/environments/variables/variables.service.ee'; +import { VariablesService } from '@/environments.ee/variables/variables.service.ee'; import { CacheService } from '@/services/cache/cache.service'; import { createOwner, createUser } from './shared/db/users'; diff --git a/packages/cli/test/integration/workflow-history-manager.test.ts b/packages/cli/test/integration/workflow-history-manager.test.ts index 825da9fcbf..eaf5d74478 100644 --- a/packages/cli/test/integration/workflow-history-manager.test.ts +++ b/packages/cli/test/integration/workflow-history-manager.test.ts @@ -5,7 +5,7 @@ import Container from 'typedi'; import config from '@/config'; import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { License } from '@/license'; -import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee'; +import { WorkflowHistoryManager } from '@/workflows/workflow-history.ee/workflow-history-manager.ee'; import { createManyWorkflowHistoryItems } from './shared/db/workflow-history'; import { createWorkflow } from './shared/db/workflows'; diff --git a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts index 3730d0db6c..ab02af5b43 100644 --- a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts +++ b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts @@ -2,7 +2,7 @@ import Container from 'typedi'; import type { User } from '@/databases/entities/user'; import { License } from '@/license'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { WorkflowSharingService } from '@/workflows/workflow-sharing.service'; import { createUser } from '../shared/db/users'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts index fb28918509..d0ee2f3d67 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts @@ -12,7 +12,7 @@ import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-his import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { License } from '@/license'; import type { ListQuery } from '@/requests'; -import { ProjectService } from '@/services/project.service'; +import { ProjectService } from '@/services/project.service.ee'; import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee'; import { mockInstance } from '../../shared/mocking'; diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index d145ba0c63..3789372ef8 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -15,7 +15,7 @@ "strict": false, "useUnknownInCatchVariables": false }, - "include": ["src/**/*.ts", "test/**/*.ts", "src/sso/saml/saml-schema-metadata-2.0.xsd"], + "include": ["src/**/*.ts", "test/**/*.ts", "src/sso.ee/saml/saml-schema-metadata-2.0.xsd"], "references": [ { "path": "../workflow/tsconfig.build.json" }, { "path": "../core/tsconfig.build.json" },