awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 23:52:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: added initial version pruning and result limiting

Browse Source
This commit is contained in:
Sheen Capadngan
2024-05-31 19:12:55 +08:00
parent b801c1e48f
commit 3a1168c7e8
8 changed files with 140 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/project/project-service.ts
+2 -1
View File
@@ -133,7 +133,8 @@ export const projectServiceFactory = ({
name: workspaceName,
orgId: organization.id,
slug: projectSlug || slugify(`${workspaceName}-${alphaNumericNanoId(4)}`),
version: ProjectVersion.V2
version: ProjectVersion.V2,
pitVersionLimit: 10
},
tx
);
backend/src/services/secret/secret-service.ts
+11 -2
View File
@@ -72,7 +72,7 @@ type TSecretServiceFactoryDep = {
secretDAL: TSecretDALFactory;
secretTagDAL: TSecretTagDALFactory;
secretVersionDAL: TSecretVersionDALFactory;
projectDAL: Pick<TProjectDALFactory, "checkProjectUpgradeStatus" | "findProjectBySlug">;
projectDAL: Pick<TProjectDALFactory, "checkProjectUpgradeStatus" | "findProjectBySlug" | "findById">;
projectEnvDAL: Pick<TProjectEnvDALFactory, "findOne">;
folderDAL: Pick<
TSecretFolderDALFactory,
@@ -1354,7 +1354,16 @@ export const secretServiceFactory = ({
);
ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Read, ProjectPermissionSub.SecretRollback);
const secretVersions = await secretVersionDAL.find({ secretId }, { offset, limit, sort: [["createdAt", "desc"]] });
const { pitVersionLimit } = await projectDAL.findById(folder.projectId);
const computedQueryLimit = Math.min(pitVersionLimit - offset, limit);
if (offset > pitVersionLimit || computedQueryLimit <= 0) {
return [];
}
const secretVersions = await secretVersionDAL.find(
{ secretId },
{ offset, limit: computedQueryLimit, sort: [["createdAt", "desc"]] }
);
return secretVersions;
};
backend/src/services/secret/secret-version-dal.ts
+37
View File
@@ -110,8 +110,45 @@ export const secretVersionDALFactory = (db: TDbClient) => {
}
};
const pruneExcessVersions = async (tx?: Knex) => {
try {
const rankedSecretVersions = (tx || db)(TableName.SecretVersion)
.select(
"id",
"secretId",
"folderId",
(tx || db).raw(
`ROW_NUMBER() OVER (PARTITION BY ${TableName.SecretVersion}."secretId" ORDER BY ${TableName.SecretVersion}."createdAt" DESC) AS row_num`
)
)
.as("ranked_secret_versions");
const versionsToKeep = (tx || db)(rankedSecretVersions)
.select("id")
.where(
"row_num",
"<=",
(tx || db)
.select(`${TableName.Project}.pitVersionLimit`)
.from(TableName.Project)
.join(TableName.Environment, `${TableName.Environment}.projectId`, `${TableName.Project}.id`)
.join(TableName.SecretFolder, `${TableName.SecretFolder}.envId`, `${TableName.Environment}.id`)
.join(rankedSecretVersions, "ranked_secret_versions.folderId", `${TableName.SecretFolder}.id`)
.limit(1)
);
await (tx || db)(TableName.SecretVersion).whereNotIn("id", versionsToKeep).delete();
} catch (error) {
throw new DatabaseError({
error,
name: "Secret Version Prune"
});
}
};
return {
...secretVersionOrm,
pruneExcessVersions,
findLatestVersionMany,
bulkUpdate,
findLatestVersionByFolderId,