From e58dbe853ef8c21f3055b7119a9d0293c2c0dffa Mon Sep 17 00:00:00 2001 From: carlosmonastyrski Date: Wed, 7 May 2025 08:38:19 -0300 Subject: [PATCH] Minor improvements on commits code quality --- .../20250505194916_add-pit-revamp-tables.ts | 15 ++++-------- .../secret-rotation-v2-service.ts | 3 +++ .../secret-rotation-queue.ts | 2 +- .../external-migration-fns.ts | 2 +- .../folder-checkpoint-dal.ts | 8 ++++--- .../folder-commit/folder-commit-dal.ts | 10 ++++---- .../folder-commit/folder-commit-service.ts | 23 ++++++++----------- .../secret-v2-bridge-types.ts | 4 ++-- 8 files changed, 32 insertions(+), 35 deletions(-) diff --git a/backend/src/db/migrations/20250505194916_add-pit-revamp-tables.ts b/backend/src/db/migrations/20250505194916_add-pit-revamp-tables.ts index ea4c8e9bb..9855d301e 100644 --- a/backend/src/db/migrations/20250505194916_add-pit-revamp-tables.ts +++ b/backend/src/db/migrations/20250505194916_add-pit-revamp-tables.ts @@ -115,26 +115,21 @@ export async function down(knex: Knex): Promise { const hasFolderTreeCheckpointTable = await knex.schema.hasTable(TableName.FolderTreeCheckpoint); const hasFolderCheckpointTable = await knex.schema.hasTable(TableName.FolderCheckpoint); - if (hasFolderCheckpointResourcesTable) { - await dropOnUpdateTrigger(knex, TableName.FolderCheckpointResources); - await knex.schema.dropTableIfExists(TableName.FolderCheckpointResources); - } - if (hasFolderTreeCheckpointResourcesTable) { await dropOnUpdateTrigger(knex, TableName.FolderTreeCheckpointResources); await knex.schema.dropTableIfExists(TableName.FolderTreeCheckpointResources); } - if (hasFolderTreeCheckpointTable) { - await dropOnUpdateTrigger(knex, TableName.FolderTreeCheckpoint); - await knex.schema.dropTableIfExists(TableName.FolderTreeCheckpoint); - } - if (hasFolderCheckpointResourcesTable) { await dropOnUpdateTrigger(knex, TableName.FolderCheckpointResources); await knex.schema.dropTableIfExists(TableName.FolderCheckpointResources); } + if (hasFolderTreeCheckpointTable) { + await dropOnUpdateTrigger(knex, TableName.FolderTreeCheckpoint); + await knex.schema.dropTableIfExists(TableName.FolderTreeCheckpoint); + } + if (hasFolderCheckpointTable) { await dropOnUpdateTrigger(knex, TableName.FolderCheckpoint); await knex.schema.dropTableIfExists(TableName.FolderCheckpoint); diff --git a/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-service.ts b/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-service.ts index 979cb5b76..0a7a5c12c 100644 --- a/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-service.ts +++ b/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-service.ts @@ -943,6 +943,9 @@ export const secretRotationV2ServiceFactory = ({ secretVersionDAL: secretVersionV2BridgeDAL, secretVersionTagDAL: secretVersionTagV2BridgeDAL, folderCommitService, + actor: { + type: ActorType.PLATFORM + }, secretTagDAL, resourceMetadataDAL }); diff --git a/backend/src/ee/services/secret-rotation/secret-rotation-queue/secret-rotation-queue.ts b/backend/src/ee/services/secret-rotation/secret-rotation-queue/secret-rotation-queue.ts index ec92a736f..95094f767 100644 --- a/backend/src/ee/services/secret-rotation/secret-rotation-queue/secret-rotation-queue.ts +++ b/backend/src/ee/services/secret-rotation/secret-rotation-queue/secret-rotation-queue.ts @@ -347,7 +347,7 @@ export const secretRotationQueueFactory = ({ actor: { type: ActorType.PLATFORM }, - message: "Secret rotation", + message: "Changed by Secret rotation", folderId: secretVersions[0].folderId, changes: secretVersions.map((sv) => ({ type: "add", diff --git a/backend/src/services/external-migration/external-migration-fns.ts b/backend/src/services/external-migration/external-migration-fns.ts index f3c2326de..645d58463 100644 --- a/backend/src/services/external-migration/external-migration-fns.ts +++ b/backend/src/services/external-migration/external-migration-fns.ts @@ -623,7 +623,7 @@ export const importDataIntoInfisicalFn = async ({ id: actorId } }, - message: "External migration", + message: "Changed by external migration", folderId: parentEnv.rootFolderId, changes: [ { diff --git a/backend/src/services/folder-checkpoint/folder-checkpoint-dal.ts b/backend/src/services/folder-checkpoint/folder-checkpoint-dal.ts index 5471f9b61..c598a8ea0 100644 --- a/backend/src/services/folder-checkpoint/folder-checkpoint-dal.ts +++ b/backend/src/services/folder-checkpoint/folder-checkpoint-dal.ts @@ -3,7 +3,7 @@ import { Knex } from "knex"; import { TDbClient } from "@app/db"; import { TableName, TFolderCheckpoints } from "@app/db/schemas"; import { DatabaseError } from "@app/lib/errors"; -import { ormify, selectAllTableCols } from "@app/lib/knex"; +import { buildFindFilter, ormify, selectAllTableCols } from "@app/lib/knex"; export type TFolderCheckpointDALFactory = ReturnType; @@ -34,7 +34,8 @@ export const folderCheckpointDALFactory = (db: TDbClient) => { try { let query = (tx || db.replicaNode())(TableName.FolderCheckpoint) .join(TableName.FolderCommit, `${TableName.FolderCheckpoint}.folderCommitId`, `${TableName.FolderCommit}.id`) - .where({ folderId }) + // eslint-disable-next-line @typescript-eslint/no-misused-promises + .where(buildFindFilter({ folderId }, TableName.FolderCommit)) .select(selectAllTableCols(TableName.FolderCheckpoint)) .select( db.ref("actorMetadata").withSchema(TableName.FolderCommit), @@ -60,7 +61,8 @@ export const folderCheckpointDALFactory = (db: TDbClient) => { try { const doc = await (tx || db.replicaNode())(TableName.FolderCheckpoint) .join(TableName.FolderCommit, `${TableName.FolderCheckpoint}.folderCommitId`, `${TableName.FolderCommit}.id`) - .where({ folderId }) + // eslint-disable-next-line @typescript-eslint/no-misused-promises + .where(buildFindFilter({ folderId }, TableName.FolderCommit)) .select(selectAllTableCols(TableName.FolderCheckpoint)) .select( db.ref("actorMetadata").withSchema(TableName.FolderCommit), diff --git a/backend/src/services/folder-commit/folder-commit-dal.ts b/backend/src/services/folder-commit/folder-commit-dal.ts index c6888f8cd..1b454be02 100644 --- a/backend/src/services/folder-commit/folder-commit-dal.ts +++ b/backend/src/services/folder-commit/folder-commit-dal.ts @@ -13,10 +13,10 @@ export const folderCommitDALFactory = (db: TDbClient) => { const findByFolderId = async (folderId: string, tx?: Knex): Promise => { try { - const docs = await (tx || db.replicaNode())(TableName.FolderCommit) + const docs = await (tx || db.replicaNode())(TableName.FolderCommit) .where({ folderId }) .select(selectAllTableCols(TableName.FolderCommit)) - .orderBy("date", "desc"); + .orderBy("createdAt", "desc"); return docs; } catch (error) { throw new DatabaseError({ error, name: "FindByFolderId" }); @@ -25,7 +25,7 @@ export const folderCommitDALFactory = (db: TDbClient) => { const findById = async (id: string, tx?: Knex): Promise => { try { - const doc = await (tx || db.replicaNode())(TableName.FolderCommit) + const doc = await (tx || db.replicaNode())(TableName.FolderCommit) .where({ id }) .select(selectAllTableCols(TableName.FolderCommit)) .first(); @@ -37,10 +37,10 @@ export const folderCommitDALFactory = (db: TDbClient) => { const findLatestCommit = async (folderId: string, tx?: Knex): Promise => { try { - const doc = await (tx || db.replicaNode())(TableName.FolderCommit) + const doc = await (tx || db.replicaNode())(TableName.FolderCommit) .where({ folderId }) .select(selectAllTableCols(TableName.FolderCommit)) - .orderBy("date", "desc") + .orderBy("createdAt", "desc") .first(); return doc; } catch (error) { diff --git a/backend/src/services/folder-commit/folder-commit-service.ts b/backend/src/services/folder-commit/folder-commit-service.ts index c82de598c..6a1dd2c89 100644 --- a/backend/src/services/folder-commit/folder-commit-service.ts +++ b/backend/src/services/folder-commit/folder-commit-service.ts @@ -77,18 +77,15 @@ export const folderCommitServiceFactory = ({ }, tx ); - for (const change of data.changes) { - // eslint-disable-next-line no-await-in-loop - await folderCommitChangesDAL.create( - { - folderCommitId: newCommit.id, - changeType: change.type, - secretVersionId: change.secretVersionId, - folderVersionId: change.folderVersionId - }, - tx - ); - } + await folderCommitChangesDAL.insertMany( + data.changes.map((change) => ({ + folderCommitId: newCommit.id, + changeType: change.type, + secretVersionId: change.secretVersionId, + folderVersionId: change.folderVersionId + })), + tx + ); return newCommit; } catch (error) { @@ -96,7 +93,7 @@ export const folderCommitServiceFactory = ({ } }; - // Add a change to a commit and trigger checkpoints as needed + // Add a change to an existing commit const addCommitChange = async (data: TCommitChangeDTO, tx?: Knex) => { try { if (!data.secretVersionId && !data.folderVersionId) { diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts index b9ae74208..f4171b1a7 100644 --- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts +++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts @@ -182,7 +182,7 @@ export type TFnSecretBulkInsert = { folderCommitService: Pick; actor?: { type: string; - actorId: string; + actorId?: string; }; }; @@ -211,7 +211,7 @@ export type TFnSecretBulkUpdate = { folderCommitService: Pick; actor?: { type: string; - actorId: string; + actorId?: string; }; tx?: Knex; };