Skip to content

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

migration: recreate migrations and define the requestID as unique with the provider type

adilsoncf7afe14fc06
diff --git a/CLAUDE.md b/CLAUDE.md
index 47fad38e93..8610931cb2 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -161,7 +161,8 @@ policies may opt in today: `assertPolicyTypeSupportsDelegatedApproval` refuses t
policies return it as a 400 rather than dropping the field.
Delivery to the delegated system is asynchronous and goes through the event outbox (see `backend/CLAUDE.md`).
-`delegatedApprovalService.createRequest` writes the `delegated_approval_requests` row and emits
+`delegatedApprovalService.createRequest` writes the `delegated_approval_requests` row, stamped with the policy's
+provider as `providerType` so `(providerRequestId, providerType)` can be unique, and emits
`delegated-approval.request.dispatch-requested` (`delegated-approval-events.ts`) in the caller's transaction, so
the dispatch is exactly as durable as the request; never enqueue it after commit. The
`delegated-approval-dispatch` consumer (`delegated-approval/dispatch/delegated-approval-dispatch-consumer.ts`)
diff --git a/backend/src/db/migrations/20261019120000_delegated-approval-callback-attempts.ts b/backend/src/db/migrations/20261019120000_delegated-approval-callback-attempts.ts
deleted file mode 100644
index dff69a8251..0000000000
--- a/backend/src/db/migrations/20261019120000_delegated-approval-callback-attempts.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-
-export async function up(knex: Knex): Promise<void> {
- if (!(await knex.schema.hasColumn(TableName.DelegatedApprovalRequests, "callbackAttempts"))) {
- await knex.schema.alterTable(TableName.DelegatedApprovalRequests, (t) => {
- t.integer("callbackAttempts").notNullable().defaultTo(0);
- });
- }
-}
-
-export async function down(knex: Knex): Promise<void> {
- if (await knex.schema.hasColumn(TableName.DelegatedApprovalRequests, "callbackAttempts")) {
- await knex.schema.alterTable(TableName.DelegatedApprovalRequests, (t) => {
- t.dropColumn("callbackAttempts");
- });
- }
-}
diff --git a/backend/src/db/migrations/20261015145100_external-approvals.ts b/backend/src/db/migrations/20261027143736_delegated-approvals.ts
similarity index 90%
rename from backend/src/db/migrations/20261015145100_external-approvals.ts
rename to backend/src/db/migrations/20261027143736_delegated-approvals.ts
index 2ff0899dfb..83ba0e6c9c 100644
--- a/backend/src/db/migrations/20261015145100_external-approvals.ts
+++ b/backend/src/db/migrations/20261027143736_delegated-approvals.ts
@@ -28,13 +28,17 @@ export async function up(knex: Knex): Promise<void> {
t.uuid("requestId").notNullable().unique();
t.foreign("requestId").references("id").inTable(TableName.ApprovalRequests).onDelete("CASCADE");
+ t.string("providerType", 50).notNullable();
t.string("status", 50).notNullable();
t.binary("encryptedCallbackToken").nullable();
t.jsonb("details").notNullable();
- t.string("providerRequestId").nullable().index();
+ t.string("providerRequestId").nullable();
+ t.integer("callbackAttempts").notNullable().defaultTo(0);
t.timestamp("decisionReadRequestedAt", { useTz: true }).nullable();
t.timestamps(true, true, true);
+
+ t.unique(["providerRequestId", "providerType"]);
});
await createOnUpdateTrigger(knex, TableName.DelegatedApprovalRequests);
}
diff --git a/backend/src/db/schemas/delegated-approval-requests.ts b/backend/src/db/schemas/delegated-approval-requests.ts
index 5ed314c0c5..8044758e13 100644
--- a/backend/src/db/schemas/delegated-approval-requests.ts
+++ b/backend/src/db/schemas/delegated-approval-requests.ts
@@ -12,14 +12,15 @@ import { TImmutableDBKeys } from "./models";
export const DelegatedApprovalRequestsSchema = z.object({
id: z.string().uuid(),
requestId: z.string().uuid(),
+ providerType: z.string(),
status: z.string(),
encryptedCallbackToken: zodBuffer.nullable().optional(),
details: z.unknown(),
providerRequestId: z.string().nullable().optional(),
+ callbackAttempts: z.number().default(0),
decisionReadRequestedAt: z.date().nullable().optional(),
createdAt: z.date(),
- updatedAt: z.date(),
- callbackAttempts: z.number().default(0)
+ updatedAt: z.date()
});
export type TDelegatedApprovalRequests = z.infer<typeof DelegatedApprovalRequestsSchema>;
diff --git a/backend/src/services/delegated-approval/delegated-approval-request-fns.ts b/backend/src/services/delegated-approval/delegated-approval-request-fns.ts
index c174e2c515..cfdac0d710 100644
--- a/backend/src/services/delegated-approval/delegated-approval-request-fns.ts
+++ b/backend/src/services/delegated-approval/delegated-approval-request-fns.ts
@@ -5,7 +5,7 @@ import { TDelegatedApprovalRequests } from "@app/db/schemas";
import { logger } from "@app/lib/logger";
import { ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";
-import { DelegatedApprovalRequestStatus } from "./delegated-approval-enums";
+import { DelegatedApprovalPolicyType, DelegatedApprovalRequestStatus } from "./delegated-approval-enums";
import { DelegatedApprovalRequestDetailsSchema } from "./delegated-approval-schemas";
import {
TDelegatedApprovalRequest,
@@ -36,6 +36,7 @@ export const parseDelegatedApprovalRequestDetails = (
export const toDelegatedApprovalRequest = (row: TDelegatedApprovalRequests): TDelegatedApprovalRequest => ({
...row,
+ providerType: row.providerType as DelegatedApprovalPolicyType,
status: row.status as DelegatedApprovalRequestStatus,
details: parseDelegatedApprovalRequestDetails(row)
});
diff --git a/backend/src/services/delegated-approval/delegated-approval-service.test.ts b/backend/src/services/delegated-approval/delegated-approval-service.test.ts
index d237b7fb25..5fee51c191 100644
--- a/backend/src/services/delegated-approval/delegated-approval-service.test.ts
+++ b/backend/src/services/delegated-approval/delegated-approval-service.test.ts
@@ -61,11 +61,23 @@ describe("delegatedApprovalService.createRequest", () => {
test("records the dispatch event in the same transaction as the request row", async () => {
const { service, emit, create } = createService();
- const request = await service.createRequest({ approvalRequest: pendingApprovalRequest as never }, TX);
+ const request = await service.createRequest(
+ { approvalRequest: pendingApprovalRequest as never, delegatedPolicy: serviceNowPolicy },
+ TX
+ );
- expect(request).toMatchObject({ id: "delegated-1", status: DelegatedApprovalRequestStatus.PendingDispatch });
+ expect(request).toMatchObject({
+ id: "delegated-1",
+ providerType: DelegatedApprovalPolicyType.ServiceNow,
+ status: DelegatedApprovalRequestStatus.PendingDispatch
+ });
expect(create).toHaveBeenCalledWith(
- { requestId: "req-1", status: DelegatedApprovalRequestStatus.PendingDispatch, details: {} },
+ {
+ requestId: "req-1",
+ providerType: DelegatedApprovalPolicyType.ServiceNow,
+ status: DelegatedApprovalRequestStatus.PendingDispatch,
+ details: {}
+ },
TX
);
expect(emit).toHaveBeenCalledTimes(1);
diff --git a/backend/src/services/delegated-approval/delegated-approval-service.ts b/backend/src/services/delegated-approval/delegated-approval-service.ts
index 6076587baf..de1bc5861d 100644
--- a/backend/src/services/delegated-approval/delegated-approval-service.ts
+++ b/backend/src/services/delegated-approval/delegated-approval-service.ts
@@ -156,12 +156,17 @@ export const delegatedApprovalServiceFactory = ({
return (policy as TDelegatedApprovalPolicy | undefined) ?? null;
};
- const createRequest = async ({ approvalRequest }: TCreateDelegatedApprovalRequestDTO, tx?: Knex) => {
+ const createRequest = async ({ approvalRequest, delegatedPolicy }: TCreateDelegatedApprovalRequestDTO, tx?: Knex) => {
assertPolicyTypeSupportsDelegatedApproval(approvalRequest.type);
try {
const request = await delegatedApprovalRequestDAL.create(
- { requestId: approvalRequest.id, status: DelegatedApprovalRequestStatus.PendingDispatch, details: {} },
+ {
+ requestId: approvalRequest.id,
+ providerType: delegatedPolicy.type,
+ status: DelegatedApprovalRequestStatus.PendingDispatch,
+ details: {}
+ },
tx
);
await emitDelegatedApprovalDispatchRequested(
diff --git a/backend/src/services/delegated-approval/delegated-approval-types.ts b/backend/src/services/delegated-approval/delegated-approval-types.ts
index fa63cf6b8b..8c6104f293 100644
--- a/backend/src/services/delegated-approval/delegated-approval-types.ts
+++ b/backend/src/services/delegated-approval/delegated-approval-types.ts
@@ -25,7 +25,8 @@ export type TDelegatedApprovalPolicy = Omit<TDelegatedApprovalPolicies, "type">
export type { TDelegatedApprovalProviderDetails, TDelegatedApprovalRequestDetails };
-export type TDelegatedApprovalRequest = Omit<TDelegatedApprovalRequests, "status" | "details"> & {
+export type TDelegatedApprovalRequest = Omit<TDelegatedApprovalRequests, "providerType" | "status" | "details"> & {
+ providerType: DelegatedApprovalPolicyType;
status: DelegatedApprovalRequestStatus;
details: TDelegatedApprovalRequestDetails;
};
@@ -53,6 +54,7 @@ export type TUpdateDelegatedApprovalPolicyDTO = {
export type TCreateDelegatedApprovalRequestDTO = {
approvalRequest: Pick<TApprovalRequests, "id" | "type">;
+ delegatedPolicy: Pick<TDelegatedApprovalPolicy, "type">;
};
export type TRetryDelegatedApprovalRequestDispatchDTO = {
diff --git a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts
index bfe4fe25fe..13b12d5849 100644
--- a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts
+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts
@@ -386,7 +386,7 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
tx
);
if (delegatedPolicy) {
- await delegatedApprovalService.createRequest({ approvalRequest }, tx);
+ await delegatedApprovalService.createRequest({ approvalRequest, delegatedPolicy }, tx);
}
return { approvalRequest, policySteps: currentSteps };
});