Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

feat(api): add private v2 batch commit route for batched secret and folder changes (SECRETS-804) (#8689)

Andrew Huangc0686a56f6ef
diff --git a/backend/src/ee/routes/v1/pit-router.ts b/backend/src/ee/routes/v1/pit-router.ts
index 822e3fd42a..759381c376 100644
--- a/backend/src/ee/routes/v1/pit-router.ts
+++ b/backend/src/ee/routes/v1/pit-router.ts
@@ -1,6 +1,7 @@
/* eslint-disable @typescript-eslint/no-base-to-string */
import { z } from "zod";
+import { SecretApprovalRequestsSchema, SecretFoldersSchema } from "@app/db/schemas";
import { EventType } from "@app/ee/services/audit-log/audit-log-types";
import { removeTrailingSlash } from "@app/lib/fn";
import { isValidFolderName } from "@app/lib/validator";
@@ -8,7 +9,7 @@ import { readLimit, secretsLimit } from "@app/server/config/rateLimiter";
import { SecretNameSchema } from "@app/server/lib/schemas";
import { getTelemetryDistinctId } from "@app/server/lib/telemetry";
import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
-import { booleanSchema } from "@app/server/routes/sanitizedSchemas";
+import { booleanSchema, secretRawSchema } from "@app/server/routes/sanitizedSchemas";
import { ActorType, AuthMode } from "@app/services/auth/auth-type";
import { commitChangesResponseSchema, resourceChangeSchema } from "@app/services/folder-commit/folder-commit-schemas";
import { ResourceMetadataWithEncryptionSchema } from "@app/services/resource-metadata/resource-metadata-schema";
@@ -40,6 +41,35 @@ const commitAuthorSchema = z.object({
name: z.string().nullable()
});
+const CommitSecretSchema = secretRawSchema.extend({
+ secretValueHidden: z.boolean()
+});
+
+const CommitApprovalSchema = SecretApprovalRequestsSchema.pick({
+ id: true,
+ slug: true,
+ policyId: true,
+ folderId: true,
+ status: true,
+ hasMerged: true,
+ commitMessage: true,
+ committerUserId: true,
+ committerIdentityId: true,
+ createdAt: true,
+ updatedAt: true
+});
+
+const CommitFolderSchema = SecretFoldersSchema.pick({
+ id: true,
+ name: true,
+ description: true,
+ envId: true,
+ parentId: true,
+ version: true,
+ createdAt: true,
+ updatedAt: true
+});
+
const folderStateSchema = z.array(
z.object({
type: z.string(),
@@ -637,7 +667,18 @@ export const registerPITRouter = async (server: FastifyZodProvider) => {
}),
response: {
200: z.object({
- message: z.string()
+ commitId: z.string().uuid().nullable(),
+ approval: CommitApprovalSchema.nullable(),
+ secrets: z.object({
+ created: CommitSecretSchema.array(),
+ updated: CommitSecretSchema.array(),
+ deleted: CommitSecretSchema.array()
+ }),
+ folders: z.object({
+ created: CommitFolderSchema.array(),
+ updated: CommitFolderSchema.array(),
+ deleted: CommitFolderSchema.array()
+ })
})
}
},
@@ -665,7 +706,7 @@ export const registerPITRouter = async (server: FastifyZodProvider) => {
type: EventType.PIT_PROCESS_NEW_COMMIT_RAW,
metadata: {
commitId: result.commitId,
- approvalId: result.approvalId,
+ approvalId: result.approval?.id,
projectId: req.body.projectId,
environment: req.body.environment,
secretPath: req.body.secretPath,
@@ -701,7 +742,12 @@ export const registerPITRouter = async (server: FastifyZodProvider) => {
);
}
- return { message: "success" };
+ return {
+ commitId: result.commitId ?? null,
+ approval: result.approval ?? null,
+ secrets: result.secrets,
+ folders: result.folders
+ };
}
});
};
diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.ts
index f2e4666955..4899e1dab5 100644
--- a/backend/src/ee/services/audit-log/audit-log-types.ts
+++ b/backend/src/ee/services/audit-log/audit-log-types.ts
@@ -216,7 +216,8 @@ export enum SecretApprovalEvent {
Delete = "delete",
CreateMany = "create-many",
UpdateMany = "update-many",
- DeleteMany = "delete-many"
+ DeleteMany = "delete-many",
+ Commit = "commit"
}
export enum UserAgentType {
diff --git a/backend/src/ee/services/pit/pit-service.test.ts b/backend/src/ee/services/pit/pit-service.test.ts
index 9560629aba..f87fe66944 100644
--- a/backend/src/ee/services/pit/pit-service.test.ts
+++ b/backend/src/ee/services/pit/pit-service.test.ts
@@ -131,7 +131,7 @@ describe("processNewCommitRaw", () => {
findById: vi.fn().mockResolvedValue({ id: "project-1", secretDetectionIgnoreValues: ["ignored"] })
},
folderCommitDAL: { transaction: vi.fn((fn: (tx: unknown) => Promise<unknown>) => fn(TRX)) },
- folderDAL: { findBySecretPath: vi.fn().mockResolvedValue({ id: "folder-1" }) },
+ folderDAL: { findBySecretPath: vi.fn().mockResolvedValue({ id: "folder-1", environment: { name: "dev" } }) },
secretApprovalRequestService: {
generateSecretApprovalRequestV2Bridge: vi.fn().mockResolvedValue(approval),
createSecretApprovalSideEffects: vi.fn().mockResolvedValue(undefined)
@@ -208,7 +208,7 @@ describe("processNewCommitRaw", () => {
deps.secretApprovalRequestService.createSecretApprovalSideEffects.mock.invocationCallOrder[0];
const transactionOrder = deps.folderCommitDAL.transaction.mock.invocationCallOrder[0];
expect(sideEffectsOrder).toBeGreaterThan(transactionOrder);
- expect(result).toMatchObject({ approvalId: "request-1" });
+ expect(result).toMatchObject({ approval: { id: "request-1" } });
});
test("a failed notification does not fail the save", async () => {
@@ -217,7 +217,7 @@ describe("processNewCommitRaw", () => {
deps.secretApprovalRequestService.createSecretApprovalSideEffects.mockRejectedValueOnce(new Error("smtp down"));
await expect(run({ update: [{ secretKey: "OTHER", secretValue: "v" }] })).resolves.toMatchObject({
- approvalId: "request-1"
+ approval: { id: "request-1" }
});
});
});
diff --git a/backend/src/ee/services/pit/pit-service.ts b/backend/src/ee/services/pit/pit-service.ts
index f1365a50fb..5d1dafc2e1 100644
--- a/backend/src/ee/services/pit/pit-service.ts
+++ b/backend/src/ee/services/pit/pit-service.ts
@@ -1,9 +1,10 @@
/* eslint-disable no-await-in-loop */
import { ForbiddenError, subject } from "@casl/ability";
-import { ActionProjectType } from "@app/db/schemas";
+import { ActionProjectType, TSecretFolders } from "@app/db/schemas";
import { Event, EventType } from "@app/ee/services/audit-log/audit-log-types";
import { ProjectPermissionCommitsActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";
+import { ProjectEvents } from "@app/ee/services/project-events/project-events-types";
import { AUDIT_LOG_SENSITIVE_VALUE } from "@app/lib/config/const";
import { BadRequestError, NotFoundError } from "@app/lib/errors";
import { logger } from "@app/lib/logger";
@@ -698,13 +699,18 @@ export const pitServiceFactory = ({
await scanSecretPolicyViolations(
projectId,
secretPath,
- secretsToScan.map((el) => ({ secretKey: el.secretKey, secretValue: el.secretValue as string })),
+ secretsToScan.map((el) => ({
+ secretKey: "newSecretName" in el && el.newSecretName ? el.newSecretName : el.secretKey,
+ secretValue: el.secretValue as string
+ })),
project.secretDetectionIgnoreValues || []
);
}
// Notifying approvers reaches Slack, Teams and SMTP, so it waits until the request has committed
let approvalSideEffects: TCreateSecretApprovalSideEffectsDTO | undefined;
+ let environmentName = environment;
+ const deferredReferenceSyncs: Parameters<TSecretQueueFactory["syncSecrets"]>[0][] = [];
const response = await folderCommitDAL.transaction(async (trx) => {
const targetFolder = await folderDAL.findBySecretPath(projectId, environment, secretPath, trx);
if (!targetFolder)
@@ -712,11 +718,12 @@ export const pitServiceFactory = ({
message: `Folder with path '${secretPath}' in environment with slug '${environment}' not found`,
name: "CreateManySecret"
});
+ environmentName = targetFolder.environment.name;
const commitChanges: TCommitResourceChangeDTO[] = [];
- const folderChanges: { create: string[]; update: string[]; delete: string[] } = {
- create: [],
- update: [],
- delete: []
+ const folders: { created: TSecretFolders[]; updated: TSecretFolders[]; deleted: TSecretFolders[] } = {
+ created: [],
+ updated: [],
+ deleted: []
};
if ((changes.folders?.create?.length ?? 0) > 0) {
@@ -750,7 +757,7 @@ export const pitServiceFactory = ({
}) as Event
);
secretMutationEvents.push(...newFolderEvents);
- folderChanges.create.push(...createdFolders.folders.map((folder) => folder.id));
+ folders.created = createdFolders.folders;
}
if ((changes.folders?.update?.length ?? 0) > 0) {
@@ -786,7 +793,7 @@ export const pitServiceFactory = ({
}) as Event
);
secretMutationEvents.push(...updatedFolderEvents);
- folderChanges.update.push(...updatedFolders.newFolders.map((folder) => folder.id));
+ folders.updated = updatedFolders.newFolders;
}
if ((changes.folders?.delete?.length ?? 0) > 0) {
@@ -818,7 +825,7 @@ export const pitServiceFactory = ({
}) as Event
);
secretMutationEvents.push(...deletedFolderEvents);
- folderChanges.delete.push(...deletedFolders.folders.map((folder) => folder.id));
+ folders.deleted = deletedFolders.folders;
}
if (shouldApplyPolicy(policy, actor)) {
@@ -907,19 +914,28 @@ export const pitServiceFactory = ({
actorOrgId
};
return {
- approvalId: approval.id,
+ approval,
commitId,
- folderChanges,
+ folders,
+ secrets: { created: [], updated: [], deleted: [] },
secretMutationEvents
};
}
return {
+ approval: undefined,
commitId,
- folderChanges,
+ folders,
+ secrets: { created: [], updated: [], deleted: [] },
secretMutationEvents
};
}
+ const secrets: {
+ created: Awaited<ReturnType<typeof secretV2BridgeService.createManySecret>>;
+ updated: Awaited<ReturnType<typeof secretV2BridgeService.updateManySecret>>;
+ deleted: Awaited<ReturnType<typeof secretV2BridgeService.deleteManySecret>>;
+ } = { created: [], updated: [], deleted: [] };
+
if ((changes.secrets?.create?.length ?? 0) > 0) {
const newSecrets = await secretV2BridgeService.createManySecret({
secretPath,
@@ -931,8 +947,10 @@ export const pitServiceFactory = ({
actorId,
secrets: changes.secrets?.create ?? [],
tx: trx,
+ skipPostProcessing: true,
commitChanges
});
+ secrets.created = newSecrets;
secretMutationEvents.push({
type: EventType.CREATE_SECRETS,
metadata: {
@@ -964,8 +982,11 @@ export const pitServiceFactory = ({
secrets: changes.secrets?.update ?? [],
mode: SecretUpdateMode.FailOnNotFound,
tx: trx,
+ skipPostProcessing: true,
+ deferredReferenceSyncs,
commitChanges
});
+ secrets.updated = updatedSecrets;
secretMutationEvents.push({
type: EventType.UPDATE_SECRETS,
metadata: {
@@ -996,8 +1017,10 @@ export const pitServiceFactory = ({
actorId,
secrets: changes.secrets?.delete ?? [],
tx: trx,
+ skipPostProcessing: true,
commitChanges
});
+ secrets.deleted = deletedSecrets;
secretMutationEvents.push({
type: EventType.DELETE_SECRETS,
metadata: {
@@ -1027,17 +1050,66 @@ export const pitServiceFactory = ({
trx
);
return {
- folderChanges,
+ approval: undefined,
+ folders,
+ secrets,
commitId: commit?.id,
secretMutationEvents
};
}
return {
- folderChanges,
+ approval: undefined,
+ folders,
+ secrets,
+ commitId: undefined,
secretMutationEvents
};
});
+ const secretSyncEvents = [
+ { type: ProjectEvents.SecretCreate, secrets: response.secrets.created },
+ { type: ProjectEvents.SecretUpdate, secrets: response.secrets.updated },
+ { type: ProjectEvents.SecretDelete, secrets: response.secrets.deleted }
+ ].filter((event) => event.secrets.length > 0);
+ if (secretSyncEvents.length > 0) {
+ try {
+ await secretQueueService.syncSecrets({
+ actor,
+ actorId,
+ secretPath,
+ projectId,
+ orgId: actorOrgId,
+ environmentSlug: environment,
+ environmentName,
+ events: secretSyncEvents.map((event) => ({
+ type: event.type,
+ secretKeys: event.secrets.map((secret) => secret.secretKey),
+ projectId,
+ secretPath,
+ environment
+ }))
+ });
+ } catch (error) {
+ logger.error(
+ error,
+ `Failed to queue secret sync for commit [projectId=${projectId}] [secretPath=${secretPath}]`
+ );
+ }
+ }
+
+ await Promise.all(
+ deferredReferenceSyncs.map(async (syncPayload) => {
+ try {
+ await secretQueueService.syncSecrets(syncPayload);
+ } catch (error) {
+ logger.error(
+ error,
+ `Failed to queue secret sync for renamed secret references [projectId=${projectId}] [secretPath=${syncPayload.secretPath}]`
+ );
+ }
+ })
+ );
+
if (approvalSideEffects) {
try {
await secretApprovalRequestService.createSecretApprovalSideEffects(approvalSideEffects);
diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-commit-fns.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-commit-fns.ts
index bd2542ba3b..7cf5d2ad0f 100644
--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-commit-fns.ts
+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-commit-fns.ts
@@ -389,14 +389,18 @@ export const secretApprovalRequestCommitFnsFactory = ({
const { metadata, ...el } = latestSecretVersions[secretId];
return {
...el,
- secretMetadata: JSON.stringify(
- (secretMetadata || [])?.map((meta) => ({
- key: meta.key,
- [meta.isEncrypted ? "encryptedValue" : "value"]: meta.isEncrypted
- ? secretManagerEncryptor({ plainText: Buffer.from(meta.value) }).cipherTextBlob.toString("base64")
- : meta.value
- }))
- ),
+ secretMetadata: secretMetadata
+ ? JSON.stringify(
+ secretMetadata.map((meta) => ({
+ key: meta.key,
+ [meta.isEncrypted ? "encryptedValue" : "value"]: meta.isEncrypted
+ ? secretManagerEncryptor({ plainText: Buffer.from(meta.value) }).cipherTextBlob.toString(
+ "base64"
+ )
+ : meta.value
+ }))
+ )
+ : null,
key: newSecretName || secretKey,
encryptedComment: setKnexStringValue(
secretComment,
diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-merge-fns.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-merge-fns.ts
index fd6c8bdf77..dcec091358 100644
--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-merge-fns.ts
+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-merge-fns.ts
@@ -498,7 +498,7 @@ export const secretApprovalRequestMergeFnsFactory = ({
skipMultilineEncoding: el.skipMultilineEncoding !== null ? el.skipMultilineEncoding : undefined,
key: el.key,
tags: el?.tags.map(({ id }) => id),
- secretMetadata: toSecretMetadataInput(el.secretMetadata),
+ secretMetadata: Array.isArray(el.secretMetadata) ? toSecretMetadataInput(el.secretMetadata) : undefined,
...encryptedValue
}
};
diff --git a/backend/src/services/secret-folder/secret-folder-service.ts b/backend/src/services/secret-folder/secret-folder-service.ts
index 98df639c02..77b5767dd3 100644
--- a/backend/src/services/secret-folder/secret-folder-service.ts
+++ b/backend/src/services/secret-folder/secret-folder-service.ts
@@ -389,11 +389,14 @@ export const secretFolderServiceFactory = ({
name: "UpdateManyFolders"
});
}
- const folder = await folderDAL
- .findOne({ envId: env.id, id, parentId: parentFolder.id })
- // now folder api accepts id based change
- // this is for cli backward compatiability and when cli removes this, we will remove this logic
- .catch(() => folderDAL.findOne({ envId: env.id, name: id, parentId: parentFolder.id }));
+ // now folder api accepts id based change
+ // this is for cli backward compatiability and when cli removes this, we will remove this logic
+ const folder = await folderDAL.findOne(
+ uuidValidate(id)
+ ? { envId: env.id, id, parentId: parentFolder.id }
+ : { envId: env.id, name: id, parentId: parentFolder.id },
+ tx
+ );
if (!folder) {
throw new NotFoundError({
@@ -403,11 +406,14 @@ export const secretFolderServiceFactory = ({
}
if (name !== folder.name) {
// ensure that new folder name is unique
- const folderToCheck = await folderDAL.findOne({
- name,
- envId: env.id,
- parentId: parentFolder.id
- });
+ const folderToCheck = await folderDAL.findOne(
+ {
+ name,
+ envId: env.id,
+ parentId: parentFolder.id
+ },
+ tx
+ );
if (folderToCheck) {
throw new BadRequestError({
@@ -475,7 +481,7 @@ export const secretFolderServiceFactory = ({
// Execute with provided transaction or create new one
const result = providedTx ? await executeBulkUpdate(providedTx) : await folderDAL.transaction(executeBulkUpdate);
- await secretV2BridgeDAL.invalidateSecretCacheByProjectId(projectId);
+ await secretV2BridgeDAL.invalidateSecretCacheByProjectId(projectId, providedTx);
await permissionService.invalidateProjectFolderPermissionCache(projectId, providedTx);
return {
projectId,
diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
index 7aea0a997e..4f6759c058 100644
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
@@ -799,6 +799,7 @@ type TFnUpdateSecretLinkedReferences = {
decryptor: (data: { cipherTextBlob: Buffer }) => Buffer;
blindIndexer: TSecretBlindIndexer;
tx?: Knex;
+ deferredSyncs?: Parameters<TSecretQueueFactory["syncSecrets"]>[0][];
};
/**
@@ -822,7 +823,8 @@ export const fnUpdateSecretLinkedReferences = async ({
encryptor,
decryptor,
blindIndexer,
- tx
+ tx,
+ deferredSyncs
}: TFnUpdateSecretLinkedReferences) => {
// case: nested references, can be inferred directly from the secret references table
const nestedSecretReferences = await secretDAL.findReferencedSecretReferencesBySecretKey(
@@ -983,7 +985,7 @@ export const fnUpdateSecretLinkedReferences = async ({
await Promise.all(
folderPaths.map(async (folder) => {
if (folder) {
- await secretQueueService.syncSecrets({
+ const syncPayload = {
projectId,
orgId,
environmentSlug: folder.environmentSlug,
@@ -991,7 +993,9 @@ export const fnUpdateSecretLinkedReferences = async ({
secretPath: folder.path,
actor: ActorType.PLATFORM,
actorId: ""
- });
+ };
+ if (deferredSyncs) deferredSyncs.push(syncPayload);
+ else await secretQueueService.syncSecrets(syncPayload);
}
})
);
diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
index 1502aff3a8..e8de94a6b2 100644
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
@@ -2407,11 +2407,13 @@ export const secretV2BridgeServiceFactory = ({
mode: updateMode,
tx: providedTx,
commitChanges,
- skipPostProcessing = false
+ skipPostProcessing = false,
+ deferredReferenceSyncs
}: TUpdateManySecretDTO & {
tx?: Knex;
commitChanges?: TCommitResourceChangeDTO[];
skipPostProcessing?: boolean;
+ deferredReferenceSyncs?: Parameters<TSecretQueueFactory["syncSecrets"]>[0][];
}) => {
const { permission, hasProjectEnforcement } = await permissionService.getProjectPermission({
actor,
@@ -2442,7 +2444,7 @@ export const secretV2BridgeServiceFactory = ({
secretsToUpdateGroupByPath[path] = Array.from(seen.values());
}
- const projectEnvironment = await projectEnvDAL.findOne({ projectId, slug: environment });
+ const projectEnvironment = await projectEnvDAL.findOne({ projectId, slug: environment }, providedTx);
if (!projectEnvironment) {
throw new NotFoundError({
message: `Environment with slug '${environment}' in project with ID '${projectId}' not found`
@@ -2450,12 +2452,13 @@ export const secretV2BridgeServiceFactory = ({
}
const folders = await folderDAL.findByManySecretPath(
- Object.keys(secretsToUpdateGroupByPath).map((el) => ({ envId: projectEnvironment.id, secretPath: el }))
+ Object.keys(secretsToUpdateGroupByPath).map((el) => ({ envId: projectEnvironment.id, secretPath: el })),
+ providedTx
);
const secretPaths = Object.keys(secretsToUpdateGroupByPath);
const { encryptor: secretManagerEncryptor, decryptor: secretManagerDecryptor } =
- await kmsService.createCipherPairWithDataKey({ type: KmsDataKey.SecretManager, projectId });
+ await kmsService.createCipherPairWithDataKey({ type: KmsDataKey.SecretManager, projectId }, providedTx);
const blindIndexer = await createSecretBlindIndexer({
projectId,
orgId: actorOrgId,
@@ -2765,7 +2768,8 @@ export const secretV2BridgeServiceFactory = ({
encryptor: ({ plainText }) => secretManagerEncryptor({ plainText }),
decryptor: ({ cipherTextBlob }) => secretManagerDecryptor({ cipherTextBlob }),
blindIndexer,
- tx
+ tx,
+ deferredSyncs: deferredReferenceSyncs
});
}
}
@@ -2914,8 +2918,13 @@ export const secretV2BridgeServiceFactory = ({
actorAuthMethod,
actorOrgId,
tx: providedTx,
- commitChanges
- }: TDeleteManySecretDTO & { tx?: Knex; commitChanges?: TCommitResourceChangeDTO[] }) => {
+ commitChanges,
+ skipPostProcessing = false
+ }: TDeleteManySecretDTO & {
+ tx?: Knex;
+ commitChanges?: TCommitResourceChangeDTO[];
+ skipPostProcessing?: boolean;
+ }) => {
const { permission } = await permissionService.getProjectPermission({
actor,
actorId,
@@ -2997,29 +3006,34 @@ export const secretV2BridgeServiceFactory = ({
? await executeBulkDelete(providedTx)
: await secretDAL.transaction(executeBulkDelete);
- await secretQueueService.syncSecrets({
- actor,
- actorId,
- secretPath,
- projectId,
- orgId: actorOrgId,
- environmentSlug: folder.environment.slug,
- environmentName: folder.environment.name,
- events: [
- {
- type: ProjectEvents.SecretDelete,
- secretKeys: secretsDeleted.map((sec) => sec.key),
- projectId,
- secretPath,
- environment
- }
- ]
- });
+ if (!skipPostProcessing) {
+ await secretQueueService.syncSecrets({
+ actor,
+ actorId,
+ secretPath,
+ projectId,
+ orgId: actorOrgId,
+ environmentSlug: folder.environment.slug,
+ environmentName: folder.environment.name,
+ events: [
+ {
+ type: ProjectEvents.SecretDelete,
+ secretKeys: secretsDeleted.map((sec) => sec.key),
+ projectId,
+ secretPath,
+ environment
+ }
+ ]
+ });
+ }
- const { decryptor: secretManagerDecryptor } = await kmsService.createCipherPairWithDataKey({
- type: KmsDataKey.SecretManager,
- projectId
- });
+ const { decryptor: secretManagerDecryptor } = await kmsService.createCipherPairWithDataKey(
+ {
+ type: KmsDataKey.SecretManager,
+ projectId
+ },
+ providedTx
+ );
return secretsDeleted.map((el) => {
const secretToDeleteMatch = secretsToDelete.find(
(i) => i.key === el.key && (i.type || SecretType.Shared) === el.type
diff --git a/backend/src/services/secret/secret-types.ts b/backend/src/services/secret/secret-types.ts
index 84547a42a4..2f62a2c267 100644
--- a/backend/src/services/secret/secret-types.ts
+++ b/backend/src/services/secret/secret-types.ts
@@ -614,7 +614,7 @@ export type TProcessNewCommitRawDTO = {
folders: {
create?: { folderName: string; description?: string }[];
update?: { folderName: string; description?: string | null; id: string }[];
- delete?: { folderName: string; id: string }[];
+ delete?: { folderName?: string; id: string }[];
};
};