Compare commits

..

2 Commits

Author SHA1 Message Date
Sheen Capadngan
36a5f728a1 misc: add secret key indicator for failed AWS integration syncs 2025-01-11 00:00:17 +08:00
Sheen
27abfa4fff Merge pull request #2966 from Infisical/misc/add-pagination-handling-for-gitlab-groups-fetch
misc: add pagination handling for gitlab groups fetch
2025-01-10 19:15:38 +08:00
2 changed files with 11 additions and 4 deletions

View File

@@ -1289,7 +1289,10 @@ const syncSecretsAWSSecretManager = async ({
if (metadata.mappingBehavior === IntegrationMappingBehavior.ONE_TO_ONE) { if (metadata.mappingBehavior === IntegrationMappingBehavior.ONE_TO_ONE) {
for await (const [key, value] of Object.entries(secrets)) { for await (const [key, value] of Object.entries(secrets)) {
await processAwsSecret(key, value.value, value.secretMetadata); await processAwsSecret(key, value.value, value.secretMetadata).catch((error) => {
error.secretKey = key;
throw error;
});
} }
} else { } else {
await processAwsSecret(integration.app as string, getSecretKeyValuePair(secrets)); await processAwsSecret(integration.app as string, getSecretKeyValuePair(secrets));

View File

@@ -971,6 +971,8 @@ export const secretQueueFactory = ({
}); });
} }
const { secretKey } = (err as { secretKey: string }) || {};
const message = const message =
// eslint-disable-next-line no-nested-ternary // eslint-disable-next-line no-nested-ternary
(err instanceof AxiosError (err instanceof AxiosError
@@ -979,6 +981,8 @@ export const secretQueueFactory = ({
: err?.message : err?.message
: (err as Error)?.message) || "Unknown error occurred."; : (err as Error)?.message) || "Unknown error occurred.";
const errorLog = `${secretKey ? `[Secret Key: ${secretKey}] ` : ""}${message}`;
await auditLogService.createAuditLog({ await auditLogService.createAuditLog({
projectId, projectId,
actor: await $generateActor(actorId, isManual), actor: await $generateActor(actorId, isManual),
@@ -989,7 +993,7 @@ export const secretQueueFactory = ({
isSynced: false, isSynced: false,
lastSyncJobId: job?.id ?? "", lastSyncJobId: job?.id ?? "",
lastUsed: new Date(), lastUsed: new Date(),
syncMessage: message syncMessage: errorLog
} }
} }
}); });
@@ -1001,13 +1005,13 @@ export const secretQueueFactory = ({
await integrationDAL.updateById(integration.id, { await integrationDAL.updateById(integration.id, {
lastSyncJobId: job.id, lastSyncJobId: job.id,
syncMessage: message, syncMessage: errorLog,
isSynced: false isSynced: false
}); });
integrationsFailedToSync.push({ integrationsFailedToSync.push({
integrationId: integration.id, integrationId: integration.id,
syncMessage: message syncMessage: errorLog
}); });
} }
} }