Skip to content

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

address comments

adilsonf0500a74c629
diff --git a/backend/src/lib/logger/logger.ts b/backend/src/lib/logger/logger.ts
index b61fd31a3b..b31acfad51 100644
--- a/backend/src/lib/logger/logger.ts
+++ b/backend/src/lib/logger/logger.ts
@@ -94,8 +94,7 @@ const outgoingRequestRedactPaths = [
"request.path",
"*.request.path",
"*.*.request.path",
- "*.*.response.config",
- "*.*.*.response.config"
+ "*.*.*.config"
];
// redact until depth of three
diff --git a/backend/src/services/secret-sync/secret-sync-queue.ts b/backend/src/services/secret-sync/secret-sync-queue.ts
index 510c1a5c04..b5a8fff605 100644
--- a/backend/src/services/secret-sync/secret-sync-queue.ts
+++ b/backend/src/services/secret-sync/secret-sync-queue.ts
@@ -683,13 +683,7 @@ export const secretSyncQueueFactory = ({
data: { syncId, auditLogInfo, importBehavior }
} = job;
- await secretSyncDAL.updateById(
- syncId,
- {
- importStatus: SecretSyncStatus.Running
- },
- { includeFolderPath: false }
- );
+ await secretSyncDAL.update({ id: syncId }, { importStatus: SecretSyncStatus.Running });
logger.info(
`SecretSync Import [syncId=${secretSync.id}] [destination=${secretSync.destination}] [projectId=${secretSync.projectId}] [folderId=${secretSync.folderId}] [connectionId=${secretSync.connectionId}]`
@@ -1296,6 +1290,17 @@ export const secretSyncQueueFactory = ({
return;
}
+ if (secretSync.connectionId !== connectionId && job.name === QueueJobs.SecretSyncSyncSecrets) {
+ logger.info(
+ `SecretSync connection changed, releasing slot and requeueing [syncId=${syncId}] [job=${job.name}] [connectionId=${connectionId}] [currentConnectionId=${secretSync.connectionId}]`
+ );
+
+ await $releaseConnectionConcurrency(connectionId);
+ await $handleAcquireLockFailure(job as SecretSyncActionJob);
+
+ return;
+ }
+
switch (job.name) {
case QueueJobs.SecretSyncSyncSecrets: {
await $handleSyncSecretsJob(job as TSecretSyncSyncSecretsDTO, secretSync);
diff --git a/backend/src/services/secret-sync/vercel/vercel-sync-fns.test.ts b/backend/src/services/secret-sync/vercel/vercel-sync-fns.test.ts
index fa9ecdbdbd..99e8d2b62a 100644
--- a/backend/src/services/secret-sync/vercel/vercel-sync-fns.test.ts
+++ b/backend/src/services/secret-sync/vercel/vercel-sync-fns.test.ts
@@ -93,24 +93,19 @@ describe("Vercel errors that retrying can't fix", () => {
post.mockReset();
});
it.each([
- ["BAD_REQUEST", false, "65,535-byte limit"],
- ["env_key_invalid_characters", false, "Rename the secret"],
- ["envs_size_too_large", false, "no space left"],
- ["some_other_error", true, ""]
- ])("sets shouldRetry and the message when a create fails with %s", async (code, shouldRetry, message) => {
+ ["BAD_REQUEST", false],
+ ["env_key_invalid_characters", false],
+ ["envs_size_too_large", false],
+ ["some_other_error", true]
+ ])("sets shouldRetry and the message when a create fails with %s", async (code, shouldRetry) => {
get.mockResolvedValue({ data: { envs: [] } });
post.mockRejectedValue(vercelError(code));
const error = await VercelSyncFns.syncSecrets(sync, payloadOf(["API_KEY"])).catch((err: unknown) => err);
expect(error).toMatchObject({
shouldRetry,
secretKey: "API_KEY",
- message: (message ? expect.stringContaining(message) : expect.any(String)) as string
+ message: shouldRetry ? "" : "Vercel rejected the request"
});
- if (message) {
- expect(error).toMatchObject({
- message: expect.stringContaining("https://vercel.com/docs/rest-api/errors") as string
- });
- }
});
it("stops retrying a read that fails with a listed code", async () => {
get.mockRejectedValue(vercelError("bad_request"));
diff --git a/backend/src/services/secret-sync/vercel/vercel-sync-fns.ts b/backend/src/services/secret-sync/vercel/vercel-sync-fns.ts
index 7e644ecc92..f5a0bfda6b 100644
--- a/backend/src/services/secret-sync/vercel/vercel-sync-fns.ts
+++ b/backend/src/services/secret-sync/vercel/vercel-sync-fns.ts
@@ -24,15 +24,9 @@ const MAX_RETRIES = 5;
const RATE_LIMIT_DELAY_MS = 60000;
// Vercel answers with these codes when a request can never succeed as sent, so retrying only repeats the
-// failure. Each maps to the message shown as the sync's error.
-const NON_RETRYABLE_VERCEL_ERRORS: Record<string, string> = {
- bad_request:
- "Vercel rejected this environment variable as invalid, for example because its name and value together are larger than Vercel's 65,535-byte limit. Fix the secret in Infisical, then sync again. Check the error code on https://vercel.com/docs/rest-api/errors.",
- env_key_invalid_characters:
- "Vercel rejected this environment variable's name. Names can only contain letters, digits and underscores, and cannot start with a digit. Rename the secret or change the sync's key schema, then sync again. Check the error code on https://vercel.com/docs/rest-api/errors.",
- envs_size_too_large:
- "Vercel has no space left for environment variables in this project. Remove environment variables you no longer need in Vercel, then sync again. Check the error code on https://vercel.com/docs/rest-api/errors."
-};
+// failure. The message shown to the user is the one Vercel returned.
+// the env_size_too_large is a new set of errors that we are seeing, but are not documented yet but it happening in some cases
+const NON_RETRYABLE_VERCEL_ERRORS = new Set(["bad_request", "env_key_invalid_characters", "envs_size_too_large"]);
const sleep = async (ms: number) =>
new Promise((resolve) => {
@@ -53,12 +47,15 @@ const getRateLimitDelayMs = (error: AxiosError) => {
// Vercel isn't consistent about casing, e.g. BAD_REQUEST alongside envs_size_too_large.
const toVercelSyncError = (error: unknown, secretKey?: string) => {
- const code = isAxiosError(error)
- ? String((error.response?.data as { error?: { code?: unknown } } | undefined)?.error?.code ?? "").toLowerCase()
- : "";
- const message = NON_RETRYABLE_VERCEL_ERRORS[code];
-
- return new SecretSyncError({ error, secretKey, shouldRetry: !message, message });
+ const vercelError = isAxiosError(error)
+ ? (error.response?.data as { error?: { code?: unknown; message?: unknown } } | undefined)?.error
+ : undefined;
+ const code = String(vercelError?.code ?? "").toLowerCase();
+ const isNonRetryable = NON_RETRYABLE_VERCEL_ERRORS.has(code);
+ const message =
+ isNonRetryable && typeof vercelError?.message === "string" && vercelError.message ? vercelError.message : undefined;
+
+ return new SecretSyncError({ error, secretKey, shouldRetry: !isNonRetryable, message });
};
const getVercelSecretsWithRetries = async (