awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 18:27:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: finalized pruning logic

Browse Source
This commit is contained in:
Sheen Capadngan
2024-05-31 21:38:16 +08:00
parent 3a1168c7e8
commit 9117067ab5
3 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/secret-snapshot/snapshot-dal.ts
+10 -11
View File
@@ -349,20 +349,19 @@ export const snapshotDALFactory = (db: TDbClient) => {
) )
.as("ranked_snapshots"); .as("ranked_snapshots");
const folderLimits = (tx || db)(TableName.Snapshot)
.join(TableName.Environment, `${TableName.Environment}.id`, `${TableName.Snapshot}.envId`)
.join(TableName.Project, `${TableName.Project}.id`, `${TableName.Environment}.projectId`)
.whereIn(`${TableName.Snapshot}.folderId`, folderBatch)
.groupBy(`${TableName.Snapshot}.folderId`, `${TableName.Project}.pitVersionLimit`)
.select("folderId", "pitVersionLimit")
.as("folder_limits");
const snapshotsToKeep = (tx || db) const snapshotsToKeep = (tx || db)
.select("id") .select("id")
.from(rankedSnapshots) .from(rankedSnapshots)
.where( .join(folderLimits, "folder_limits.folderId", "ranked_snapshots.folderId")
"row_num", .whereRaw(`ranked_snapshots.row_num <= folder_limits."pitVersionLimit"`);
"<=",
(tx || db)
.select(`${TableName.Project}.pitVersionLimit`)
.from(TableName.Project)
.join(TableName.Environment, `${TableName.Environment}.projectId`, `${TableName.Project}.id`)
.join(TableName.Snapshot, `${TableName.Snapshot}.envId`, `${TableName.Environment}.id`)
.join(rankedSnapshots, "ranked_snapshots.folderId", `${TableName.Snapshot}.folderId`)
.limit(1)
);
await (tx || db)(TableName.Snapshot) await (tx || db)(TableName.Snapshot)
.whereIn("folderId", folderBatch) .whereIn("folderId", folderBatch)
backend/src/services/secret-folder/secret-folder-version-dal.ts
+35 -1
View File
@@ -62,5 +62,39 @@ export const secretFolderVersionDALFactory = (db: TDbClient) => {
} }
}; };
return { ...secretFolderVerOrm, findLatestFolderVersions, findLatestVersionByFolderId }; const pruneExcessVersions = async (tx?: Knex) => {
try {
const rankedFolderVersions = (tx || db)(TableName.SecretFolderVersion)
.select(
"id",
"folderId",
(tx || db).raw(
`ROW_NUMBER() OVER (PARTITION BY ${TableName.SecretFolderVersion}."folderId" ORDER BY ${TableName.SecretFolderVersion}."createdAt" DESC) AS row_num`
)
)
.as("ranked_folder_versions");
const folderLimits = (tx || db)(TableName.SecretFolderVersion)
.join(TableName.Environment, `${TableName.Environment}.id`, `${TableName.SecretFolderVersion}.envId`)
.join(TableName.Project, `${TableName.Project}.id`, `${TableName.Environment}.projectId`)
.groupBy(`${TableName.SecretFolderVersion}.folderId`, `${TableName.Project}.pitVersionLimit`)
.select("folderId", "pitVersionLimit")
.as("folder_limits");
const versionsToKeep = (tx || db)(rankedFolderVersions)
.select("id")
.from(rankedFolderVersions)
.join(folderLimits, "folder_limits.folderId", "ranked_folder_versions.folderId")
.whereRaw(`ranked_folder_versions.row_num <= folder_limits."pitVersionLimit"`);
await (tx || db)(TableName.SecretFolderVersion).whereNotIn("id", versionsToKeep).delete();
} catch (error) {
throw new DatabaseError({
error,
name: "Secret Version Prune"
});
}
};
return { ...secretFolderVerOrm, findLatestFolderVersions, findLatestVersionByFolderId, pruneExcessVersions };
}; };
backend/src/services/secret/secret-version-dal.ts
+11 -11
View File
@@ -123,19 +123,19 @@ export const secretVersionDALFactory = (db: TDbClient) => {
) )
.as("ranked_secret_versions"); .as("ranked_secret_versions");
const folderLimits = (tx || db)(TableName.SecretVersion)
.join(TableName.SecretFolder, `${TableName.SecretFolder}.id`, `${TableName.SecretVersion}.folderId`)
.join(TableName.Environment, `${TableName.Environment}.id`, `${TableName.SecretFolder}.envId`)
.join(TableName.Project, `${TableName.Project}.id`, `${TableName.Environment}.projectId`)
.groupBy(`${TableName.SecretVersion}.folderId`, `${TableName.Project}.pitVersionLimit`)
.select("folderId", "pitVersionLimit")
.as("folder_limits");
const versionsToKeep = (tx || db)(rankedSecretVersions) const versionsToKeep = (tx || db)(rankedSecretVersions)
.select("id") .select("id")
.where( .from(rankedSecretVersions)
"row_num", .join(folderLimits, "folder_limits.folderId", "ranked_secret_versions.folderId")
"<=", .whereRaw(`ranked_secret_versions.row_num <= folder_limits."pitVersionLimit"`);
(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(); await (tx || db)(TableName.SecretVersion).whereNotIn("id", versionsToKeep).delete();
} catch (error) { } catch (error) {