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
remove unused methods
adilson207ae188f556
diff --git a/backend/e2e-test/routes/v1/secret-approval-policy-bridge.spec.ts b/backend/e2e-test/routes/v1/secret-approval-policy-bridge.spec.tsindex ba29eb86da..fc9572b4d8 100644--- a/backend/e2e-test/routes/v1/secret-approval-policy-bridge.spec.ts+++ b/backend/e2e-test/routes/v1/secret-approval-policy-bridge.spec.ts@@ -1,3 +1,4 @@+import { seedLegacySecretApprovalPolicy } from "e2e-test/testUtils/secret-approval-policies";import { Knex } from "knex";import { TableName } from "@app/db/schemas";@@ -13,15 +14,17 @@ const LEGACY_PATH = "/sap-policy-bridge-legacy";const NEW_PATH = "/sap-policy-bridge-new";const MOVED_PATH = "/sap-policy-bridge-moved";const GLOB_BASE = "/sap-policy-bridge-glob";+const V1_PATH = "/sap-policy-bridge-v1";const authHeaders = () => ({ authorization: `Bearer ${jwtAuthToken}` });const approvers = [{ type: ApproverType.User, id: seedData1.id }];-const createLegacyPolicy = (secretPath: string) =>- testServer.inject({- method: "POST",- url: "/api/v1/secret-approvals",- headers: authHeaders(),- body: { workspaceId: projectId, environment: envSlug, secretPath, approvers, approvals: 1, name: "legacy-policy" }+const seedLegacyPolicy = (secretPath: string) =>+ seedLegacySecretApprovalPolicy(getDb(), {+ projectId,+ environment: envSlug,+ secretPath,+ name: "legacy-policy",+ approverUserId: seedData1.id});const createBridgePolicy = (secretPath: string) =>@@ -101,9 +104,7 @@ describe("Secret approval policy bridge routing", () => {});test("a legacy policy stays on the legacy tables through update and is soft-deleted on delete", async () => {- const createRes = await createLegacyPolicy(LEGACY_PATH);- expect(createRes.statusCode).toBe(200);- const legacyId = createRes.json().approval.id as string;+ const legacyId = (await seedLegacyPolicy(LEGACY_PATH)).id;legacyIds.push(legacyId);expect(await legacyRow(legacyId)).toMatchObject({ secretPath: LEGACY_PATH, deletedAt: null });expect(await bridgeRow(legacyId)).toBeUndefined();@@ -184,9 +185,7 @@ describe("Secret approval policy bridge routing", () => {});test("an update is refused when the path is governed by a policy on the other store", async () => {- const legacyRes = await createLegacyPolicy(NEW_PATH);- expect(legacyRes.statusCode).toBe(200);- const legacyId = legacyRes.json().approval.id as string;+ const legacyId = (await seedLegacyPolicy(NEW_PATH)).id;legacyIds.push(legacyId);const [bridgeId] = bridgeIds;@@ -257,9 +256,7 @@ describe("Secret approval policy bridge routing", () => {});test("a secret path is resolved across both stores with the exact path winning over a glob", async () => {- const legacyRes = await createLegacyPolicy(`${GLOB_BASE}/**`);- expect(legacyRes.statusCode).toBe(200);- const legacyId = legacyRes.json().approval.id as string;+ const legacyId = (await seedLegacyPolicy(`${GLOB_BASE}/**`)).id;legacyIds.push(legacyId);const bridgeRes = await createBridgePolicy(`${GLOB_BASE}/svc`);@@ -332,4 +329,27 @@ describe("Secret approval policy bridge routing", () => {expect(deleteEnvRes.statusCode).toBe(200);expect(deleteEnvRes.json().environment.id).toBe(guardedEnvId);});++ test("the deprecated v1 create puts a policy on a V3 project on the global approval system", async () => {+ const createRes = await testServer.inject({+ method: "POST",+ url: "/api/v1/secret-approvals",+ headers: authHeaders(),+ body: {+ workspaceId: projectId,+ environment: envSlug,+ secretPath: V1_PATH,+ approvers,+ approvals: 1,+ name: "v1-policy"+ }+ });+ expect(createRes.statusCode).toBe(200);+ const policyId = createRes.json().approval.id as string;+ bridgeIds.push(policyId);++ expect(await bridgeRow(policyId)).toMatchObject({ type: ApprovalPolicyType.SecretChange, projectId });+ expect(await bridgeEnvRows(policyId)).toMatchObject([{ policyId, envId, secretPath: V1_PATH }]);+ expect(await legacyRow(policyId)).toBeUndefined();+ });});diff --git a/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.ts b/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.tsindex c9508c9dcf..89630987a1 100644--- a/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.ts+++ b/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.ts@@ -1,4 +1,5 @@import { createFolder, deleteFolder } from "e2e-test/testUtils/folders";+import { seedLegacySecretApprovalPolicy } from "e2e-test/testUtils/secret-approval-policies";import { Knex } from "knex";import { SecretType, TableName } from "@app/db/schemas";@@ -81,25 +82,6 @@ const mergeRequest = (id: string) =>body: {}});-const seedLegacyPolicy = async (db: Knex) => {- const env = await db(TableName.Environment).where({ projectId, slug: seedData1.environment.slug }).first();- if (!env) throw new Error("seeded environment not found");-- const [policy] = await db(TableName.SecretApprovalPolicy)- .insert({- name: "legacy-bridge-test-policy",- secretPath: "/",- approvals: 1,- envId: env.id,- enforcementLevel: "hard",- bypassForMachineIdentities: false- })- .returning("*");- await db(TableName.SecretApprovalPolicyEnvironment).insert({ policyId: policy.id, envId: env.id });- await db(TableName.SecretApprovalPolicyApprover).insert({ policyId: policy.id, approverUserId: seedData1.id });- return policy;-};-const createGlobalSystemPolicy = async () => {const res = await testServer.inject({method: "POST",@@ -127,7 +109,15 @@ describe("Secret approval request bridge routing", () => {beforeAll(async () => {const db = getDb();- legacyPolicyId = (await seedLegacyPolicy(db)).id;+ legacyPolicyId = (+ await seedLegacySecretApprovalPolicy(db, {+ projectId,+ environment: envSlug,+ secretPath: "/",+ name: "legacy-bridge-test-policy",+ approverUserId: seedData1.id+ })+ ).id;globalSystemFolderId = (await createFolder({workspaceId: projectId,@@ -403,9 +393,9 @@ describe("Secret approval request bridge routing", () => {const closedRes = await listRequests(`&status=${RequestState.Closed}`);expect(closedRes.statusCode).toBe(200);- const closed: { approvals: (TListedRequest & { policyId: string })[] } = closedRes.json();+ const closed: { approvals: (TListedRequest & { policyId: string | null })[] } = closedRes.json();expect(closed.approvals.find((row) => row.id === request.id)).toMatchObject({- policyId: "",+ policyId: null,status: RequestState.Closed,policy: { name: "Deleted policy", deletedAt: expect.any(String) as string }});@@ -413,7 +403,7 @@ describe("Secret approval request bridge routing", () => {const detailsRes = await getRequest(request.id);expect(detailsRes.statusCode).toBe(200);expect(detailsRes.json().approval).toMatchObject({- policyId: "",+ policyId: null,status: RequestState.Closed,policy: { name: "Deleted policy" }});diff --git a/backend/e2e-test/routes/v1/secret-approval-request-lifecycle.spec.ts b/backend/e2e-test/routes/v1/secret-approval-request-lifecycle.spec.tsindex f2ed3f2ce1..3b8b1b93bd 100644--- a/backend/e2e-test/routes/v1/secret-approval-request-lifecycle.spec.ts+++ b/backend/e2e-test/routes/v1/secret-approval-request-lifecycle.spec.ts@@ -1,4 +1,5 @@import { createFolder, deleteFolder } from "e2e-test/testUtils/folders";+import { seedLegacySecretApprovalPolicy } from "e2e-test/testUtils/secret-approval-policies";import { Knex } from "knex";import { SecretType, TableName } from "@app/db/schemas";@@ -394,9 +395,15 @@ describe("Secret approval request lifecycle on a policy on the legacy approval sbeforeAll(async () => {({ folderId, secretPath, baseSecretId, baseVersion } = await setupFolderWithBaseSecret(FOLDER));- const policyRes = await createPolicy("/api/v1/secret-approvals", secretPath, "lifecycle-legacy-policy");- expect(policyRes.statusCode).toBe(200);- policyId = policyRes.json().approval.id as string;+ policyId = (+ await seedLegacySecretApprovalPolicy(getDb(), {+ projectId,+ environment: envSlug,+ secretPath,+ name: "lifecycle-legacy-policy",+ approverUserId: seedData1.id+ })+ ).id;});afterAll(async () => {diff --git a/backend/e2e-test/routes/v1/secret-approval-request-move-bridge.spec.ts b/backend/e2e-test/routes/v1/secret-approval-request-move-bridge.spec.tsindex 4e7d4ca431..f4ba976458 100644--- a/backend/e2e-test/routes/v1/secret-approval-request-move-bridge.spec.ts+++ b/backend/e2e-test/routes/v1/secret-approval-request-move-bridge.spec.ts@@ -1,4 +1,5 @@import { createFolder, deleteFolder } from "e2e-test/testUtils/folders";+import { seedLegacySecretApprovalPolicy } from "e2e-test/testUtils/secret-approval-policies";import { Knex } from "knex";import { SecretType, TableName } from "@app/db/schemas";@@ -87,9 +88,15 @@ describe("Secret move under a secret approval policy", () => {folderIds[name] = folder.id;}- const legacyRes = await createPolicy("/api/v1/secret-approvals", `/${LEGACY_FOLDER}`, "move-legacy-policy");- expect(legacyRes.statusCode).toBe(200);- legacyPolicyId = legacyRes.json().approval.id as string;+ legacyPolicyId = (+ await seedLegacySecretApprovalPolicy(getDb(), {+ projectId,+ environment: envSlug,+ secretPath: `/${LEGACY_FOLDER}`,+ name: "move-legacy-policy",+ approverUserId: seedData1.id+ })+ ).id;const bridgeRes = await createPolicy("/api/v2/secret-approvals", `/${BRIDGE_FOLDER}`, "move-bridge-policy");expect(bridgeRes.statusCode).toBe(200);diff --git a/backend/e2e-test/testUtils/secret-approval-policies.ts b/backend/e2e-test/testUtils/secret-approval-policies.tsnew file mode 100644index 0000000000..c0d819b921--- /dev/null+++ b/backend/e2e-test/testUtils/secret-approval-policies.ts@@ -0,0 +1,28 @@+import { Knex } from "knex";++import { TableName } from "@app/db/schemas";+import { EnforcementLevel } from "@app/lib/types";++// The API puts every new policy on a V3 project on the global approval system, so a policy on the legacy+// approval system can only be seeded directly.+export const seedLegacySecretApprovalPolicy = async (+ db: Knex,+ dto: { projectId: string; environment: string; secretPath: string; name: string; approverUserId: string }+) => {+ const env = await db(TableName.Environment).where({ projectId: dto.projectId, slug: dto.environment }).first();+ if (!env) throw new Error(`environment '${dto.environment}' not found in project ${dto.projectId}`);++ const [policy] = await db(TableName.SecretApprovalPolicy)+ .insert({+ name: dto.name,+ secretPath: dto.secretPath,+ approvals: 1,+ envId: env.id,+ enforcementLevel: EnforcementLevel.Hard,+ bypassForMachineIdentities: false+ })+ .returning("*");+ await db(TableName.SecretApprovalPolicyEnvironment).insert({ policyId: policy.id, envId: env.id });+ await db(TableName.SecretApprovalPolicyApprover).insert({ policyId: policy.id, approverUserId: dto.approverUserId });+ return policy;+};diff --git a/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.test.ts b/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.test.tsindex 712edff4c4..a2f053fa5d 100644--- a/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.test.ts+++ b/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.test.ts@@ -2,6 +2,7 @@ import { createMongoAbility } from "@casl/ability";import { Knex } from "knex";import { describe, expect, test, vi } from "vitest";+import { ProjectVersion } from "@app/db/schemas";import { conditionsMatcher } from "@app/lib/casl";import { EnforcementLevel } from "@app/lib/types";import { ActorType } from "@app/services/auth/auth-type";@@ -50,9 +51,11 @@ const buildService = ({bridgePolicy = undefined as TExistingPolicy | undefined,legacyPolicies = [] as TPolicy[],bridgePolicies = [] as TPolicy[],- bridgeOwnsPolicy = false+ bridgeOwnsPolicy = false,+ projectVersion = ProjectVersion.V2} = {}) => {const deps = {+ projectDAL: { findById: vi.fn().mockResolvedValue({ id: PROJECT_ID, version: projectVersion }) },permissionService: { getProjectPermission: vi.fn().mockResolvedValue({ permission: allowAll }) },licenseService: { getPlan: vi.fn().mockResolvedValue({ secretApproval: true }) },projectEnvDAL: {@@ -68,6 +71,7 @@ const buildService = ({findSecretChangePolicyBySecretPath: vi.fn().mockResolvedValue(bridgePolicy),findSecretChangePoliciesByEnvId: vi.fn().mockResolvedValue(bridgePolicies),findSecretChangePoliciesByProjectId: vi.fn().mockResolvedValue(bridgePolicies),+ createSecretChangePolicy: vi.fn().mockResolvedValue({ id: "bridge-policy" }),getSecretChangePolicyById: vi.fn().mockResolvedValue({ id: "bridge-policy" })}};@@ -79,25 +83,39 @@ const buildService = ({};describe("secretApprovalPolicyService createSecretApprovalPolicy", () => {+ const createDto = {+ ...ctx,+ projectId: PROJECT_ID,+ name: "dev-policy",+ approvals: 1,+ approvers: [{ type: ApproverType.User, id: "user-1" }],+ secretPath: "/",+ environment: ENV_DEV.slug,+ enforcementLevel: EnforcementLevel.Hard,+ allowedSelfApprovals: true,+ bypassForMachineIdentities: false+ } as unknown as Parameters<ReturnType<typeof secretApprovalPolicyServiceFactory>["createSecretApprovalPolicy"]>[0];++ test("creates a policy on a V3 project on the global approval system", async () => {+ const { service, deps } = buildService({ projectVersion: ProjectVersion.V3 });++ await expect(service.createSecretApprovalPolicy(createDto)).resolves.toEqual({ id: "bridge-policy" });++ expect(deps.secretChangePolicyBridgeService.createSecretChangePolicy).toHaveBeenCalledWith(createDto);+ expect(deps.permissionService.getProjectPermission).not.toHaveBeenCalled();+ expect(deps.secretApprovalPolicyDAL.findPolicyByEnvIdAndSecretPath).not.toHaveBeenCalled();+ });+test("rejects a path and environment already governed by a policy created through the bridge", async () => {const { service, deps } = buildService({bridgePolicy: { id: "bridge-policy-1", environments: [{ id: ENV_DEV.id }] }});- await expect(- service.createSecretApprovalPolicy({- ...ctx,- projectId: PROJECT_ID,- name: "dev-policy",- approvals: 1,- approvers: [{ type: ApproverType.User, id: "user-1" }],- secretPath: "/",- environment: ENV_DEV.slug,- enforcementLevel: EnforcementLevel.Hard,- allowedSelfApprovals: true,- bypassForMachineIdentities: false- } as unknown as Parameters<typeof service.createSecretApprovalPolicy>[0])- ).rejects.toThrow("A policy for secret path '/' already exists in environment 'dev'");+ await expect(service.createSecretApprovalPolicy(createDto)).rejects.toThrow(+ "A policy for secret path '/' already exists in environment 'dev'"+ );++ expect(deps.secretChangePolicyBridgeService.createSecretChangePolicy).not.toHaveBeenCalled();expect(deps.secretApprovalPolicyDAL.findPolicyByEnvIdAndSecretPath).toHaveBeenCalledWith({envIds: [ENV_DEV.id],diff --git a/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.ts b/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.tsindex 975a857b3d..681f646937 100644--- a/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.ts+++ b/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.ts@@ -1,7 +1,7 @@import { ForbiddenError } from "@casl/ability";import { Knex } from "knex";-import { ActionProjectType } from "@app/db/schemas";+import { ActionProjectType, ProjectVersion } from "@app/db/schemas";import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";import { ProjectPermissionActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";import { BadRequestError, NotFoundError } from "@app/lib/errors";@@ -36,7 +36,7 @@ type TSecretApprovalPolicyServiceFactoryDep = {permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;secretApprovalPolicyDAL: TSecretApprovalPolicyDALFactory;projectEnvDAL: Pick<TProjectEnvDALFactory, "findOne" | "find">;- projectDAL: Pick<TProjectDALFactory, "findEffectiveProjectSubjectsMembership">;+ projectDAL: Pick<TProjectDALFactory, "findById" | "findEffectiveProjectSubjectsMembership">;userDAL: Pick<TUserDALFactory, "find">;secretApprovalPolicyApproverDAL: TSecretApprovalPolicyApproverDALFactory;secretApprovalPolicyBypasserDAL: TSecretApprovalPolicyBypasserDALFactory;@@ -49,6 +49,7 @@ type TSecretApprovalPolicyServiceFactoryDep = {| "findSecretChangePolicyBySecretPath"| "findSecretChangePoliciesByEnvId"| "findSecretChangePoliciesByProjectId"+ | "createSecretChangePolicy"| "updateSecretChangePolicy"| "deleteSecretChangePolicy"| "getSecretChangePolicyById"@@ -98,23 +99,29 @@ export const secretApprovalPolicyServiceFactory = ({const $useSecretChangePolicyBridge = async (policyId: string) =>Boolean(await secretChangePolicyBridgeService.findSecretChangePolicy(policyId));- const createSecretApprovalPolicy = async ({- name,- actor,- actorId,- actorOrgId,- actorAuthMethod,- approvals,- approvers,- bypassers,- projectId,- secretPath,- environment,- environments,- enforcementLevel,- allowedSelfApprovals,- bypassForMachineIdentities- }: TCreateSapDTO) => {+ const createSecretApprovalPolicy = async (dto: TCreateSapDTO) => {+ const project = await projectDAL.findById(dto.projectId);+ if (project?.version === ProjectVersion.V3) {+ return secretChangePolicyBridgeService.createSecretChangePolicy(dto);+ }++ const {+ name,+ actor,+ actorId,+ actorOrgId,+ actorAuthMethod,+ approvals,+ approvers,+ bypassers,+ projectId,+ secretPath,+ environment,+ environments,+ enforcementLevel,+ allowedSelfApprovals,+ bypassForMachineIdentities+ } = dto;const groupApprovers = approvers?.filter((approver) => approver.type === ApproverType.Group).map((approver) => approver.id)diff --git a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.test.ts b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.test.tsindex 67f4fbb33d..df60b27cb2 100644--- a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.test.ts+++ b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.test.ts@@ -143,9 +143,6 @@ const buildService = ({projectEnvDAL: {find: vi.fn(({ $in }: { $in: { slug: string[] } }) =>Promise.resolve(envs.filter((env) => $in.slug.includes(env.slug)))- ),- findOne: vi.fn(({ slug, projectId }: { slug: string; projectId: string }) =>- Promise.resolve(envs.find((env) => env.slug === slug && env.projectId === projectId)))},projectDAL: { findById: vi.fn().mockResolvedValue(project), findEffectiveProjectSubjectsMembership },@@ -822,89 +819,3 @@ describe("secretChangePolicyBridge getSecretChangePolicyById", () => {);});});--describe("secretChangePolicyBridge getSecretChangePolicyByProjectId", () => {- const list = (service: TService) => service.getSecretChangePolicyByProjectId({ ...ctx, projectId: PROJECT_ID });-- test("rejects an actor without read permission on secret approvals", async () => {- const { service, deps } = buildService({ permission: denyAll });-- await expect(list(service)).rejects.toBeInstanceOf(ForbiddenError);- expect(deps.secretChangePolicyBridgeDAL.findSecretChangePolicies).not.toHaveBeenCalled();- });-- test("returns every policy of the project in the legacy shape", async () => {- const rows = [buildRow(), buildRow({ id: "policy-2", secretPath: "/other" })];- const { service, deps } = buildService({ permission: allowRead, rows });-- await expect(list(service)).resolves.toEqual(rows.map(toSecretChangePolicy));- expect(deps.secretChangePolicyBridgeDAL.findSecretChangePolicies).toHaveBeenCalledWith({ projectId: PROJECT_ID });- });-});--describe("secretChangePolicyBridge getSecretChangePolicy", () => {- const globRow = buildRow({ id: "glob", secretPath: "/app/**", createdAt: new Date("2026-01-01") });- const exactRow = buildRow({ id: "exact", secretPath: "/app/svc", createdAt: new Date("2026-01-02") });-- test("rejects an environment slug that does not exist in the project", async () => {- const { service, deps } = buildService();-- const result = service.getSecretChangePolicy(PROJECT_ID, "staging", "/app", TX);- await expect(result).rejects.toBeInstanceOf(NotFoundError);- await expect(result).rejects.toThrow("Environment with slug 'staging' not found in project with ID project-1");- expect(deps.secretChangePolicyBridgeDAL.findSecretChangePolicies).not.toHaveBeenCalled();- });-- test("threads the transaction through the environment lookup and the policy read", async () => {- const { service, deps } = buildService({ rows: [globRow] });-- await service.getSecretChangePolicy(PROJECT_ID, "dev", "/app/svc", TX);-- expect(deps.projectEnvDAL.findOne).toHaveBeenCalledWith({ slug: "dev", projectId: PROJECT_ID }, TX);- expect(deps.secretChangePolicyBridgeDAL.findSecretChangePolicies).toHaveBeenCalledWith({ envId: ENV_DEV.id }, TX);- });-- test("prefers an exact path over a glob and ignores a trailing slash", async () => {- const { service } = buildService({ rows: [globRow, exactRow] });-- await expect(service.getSecretChangePolicy(PROJECT_ID, "dev", "/app/svc/")).resolves.toMatchObject({- id: "exact"- });- await expect(service.getSecretChangePolicy(PROJECT_ID, "dev", "/app/other")).resolves.toMatchObject({- id: "glob"- });- await expect(service.getSecretChangePolicy(PROJECT_ID, "dev", "/elsewhere")).resolves.toBeUndefined();- });-- test("returns a policy per governed path when resolving several paths at once", async () => {- const { service, deps } = buildService({ rows: [globRow, exactRow] });-- const byPath = await service.getSecretChangePolicyByPaths(- PROJECT_ID,- "dev",- ["/app/svc/", "/app/other", "/elsewhere"],- TX- );-- expect(deps.secretChangePolicyBridgeDAL.findSecretChangePolicies).toHaveBeenCalledTimes(1);- expect([...byPath.keys()]).toEqual(["/app/svc/", "/app/other"]);- expect(byPath.get("/app/svc/")).toMatchObject({ id: "exact" });- expect(byPath.get("/app/other")).toMatchObject({ id: "glob" });- });-- test("only requires project membership to read the policy of a folder", async () => {- const { service, deps } = buildService({ permission: denyAll, rows: [exactRow] });-- await expect(- service.getSecretChangePolicyOfFolder({- ...ctx,- projectId: PROJECT_ID,- environment: "dev",- secretPath: "/app/svc"- })- ).resolves.toMatchObject({ id: "exact", userApprovers: [{ userId: "user-1" }] });- expect(deps.permissionService.getProjectPermission).toHaveBeenCalledWith(- expect.objectContaining({ projectId: PROJECT_ID })- );- });-});diff --git a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.ts b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.tsindex 49b7d99532..52ee093055 100644--- a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.ts+++ b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.ts@@ -1,11 +1,9 @@import { ForbiddenError } from "@casl/ability";-import { Knex } from "knex";import { ActionProjectType, ProjectVersion } from "@app/db/schemas";import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";import { ProjectPermissionActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";import { BadRequestError, NotFoundError } from "@app/lib/errors";-import { removeTrailingSlash } from "@app/lib/fn";import {TApprovalPolicyBypassersDALFactory,TApprovalPolicyDALFactory,@@ -20,15 +18,10 @@ import { TUserDALFactory } from "@app/services/user/user-dal";import { TLicenseServiceFactory } from "../license/license-service";import { TSecretApprovalPolicyDALFactory } from "../secret-approval-policy/secret-approval-policy-dal";-import { resolvePolicyForPath } from "../secret-approval-policy/secret-approval-policy-fns";import { RequestState } from "../secret-approval-request/secret-approval-request-types";import { TSecretChangePolicyBridgeDALFactory } from "./secret-change-policy-bridge-dal";import { secretChangePolicyFnsFactory, splitApprovers, toSecretChangePolicy } from "./secret-change-policy-bridge-fns";-import {- TSecretChangePolicy,- TSecretChangePolicyBridgeMethods,- TSecretChangePolicyEnvironment-} from "./secret-change-policy-bridge-types";+import { TSecretChangePolicyBridgeMethods, TSecretChangePolicyEnvironment } from "./secret-change-policy-bridge-types";import { TApprovalPolicySecretEnvironmentDALFactory } from "./secret-change-policy-environment-dal";type TSecretChangePolicyBridgeServiceFactoryDep = {@@ -46,7 +39,7 @@ type TSecretChangePolicyBridgeServiceFactoryDep = {approvalRequestDAL: Pick<TApprovalRequestDALFactory, "update">;secretChangePolicyBridgeDAL: Pick<TSecretChangePolicyBridgeDALFactory, "findSecretChangePolicies">;secretApprovalPolicyDAL: Pick<TSecretApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;- projectEnvDAL: Pick<TProjectEnvDALFactory, "find" | "findOne">;+ projectEnvDAL: Pick<TProjectEnvDALFactory, "find">;projectDAL: Pick<TProjectDALFactory, "findById" | "findEffectiveProjectSubjectsMembership">;userDAL: Pick<TUserDALFactory, "find">;permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;@@ -105,16 +98,6 @@ export const secretChangePolicyBridgeServiceFactory = ({return toSecretChangePolicy(row);};- const $findEnvPolicies = async (projectId: string, environment: string, tx?: Knex) => {- const env = await projectEnvDAL.findOne({ slug: environment, projectId }, tx);- if (!env) {- throw new NotFoundError({- message: `Environment with slug '${environment}' not found in project with ID ${projectId}`- });- }- return findSecretChangePoliciesByEnvId(env.id, tx);- };-const createSecretChangePolicy: TSecretChangePolicyBridgeMethods["createSecretChangePolicy"] = async ({name,actor,@@ -364,72 +347,6 @@ export const secretChangePolicyBridgeServiceFactory = ({return { ...policy, deletedAt: new Date() };};- const getSecretChangePolicy: TSecretChangePolicyBridgeMethods["getSecretChangePolicy"] = async (- projectId,- environment,- path,- tx- ) => {- const policies = await $findEnvPolicies(projectId, environment, tx);- return resolvePolicyForPath(policies, removeTrailingSlash(path));- };-- const getSecretChangePolicyByPaths: TSecretChangePolicyBridgeMethods["getSecretChangePolicyByPaths"] = async (- projectId,- environment,- secretPaths,- tx- ) => {- const policyByPath = new Map<string, TSecretChangePolicy>();- const policies = await $findEnvPolicies(projectId, environment, tx);- if (!policies.length) return policyByPath;-- for (const path of secretPaths) {- const policy = resolvePolicyForPath(policies, removeTrailingSlash(path));- if (policy) policyByPath.set(path, policy);- }- return policyByPath;- };-- const getSecretChangePolicyByProjectId: TSecretChangePolicyBridgeMethods["getSecretChangePolicyByProjectId"] =- async ({ actor, actorId, actorOrgId, actorAuthMethod, projectId }) => {- const { permission } = await permissionService.getProjectPermission({- actor,- actorId,- projectId,- actorAuthMethod,- actorOrgId,- actionProjectType: ActionProjectType.SecretManager- });- ForbiddenError.from(permission).throwUnlessCan(- ProjectPermissionActions.Read,- ProjectPermissionSub.SecretApproval- );-- return findSecretChangePoliciesByProjectId(projectId);- };-- const getSecretChangePolicyOfFolder: TSecretChangePolicyBridgeMethods["getSecretChangePolicyOfFolder"] = async ({- projectId,- actor,- actorId,- actorOrgId,- actorAuthMethod,- environment,- secretPath- }) => {- await permissionService.getProjectPermission({- actor,- actorId,- projectId,- actorAuthMethod,- actorOrgId,- actionProjectType: ActionProjectType.SecretManager- });-- return getSecretChangePolicy(projectId, environment, secretPath);- };-const getSecretChangePolicyById: TSecretChangePolicyBridgeMethods["getSecretChangePolicyById"] = async ({actor,actorId,@@ -461,10 +378,6 @@ export const secretChangePolicyBridgeServiceFactory = ({createSecretChangePolicy,updateSecretChangePolicy,deleteSecretChangePolicy,- getSecretChangePolicy,- getSecretChangePolicyByPaths,- getSecretChangePolicyByProjectId,- getSecretChangePolicyOfFolder,getSecretChangePolicyById};};diff --git a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-types.ts b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-types.tsindex 5b0ee156f0..cd5b82ef82 100644--- a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-types.ts+++ b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-types.ts@@ -6,9 +6,7 @@ import { ApproverType, BypasserType } from "../access-approval-policy/access-appimport {TCreateSapDTO,TDeleteSapDTO,- TGetBoardSapDTO,TGetSapByIdDTO,- TListSapDTO,TUpdateSapDTO} from "../secret-approval-policy/secret-approval-policy-types";@@ -33,19 +31,5 @@ export type TSecretChangePolicyBridgeMethods = {findSecretChangePolicyById: (policyId: string, tx?: Knex) => Promise<TSecretChangePolicy | undefined>;findSecretChangePoliciesByEnvId: (envId: string, tx?: Knex) => Promise<TSecretChangePolicy[]>;findSecretChangePoliciesByProjectId: (projectId: string) => Promise<TSecretChangePolicy[]>;- getSecretChangePolicy: (- projectId: string,- environment: string,- path: string,- tx?: Knex- ) => Promise<TSecretChangePolicy | undefined>;- getSecretChangePolicyByPaths: (- projectId: string,- environment: string,- secretPaths: string[],- tx?: Knex- ) => Promise<Map<string, TSecretChangePolicy>>;- getSecretChangePolicyByProjectId: (dto: TListSapDTO) => Promise<TSecretChangePolicy[]>;- getSecretChangePolicyOfFolder: (dto: TGetBoardSapDTO) => Promise<TSecretChangePolicy | undefined>;getSecretChangePolicyById: (dto: TGetSapByIdDTO) => Promise<TSecretChangePolicy>;};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.tsindex 7c7a711852..f1dc5ca1f7 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@@ -95,7 +95,7 @@ export const toSecretChangeRequestBase = ({secretChangeRequest: TSecretChangeRequests;}): Omit<TSecretChangeRequest, "commits"> => ({id: approvalRequest.id,- policyId: approvalRequest.policyId ?? "",+ policyId: approvalRequest.policyId ?? null,status: approvalRequest.status,hasMerged: secretChangeRequest.hasMerged,conflicts: secretChangeRequest.conflicts ?? null,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.tsindex 55177e64b5..25676541c3 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,7 +25,10 @@ import {// generic request envelope holds no data of its own.export type TSecretChangeRequestData = Record<string, never>;-export type TSecretChangeRequest = TSecretApprovalRequests & { commits: TSecretApprovalRequestsSecretsV2[] };+export type TSecretChangeRequest = Omit<TSecretApprovalRequests, "policyId"> & {+ policyId: string | null;+ commits: TSecretApprovalRequestsSecretsV2[];+};export type TSecretChangeRequestCommitInsert = Omit<TSecretApprovalRequestsSecretsV2Insert,