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

misc: addressed import knex issue

Browse Source
This commit is contained in:
Sheen Capadngan
2024-10-04 22:15:39 +08:00
parent d669320385
commit 6bfeac5e98
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/audit-log/audit-log-dal.ts
+5 -4
View File
@@ -1,4 +1,5 @@
import { Knex, knex } from "knex"; // weird commonjs-related error in the CI requires us to use this kind of import
import * as kx from "knex";
import { TDbClient } from "@app/db"; import { TDbClient } from "@app/db";
import { TableName } from "@app/db/schemas"; import { TableName } from "@app/db/schemas";
@@ -46,7 +47,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
eventType?: EventType[]; eventType?: EventType[];
eventMetadata?: Record<string, string>; eventMetadata?: Record<string, string>;
}, },
tx?: Knex tx?: kx.Knex
) => { ) => {
if (!orgId && !projectId) { if (!orgId && !projectId) {
throw new Error("Either orgId or projectId must be provided"); throw new Error("Either orgId or projectId must be provided");
@@ -110,7 +111,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
return docs; return docs;
} catch (error) { } catch (error) {
if (error instanceof knex.KnexTimeoutError) { if (error instanceof kx.KnexTimeoutError) {
throw new BadRequestError({ throw new BadRequestError({
error, error,
message: "Failed to fetch audit logs due to timeout. Add more search filters." message: "Failed to fetch audit logs due to timeout. Add more search filters."
@@ -122,7 +123,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
}; };
// delete all audit log that have expired // delete all audit log that have expired
const pruneAuditLog = async (tx?: Knex) => { const pruneAuditLog = async (tx?: kx.Knex) => {
const AUDIT_LOG_PRUNE_BATCH_SIZE = 10000; const AUDIT_LOG_PRUNE_BATCH_SIZE = 10000;
const MAX_RETRY_ON_FAILURE = 3; const MAX_RETRY_ON_FAILURE = 3;