Skip to content

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

add a for update on the query

adilson3dcc21bd96d2
diff --git a/backend/src/services/approval-policy/approval-request-dal.ts b/backend/src/services/approval-policy/approval-request-dal.ts
index 7728745812..69b39c82f1 100644
--- a/backend/src/services/approval-policy/approval-request-dal.ts
+++ b/backend/src/services/approval-policy/approval-request-dal.ts
@@ -169,6 +169,17 @@ export const approvalRequestDALFactory = (db: TDbClient) => {
}
};
+ const findPendingByPolicyIdForUpdate = async (policyId: string, tx: Knex) => {
+ try {
+ return await tx(TableName.ApprovalRequests)
+ .forUpdate()
+ .where({ policyId, status: ApprovalRequestStatus.Pending })
+ .orderBy("id", "asc");
+ } catch (error) {
+ throw new DatabaseError({ error, name: "FindPendingApprovalRequestsByPolicyIdForUpdate" });
+ }
+ };
+
const markExpiredRequests = async (): Promise<number> => {
try {
const rows = await db(TableName.ApprovalRequests)
@@ -188,6 +199,7 @@ export const approvalRequestDALFactory = (db: TDbClient) => {
findStepsByRequestId,
findByProjectId,
findByIdForUpdate,
+ findPendingByPolicyIdForUpdate,
markExpiredRequests
};
};
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
index ab97e3d0b9..adbc80fb8a 100644
--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
@@ -274,7 +274,7 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({
{ policyId, steps }: { policyId: string; steps: TPolicyStep[] },
tx: Knex
) => {
- const pendingRequests = await approvalRequestDAL.find({ policyId, status: ApprovalRequestStatus.Pending }, { tx });
+ const pendingRequests = await approvalRequestDAL.findPendingByPolicyIdForUpdate(policyId, tx);
if (!pendingRequests.length) return;
const requestIds = pendingRequests.map((request) => request.id);
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.ts
index 7d850f0991..8152271573 100644
--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.ts
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-types.ts
@@ -42,7 +42,7 @@ export type TSecretAccessApprovalPolicyBridgeServiceFactoryDep = {
TApprovalPolicySecretEnvironmentDALFactory,
"insertMany" | "delete" | "findPolicyByEnvIdsAndSecretPath"
>;
- approvalRequestDAL: Pick<TApprovalRequestDALFactory, "find" | "update">;
+ approvalRequestDAL: Pick<TApprovalRequestDALFactory, "find" | "update" | "findPendingByPolicyIdForUpdate">;
approvalRequestStepsDAL: Pick<TApprovalRequestStepsDALFactory, "create" | "delete">;
approvalRequestStepEligibleApproversDAL: Pick<TApprovalRequestStepEligibleApproversDALFactory, "create">;
approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "update">;