Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

refactor(alerts): ask for a primary read instead of handing out a connection

Calvin2f18ac460a00
diff --git a/backend/src/services/alert/providers/secret-reminder-alert-dal.ts b/backend/src/services/alert/providers/secret-reminder-alert-dal.ts
index d46c79f7b3..0ac15ab0f0 100644
--- a/backend/src/services/alert/providers/secret-reminder-alert-dal.ts
+++ b/backend/src/services/alert/providers/secret-reminder-alert-dal.ts
@@ -61,7 +61,5 @@ export const secretReminderAlertDALFactory = (db: TDbClient) => {
}
};
- const primaryNode = () => db.primaryNode();
-
- return { findReminderSecrets, primaryNode };
+ return { findReminderSecrets };
};
diff --git a/backend/src/services/alert/providers/secret-reminder-alert-provider.test.ts b/backend/src/services/alert/providers/secret-reminder-alert-provider.test.ts
index e4b97cdacc..0246ba3024 100644
--- a/backend/src/services/alert/providers/secret-reminder-alert-provider.test.ts
+++ b/backend/src/services/alert/providers/secret-reminder-alert-provider.test.ts
@@ -31,14 +31,17 @@ const buildProvider = (
opts: { secrets?: TReminderSecret[]; rules?: { action: string; subject: string }[]; unresolvedPath?: boolean } = {}
) => {
const permissionCalls: unknown[] = [];
+ const pathLookupOptions: unknown[] = [];
const provider = secretReminderAlertProviderFactory({
secretReminderAlertDAL: {
findReminderSecrets: async (ids: string[]) =>
- (opts.secrets ?? [SECRET]).filter((secret) => ids.includes(secret.secretId)),
- primaryNode: () => ({}) as never
+ (opts.secrets ?? [SECRET]).filter((secret) => ids.includes(secret.secretId))
},
folderDAL: {
- findSecretPathByFolderIds: async () => (opts.unresolvedPath ? [] : [{ id: "folder-1", path: "/payments" }])
+ findSecretPathByFolderIds: async (_projectId: string, _folderIds: string[], _tx: unknown, options: unknown) => {
+ pathLookupOptions.push(options);
+ return opts.unresolvedPath ? [] : [{ id: "folder-1", path: "/payments" }];
+ }
} as never,
permissionService: {
getProjectPermission: async (input: unknown) => {
@@ -54,7 +57,7 @@ const buildProvider = (
}
} as never
});
- return { provider, permissionCalls };
+ return { provider, permissionCalls, pathLookupOptions };
};
const alertContext: TAlertContext = {
@@ -117,6 +120,14 @@ describe("secret reminder alert provider", () => {
expect(await provider.findEventTargets(dueEvent())).toEqual([]);
});
+ // An empty result here marks the event delivered, so a replica that has not seen a new folder would lose
+ // the reminder for good.
+ test("reads folder paths from the primary", async () => {
+ const { provider, pathLookupOptions } = buildProvider();
+ await provider.findEventTargets(dueEvent());
+ expect(pathLookupOptions).toEqual([{ readFromPrimary: true }]);
+ });
+
test("drops a secret whose folder path cannot be resolved", async () => {
const { provider } = buildProvider({ unresolvedPath: true });
expect(await provider.findEventTargets(dueEvent())).toEqual([]);
diff --git a/backend/src/services/alert/providers/secret-reminder-alert-provider.ts b/backend/src/services/alert/providers/secret-reminder-alert-provider.ts
index 95b357977a..739e20d7ae 100644
--- a/backend/src/services/alert/providers/secret-reminder-alert-provider.ts
+++ b/backend/src/services/alert/providers/secret-reminder-alert-provider.ts
@@ -35,7 +35,7 @@ export type TSecretReminderTarget = TReminderSecret & {
};
export type TSecretReminderAlertProviderDep = {
- secretReminderAlertDAL: Pick<TSecretReminderAlertDALFactory, "findReminderSecrets" | "primaryNode">;
+ secretReminderAlertDAL: Pick<TSecretReminderAlertDALFactory, "findReminderSecrets">;
folderDAL: Pick<TSecretFolderDALFactory, "findSecretPathByFolderIds">;
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
};
@@ -69,11 +69,9 @@ export const secretReminderAlertProviderFactory = ({
// The path decides what a permission check allows, so it comes from the primary like the secret:
// a replica that has not seen a new folder would otherwise leave it unresolved.
// eslint-disable-next-line no-await-in-loop -- reminders fire per secret, so this is one project
- const folders = await folderDAL.findSecretPathByFolderIds(
- projectId,
- folderIds,
- secretReminderAlertDAL.primaryNode()
- );
+ const folders = await folderDAL.findSecretPathByFolderIds(projectId, folderIds, undefined, {
+ readFromPrimary: true
+ });
folders.forEach((folder) => {
if (folder?.path) paths.set(folder.id, folder.path);
});
diff --git a/backend/src/services/secret-folder/secret-folder-dal.ts b/backend/src/services/secret-folder/secret-folder-dal.ts
index 946994da34..842998b456 100644
--- a/backend/src/services/secret-folder/secret-folder-dal.ts
+++ b/backend/src/services/secret-folder/secret-folder-dal.ts
@@ -213,9 +213,15 @@ export const secretFolderDALFactory = (db: TDbClient) => {
// this is used to do an inverse query in folders
// that is instances in which for a given folderid find the secret path
- const findSecretPathByFolderIds = async (projectId: string, folderIds: string[], tx?: Knex) => {
+ const findSecretPathByFolderIds = async (
+ projectId: string,
+ folderIds: string[],
+ tx?: Knex,
+ { readFromPrimary = false }: { readFromPrimary?: boolean } = {}
+ ) => {
+ const conn = tx || (readFromPrimary ? db : db.replicaNode());
try {
- const targetFolders = await (tx || db.replicaNode())(TableName.SecretFolder)
+ const targetFolders = await conn(TableName.SecretFolder)
.join(TableName.Environment, `${TableName.SecretFolder}.envId`, `${TableName.Environment}.id`)
.whereIn(`${TableName.SecretFolder}.id`, folderIds)
.where(`${TableName.Environment}.projectId`, projectId)
@@ -230,9 +236,9 @@ export const secretFolderDALFactory = (db: TDbClient) => {
return folderIds.map(() => undefined);
}
- const allEnvFolders = await (tx || db.replicaNode())(TableName.SecretFolder).whereIn(
+ const allEnvFolders = await conn(TableName.SecretFolder).whereIn(
"envId",
- (tx || db.replicaNode())(TableName.SecretFolder)
+ conn(TableName.SecretFolder)
.select("envId")
.join(TableName.Environment, `${TableName.SecretFolder}.envId`, `${TableName.Environment}.id`)
.whereIn(`${TableName.SecretFolder}.id`, folderIds)