Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
feat(secret-sync): make Cloudflare secret types configurable for Pages and Workers
DimitrisStaratzis6b5c339402f8
diff --git a/backend/src/lib/api-docs/constants.ts b/backend/src/lib/api-docs/constants.tsindex 1ab15e6296..74e3f2cdf6 100644--- a/backend/src/lib/api-docs/constants.ts+++ b/backend/src/lib/api-docs/constants.ts@@ -3292,15 +3292,9 @@ export const SecretSyncs = {disableCertificateImport:"Whether Infisical should skip importing certificate objects from Azure Key Vault when syncing secrets."},- CLOUDFLARE_PAGES: {- variableType:- "The type of environment variable to sync secrets as: secret_text (default) or plain_text. Infisical only deletes variables of this type."- },CLOUDFLARE_WORKERS: {syncNonSecretBindings:- "Whether Infisical should also sync plaintext and JSON variable bindings in addition to secret bindings. Only applies when variableType is secret_text.",- variableType:- "The type of variable to sync secrets as: secret_text (default), plain_text or json. With plain_text or json, Infisical replaces any secret or variable of the same name and only deletes variables of that type."+ "Whether Infisical should also sync plaintext and JSON variable bindings in addition to secret bindings. Only applies when variableType is secret_text or omitted."},SPACELIFT: {writeOnly:@@ -3484,10 +3478,14 @@ export const SecretSyncs = {},CLOUDFLARE_PAGES: {projectName: "The name of the Cloudflare Pages project to sync secrets to.",- environment: "The environment of the Cloudflare Pages project to sync secrets to."+ environment: "The environment of the Cloudflare Pages project to sync secrets to.",+ variableType:+ "The type of environment variable to sync secrets as: secret_text (default) or plain_text. Infisical only deletes variables of this type."},CLOUDFLARE_WORKERS: {- scriptId: "The ID of the Cloudflare Workers script to sync secrets to."+ scriptId: "The ID of the Cloudflare Workers script to sync secrets to.",+ variableType:+ "The type of variable to sync secrets as: secret_text, plain_text or json. Infisical replaces any secret or variable of the same name with this type and only deletes variables of this type. If omitted, secrets are synced as secret_text but keys that already exist as plaintext or JSON variables are skipped."},CLOUDFLARE_SECRETS_STORE: {storeId: "The ID of the Cloudflare Secrets Store to sync secrets to.",diff --git a/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-fns.test.ts b/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-fns.test.tsindex 14b3526deb..ba7796ef84 100644--- a/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-fns.test.ts+++ b/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-fns.test.ts@@ -16,12 +16,12 @@ vi.mock("@app/lib/config/request", async (importOriginal) => ({request: { get, patch }}));-const syncWith = (syncOptions: Record<string, unknown>) =>+const syncWith = (variableType?: CloudflarePagesVariableType) =>({destination: "cloudflare-pages",- destinationConfig: { projectName: "my-site", environment: "production" },+ destinationConfig: { projectName: "my-site", environment: "production", variableType },environment: { slug: "prod" },- syncOptions: { disableSecretDeletion: false, ...syncOptions },+ syncOptions: { disableSecretDeletion: false },connection: { credentials: { apiToken: "token", accountId: "account-id" } }}) as unknown as TCloudflarePagesSyncWithCredentials;@@ -52,7 +52,7 @@ describe("CloudflarePagesSyncFns", () => {});await CloudflarePagesSyncFns.syncSecrets(- syncWith({ variableType: CloudflarePagesVariableType.Text }),+ syncWith(CloudflarePagesVariableType.Text),payloadOf({ API_URL: "https://api.example.com" }));diff --git a/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-fns.ts b/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-fns.tsindex 47602ed32d..92ab9082cd 100644--- a/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-fns.ts+++ b/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-fns.ts@@ -11,11 +11,11 @@ import { TCloudflarePagesSyncWithCredentials } from "./cloudflare-pages-types";const getProjectEnvironmentSecrets = async (secretSync: TCloudflarePagesSyncWithCredentials) => {const {destinationConfig,- syncOptions: { variableType = CloudflarePagesVariableType.Secret },connection: {credentials: { apiToken, accountId }}} = secretSync;+ const { variableType = CloudflarePagesVariableType.Secret } = destinationConfig;const secrets = (await request.get<{@@ -52,11 +52,11 @@ export const CloudflarePagesSyncFns = {const secretMap = payload.flatten();const {destinationConfig,- syncOptions: { variableType = CloudflarePagesVariableType.Secret },connection: {credentials: { apiToken, accountId }}} = secretSync;+ const { variableType = CloudflarePagesVariableType.Secret } = destinationConfig;// Create/update secret entrieslet secretEntries: [string, object | null][] = Object.entries(secretMap).map(([key, val]) => [diff --git a/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-schema.ts b/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-schema.tsindex ffc06c5a77..35a55b1b78 100644--- a/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-schema.ts+++ b/backend/src/services/secret-sync/cloudflare-pages/cloudflare-pages-schema.ts@@ -21,22 +21,18 @@ const CloudflarePagesSyncDestinationConfigSchema = z.object({environment: z.string().min(1, "Environment is required")- .describe(SecretSyncs.DESTINATION_CONFIG.CLOUDFLARE_PAGES.environment)-});--const CloudflarePagesSyncAdditionalOptionsSchema = z.object({+ .describe(SecretSyncs.DESTINATION_CONFIG.CLOUDFLARE_PAGES.environment),variableType: z.nativeEnum(CloudflarePagesVariableType).optional()- .describe(SecretSyncs.ADDITIONAL_SYNC_OPTIONS.CLOUDFLARE_PAGES.variableType)+ .describe(SecretSyncs.DESTINATION_CONFIG.CLOUDFLARE_PAGES.variableType)});const CloudflarePagesSyncOptionsConfig: TSyncOptionsConfig = { canImportSecrets: false };export const CloudflarePagesSyncSchema = BaseSecretSyncSchema(SecretSync.CloudflarePages,- CloudflarePagesSyncOptionsConfig,- CloudflarePagesSyncAdditionalOptionsSchema+ CloudflarePagesSyncOptionsConfig).extend({destination: z.literal(SecretSync.CloudflarePages),@@ -46,16 +42,14 @@ export const CloudflarePagesSyncSchema = BaseSecretSyncSchema(export const CreateCloudflarePagesSyncSchema = GenericCreateSecretSyncFieldsSchema(SecretSync.CloudflarePages,- CloudflarePagesSyncOptionsConfig,- CloudflarePagesSyncAdditionalOptionsSchema+ CloudflarePagesSyncOptionsConfig).extend({destinationConfig: CloudflarePagesSyncDestinationConfigSchema});export const UpdateCloudflarePagesSyncSchema = GenericUpdateSecretSyncFieldsSchema(SecretSync.CloudflarePages,- CloudflarePagesSyncOptionsConfig,- CloudflarePagesSyncAdditionalOptionsSchema+ CloudflarePagesSyncOptionsConfig).extend({destinationConfig: CloudflarePagesSyncDestinationConfigSchema.optional()});diff --git a/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-fns.test.ts b/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-fns.test.tsindex b988b11f2a..82f3577c3d 100644--- a/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-fns.test.ts+++ b/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-fns.test.ts@@ -18,12 +18,12 @@ vi.mock("@app/lib/config/request", async (importOriginal) => ({type TBinding = { type: string; name: string; text?: string; json?: unknown };-const syncWith = (syncOptions: Record<string, unknown>) =>+const syncWith = (variableType?: CloudflareWorkersVariableType) =>({destination: "cloudflare-workers",- destinationConfig: { scriptId: "my-worker" },+ destinationConfig: { scriptId: "my-worker", variableType },environment: { slug: "prod" },- syncOptions: { disableSecretDeletion: false, ...syncOptions },+ syncOptions: { disableSecretDeletion: false },connection: { credentials: { apiToken: "token", accountId: "account-id" } }}) as unknown as TCloudflareWorkersSyncWithCredentials;@@ -39,8 +39,8 @@ const stubWorker = (bindings: TBinding[]) =>: { data: { result: { bindings } } });-const patchedBindings = async () => {- const [, formData] = patch.mock.calls[0] as [string, FormData];+const patchedBindings = async (call = 0) => {+ const [, formData] = patch.mock.calls[call] as [string, FormData];return (JSON.parse(await (formData.get("settings") as Blob).text()) as { bindings: TBinding[] }).bindings;};@@ -58,7 +58,7 @@ describe("CloudflareWorkersSyncFns", () => {]);await CloudflareWorkersSyncFns.syncSecrets(- syncWith({ variableType: CloudflareWorkersVariableType.Text }),+ syncWith(CloudflareWorkersVariableType.Text),payloadOf({ API_KEY: "key", NEW_VAR: "new" }));@@ -75,7 +75,7 @@ describe("CloudflareWorkersSyncFns", () => {it("rejects values that are not JSON before calling Cloudflare", async () => {await expect(CloudflareWorkersSyncFns.syncSecrets(- syncWith({ variableType: CloudflareWorkersVariableType.Json }),+ syncWith(CloudflareWorkersVariableType.Json),payloadOf({ VALID: '{"a":1}', BROKEN: "not json" }))).rejects.toThrow("cannot be synced as Cloudflare Workers JSON variables: BROKEN.");@@ -83,6 +83,43 @@ describe("CloudflareWorkersSyncFns", () => {expect(get).not.toHaveBeenCalled();});+ it("refuses to replace a non-variable binding with the same name", async () => {+ stubWorker([{ type: "kv_namespace", name: "CACHE" }]);++ await expect(+ CloudflareWorkersSyncFns.syncSecrets(syncWith(CloudflareWorkersVariableType.Text), payloadOf({ CACHE: "value" }))+ ).rejects.toThrow("same name as another binding on the Cloudflare Worker, such as a KV namespace or a service: CACHE.");++ expect(patch).not.toHaveBeenCalled();+ });++ it("converts a same-name text variable into a secret when Secret is chosen", async () => {+ stubWorker([+ { type: "plain_text", name: "API_URL", text: "old" },+ { type: "kv_namespace", name: "CACHE" }+ ]);++ await CloudflareWorkersSyncFns.syncSecrets(+ syncWith(CloudflareWorkersVariableType.Secret),+ payloadOf({ API_URL: "new" })+ );++ expect(patch).toHaveBeenCalledTimes(2);+ expect(await patchedBindings(0)).toEqual([{ type: "kv_namespace", name: "CACHE" }]);+ expect(patch.mock.calls[1][0]).toMatch(/\/secrets-bulk$/);+ expect(patch.mock.calls[1][1]).toEqual({+ secrets: { API_URL: { name: "API_URL", text: "new", type: "secret_text" } }+ });+ });++ it("keeps skipping same-name text variables for syncs saved without a type", async () => {+ stubWorker([{ type: "plain_text", name: "API_URL", text: "old" }]);++ await CloudflareWorkersSyncFns.syncSecrets(syncWith(), payloadOf({ API_URL: "new" }));++ expect(patch).not.toHaveBeenCalled();+ });+it("removes only variables of the sync's type", async () => {stubWorker([{ type: "plain_text", name: "TEXT_VAR", text: "a" },@@ -90,7 +127,7 @@ describe("CloudflareWorkersSyncFns", () => {]);await CloudflareWorkersSyncFns.removeSecrets(- syncWith({ variableType: CloudflareWorkersVariableType.Text }),+ syncWith(CloudflareWorkersVariableType.Text),payloadOf({ TEXT_VAR: "a", SECRET_VAR: "b" }));diff --git a/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-fns.ts b/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-fns.tsindex b506e3a7f2..9b9b6968bf 100644--- a/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-fns.ts+++ b/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-fns.ts@@ -15,6 +15,7 @@ import { TCloudflareWorkersSyncWithCredentials } from "./cloudflare-workers-typeconst CLOUDFLARE_UNDEPLOYED_VERSION_ERROR_CODE = 10215;const CLOUDFLARE_SECRET_TYPE = "secret_text";+const VARIABLE_BINDING_TYPES = new Set<string>(Object.values(CloudflareWorkersVariableType));// Cloudflare rejects secrets-bulk requests carrying more than 100 secrets (error code 100160).const CLOUDFLARE_BULK_SECRETS_LIMIT = 100;@@ -154,13 +155,13 @@ const $getManagedBindings = (secretSync: TCloudflareWorkersSyncWithCredentials,{ secrets, nonSecretBindings }: TCloudflareBindings) => {- const { variableType = CloudflareWorkersVariableType.Secret, syncNonSecretBindings } = secretSync.syncOptions;+ const { variableType = CloudflareWorkersVariableType.Secret } = secretSync.destinationConfig;if (variableType !== CloudflareWorkersVariableType.Secret) {return nonSecretBindings.filter((binding) => binding.type === variableType);}- return syncNonSecretBindings ? [...secrets, ...nonSecretBindings] : secrets;+ return secretSync.syncOptions.syncNonSecretBindings ? [...secrets, ...nonSecretBindings] : secrets;};// Text and JSON variables are bindings in the Worker's settings, which take the full binding list. One@@ -219,8 +220,21 @@ const $syncVariableBindings = async (}});+ const existingBindings = settingsData.result.bindings ?? [];++ const conflictingKeys = existingBindings+ .filter((binding) => secretMapKeys.has(binding.name) && !VARIABLE_BINDING_TYPES.has(binding.type))+ .map((binding) => binding.name);++ if (conflictingKeys.length > 0) {+ throw new SecretSyncError({+ message: `The following secrets have the same name as another binding on the Cloudflare Worker, such as a KV namespace or a service: ${conflictingKeys.join(", ")}. Rename the secrets in Infisical, or use a key schema to change their names in Cloudflare.`,+ shouldRetry: false+ });+ }+const bindings = [- ...settingsData.result.bindings.filter((binding) => !secretMapKeys.has(binding.name) && !isDeleted(binding)),+ ...existingBindings.filter((binding) => !secretMapKeys.has(binding.name) && !isDeleted(binding)),...variableBindings];@@ -245,11 +259,10 @@ export const CloudflareWorkersSyncFns = {connection: {credentials: { apiToken, accountId }},- destinationConfig: { scriptId },- syncOptions: { variableType = CloudflareWorkersVariableType.Secret }+ destinationConfig: { scriptId, variableType }} = secretSync;- if (variableType !== CloudflareWorkersVariableType.Secret) {+ if (variableType === CloudflareWorkersVariableType.Text || variableType === CloudflareWorkersVariableType.Json) {await $syncVariableBindings(secretSync, secretMap, variableType);return;}@@ -263,12 +276,17 @@ export const CloudflareWorkersSyncFns = {const existingSecretsMap = Object.fromEntries(existingSecrets.map(({ key, type }) => [key, type]));const secretMapKeys = new Set(Object.keys(secretMap));- // We cannot sync secrets that have the same name as a non-secret- // if shouldSyncNonSecretBindings = false. This happens because- // Cloudflare will reject the request due to name conflicts. A secret- // cannot have the same name as a non-secret variable.+ // Cloudflare rejects a secret with the same name as a plaintext or JSON variable. A sync with Secret+ // chosen explicitly removes those variables so it can write the secrets. Syncs saved before the type+ // could be chosen keep skipping those keys, unless shouldSyncNonSecretBindings updates them in place.+ const bindingKeysToConvert = new Set(+ variableType === CloudflareWorkersVariableType.Secret && !shouldSyncNonSecretBindings+ ? Object.keys(secretMap).filter((key) => nonSecretBindingKeys.has(key))+ : []+ );+const syncableEntries = Object.entries(secretMap).filter(- ([key]) => shouldSyncNonSecretBindings || !nonSecretBindingKeys.has(key)+ ([key]) => shouldSyncNonSecretBindings || bindingKeysToConvert.has(key) || !nonSecretBindingKeys.has(key));const bindingEntries: Array<[string, { value: string }]> = [];@@ -284,7 +302,7 @@ export const CloudflareWorkersSyncFns = {}try {- if (bindingEntries.length > 0) {+ if (bindingEntries.length > 0 || bindingKeysToConvert.size > 0) {const { data: settingsData } = await request.get<{result: { bindings: Array<{ type: string; name: string; text?: string; json?: string }> };}>(@@ -301,7 +319,9 @@ export const CloudflareWorkersSyncFns = {$validateJsonBindings(settingsData.result.bindings, updatedBindingMap);- const updatedBindings = settingsData.result.bindings.map((binding) => {+ const keptBindings = settingsData.result.bindings.filter((binding) => !bindingKeysToConvert.has(binding.name));++ const updatedBindings = keptBindings.map((binding) => {if (binding.type !== CLOUDFLARE_SECRET_TYPE && updatedBindingMap[binding.name] !== undefined) {const newValue = updatedBindingMap[binding.name].value;if (binding.type === "json") {diff --git a/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-schemas.ts b/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-schemas.tsindex 5e129134e9..da9e2a94a9 100644--- a/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-schemas.ts+++ b/backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-schemas.ts@@ -23,18 +23,18 @@ const CloudflareWorkersSyncDestinationConfigSchema = z.object({const re2 = new RE2(/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/);return re2.test(val);}, "Invalid script ID format")- .describe(SecretSyncs.DESTINATION_CONFIG.CLOUDFLARE_WORKERS.scriptId)+ .describe(SecretSyncs.DESTINATION_CONFIG.CLOUDFLARE_WORKERS.scriptId),+ variableType: z+ .nativeEnum(CloudflareWorkersVariableType)+ .optional()+ .describe(SecretSyncs.DESTINATION_CONFIG.CLOUDFLARE_WORKERS.variableType)});const CloudflareWorkersSyncAdditionalOptionsSchema = z.object({syncNonSecretBindings: z.boolean().optional()- .describe(SecretSyncs.ADDITIONAL_SYNC_OPTIONS.CLOUDFLARE_WORKERS.syncNonSecretBindings),- variableType: z- .nativeEnum(CloudflareWorkersVariableType)- .optional()- .describe(SecretSyncs.ADDITIONAL_SYNC_OPTIONS.CLOUDFLARE_WORKERS.variableType)+ .describe(SecretSyncs.ADDITIONAL_SYNC_OPTIONS.CLOUDFLARE_WORKERS.syncNonSecretBindings)});const CloudflareWorkersSyncOptionsConfig: TSyncOptionsConfig = { canImportSecrets: false };diff --git a/backend/src/services/secret-sync/secret-sync-maps.ts b/backend/src/services/secret-sync/secret-sync-maps.tsindex 42dbd2074e..14aa259c84 100644--- a/backend/src/services/secret-sync/secret-sync-maps.ts+++ b/backend/src/services/secret-sync/secret-sync-maps.ts@@ -2,6 +2,8 @@ import { AppConnection } from "@app/services/app-connection/app-connection-enumsimport { buildAwsConnectionConfig, getAwsAccountId } from "@app/services/app-connection/aws/aws-connection-fns";import { TAwsConnection } from "@app/services/app-connection/aws/aws-connection-types";import { TDaytonaConnection } from "@app/services/app-connection/daytona";+import { CloudflarePagesVariableType } from "@app/services/secret-sync/cloudflare-pages/cloudflare-pages-constants";+import { CloudflareWorkersVariableType } from "@app/services/secret-sync/cloudflare-workers/cloudflare-workers-constants";import { GcpSyncScope } from "@app/services/secret-sync/gcp/gcp-sync-enums";import { SecretSync, SecretSyncPlanType } from "@app/services/secret-sync/secret-sync-enums";import { DestinationDuplicateCheckFn } from "@app/services/secret-sync/secret-sync-types";@@ -200,8 +202,8 @@ export const SECRET_SYNC_SKIP_FIELDS_MAP: Record<SecretSync, string[]> = {"groupId","projectId"],- [SecretSync.CloudflarePages]: [],- [SecretSync.CloudflareWorkers]: [],+ [SecretSync.CloudflarePages]: ["variableType"],+ [SecretSync.CloudflareWorkers]: ["variableType"],[SecretSync.CloudflareSecretsStore]: ["storeName", "scopes"],[SecretSync.Supabase]: ["projectName"],[SecretSync.Rundeck]: [],@@ -280,6 +282,14 @@ const daytonaDuplicateCheck: DestinationDuplicateCheckFn = async ({ existingSyncreturn existingOrgId === newOrgId;};+// Syncs of different variable types own different variables, so they can share a destination. Syncs saved+// before the type could be chosen have none and sync as secrets.+const cloudflareVariableTypeDuplicateCheck =+ (defaultVariableType: string): DestinationDuplicateCheckFn =>+ async ({ existingSync, newSync }) =>+ (existingSync.destinationConfig.variableType ?? defaultVariableType) ===+ (newSync.destinationConfig.variableType ?? defaultVariableType);+const gcpDuplicateCheck: DestinationDuplicateCheckFn = async ({ existingSync, newSync }) => {const existingConfig = existingSync.destinationConfig;const newConfig = newSync.destinationConfig;@@ -343,8 +353,8 @@ export const DESTINATION_DUPLICATE_CHECK_MAP: Record<SecretSync, DestinationDuplreturn existingTargetEnv === newTargetEnv;},- [SecretSync.CloudflarePages]: defaultDuplicateCheck,- [SecretSync.CloudflareWorkers]: defaultDuplicateCheck,+ [SecretSync.CloudflarePages]: cloudflareVariableTypeDuplicateCheck(CloudflarePagesVariableType.Secret),+ [SecretSync.CloudflareWorkers]: cloudflareVariableTypeDuplicateCheck(CloudflareWorkersVariableType.Secret),[SecretSync.CloudflareSecretsStore]: defaultDuplicateCheck,[SecretSync.Supabase]: defaultDuplicateCheck,[SecretSync.Rundeck]: defaultDuplicateCheck,diff --git a/docs/integrations/secret-syncs/cloudflare-workers.mdx b/docs/integrations/secret-syncs/cloudflare-workers.mdxindex 43c876c977..4970e68f6f 100644--- a/docs/integrations/secret-syncs/cloudflare-workers.mdx+++ b/docs/integrations/secret-syncs/cloudflare-workers.mdx@@ -46,10 +46,6 @@ description: "Learn how to configure a Cloudflare Workers Sync for Infisical."- **Text**: Plain text that you can read in the Cloudflare dashboard- **JSON**: A JSON value that your Worker receives already parsed (each secret value must be valid JSON)- <Note>- If you change a sync from **Text** or **JSON** to **Secret**, Infisical doesn't convert the existing text or JSON variables into secrets. To convert them, first select **Remove Secrets** in the sync's options menu. Then change the type and sync again.- </Note>-6. Configure the **Details** of your Cloudflare Workers Sync, then click **Next**.diff --git a/frontend/src/components/secret-syncs/forms/SecretSyncOptionsFields/CloudflarePagesSyncOptionsFields.tsx b/frontend/src/components/secret-syncs/forms/SecretSyncOptionsFields/CloudflarePagesSyncOptionsFields.tsxindex 4900b3428c..293e2334e2 100644--- a/frontend/src/components/secret-syncs/forms/SecretSyncOptionsFields/CloudflarePagesSyncOptionsFields.tsx+++ b/frontend/src/components/secret-syncs/forms/SecretSyncOptionsFields/CloudflarePagesSyncOptionsFields.tsx@@ -25,7 +25,7 @@ export const CloudflarePagesSyncOptionsFields = () => {return (<Controller- name="syncOptions.variableType"+ name="destinationConfig.variableType"control={control}defaultValue={CloudflarePagesVariableType.Secret}render={({ field: { value, onChange }, fieldState: { error } }) => (diff --git a/frontend/src/components/secret-syncs/forms/SecretSyncOptionsFields/CloudflareWorkersSyncOptionsFields.tsx b/frontend/src/components/secret-syncs/forms/SecretSyncOptionsFields/CloudflareWorkersSyncOptionsFields.tsxindex 772836f20e..7acb501bd1 100644--- a/frontend/src/components/secret-syncs/forms/SecretSyncOptionsFields/CloudflareWorkersSyncOptionsFields.tsx+++ b/frontend/src/components/secret-syncs/forms/SecretSyncOptionsFields/CloudflareWorkersSyncOptionsFields.tsx@@ -31,12 +31,15 @@ export const CloudflareWorkersSyncOptionsFields = () => {const disableSecretDeletion = watch("syncOptions.disableSecretDeletion");const syncNonSecretBindings = watch("syncOptions.syncNonSecretBindings");- const variableType = watch("syncOptions.variableType", CloudflareWorkersVariableType.Secret);+ const variableType = watch(+ "destinationConfig.variableType",+ CloudflareWorkersVariableType.Secret+ );return (<><Controller- name="syncOptions.variableType"+ name="destinationConfig.variableType"control={control}defaultValue={CloudflareWorkersVariableType.Secret}render={({ field: { value, onChange }, fieldState: { error } }) => (@@ -80,9 +83,8 @@ export const CloudflareWorkersSyncOptionsFields = () => {Sync plaintext and JSON variables</Label><FieldDescription>- When enabled, Infisical will also sync plaintext and JSON variable bindings in- addition to secret bindings. Infisical can only update existing plaintext and- JSON bindings on Cloudflare Workers, not create new ones.+ Keep existing plaintext and JSON variables as their type and update their+ values, instead of converting them to secrets.</FieldDescription></FieldContent><Togglediff --git a/frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/CloudflarePagesReviewFields.tsx b/frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/CloudflarePagesReviewFields.tsxindex c602cb3f5d..ecdb488e1a 100644--- a/frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/CloudflarePagesReviewFields.tsx+++ b/frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/CloudflarePagesReviewFields.tsx@@ -7,7 +7,7 @@ import { SecretSync } from "@app/hooks/api/secretSyncs";export const CloudflarePagesSyncOptionsReviewFields = () => {const { watch } = useFormContext<TSecretSyncForm & { destination: SecretSync.CloudflarePages }>();- const variableType = watch("syncOptions.variableType");+ const variableType = watch("destinationConfig.variableType");return (<Detail>diff --git a/frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/CloudflareWorkersReviewFields.tsx b/frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/CloudflareWorkersReviewFields.tsxindex cbc827032c..59fcaa10f4 100644--- a/frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/CloudflareWorkersReviewFields.tsx+++ b/frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/CloudflareWorkersReviewFields.tsx@@ -11,7 +11,10 @@ export const CloudflareWorkersSyncOptionsReviewFields = () => {TSecretSyncForm & { destination: SecretSync.CloudflareWorkers }>();- const [{ syncNonSecretBindings, variableType }] = watch(["syncOptions"]);+ const [{ syncNonSecretBindings }, variableType] = watch([+ "syncOptions",+ "destinationConfig.variableType"+ ]);return (<>diff --git a/frontend/src/components/secret-syncs/forms/schemas/cloudflare-pages-sync-destination-schema.ts b/frontend/src/components/secret-syncs/forms/schemas/cloudflare-pages-sync-destination-schema.tsindex 48e39dc20a..2d4020124f 100644--- a/frontend/src/components/secret-syncs/forms/schemas/cloudflare-pages-sync-destination-schema.ts+++ b/frontend/src/components/secret-syncs/forms/schemas/cloudflare-pages-sync-destination-schema.ts@@ -4,18 +4,15 @@ import { BaseSecretSyncSchema } from "@app/components/secret-syncs/forms/schemasimport { SecretSync } from "@app/hooks/api/secretSyncs/enums";import { CloudflarePagesVariableType } from "@app/hooks/api/secretSyncs/types/cloudflare-pages-sync";-export const CloudflarePagesSyncDestinationSchema = BaseSecretSyncSchema(- z.object({- variableType: z- .nativeEnum(CloudflarePagesVariableType)- .default(CloudflarePagesVariableType.Secret)- })-).merge(+export const CloudflarePagesSyncDestinationSchema = BaseSecretSyncSchema().merge(z.object({destination: z.literal(SecretSync.CloudflarePages),destinationConfig: z.object({projectName: z.string().trim().min(1, "Project name is required"),- environment: z.string().trim().min(1, "Environment is required")+ environment: z.string().trim().min(1, "Environment is required"),+ variableType: z+ .nativeEnum(CloudflarePagesVariableType)+ .default(CloudflarePagesVariableType.Secret)})}));diff --git a/frontend/src/components/secret-syncs/forms/schemas/cloudflare-workers-sync-destination-schema.ts b/frontend/src/components/secret-syncs/forms/schemas/cloudflare-workers-sync-destination-schema.tsindex 4d51f79ffa..49fb942de0 100644--- a/frontend/src/components/secret-syncs/forms/schemas/cloudflare-workers-sync-destination-schema.ts+++ b/frontend/src/components/secret-syncs/forms/schemas/cloudflare-workers-sync-destination-schema.ts@@ -6,10 +6,7 @@ import { CloudflareWorkersVariableType } from "@app/hooks/api/secretSyncs/types/export const CloudflareWorkersSyncDestinationSchema = BaseSecretSyncSchema(z.object({- syncNonSecretBindings: z.boolean().optional().default(false),- variableType: z- .nativeEnum(CloudflareWorkersVariableType)- .default(CloudflareWorkersVariableType.Secret)+ syncNonSecretBindings: z.boolean().optional().default(false)})).merge(z.object({@@ -20,7 +17,10 @@ export const CloudflareWorkersSyncDestinationSchema = BaseSecretSyncSchema(.trim().min(1, "Script ID is required").max(64)- .regex(/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/, "Invalid script ID format")+ .regex(/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/, "Invalid script ID format"),+ variableType: z+ .nativeEnum(CloudflareWorkersVariableType)+ .default(CloudflareWorkersVariableType.Secret)})}));diff --git a/frontend/src/hooks/api/secretSyncs/types/cloudflare-pages-sync.ts b/frontend/src/hooks/api/secretSyncs/types/cloudflare-pages-sync.tsindex 68278092b9..eed43848af 100644--- a/frontend/src/hooks/api/secretSyncs/types/cloudflare-pages-sync.ts+++ b/frontend/src/hooks/api/secretSyncs/types/cloudflare-pages-sync.ts@@ -1,6 +1,6 @@import { AppConnection } from "@app/hooks/api/appConnections/enums";import { SecretSync } from "@app/hooks/api/secretSyncs";-import { RootSyncOptions, TRootSecretSync } from "@app/hooks/api/secretSyncs/types/root-sync";+import { TRootSecretSync } from "@app/hooks/api/secretSyncs/types/root-sync";export enum CloudflarePagesVariableType {Secret = "secret_text",@@ -12,13 +12,11 @@ export type TCloudflarePagesSync = TRootSecretSync & {destinationConfig: {projectName: string;environment: string;+ variableType?: CloudflarePagesVariableType;};connection: {app: AppConnection.Cloudflare;name: string;id: string;};- syncOptions: RootSyncOptions & {- variableType?: CloudflarePagesVariableType;- };};diff --git a/frontend/src/hooks/api/secretSyncs/types/cloudflare-workers-sync.ts b/frontend/src/hooks/api/secretSyncs/types/cloudflare-workers-sync.tsindex 966eec3b8a..0a9790e9cd 100644--- a/frontend/src/hooks/api/secretSyncs/types/cloudflare-workers-sync.ts+++ b/frontend/src/hooks/api/secretSyncs/types/cloudflare-workers-sync.ts@@ -12,6 +12,7 @@ export type TCloudflareWorkersSync = TRootSecretSync & {destination: SecretSync.CloudflareWorkers;destinationConfig: {scriptId: string;+ variableType?: CloudflareWorkersVariableType;};connection: {app: AppConnection.Cloudflare;@@ -20,6 +21,5 @@ export type TCloudflareWorkersSync = TRootSecretSync & {};syncOptions: RootSyncOptions & {syncNonSecretBindings?: boolean;- variableType?: CloudflareWorkersVariableType;};};diff --git a/frontend/src/pages/secret-manager/SecretSyncDetailsByIDPage/components/SecretSyncOptionsSection/CloudflarePagesSyncOptionsSection.tsx b/frontend/src/pages/secret-manager/SecretSyncDetailsByIDPage/components/SecretSyncOptionsSection/CloudflarePagesSyncOptionsSection.tsxindex 370a3f58f9..089ad5abce 100644--- a/frontend/src/pages/secret-manager/SecretSyncDetailsByIDPage/components/SecretSyncOptionsSection/CloudflarePagesSyncOptionsSection.tsx+++ b/frontend/src/pages/secret-manager/SecretSyncDetailsByIDPage/components/SecretSyncOptionsSection/CloudflarePagesSyncOptionsSection.tsx@@ -11,7 +11,7 @@ type Props = {export const CloudflarePagesSyncOptionsSection = ({ secretSync }: Props) => {const {- syncOptions: { variableType = CloudflarePagesVariableType.Secret }+ destinationConfig: { variableType = CloudflarePagesVariableType.Secret }} = secretSync;return (diff --git a/frontend/src/pages/secret-manager/SecretSyncDetailsByIDPage/components/SecretSyncOptionsSection/CloudflareWorkersSyncOptionsSection.tsx b/frontend/src/pages/secret-manager/SecretSyncDetailsByIDPage/components/SecretSyncOptionsSection/CloudflareWorkersSyncOptionsSection.tsxindex e2c97d0bfb..02c3b26f2c 100644--- a/frontend/src/pages/secret-manager/SecretSyncDetailsByIDPage/components/SecretSyncOptionsSection/CloudflareWorkersSyncOptionsSection.tsx+++ b/frontend/src/pages/secret-manager/SecretSyncDetailsByIDPage/components/SecretSyncOptionsSection/CloudflareWorkersSyncOptionsSection.tsx@@ -11,7 +11,7 @@ type Props = {export const CloudflareWorkersSyncOptionsSection = ({ secretSync }: Props) => {const {- syncOptions: { variableType = CloudflareWorkersVariableType.Secret }+ destinationConfig: { variableType = CloudflareWorkersVariableType.Secret }} = secretSync;return (