mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 13:27:46 +00:00
Merge pull request #2970 from Infisical/misc/add-secret-key-indicator-for-failed-integrations-when-possible
misc: add secret key indicator for failed AWS integration syncs
This commit is contained in:
@@ -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));
|
||||||
|
|||||||
@@ -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
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user