awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4909 from Infisical/chore/removes-shouldCheckSecretPermission-column

Browse Source 
[ENG-4178] chore: removes `shouldCheckSecretPermission` column
This commit is contained in:
Piyush Gupta
2025-11-21 02:21:22 +05:30
committed by GitHub
parent 1233ff8a5f 8e6733d42c
commit f37af1e9fb
5 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/db/migrations/20250824192801_backfill-secret-read-compat-flag.ts
View File

@@ -14,13 +14,16 @@ export async function up(knex: Knex): Promise<void> {
if (rows.length > 0) { if (rows.length > 0) {
for (let i = 0; i < rows.length; i += BATCH_SIZE) { for (let i = 0; i < rows.length; i += BATCH_SIZE) {
const batch = rows.slice(i, i + BATCH_SIZE); const batch = rows.slice(i, i + BATCH_SIZE);
const ids = batch.map((row) => row.id);
// eslint-disable-next-line no-await-in-loop // eslint-disable-next-line no-await-in-loop
await knex(TableName.SecretApprovalPolicy) await knex.raw(
.whereIn( `
"id", UPDATE ??
batch.map((row) => row.id) SET ?? = true
) WHERE ?? IN (${ids.map(() => "?").join(",")})
.update({ shouldCheckSecretPermission: true }); `,
[TableName.SecretApprovalPolicy, "shouldCheckSecretPermission", "id", ids]
);
} }
} }
} }

19
backend/src/db/migrations/20251119213350_remove-should-check-secret-permission.ts Normal file
View File

@@ -0,0 +1,19 @@
import { Knex } from "knex";
import { TableName } from "../schemas";
export async function up(knex: Knex): Promise<void> {
if (await knex.schema.hasColumn(TableName.SecretApprovalPolicy, "shouldCheckSecretPermission")) {
await knex.schema.alterTable(TableName.SecretApprovalPolicy, (t) => {
t.dropColumn("shouldCheckSecretPermission");
});
}
}
export async function down(knex: Knex): Promise<void> {
if (!(await knex.schema.hasColumn(TableName.SecretApprovalPolicy, "shouldCheckSecretPermission"))) {
await knex.schema.alterTable(TableName.SecretApprovalPolicy, (t) => {
t.boolean("shouldCheckSecretPermission").nullable();
});
}
}

3
backend/src/db/schemas/secret-approval-policies.ts
View File

@@ -17,8 +17,7 @@ export const SecretApprovalPoliciesSchema = z.object({
updatedAt: z.date(), updatedAt: z.date(),
enforcementLevel: z.string().default("hard"), enforcementLevel: z.string().default("hard"),
deletedAt: z.date().nullable().optional(), deletedAt: z.date().nullable().optional(),
allowedSelfApprovals: z.boolean().default(true), allowedSelfApprovals: z.boolean().default(true)
shouldCheckSecretPermission: z.boolean().nullable().optional()
}); });
export type TSecretApprovalPolicies = z.infer<typeof SecretApprovalPoliciesSchema>; export type TSecretApprovalPolicies = z.infer<typeof SecretApprovalPoliciesSchema>;

3
backend/src/ee/routes/v1/secret-approval-request-router.ts
View File

@@ -305,8 +305,7 @@ export const registerSecretApprovalRequestRouter = async (server: FastifyZodProv
secretPath: z.string().optional().nullable(), secretPath: z.string().optional().nullable(),
enforcementLevel: z.string(), enforcementLevel: z.string(),
deletedAt: z.date().nullish(), deletedAt: z.date().nullish(),
allowedSelfApprovals: z.boolean(), allowedSelfApprovals: z.boolean()
shouldCheckSecretPermission: z.boolean().nullable().optional()
}), }),
environment: z.string(), environment: z.string(),
statusChangedByUser: approvalRequestUser.optional(), statusChangedByUser: approvalRequestUser.optional(),

9
backend/src/ee/services/secret-approval-request/secret-approval-request-dal.ts
View File

@@ -181,11 +181,7 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
tx.ref("enforcementLevel").withSchema(TableName.SecretApprovalPolicy).as("policyEnforcementLevel"), tx.ref("enforcementLevel").withSchema(TableName.SecretApprovalPolicy).as("policyEnforcementLevel"),
tx.ref("allowedSelfApprovals").withSchema(TableName.SecretApprovalPolicy).as("policyAllowedSelfApprovals"), tx.ref("allowedSelfApprovals").withSchema(TableName.SecretApprovalPolicy).as("policyAllowedSelfApprovals"),
tx.ref("approvals").withSchema(TableName.SecretApprovalPolicy).as("policyApprovals"), tx.ref("approvals").withSchema(TableName.SecretApprovalPolicy).as("policyApprovals"),
tx.ref("deletedAt").withSchema(TableName.SecretApprovalPolicy).as("policyDeletedAt"), tx.ref("deletedAt").withSchema(TableName.SecretApprovalPolicy).as("policyDeletedAt")
tx
.ref("shouldCheckSecretPermission")
.withSchema(TableName.SecretApprovalPolicy)
.as("policySecretReadAccessCompat")
); );
const findById = async (id: string, tx?: Knex) => { const findById = async (id: string, tx?: Knex) => {
@@ -225,8 +221,7 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
enforcementLevel: el.policyEnforcementLevel, enforcementLevel: el.policyEnforcementLevel,
envId: el.policyEnvId, envId: el.policyEnvId,
deletedAt: el.policyDeletedAt, deletedAt: el.policyDeletedAt,
allowedSelfApprovals: el.policyAllowedSelfApprovals, allowedSelfApprovals: el.policyAllowedSelfApprovals
shouldCheckSecretPermission: el.policySecretReadAccessCompat
} }
}), }),
childrenMapper: [ childrenMapper: [