Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
refactoring to make the validations staight forward
adilson8d750d9e9f04
diff --git a/backend/src/db/migrations/20261013120000_migrate-access-approval-policies-to-global.ts b/backend/src/db/migrations/20261013120000_migrate-access-approval-policies-to-global.tsindex dc390f1036..2b62c9aeda 100644--- a/backend/src/db/migrations/20261013120000_migrate-access-approval-policies-to-global.ts+++ b/backend/src/db/migrations/20261013120000_migrate-access-approval-policies-to-global.ts@@ -5,8 +5,9 @@ import { Knex } from "knex";import { verifyRequestedPermissions } from "@app/ee/services/access-approval-request/access-approval-request-fns";import { isGlobSubsetOfGlob } from "@app/lib/casl/glob-subset";-import { chunkArray } from "@app/lib/fn";+import { chunkArray, deepEqual, groupBy } from "@app/lib/fn";import { ms } from "@app/lib/ms";+import { EnforcementLevel } from "@app/lib/types";import { TableName } from "../schemas";import {@@ -50,14 +51,12 @@ import {const LOG_PREFIX = "migrate-access-approval-policies-to-global";const SECRET_ACCESS = "secret-access";-const SOFT_ENFORCEMENT = "soft";const LEGACY_TABLES: TLegacyApprovalTables = {legacyPolicies: TableName.AccessApprovalPolicy,legacyApprovers: TableName.AccessApprovalPolicyApprover,legacyBypassers: TableName.AccessApprovalPolicyBypasser,legacyEnvironments: TableName.AccessApprovalPolicyEnvironment,- legacyRequests: TableName.AccessApprovalRequest,legacyReviewers: TableName.AccessApprovalRequestReviewer};@@ -153,20 +152,6 @@ type TGlobalRows = TGlobalPolicyRows &additionalPrivilegeGrants: { additionalPrivilegeId: string; grantId: string }[];};-const canonicalize = (value: unknown): unknown => {- if (Array.isArray(value)) return value.map(canonicalize);- if (value && typeof value === "object") {- return Object.fromEntries(- Object.keys(value as Record<string, unknown>)- .sort()- .map((key) => [key, canonicalize((value as Record<string, unknown>)[key])])- );- }- return value;-};--const isSameJson = (a: unknown, b: unknown) => JSON.stringify(canonicalize(a)) === JSON.stringify(canonicalize(b));-const durationMs = (range?: string | null) => {if (!range) return null;try {@@ -218,7 +203,7 @@ const checkPendingScope = (// reason is optional, so bypassReason alone under-reports it.const isBreakGlassApproval = (policy: TLegacyPolicy, request: TLegacyRequest, reviews: TLegacyReview[]) =>Boolean(request.bypassReason) ||- (policy.enforcementLevel === SOFT_ENFORCEMENT &&+ (policy.enforcementLevel === EnforcementLevel.Soft &&reviews.some((review) => review.status === ReviewDecision.Approved && review.reviewerUserId === request.requestedByUserId));@@ -232,7 +217,7 @@ const checkAdditionalPrivilegeState = (}: {additionalPrivilege?: TAdditionalPrivilege;projectId?: string;- requestsByAdditionalPrivilegeId: Map<string, string[]>;+ requestsByAdditionalPrivilegeId: Record<string, TLegacyRequest[]>;},failures: TMigrationFailure[]) => {@@ -243,7 +228,9 @@ const checkAdditionalPrivilegeState = (fail(`A ${request.status} request still points to additional privilege ${request.privilegeId}`);}- const sharedWith = (requestsByAdditionalPrivilegeId.get(request.privilegeId) ?? []).filter((id) => id !== request.id);+ const sharedWith = (requestsByAdditionalPrivilegeId[request.privilegeId] ?? [])+ .map(({ id }) => id)+ .filter((id) => id !== request.id);if (sharedWith.length) {fail(`Additional privilege ${request.privilegeId} is shared with requests ${sharedWith.join(", ")}`);}@@ -258,7 +245,7 @@ const checkAdditionalPrivilegeState = (if (additionalPrivilege.grantId) {fail(`Additional privilege ${additionalPrivilege.id} is already linked to grant ${additionalPrivilege.grantId}`);}- if (!isSameJson(additionalPrivilege.permissions, request.permissions)) {+ if (!deepEqual(additionalPrivilege.permissions, request.permissions)) {failures.push({code: "privilege-permissions-mismatch",requestId: request.id,@@ -289,7 +276,7 @@ export const translatePolicy = (data: TPolicyData, now: Date) => {maxTimePeriod: policy.maxTimePeriod ?? null}},- bypassForMachineIdentities: false // always false for access approval policies+ bypassForMachineIdentities: false}),secretEnvironments: buildPolicyEnvironmentRows(policy.id, environments, policy.secretPath),...buildPolicyStepRows(policy.id, steps),@@ -308,21 +295,14 @@ export const translatePolicy = (data: TPolicyData, now: Date) => {const additionalPrivilegeById = new Map(additionalPrivileges.map((additionalPrivilege) => [additionalPrivilege.id, additionalPrivilege]));- const reviewsByRequestId = new Map<string, TLegacyReview[]>();- reviews.forEach((review) => {- reviewsByRequestId.set(review.requestId, [...(reviewsByRequestId.get(review.requestId) ?? []), review]);- });- const requestsByAdditionalPrivilegeId = new Map<string, string[]>();- requests.forEach(({ id, privilegeId }) => {- if (privilegeId)- requestsByAdditionalPrivilegeId.set(privilegeId, [- ...(requestsByAdditionalPrivilegeId.get(privilegeId) ?? []),- id- ]);- });+ const reviewsByRequestId = groupBy(reviews, (review) => review.requestId);+ const requestsByAdditionalPrivilegeId = groupBy(+ requests.filter(({ privilegeId }) => privilegeId),+ ({ privilegeId }) => privilegeId as string+ );requests.forEach((request) => {- const requestReviews = reviewsByRequestId.get(request.id) ?? [];+ const requestReviews = reviewsByRequestId[request.id] ?? [];const knownStatuses = Object.values(LegacyRequestStatus) as string[];if (!knownStatuses.includes(request.status)) {@@ -463,36 +443,38 @@ const linkAdditionalPrivilegesToGrants = async (tx: Knex, pairs: TGlobalRows["adconst readPolicyData = async (tx: Knex, policy: TLegacyPolicy, requests: TLegacyRequest[]): Promise<TPolicyData> => {const { id: policyId } = policy;-- const additionalPrivileges = (await tx(TableName.AdditionalPrivilege)- .join(- TableName.AccessApprovalRequest,- `${TableName.AccessApprovalRequest}.privilegeId`,- `${TableName.AdditionalPrivilege}.id`- )- .where(`${TableName.AccessApprovalRequest}.policyId`, policyId)- .forUpdate(TableName.AdditionalPrivilege)- .select(- tx.ref("id").withSchema(TableName.AdditionalPrivilege),- tx.ref("actorUserId").withSchema(TableName.AdditionalPrivilege),- tx.ref("projectId").withSchema(TableName.AdditionalPrivilege),- tx.ref("permissions").withSchema(TableName.AdditionalPrivilege),- tx.ref("isTemporary").withSchema(TableName.AdditionalPrivilege),- tx.ref("temporaryAccessEndTime").withSchema(TableName.AdditionalPrivilege),- tx.ref("grantId").withSchema(TableName.AdditionalPrivilege)- )) as TAdditionalPrivilege[];+ const requestIds = requests.map(({ id }) => id);+ const privilegeIds = [...new Set(requests.map(({ privilegeId }) => privilegeId).filter(Boolean))];+ const requesterIds = [...new Set(requests.map(({ requestedByUserId }) => requestedByUserId))];++ const additionalPrivileges = privilegeIds.length+ ? ((await tx(TableName.AdditionalPrivilege)+ .whereRaw(`"id" = ANY(?::uuid[])`, [privilegeIds])+ .forUpdate()+ .select(+ "id",+ "actorUserId",+ "projectId",+ "permissions",+ "isTemporary",+ "temporaryAccessEndTime",+ "grantId"+ )) as TAdditionalPrivilege[])+ : [];const environments = await readPolicyEnvironments(tx, LEGACY_TABLES, policyId);const approvers = await readLegacyApprovers(tx, LEGACY_TABLES, policyId);const bypassers = await readLegacyBypassers(tx, LEGACY_TABLES, policyId);- const reviews = await readLegacyReviews(tx, LEGACY_TABLES, policyId);+ const reviews = await readLegacyReviews(tx, LEGACY_TABLES, requestIds);- const requesters = (await tx(TableName.Users)- .whereIn("id", tx(TableName.AccessApprovalRequest).where({ policyId }).select("requestedByUserId"))- .select("id", "username", "email", "firstName", "lastName")) as TRequester[];+ const requesters = requesterIds.length+ ? ((await tx(TableName.Users)+ .whereRaw(`"id" = ANY(?::uuid[])`, [requesterIds])+ .select("id", "username", "email", "firstName", "lastName")) as TRequester[])+ : [];const groupMembers = await readApproverGroupMembers(tx, approvers);- const requestIdsAlreadyOnGlobal = await readRequestIdsAlreadyOnGlobal(tx, LEGACY_TABLES, policyId);+ const requestIdsAlreadyOnGlobal = await readRequestIdsAlreadyOnGlobal(tx, requestIds);return {policy,@@ -501,11 +483,7 @@ const readPolicyData = async (tx: Knex, policy: TLegacyPolicy, requests: TLegacybypassers,requests,reviews,- additionalPrivileges: [- ...new Map(- additionalPrivileges.map((additionalPrivilege) => [additionalPrivilege.id, additionalPrivilege])- ).values()- ],+ additionalPrivileges,requesters,groupMembers,requestIdsAlreadyOnGlobaldiff --git a/backend/src/db/migrations/utils/approval-migration.test.ts b/backend/src/db/migrations/utils/approval-migration.test.tsindex e3504c5111..8ff11eed08 100644--- a/backend/src/db/migrations/utils/approval-migration.test.ts+++ b/backend/src/db/migrations/utils/approval-migration.test.ts@@ -14,7 +14,6 @@ import {checkPolicyEnvironments,checkRequestsAlreadyMigrated,checkReviewStatuses,- formatFailure,logFailedChecks,replayReviews,runLegacyPolicyMigration,@@ -79,7 +78,6 @@ const legacyTables = {legacyApprovers: "legacy_approvers",legacyBypassers: "legacy_bypassers",legacyEnvironments: "legacy_environments",- legacyRequests: "legacy_requests",legacyReviewers: "legacy_reviewers"} as unknown as Parameters<typeof runLegacyPolicyMigration>[1]["tables"];@@ -87,18 +85,6 @@ beforeEach(() => {vi.clearAllMocks();});-describe("formatFailure", () => {- test("prints the code and message", () => {- expect(formatFailure({ code: "no-approvers", message: "none" })).toBe("no-approvers: none");- });-- test("tags the request when the failure has one", () => {- expect(formatFailure({ code: "requester-missing", message: "gone", requestId: "req-1" })).toBe(- "requester-missing [requestId=req-1]: gone"- );- });-});-describe("logFailedChecks", () => {test("writes one warning carrying every reason in the searchable format", () => {const failures: TMigrationFailure[] = [@@ -265,7 +251,6 @@ describe("buildApprovalSteps", () => {expect(steps[0]).toMatchObject({userIds: ["u1"],groupIds: ["g1"],- groupMemberIds: new Set(["u1", "u2"]),eligibleUserIds: new Set(["u1", "u2"])});});diff --git a/backend/src/db/migrations/utils/approval-migration.ts b/backend/src/db/migrations/utils/approval-migration.tsindex 222f96b96a..237fc08269 100644--- a/backend/src/db/migrations/utils/approval-migration.ts+++ b/backend/src/db/migrations/utils/approval-migration.ts@@ -4,7 +4,9 @@ import crypto from "node:crypto";import { Knex } from "knex";import { TableName } from "@app/db/schemas";-import { chunkArray } from "@app/lib/fn";+import { DatabaseErrorCode } from "@app/lib/error-codes";+import { hasPostgresErrorCode } from "@app/lib/errors/postgres";+import { chunkArray, groupBy } from "@app/lib/fn";import { initLogger, logger } from "@app/lib/logger";// Shared by every migration that moves a legacy approval system onto the global approval tables. Once a@@ -13,11 +15,10 @@ import { initLogger, logger } from "@app/lib/logger";export const INSERT_CHUNK_SIZE = 500;export const POLICY_STATEMENT_TIMEOUT_MS = 60_000;-export const POLICY_LOCK_TIMEOUT_MS = 10_000;+const POLICY_LOCK_TIMEOUT_MS = 10_000;const POLICY_BATCH_SIZE = 100;-const PG_LOCK_NOT_AVAILABLE = "55P03";-export enum ApprovalStepStatus {+enum ApprovalStepStatus {Pending = "pending",InProgress = "in-progress",Completed = "completed"@@ -33,7 +34,6 @@ export type TLegacyApprovalTables = {legacyApprovers: TableName;legacyBypassers: TableName;legacyEnvironments: TableName;- legacyRequests: TableName;legacyReviewers: TableName;};@@ -66,7 +66,6 @@ export type TApprovalStep = {requiredApprovals: number;userIds: string[];groupIds: string[];- groupMemberIds: Set<string>;eligibleUserIds: Set<string>;};@@ -89,7 +88,7 @@ export type TPolicyOutcome = "migrated" | "failedChecks" | "skipped";const isId = (id: string | null | undefined): id is string => Boolean(id);-export const formatFailure = ({ code, message, requestId }: TMigrationFailure) =>+const formatFailure = ({ code, message, requestId }: TMigrationFailure) =>`${code}${requestId ? ` [requestId=${requestId}]` : ""}: ${message}`;export const logFailedChecks = ({@@ -135,14 +134,14 @@ export const readLegacyBypassers = async (tx: Knex, tables: TLegacyApprovalTableexport const readLegacyReviews = async (tx: Knex,tables: TLegacyApprovalTables,- policyId: string,+ requestIds: string[],{ withComment = false }: { withComment?: boolean } = {}) => {+ if (!requestIds.length) return [] as TLegacyReview[];const columns = ["id", "requestId", "reviewerUserId", "status", "createdAt", ...(withComment ? ["comment"] : [])];return (await tx(tables.legacyReviewers)- .join(tables.legacyRequests, `${tables.legacyRequests}.id`, `${tables.legacyReviewers}.requestId`)- .where(`${tables.legacyRequests}.policyId`, policyId)- .select(...columns.map((column) => tx.ref(column).withSchema(tables.legacyReviewers)))) as TLegacyReview[];+ .whereRaw(`"requestId" = ANY(?::uuid[])`, [requestIds])+ .select(columns)) as TLegacyReview[];};export const readApproverGroupMembers = async (tx: Knex, approvers: TLegacyApprover[]) => {@@ -153,10 +152,10 @@ export const readApproverGroupMembers = async (tx: Knex, approvers: TLegacyAppro.select("groupId", "userId")) as TGroupMember[];};-export const readRequestIdsAlreadyOnGlobal = async (tx: Knex, tables: TLegacyApprovalTables, policyId: string) =>- (await tx(TableName.ApprovalRequests)- .whereIn("id", tx(tables.legacyRequests).where({ policyId }).select("id"))- .pluck("id")) as string[];+export const readRequestIdsAlreadyOnGlobal = async (tx: Knex, requestIds: string[]) => {+ if (!requestIds.length) return [] as string[];+ return (await tx(TableName.ApprovalRequests).whereRaw(`"id" = ANY(?::uuid[])`, [requestIds]).pluck("id")) as string[];+};export const checkPolicyEnvironments = (environments: TPolicyEnvironment[], failures: TMigrationFailure[]) => {if (!environments.length) {@@ -191,21 +190,14 @@ export const buildApprovalSteps = (});}- const membersByGroup = new Map<string, string[]>();- groupMembers.forEach(({ groupId, userId }) => {- membersByGroup.set(groupId, [...(membersByGroup.get(groupId) ?? []), userId]);- });-- const approversBySequence = new Map<number, TLegacyApprover[]>();- approvers.forEach((approver) => {- const sequence = approver.sequence || 1;- approversBySequence.set(sequence, [...(approversBySequence.get(sequence) ?? []), approver]);- });+ const membersByGroup = groupBy(groupMembers, (member) => member.groupId);+ const approversBySequence = groupBy(approvers, (approver) => approver.sequence || 1);- return [...approversBySequence.keys()]+ return Object.keys(approversBySequence)+ .map(Number).sort((a, b) => a - b).map((sequence, index) => {- const rows = approversBySequence.get(sequence) as TLegacyApprover[];+ const rows = approversBySequence[sequence];const requiredValues = [...new Set(rows.map((row) => row.approvalsRequired ?? null))];if (requiredValues.length > 1) {failures.push({@@ -225,8 +217,10 @@ export const buildApprovalSteps = (const userIds = [...new Set(rows.map((row) => row.approverUserId).filter(isId))];const groupIds = [...new Set(rows.map((row) => row.approverGroupId).filter(isId))];- const groupMemberIds = new Set(groupIds.flatMap((groupId) => membersByGroup.get(groupId) ?? []));- const eligibleUserIds = new Set([...userIds, ...groupMemberIds]);+ const eligibleUserIds = new Set([+ ...userIds,+ ...groupIds.flatMap((groupId) => (membersByGroup[groupId] ?? []).map((member) => member.userId))+ ]);if (!groupIds.length && requiredApprovals > userIds.length) {failures.push({@@ -242,7 +236,7 @@ export const buildApprovalSteps = (});}- return { sequence, requiredApprovals, userIds, groupIds, groupMemberIds, eligibleUserIds };+ return { sequence, requiredApprovals, userIds, groupIds, eligibleUserIds };});};@@ -267,7 +261,6 @@ export const checkReviewStatuses = (requestId: string, reviews: TLegacyReview[],});};-// I need to check it more carefullyexport const replayReviews = (steps: TApprovalStep[], reviews: TLegacyReview[]) => {const approvedCounts = steps.map(() => 0);const completedAt: (Date | null)[] = steps.map(() => null);@@ -308,7 +301,7 @@ const legacyPendingState = (steps: TApprovalStep[], reviews: TLegacyReview[]) =>const approvedBy = new Set(reviews.filter((review) => review.status === ReviewDecision.Approved).map((review) => review.reviewerUserId));- const counts = steps.map((step) => [...step.eligibleUserIds].filter((userId) => approvedBy.has(userId)).length);+ const counts = steps.map((step) => [...approvedBy].filter((userId) => step.eligibleUserIds.has(userId)).length);return { counts, presentIndex: steps.findIndex((step, i) => counts[i] < step.requiredApprovals) };};@@ -474,15 +467,13 @@ export const buildRequestStepRows = ({);});- const approvals: Record<string, unknown>[] = stepIds.length- ? replay.attributed.map(({ review, stepIndex }) => ({- stepId: stepIds[stepIndex],- approverUserId: review.reviewerUserId,- decision: review.status,- comment: review.comment ?? null,- createdAt: review.createdAt- }))- : [];+ const approvals: Record<string, unknown>[] = replay.attributed.map(({ review, stepIndex }) => ({+ stepId: stepIds[stepIndex],+ approverUserId: review.reviewerUserId,+ decision: review.status,+ comment: review.comment ?? null,+ createdAt: review.createdAt+ }));return { requestSteps, eligibleApprovers, approvals };};@@ -561,10 +552,11 @@ export const runLegacyPolicyMigration = async (for (const policyId of policyIds) {try {logger.info(`${logPrefix}: locking policy [policyId=${policyId}]`);- counts[await knex.transaction((tx) => migratePolicy(tx, policyId))] += 1;- logger.info(`${logPrefix}: policy migrated [policyId=${policyId}]`);+ const outcome = await knex.transaction((tx) => migratePolicy(tx, policyId));+ counts[outcome] += 1;+ if (outcome === "migrated") logger.info(`${logPrefix}: policy migrated [policyId=${policyId}]`);} catch (error) {- if ((error as { code?: string })?.code === PG_LOCK_NOT_AVAILABLE) {+ if (hasPostgresErrorCode(error, DatabaseErrorCode.LockNotAvailable)) {counts.locked += 1;logger.warn(`${logPrefix}: policy not migrated, it stays on the legacy approval system [policyId=${policyId}] reasons=[locked: its rows were held by another transaction for over ${POLICY_LOCK_TIMEOUT_MS}ms, the next run retries it]`diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.tsindex d646813e61..cfa9685062 100644--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts@@ -3,7 +3,15 @@ import { Knex } from "knex";import { TDbClient } from "@app/db";import { AccessApprovalPoliciesSchema, TableName, TAccessApprovalPolicies, TUsers } from "@app/db/schemas";import { DatabaseError } from "@app/lib/errors";-import { buildFindFilter, ormify, selectAllTableCols, sqlNestRelationships, TFindFilter, TOrmify } from "@app/lib/knex";+import {+ buildFindFilter,+ ormify,+ rowWithSameIdIn,+ selectAllTableCols,+ sqlNestRelationships,+ TFindFilter,+ TOrmify+} from "@app/lib/knex";import {ApproverType,@@ -398,12 +406,7 @@ export const accessApprovalPolicyDALFactory = (db: TDbClient): TAccessApprovalPoconst result = await tx(TableName.AccessApprovalPolicy)// eslint-disable-next-line.where(buildFindFilter(filter))- .whereNotExists((qb) => {- void qb- .select(db.raw("1"))- .from(TableName.ApprovalPolicies)- .whereRaw(`"${TableName.ApprovalPolicies}"."id" = "${TableName.AccessApprovalPolicy}"."id"`);- })+ .whereNotExists(rowWithSameIdIn(TableName.ApprovalPolicies, TableName.AccessApprovalPolicy)).where((qb) => {if (customFilter?.policyId) {void qb.where(`${TableName.AccessApprovalPolicy}.id`, "=", customFilter.policyId);@@ -599,12 +602,7 @@ export const accessApprovalPolicyDALFactory = (db: TDbClient): TAccessApprovalPo`${TableName.AccessApprovalPolicy}.id`).where(`${TableName.AccessApprovalPolicyEnvironment}.envId`, "=", envId)- .whereNotExists((qb) => {- void qb- .select(db.raw("1"))- .from(TableName.ApprovalPolicies)- .whereRaw(`"${TableName.ApprovalPolicies}"."id" = "${TableName.AccessApprovalPolicy}"."id"`);- })+ .whereNotExists(rowWithSameIdIn(TableName.ApprovalPolicies, TableName.AccessApprovalPolicy)).orderBy("deletedAt", "desc").orderByRaw(`"deletedAt" IS NULL`).select(selectAllTableCols(TableName.AccessApprovalPolicy))@@ -653,12 +651,7 @@ export const accessApprovalPolicyDALFactory = (db: TDbClient): TAccessApprovalPo)).whereNull(`${TableName.AccessApprovalPolicy}.deletedAt`)- .whereNotExists((qb) => {- void qb- .select(db.raw("1"))- .from(TableName.ApprovalPolicies)- .whereRaw(`"${TableName.ApprovalPolicies}"."id" = "${TableName.AccessApprovalPolicy}"."id"`);- })+ .whereNotExists(rowWithSameIdIn(TableName.ApprovalPolicies, TableName.AccessApprovalPolicy)).where((qb) => {if (excludePolicyId) void qb.whereNot(`${TableName.AccessApprovalPolicy}.id`, excludePolicyId);})diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-environment-dal.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-environment-dal.tsindex 1b86bcd77f..50de82e04c 100644--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-environment-dal.ts+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-environment-dal.ts@@ -3,7 +3,7 @@ import { Knex } from "knex";import { TDbClient } from "@app/db";import { TableName } from "@app/db/schemas";import { DatabaseError } from "@app/lib/errors";-import { buildFindFilter, ormify, selectAllTableCols } from "@app/lib/knex";+import { buildFindFilter, ormify, rowWithSameIdIn, selectAllTableCols } from "@app/lib/knex";export type TAccessApprovalPolicyEnvironmentDALFactory = ReturnType<typeof accessApprovalPolicyEnvironmentDALFactory>;@@ -21,12 +21,7 @@ export const accessApprovalPolicyEnvironmentDALFactory = (db: TDbClient) => {// eslint-disable-next-line @typescript-eslint/no-misused-promises.where(buildFindFilter({ envId }, TableName.AccessApprovalPolicyEnvironment)).whereNull(`${TableName.AccessApprovalPolicy}.deletedAt`)- .whereNotExists((qb) => {- void qb- .select(db.raw("1"))- .from(TableName.ApprovalPolicies)- .whereRaw(`"${TableName.ApprovalPolicies}"."id" = "${TableName.AccessApprovalPolicy}"."id"`);- })+ .whereNotExists(rowWithSameIdIn(TableName.ApprovalPolicies, TableName.AccessApprovalPolicy)).select(selectAllTableCols(TableName.AccessApprovalPolicyEnvironment));return docs;} catch (error) {diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts b/backend/src/ee/services/access-approval-request/access-approval-request-dal.tsindex a9ef167db5..a4ef27bdde 100644--- a/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts+++ b/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts@@ -11,7 +11,7 @@ import {TUsers} from "@app/db/schemas";import { DatabaseError } from "@app/lib/errors";-import { ormify, selectAllTableCols, sqlNestRelationships, TFindFilter, TOrmify } from "@app/lib/knex";+import { ormify, rowWithSameIdIn, selectAllTableCols, sqlNestRelationships, TFindFilter, TOrmify } from "@app/lib/knex";import { ApprovalStatus } from "./access-approval-request-types";@@ -278,12 +278,7 @@ export const accessApprovalRequestDALFactory = (db: TDbClient): TAccessApprovalRconst docs = await db.replicaNode()(TableName.AccessApprovalRequest).whereIn(`${TableName.AccessApprovalRequest}.policyId`, policyIds)- .whereNotExists((qb) => {- void qb- .select(db.raw("1"))- .from(TableName.ApprovalRequests)- .whereRaw(`"${TableName.ApprovalRequests}"."id" = "${TableName.AccessApprovalRequest}"."id"`);- })+ .whereNotExists(rowWithSameIdIn(TableName.ApprovalRequests, TableName.AccessApprovalRequest)).leftJoin(TableName.AdditionalPrivilege,`${TableName.AccessApprovalRequest}.privilegeId`,@@ -910,12 +905,7 @@ export const accessApprovalRequestDALFactory = (db: TDbClient): TAccessApprovalR`${TableName.AccessApprovalRequestReviewer}.requestId`).where(`${TableName.Environment}.projectId`, projectId)- .whereNotExists((qb) => {- void qb- .select(db.raw("1"))- .from(TableName.ApprovalRequests)- .whereRaw(`"${TableName.ApprovalRequests}"."id" = "${TableName.AccessApprovalRequest}"."id"`);- })+ .whereNotExists(rowWithSameIdIn(TableName.ApprovalRequests, TableName.AccessApprovalRequest)).where((qb) => {if (policyId) {void qb.where(`${TableName.AccessApprovalPolicy}.id`, policyId);diff --git a/backend/src/lib/error-codes/database.ts b/backend/src/lib/error-codes/database.tsindex 051c3233e3..29dfe0eb8a 100644--- a/backend/src/lib/error-codes/database.ts+++ b/backend/src/lib/error-codes/database.ts@@ -1,5 +1,6 @@export enum DatabaseErrorCode {StringDataRightTruncation = "22001",ForeignKeyViolation = "23503",- UniqueViolation = "23505"+ UniqueViolation = "23505",+ LockNotAvailable = "55P03"}diff --git a/backend/src/lib/knex/select.ts b/backend/src/lib/knex/select.tsindex 8cc3f48921..a72f9be23f 100644--- a/backend/src/lib/knex/select.ts+++ b/backend/src/lib/knex/select.ts@@ -1,8 +1,16 @@+import { Knex } from "knex";import { Tables } from "knex/types/tables";+import { TableName } from "@app/db/schemas";+export const selectAllTableCols = <Tname extends keyof Tables>(tableName: Tname) =>`${tableName}.*` as keyof Tables[Tname]["base"];+// use it for data migration between different tables with the samed id+export const rowWithSameIdIn = (otherTable: TableName, table: TableName) => (qb: Knex.QueryBuilder) => {+ void qb.select(`${otherTable}.id`).from(otherTable).whereRaw(`"${otherTable}"."id" = "${table}"."id"`);+};+export const stripUndefinedInWhere = <T extends object>(val: T): Exclude<T, undefined> => {const copy = val;Object.entries(copy).forEach(([key, value]) => {diff --git a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.tsindex ab9fc92f95..92230a52d8 100644--- a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts@@ -576,10 +576,7 @@ export const secretAccessApprovalGlobalPolicyBridgeServiceFactory = ({await approvalPolicyDAL.deleteById(policy.id, tx);- const legacyPolicy = await accessApprovalPolicyDAL.findOne({ id: policy.id }, tx);- if (legacyPolicy && !legacyPolicy.deletedAt) {- await accessApprovalPolicyDAL.softDeleteById(policy.id, tx);- }+ await accessApprovalPolicyDAL.update({ id: policy.id, deletedAt: null }, { deletedAt: new Date() }, tx);});return policy;diff --git a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.tsindex 68ec543d58..d206599635 100644--- a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-types.ts@@ -33,10 +33,7 @@ export type TSecretAccessApprovalGlobalPolicyBridgeServiceFactoryDep = {projectEnvDAL: Pick<TProjectEnvDALFactory, "find">;userDAL: Pick<TUserDALFactory, "find">;groupDAL: Pick<TGroupDALFactory, "find">;- accessApprovalPolicyDAL: Pick<- TAccessApprovalPolicyDALFactory,- "findPolicyByEnvIdAndSecretPath" | "findOne" | "softDeleteById"- >;+ accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath" | "update">;approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "create" | "transaction" | "updateById" | "deleteById">;approvalPolicyStepsDAL: Pick<TApprovalPolicyStepsDALFactory, "insertMany" | "delete">;approvalPolicyStepApproversDAL: Pick<TApprovalPolicyStepApproversDALFactory, "insertMany">;