From 87cd3ea72703073b0bfe47aa1c5ae42fdaf83e19 Mon Sep 17 00:00:00 2001 From: Daniel Hougaard Date: Tue, 15 Oct 2024 09:26:05 +0400 Subject: [PATCH] fix: envkey migration failing due to not using batches --- .../external-migration-fns.ts | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/backend/src/services/external-migration/external-migration-fns.ts b/backend/src/services/external-migration/external-migration-fns.ts index a69b5ef7c..b299d00c7 100644 --- a/backend/src/services/external-migration/external-migration-fns.ts +++ b/backend/src/services/external-migration/external-migration-fns.ts @@ -214,22 +214,21 @@ export const importDataIntoInfisicalFn = async ({ name: "Create secret" }); - const secretsByKeys = await secretDAL.findBySecretKeys( - folder.id, - secrets.map((el) => ({ - key: el.secretKey, - type: SecretType.Shared - })), - tx - ); - if (secretsByKeys.length) { - throw new BadRequestError({ - message: `Secret already exist: ${secretsByKeys.map((el) => el.key).join(",")}` - }); - } - const secretBatches = chunkArray(secrets, 2500); for await (const secretBatch of secretBatches) { + const secretsByKeys = await secretDAL.findBySecretKeys( + folder.id, + secretBatch.map((el) => ({ + key: el.secretKey, + type: SecretType.Shared + })), + tx + ); + if (secretsByKeys.length) { + throw new BadRequestError({ + message: `Secret already exist: ${secretsByKeys.map((el) => el.key).join(",")}` + }); + } await fnSecretBulkInsert({ inputSecrets: secretBatch.map((el) => { const references = getAllNestedSecretReferences(el.secretValue);