Skip to content

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

fix tests

adilson94bf3be1ac6c
diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts
index 74fafcee56..54c6e0d1dc 100644
--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts
+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts
@@ -75,6 +75,7 @@ describe("toSecretChangeRequest", () => {
const commits = [{ id: "commit-1", key: "KEY", op: "create" }] as never[];
const result = toSecretChangeRequest({
+ policy: { id: "policy-1" },
approvalRequest: approvalRequest(),
secretChangeRequest: secretChangeRequest(),
commits
@@ -102,6 +103,7 @@ describe("toSecretChangeRequest", () => {
test("passes the close status through and maps an identity requester onto committerIdentityId", () => {
const result = toSecretChangeRequest({
+ policy: { id: "policy-1" },
approvalRequest: approvalRequest({
status: ApprovalRequestStatus.Closed,
requesterId: null,
diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts
index f1dc5ca1f7..8c6aa7310c 100644
--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts
+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts
@@ -43,6 +43,7 @@ import { TSecretChangePolicy } from "../secret-change-policy-bridge/secret-chang
import {
TApprovalRequestUser,
TSecretChangeRequest,
+ TSecretChangeRequestBase,
TSecretChangeRequestListItem,
TSecretChangeRequestPolicySummary
} from "./secret-change-request-bridge-types";
@@ -93,7 +94,7 @@ export const toSecretChangeRequestBase = ({
}: {
approvalRequest: TApprovalRequests;
secretChangeRequest: TSecretChangeRequests;
-}): Omit<TSecretChangeRequest, "commits"> => ({
+}): TSecretChangeRequestBase => ({
id: approvalRequest.id,
policyId: approvalRequest.policyId ?? null,
status: approvalRequest.status,
@@ -112,13 +113,15 @@ export const toSecretChangeRequestBase = ({
});
export const toSecretChangeRequest = ({
+ policy,
commits,
...request
}: {
+ policy: { id: string };
approvalRequest: TApprovalRequests;
secretChangeRequest: TSecretChangeRequests;
commits: TSecretApprovalRequestsSecretsV2[];
-}): TSecretChangeRequest => ({ ...toSecretChangeRequestBase(request), commits });
+}): TSecretChangeRequest => ({ ...toSecretChangeRequestBase(request), policyId: policy.id, commits });
export const toSecretChangeRequestCommit = ({
secret,
diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts
index 781b0c6575..483cd37dc9 100644
--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts
+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts
@@ -1248,7 +1248,7 @@ describe("secretChangeRequestBridge getSecretChangeRequestById", () => {
const result = await details(service);
expect(deps.secretChangePolicyBridgeService.findSecretChangePolicyById).not.toHaveBeenCalled();
- expect(result.policyId).toBe("");
+ expect(result.policyId).toBeNull();
expect(result.policy).toMatchObject({
id: "",
approvals: 1,
@@ -1373,7 +1373,7 @@ describe("secretChangeRequestBridge listSecretChangeRequests and countSecretChan
const result = await service.listSecretChangeRequests(filter);
expect(deps.approvalPolicyDAL.findBypassersByPolicyIds).toHaveBeenCalledWith([]);
- expect(result.approvals[0].policyId).toBe("");
+ expect(result.approvals[0].policyId).toBeNull();
expect(result.approvals[0].policy).toMatchObject({ id: "", approvals: 1, deletedAt: expect.any(Date) as Date });
deps.approvalRequestDAL.findStepsByRequestIds.mockClear();
diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts
index cd764d701f..e55c6130ff 100644
--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts
+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts
@@ -694,6 +694,7 @@ export const secretChangeRequestBridgeServiceFactory = ({
return {
secrets: merged.secrets,
approval: toSecretChangeRequest({
+ policy,
approvalRequest: merged.approvalRequest,
secretChangeRequest: merged.secretChangeRequest,
commits: commits.map(toSecretChangeRequestCommit)
@@ -878,7 +879,7 @@ export const secretChangeRequestBridgeServiceFactory = ({
);
}
- return { ...toSecretChangeRequestBase(updated), projectId: approvalRequest.projectId };
+ return { ...toSecretChangeRequestBase(updated), policyId: policy.id, projectId: approvalRequest.projectId };
};
const getSecretChangeRequestById: TSecretChangeRequestBridgeMethods["getSecretChangeRequestById"] = async ({
diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-types.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-types.ts
index 25676541c3..275633a4b0 100644
--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-types.ts
+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-types.ts
@@ -25,10 +25,9 @@ import {
// generic request envelope holds no data of its own.
export type TSecretChangeRequestData = Record<string, never>;
-export type TSecretChangeRequest = Omit<TSecretApprovalRequests, "policyId"> & {
- policyId: string | null;
- commits: TSecretApprovalRequestsSecretsV2[];
-};
+export type TSecretChangeRequest = TSecretApprovalRequests & { commits: TSecretApprovalRequestsSecretsV2[] };
+
+export type TSecretChangeRequestBase = Omit<TSecretChangeRequest, "commits" | "policyId"> & { policyId: string | null };
export type TSecretChangeRequestCommitInsert = Omit<
TSecretApprovalRequestsSecretsV2Insert,
@@ -71,7 +70,7 @@ export type TSecretChangeRequestCommitter = {
committerIdentity: { identityId: string; name: string } | null;
};
-export type TSecretChangeRequestDetails = Omit<TSecretChangeRequest, "commits"> &
+export type TSecretChangeRequestDetails = TSecretChangeRequestBase &
TSecretChangeRequestCommitter & {
projectId: string;
environment: string;
@@ -90,7 +89,7 @@ export type TSecretChangeRequestDetails = Omit<TSecretChangeRequest, "commits">
commits: TFormattedSecretApprovalCommitV2Bridge[];
};
-export type TSecretChangeRequestListItem = Omit<TSecretChangeRequest, "commits"> &
+export type TSecretChangeRequestListItem = TSecretChangeRequestBase &
TSecretChangeRequestCommitter & {
projectId: string;
environment: string;