From 51d4fcf9ee04e8d2a35ae744c45624e8a3eedb0d Mon Sep 17 00:00:00 2001 From: = Date: Wed, 29 May 2024 21:18:31 +0530 Subject: [PATCH] feat: moved secret replication to ee folder --- .../secret-replication-dal.ts | 0 .../secret-replication-service.ts | 24 +++++++++---------- .../secret-replication-types.ts | 0 backend/src/server/routes/index.ts | 4 ++-- .../ActionBar/CreateSecretImportForm.tsx | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) rename backend/src/{ => ee}/services/secret-replication/secret-replication-dal.ts (100%) rename backend/src/{ => ee}/services/secret-replication/secret-replication-service.ts (94%) rename backend/src/{ => ee}/services/secret-replication/secret-replication-types.ts (100%) diff --git a/backend/src/services/secret-replication/secret-replication-dal.ts b/backend/src/ee/services/secret-replication/secret-replication-dal.ts similarity index 100% rename from backend/src/services/secret-replication/secret-replication-dal.ts rename to backend/src/ee/services/secret-replication/secret-replication-dal.ts diff --git a/backend/src/services/secret-replication/secret-replication-service.ts b/backend/src/ee/services/secret-replication/secret-replication-service.ts similarity index 94% rename from backend/src/services/secret-replication/secret-replication-service.ts rename to backend/src/ee/services/secret-replication/secret-replication-service.ts index da004426e..a8296536a 100644 --- a/backend/src/services/secret-replication/secret-replication-service.ts +++ b/backend/src/ee/services/secret-replication/secret-replication-service.ts @@ -8,19 +8,19 @@ import { groupBy } from "@app/lib/fn"; import { logger } from "@app/lib/logger"; import { alphaNumericNanoId } from "@app/lib/nanoid"; import { QueueName, TQueueServiceFactory } from "@app/queue"; +import { ActorType } from "@app/services/auth/auth-type"; +import { TProjectMembershipDALFactory } from "@app/services/project-membership/project-membership-dal"; +import { TSecretDALFactory } from "@app/services/secret/secret-dal"; +import { fnSecretBulkInsert, fnSecretBulkUpdate } from "@app/services/secret/secret-fns"; +import { TSecretQueueFactory } from "@app/services/secret/secret-queue"; +import { SecretOperations, TSyncSecretsDTO } from "@app/services/secret/secret-types"; +import { TSecretVersionDALFactory } from "@app/services/secret/secret-version-dal"; +import { TSecretVersionTagDALFactory } from "@app/services/secret/secret-version-tag-dal"; +import { TSecretBlindIndexDALFactory } from "@app/services/secret-blind-index/secret-blind-index-dal"; +import { TSecretFolderDALFactory } from "@app/services/secret-folder/secret-folder-dal"; +import { TSecretImportDALFactory } from "@app/services/secret-import/secret-import-dal"; +import { TSecretTagDALFactory } from "@app/services/secret-tag/secret-tag-dal"; -import { ActorType } from "../auth/auth-type"; -import { TProjectMembershipDALFactory } from "../project-membership/project-membership-dal"; -import { TSecretDALFactory } from "../secret/secret-dal"; -import { fnSecretBulkInsert, fnSecretBulkUpdate } from "../secret/secret-fns"; -import { TSecretQueueFactory } from "../secret/secret-queue"; -import { SecretOperations, TSyncSecretsDTO } from "../secret/secret-types"; -import { TSecretVersionDALFactory } from "../secret/secret-version-dal"; -import { TSecretVersionTagDALFactory } from "../secret/secret-version-tag-dal"; -import { TSecretBlindIndexDALFactory } from "../secret-blind-index/secret-blind-index-dal"; -import { TSecretFolderDALFactory } from "../secret-folder/secret-folder-dal"; -import { TSecretImportDALFactory } from "../secret-import/secret-import-dal"; -import { TSecretTagDALFactory } from "../secret-tag/secret-tag-dal"; import { TSecretReplicationDALFactory } from "./secret-replication-dal"; type TSecretReplicationServiceFactoryDep = { diff --git a/backend/src/services/secret-replication/secret-replication-types.ts b/backend/src/ee/services/secret-replication/secret-replication-types.ts similarity index 100% rename from backend/src/services/secret-replication/secret-replication-types.ts rename to backend/src/ee/services/secret-replication/secret-replication-types.ts diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts index 9bbb49d64..05b9982bb 100644 --- a/backend/src/server/routes/index.ts +++ b/backend/src/server/routes/index.ts @@ -44,6 +44,8 @@ import { secretApprovalRequestDALFactory } from "@app/ee/services/secret-approva import { secretApprovalRequestReviewerDALFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-reviewer-dal"; import { secretApprovalRequestSecretDALFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-secret-dal"; import { secretApprovalRequestServiceFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-service"; +import { secretReplicationDALFactory } from "@app/ee/services/secret-replication/secret-replication-dal"; +import { secretReplicationServiceFactory } from "@app/ee/services/secret-replication/secret-replication-service"; import { secretRotationDALFactory } from "@app/ee/services/secret-rotation/secret-rotation-dal"; import { secretRotationQueueFactory } from "@app/ee/services/secret-rotation/secret-rotation-queue"; import { secretRotationServiceFactory } from "@app/ee/services/secret-rotation/secret-rotation-service"; @@ -130,8 +132,6 @@ import { secretFolderServiceFactory } from "@app/services/secret-folder/secret-f import { secretFolderVersionDALFactory } from "@app/services/secret-folder/secret-folder-version-dal"; import { secretImportDALFactory } from "@app/services/secret-import/secret-import-dal"; import { secretImportServiceFactory } from "@app/services/secret-import/secret-import-service"; -import { secretReplicationDALFactory } from "@app/services/secret-replication/secret-replication-dal"; -import { secretReplicationServiceFactory } from "@app/services/secret-replication/secret-replication-service"; import { secretSharingDALFactory } from "@app/services/secret-sharing/secret-sharing-dal"; import { secretSharingServiceFactory } from "@app/services/secret-sharing/secret-sharing-service"; import { secretTagDALFactory } from "@app/services/secret-tag/secret-tag-dal"; diff --git a/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx b/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx index b9ddb7bfe..13aa8ee42 100644 --- a/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx +++ b/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx @@ -153,8 +153,8 @@ export const CreateSecretImportForm = ({ defaultValue={false} render={({ field }) => ( - Enable replication to synchronize changes. Warning: this will overwrite any existing - secrets with the same name. + Enable replication to synchronize changes.
Warning: This will overwrite any + existing secrets with the same name. )} />