Skip to content

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

Revert "fix(secret-sync): serialize writes to the same cloudflare worker"

DimitrisStaratzisab694c4a9f96
diff --git a/backend/src/keystore/keystore.ts b/backend/src/keystore/keystore.ts
index 242b389c05..c78303d43f 100644
--- a/backend/src/keystore/keystore.ts
+++ b/backend/src/keystore/keystore.ts
@@ -61,8 +61,6 @@ export const KeyStorePrefixes = {
SyncSecretIntegrationLastRunTimestamp: (projectId: string, environmentSlug: string, secretPath: string) =>
`sync-integration-last-run-${projectId}-${environmentSlug}-${secretPath}` as const,
SecretSyncLock: (syncId: string) => `secret-sync-mutex-${syncId}` as const,
- CloudflareWorkerSyncLock: (connectionId: string, scriptId: string) =>
- `secret-sync-cloudflare-worker-mutex-${connectionId}-${scriptId}` as const,
PkiSyncLock: (syncId: string) => `pki-sync-mutex-${syncId}` as const,
PkiSyncFilterLock: (syncId: string) => `pki-sync-filter-mutex-${syncId}` as const,
AppConnectionConcurrentJobs: (connectionId: string, targetHost?: string) =>
diff --git a/backend/src/services/secret-sync/secret-sync-fns.test.ts b/backend/src/services/secret-sync/secret-sync-fns.test.ts
deleted file mode 100644
index efc383b471..0000000000
--- a/backend/src/services/secret-sync/secret-sync-fns.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { KeyStorePrefixes } from "@app/keystore/keystore";
-
-import { SecretSync } from "./secret-sync-enums";
-import { getSecretSyncWriteLockKeys } from "./secret-sync-fns";
-
-vi.mock("@app/lib/config/env", () => ({ getConfig: () => ({}) }));
-
-describe("getSecretSyncWriteLockKeys", () => {
- test("locks a Cloudflare Workers sync on its Worker as well as on itself", () => {
- expect(
- getSecretSyncWriteLockKeys({
- id: "sync-a",
- destination: SecretSync.CloudflareWorkers,
- connectionId: "conn",
- destinationConfig: { scriptId: "my-worker" }
- })
- ).toEqual([
- KeyStorePrefixes.SecretSyncLock("sync-a"),
- KeyStorePrefixes.CloudflareWorkerSyncLock("conn", "my-worker")
- ]);
- });
-
- test("locks other syncs on themselves only", () => {
- expect(
- getSecretSyncWriteLockKeys({
- id: "sync-b",
- destination: SecretSync.CloudflarePages,
- connectionId: "conn",
- destinationConfig: { projectName: "site", environment: "production" }
- })
- ).toEqual([KeyStorePrefixes.SecretSyncLock("sync-b")]);
- });
-});
diff --git a/backend/src/services/secret-sync/secret-sync-fns.ts b/backend/src/services/secret-sync/secret-sync-fns.ts
index 38c19d3247..6d19b89574 100644
--- a/backend/src/services/secret-sync/secret-sync-fns.ts
+++ b/backend/src/services/secret-sync/secret-sync-fns.ts
@@ -7,7 +7,6 @@ import { TLicenseServiceFactory } from "@app/ee/services/license/license-service
import { CHEF_SYNC_LIST_OPTION } from "@app/ee/services/secret-sync/chef";
import { chefPreSaveTransformDestinationConfig, ChefSyncFns } from "@app/ee/services/secret-sync/chef/chef-sync-fns";
import { OCI_VAULT_SYNC_LIST_OPTION, OCIVaultSyncFns } from "@app/ee/services/secret-sync/oci-vault";
-import { KeyStorePrefixes } from "@app/keystore/keystore";
import { BadRequestError } from "@app/lib/errors";
import {
AWS_PARAMETER_STORE_SYNC_LIST_OPTION,
@@ -28,7 +27,6 @@ import {
TPreSaveTransformSyncOptionsFn,
TPreSaveTransformSyncOptionsParams,
TSecretMap,
- TSecretSync,
TSecretSyncListItem,
TSecretSyncWithCredentials,
TSyncSecretsResult
@@ -57,11 +55,7 @@ import { CLOUD66_SYNC_LIST_OPTION, Cloud66SyncFns } from "./cloud66";
import { CLOUDFLARE_PAGES_SYNC_LIST_OPTION } from "./cloudflare-pages/cloudflare-pages-constants";
import { CloudflarePagesSyncFns } from "./cloudflare-pages/cloudflare-pages-fns";
import { CLOUDFLARE_SECRETS_STORE_SYNC_LIST_OPTION, CloudflareSecretsStoreSyncFns } from "./cloudflare-secrets-store";
-import {
- CLOUDFLARE_WORKERS_SYNC_LIST_OPTION,
- CloudflareWorkersSyncFns,
- TCloudflareWorkersSync
-} from "./cloudflare-workers";
+import { CLOUDFLARE_WORKERS_SYNC_LIST_OPTION, CloudflareWorkersSyncFns } from "./cloudflare-workers";
import { DAYTONA_SYNC_LIST_OPTION, DaytonaSyncFns } from "./daytona";
import { DEVIN_SYNC_LIST_OPTION, DevinSyncFns } from "./devin";
import {
@@ -754,22 +748,6 @@ export const SecretSyncFns = {
const MAX_MESSAGE_LENGTH = 1024;
-// Cloudflare Workers variables are written as the Worker's full binding list, so two syncs writing to one
-// Worker at the same time would each drop what the other just wrote. Every write job on a Worker shares one
-// lock; other destinations only need the per-sync lock.
-export const getSecretSyncWriteLockKeys = (
- secretSync: Pick<TSecretSync, "id" | "destination" | "connectionId" | "destinationConfig">
-) => {
- const keys: string[] = [KeyStorePrefixes.SecretSyncLock(secretSync.id)];
-
- if (secretSync.destination === SecretSync.CloudflareWorkers) {
- const { scriptId } = secretSync.destinationConfig as TCloudflareWorkersSync["destinationConfig"];
- keys.push(KeyStorePrefixes.CloudflareWorkerSyncLock(secretSync.connectionId, scriptId));
- }
-
- return keys;
-};
-
export const parseSyncErrorMessage = (err: unknown): string => {
let errorMessage: string;
diff --git a/backend/src/services/secret-sync/secret-sync-queue.ts b/backend/src/services/secret-sync/secret-sync-queue.ts
index 41b87e32f6..a09cca8754 100644
--- a/backend/src/services/secret-sync/secret-sync-queue.ts
+++ b/backend/src/services/secret-sync/secret-sync-queue.ts
@@ -42,12 +42,7 @@ import {
SecretSyncInitialSyncBehavior
} from "@app/services/secret-sync/secret-sync-enums";
import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";
-import {
- enterpriseSyncCheck,
- getSecretSyncWriteLockKeys,
- parseSyncErrorMessage,
- SecretSyncFns
-} from "@app/services/secret-sync/secret-sync-fns";
+import { enterpriseSyncCheck, parseSyncErrorMessage, SecretSyncFns } from "@app/services/secret-sync/secret-sync-fns";
import { SECRET_SYNC_DAILY_RETRY_DESTINATIONS, SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";
import { buildSyncPayload, getAncestorPaths } from "@app/services/secret-sync/secret-sync-recursive-fns";
import {
@@ -1238,9 +1233,7 @@ export const secretSyncQueueFactory = ({
try {
lock = await keyStore.acquireLock(
- job.name === QueueJobs.SecretSyncImportSecrets
- ? [KeyStorePrefixes.SecretSyncLock(syncId)]
- : getSecretSyncWriteLockKeys(secretSync),
+ [KeyStorePrefixes.SecretSyncLock(syncId)],
// scott: not sure on this duration; syncs can take excessive amounts of time so we need to keep it locked,
// but should always release below...
5 * 60 * 1000