mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-09 23:28:31 +00:00
feat: reptile review fixed
This commit is contained in:
@@ -787,6 +787,7 @@ export const secretApprovalRequestServiceFactory = ({
|
|||||||
},
|
},
|
||||||
tx
|
tx
|
||||||
);
|
);
|
||||||
|
await secretV2BridgeDAL.invalidateSecretCacheByProjectId(projectId, tx);
|
||||||
return {
|
return {
|
||||||
secrets: { created: newSecrets, updated: updatedSecrets, deleted: deletedSecret },
|
secrets: { created: newSecrets, updated: updatedSecrets, deleted: deletedSecret },
|
||||||
approval: updatedSecretApproval
|
approval: updatedSecretApproval
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ const MAX_RETRY_ON_FAILURE = 3;
|
|||||||
export const keyValueStoreDALFactory = (db: TDbClient): TKeyValueStoreDALFactory => {
|
export const keyValueStoreDALFactory = (db: TDbClient): TKeyValueStoreDALFactory => {
|
||||||
const keyValueStoreOrm = ormify(db, TableName.KeyValueStore);
|
const keyValueStoreOrm = ormify(db, TableName.KeyValueStore);
|
||||||
|
|
||||||
const incrementBy: TKeyValueStoreDALFactory["incrementBy"] = (key, { incr = 1, tx, expiresAt }) => {
|
const incrementBy: TKeyValueStoreDALFactory["incrementBy"] = async (key, { incr = 1, tx, expiresAt }) => {
|
||||||
return (tx || db)(TableName.KeyValueStore)
|
return (tx || db)(TableName.KeyValueStore)
|
||||||
.insert({ key, integerValue: 1, expiresAt })
|
.insert({ key, integerValue: 1, expiresAt })
|
||||||
.onConflict("key")
|
.onConflict("key")
|
||||||
@@ -27,7 +27,8 @@ export const keyValueStoreDALFactory = (db: TDbClient): TKeyValueStoreDALFactory
|
|||||||
integerValue: db.raw(`"${TableName.KeyValueStore}"."integerValue" + ?`, [incr]),
|
integerValue: db.raw(`"${TableName.KeyValueStore}"."integerValue" + ?`, [incr]),
|
||||||
expiresAt
|
expiresAt
|
||||||
})
|
})
|
||||||
.returning("integerValue");
|
.returning("integerValue")
|
||||||
|
.then((result) => Number(result[0]?.integerValue || 0));
|
||||||
};
|
};
|
||||||
|
|
||||||
const findOneInt: TKeyValueStoreDALFactory["findOneInt"] = async (key, tx) => {
|
const findOneInt: TKeyValueStoreDALFactory["findOneInt"] = async (key, tx) => {
|
||||||
@@ -44,7 +45,6 @@ export const keyValueStoreDALFactory = (db: TDbClient): TKeyValueStoreDALFactory
|
|||||||
return Number(doc?.integerValue || 0);
|
return Number(doc?.integerValue || 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
// delete all audit log that have expired
|
|
||||||
const pruneExpiredKeys: TKeyValueStoreDALFactory["pruneExpiredKeys"] = async () => {
|
const pruneExpiredKeys: TKeyValueStoreDALFactory["pruneExpiredKeys"] = async () => {
|
||||||
let deletedIds: { key: string }[] = [];
|
let deletedIds: { key: string }[] = [];
|
||||||
let numberOfRetryOnFailure = 0;
|
let numberOfRetryOnFailure = 0;
|
||||||
|
|||||||
@@ -278,7 +278,7 @@ export const ormify = <DbOps extends object, Tname extends keyof Tables>(
|
|||||||
}
|
}
|
||||||
if ($decr) {
|
if ($decr) {
|
||||||
Object.entries($decr).forEach(([incrementField, incrementValue]) => {
|
Object.entries($decr).forEach(([incrementField, incrementValue]) => {
|
||||||
void query.increment(incrementField, incrementValue as number);
|
void query.decrement(incrementField, incrementValue as number);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return (await query) as Tables[Tname]["base"][];
|
return (await query) as Tables[Tname]["base"][];
|
||||||
|
|||||||
@@ -661,7 +661,7 @@ describe("folderCommitServiceFactory", () => {
|
|||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
expect(mockFolderCommitDAL.create).toHaveBeenCalled();
|
expect(mockFolderCommitDAL.create).toHaveBeenCalled();
|
||||||
expect(mockSecretV2BridgeDAL.invalidateSecretCacheByProjectId).toHaveBeenCalledWith(projectId);
|
expect(mockSecretV2BridgeDAL.invalidateSecretCacheByProjectId).toHaveBeenCalledWith(projectId, {});
|
||||||
|
|
||||||
// Check that we got the right counts
|
// Check that we got the right counts
|
||||||
expect(result.totalChanges).toEqual(2);
|
expect(result.totalChanges).toEqual(2);
|
||||||
|
|||||||
Reference in New Issue
Block a user