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

adjustment: removed artificial limiting of pit versions

Browse Source
This commit is contained in:
Sheen Capadngan
2024-06-04 23:46:02 +08:00
parent 68a30f4212
commit f21a13f388
5 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/secret-snapshot/secret-snapshot-service.ts
+2 -16
View File
@@ -4,7 +4,6 @@ import { TableName, TSecretTagJunctionInsert } from "@app/db/schemas";
import { BadRequestError, InternalServerError } from "@app/lib/errors";
import { groupBy } from "@app/lib/fn";
import { logger } from "@app/lib/logger";
import { TProjectDALFactory } from "@app/services/project/project-dal";
import { TSecretDALFactory } from "@app/services/secret/secret-dal";
import { TSecretVersionDALFactory } from "@app/services/secret/secret-version-dal";
import { TSecretVersionTagDALFactory } from "@app/services/secret/secret-version-tag-dal";
@@ -38,7 +37,6 @@ type TSecretSnapshotServiceFactoryDep = {
folderDAL: Pick<TSecretFolderDALFactory, "findById" | "findBySecretPath" | "delete" | "insertMany" | "find">;
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
licenseService: Pick<TLicenseServiceFactory, "isValidLicense">;
projectDAL: Pick<TProjectDALFactory, "findById">;
};
export type TSecretSnapshotServiceFactory = ReturnType<typeof secretSnapshotServiceFactory>;
@@ -50,7 +48,6 @@ export const secretSnapshotServiceFactory = ({
snapshotSecretDAL,
snapshotFolderDAL,
folderDAL,
projectDAL,
secretDAL,
permissionService,
licenseService,
@@ -84,9 +81,7 @@ export const secretSnapshotServiceFactory = ({
const folder = await folderDAL.findBySecretPath(projectId, environment, path);
if (!folder) throw new BadRequestError({ message: "Folder not found" });
const project = await projectDAL.findById(projectId);
const count = await snapshotDAL.countOfSnapshotsByFolderId(folder.id);
return Math.min(count, project.pitVersionLimit);
return snapshotDAL.countOfSnapshotsByFolderId(folder.id);
};
const listSnapshots = async ({
@@ -118,16 +113,7 @@ export const secretSnapshotServiceFactory = ({
const folder = await folderDAL.findBySecretPath(projectId, environment, path);
if (!folder) throw new BadRequestError({ message: "Folder not found" });
const { pitVersionLimit } = await projectDAL.findById(projectId);
const computedQueryLimit = Math.min(pitVersionLimit - offset, limit);
if (offset > pitVersionLimit || computedQueryLimit <= 0) {
return [];
}
const snapshots = await snapshotDAL.find(
{ folderId: folder.id },
{ limit: computedQueryLimit, offset, sort: [["createdAt", "desc"]] }
);
const snapshots = await snapshotDAL.find({ folderId: folder.id }, { limit, offset, sort: [["createdAt", "desc"]] });
return snapshots;
};
backend/src/ee/services/secret-snapshot/snapshot-dal.ts
-1
View File
@@ -341,7 +341,6 @@ export const snapshotDALFactory = (db: TDbClient) => {
.select("id");
const batchEntries = folderBatch.map((folder) => folder.id);
logger.info("UUID offset:", uuidOffset);
if (folderBatch.length) {
try {