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
refactor(secret-sync): pass the secret payload to every provider
Calvin1d31f2bfd403
diff --git a/backend/e2e-test/fakes/aws-parameter-store-sync-fns.ts b/backend/e2e-test/fakes/aws-parameter-store-sync-fns.tsindex e05da7c669..1a2bd93bd5 100644--- a/backend/e2e-test/fakes/aws-parameter-store-sync-fns.ts+++ b/backend/e2e-test/fakes/aws-parameter-store-sync-fns.ts@@ -1,6 +1,7 @@import { TAwsParameterStoreSyncWithCredentials } from "@app/services/secret-sync/aws-parameter-store/aws-parameter-store-sync-types";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";// Type-only, and by a path the aliases do not match, so this does not resolve back to here.@@ -82,7 +83,8 @@ export const fakeParameterStore = {};export const AwsParameterStoreSyncFns = {- syncSecrets: (secretSync: TAwsParameterStoreSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: (secretSync: TAwsParameterStoreSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { syncOptions, environment } = secretSync;const store = storeForSync(secretSync);@@ -137,7 +139,8 @@ export const AwsParameterStoreSyncFns = {Object.fromEntries(Object.entries(storeForSync(secretSync).secrets).map(([key, value]) => [key, { value }]))),- removeSecrets: (secretSync: TAwsParameterStoreSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: (secretSync: TAwsParameterStoreSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const store = storeForSync(secretSync);if (store.writeError) {diff --git a/backend/src/ee/services/secret-sync/chef/chef-sync-fns.ts b/backend/src/ee/services/secret-sync/chef/chef-sync-fns.tsindex 699037973b..3825466ac0 100644--- a/backend/src/ee/services/secret-sync/chef/chef-sync-fns.ts+++ b/backend/src/ee/services/secret-sync/chef/chef-sync-fns.ts@@ -2,6 +2,7 @@ import { getChefDataBagItem, updateChefDataBagItem } from "@app/ee/services/app-import { TGatewayPoolServiceFactory } from "@app/ee/services/gateway-pool/gateway-pool-service";import { TGatewayV2ServiceFactory } from "@app/ee/services/gateway-v2/gateway-v2-service";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import {@@ -127,10 +128,11 @@ const updateChefSecrets = async (export const ChefSyncFns = {async syncSecrets(secretSync: TChefSyncWithCredentials,- secretMap: TSecretMap,+ payload: TSecretSyncPayload,gatewayV2Service: TChefSyncGatewayV2Service,gatewayPoolService: TChefSyncGatewayPoolService) {+ const secretMap = payload.flatten();const {environment,syncOptions: { disableSecretDeletion, keySchema }@@ -179,10 +181,11 @@ export const ChefSyncFns = {async removeSecrets(secretSync: TChefSyncWithCredentials,- secretMap: TSecretMap,+ payload: TSecretSyncPayload,gatewayV2Service: TChefSyncGatewayV2Service,gatewayPoolService: TChefSyncGatewayPoolService) {+ const secretMap = payload.flatten();const gatewayId = await resolveGatewayId(secretSync, gatewayPoolService);const { id, secrets: existingSecrets } = await getChefSecrets(secretSync, gatewayId, gatewayV2Service);diff --git a/backend/src/ee/services/secret-sync/oci-vault/oci-vault-sync-fns.ts b/backend/src/ee/services/secret-sync/oci-vault/oci-vault-sync-fns.tsindex 94423b415f..19e231e817 100644--- a/backend/src/ee/services/secret-sync/oci-vault/oci-vault-sync-fns.ts+++ b/backend/src/ee/services/secret-sync/oci-vault/oci-vault-sync-fns.ts@@ -13,7 +13,7 @@ import {import { delay } from "@app/lib/delay";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";-import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";const listOCIVaultVariables = async ({ provider, compartmentId, vaultId, onlyActive }: TOCIVaultListVariables) => {const vaultsClient = new vault.VaultsClient({ authenticationDetailsProvider: provider });@@ -115,7 +115,8 @@ const unmarkOCIVaultVariableFromDeletion = async ({ provider, secretId }: TUnmar};export const OCIVaultSyncFns = {- syncSecrets: async (secretSync: TOCIVaultSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TOCIVaultSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,environment,@@ -254,7 +255,8 @@ export const OCIVaultSyncFns = {}}},- removeSecrets: async (secretSync: TOCIVaultSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TOCIVaultSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,destinationConfig: { compartmentOcid, vaultOcid }diff --git a/backend/src/services/secret-sync/1password/1password-sync-fns.ts b/backend/src/services/secret-sync/1password/1password-sync-fns.tsindex c2011c1012..0cc881018f 100644--- a/backend/src/services/secret-sync/1password/1password-sync-fns.ts+++ b/backend/src/services/secret-sync/1password/1password-sync-fns.ts@@ -11,7 +11,7 @@ import {} from "@app/services/secret-sync/1password/1password-sync-types";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";-import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";// This should not be changed or it may break existing logicconst VALUE_LABEL_DEFAULT = "value";@@ -142,7 +142,8 @@ const deleteOnePassItem = async ({ instanceUrl, apiToken, vaultId, itemId }: TDe};export const OnePassSyncFns = {- syncSecrets: async (secretSync: TOnePassSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TOnePassSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,environment,@@ -237,7 +238,8 @@ export const OnePassSyncFns = {}}},- removeSecrets: async (secretSync: TOnePassSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TOnePassSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,destinationConfig: { vaultId, valueLabel }diff --git a/backend/src/services/secret-sync/aws-parameter-store/aws-parameter-store-sync-fns.ts b/backend/src/services/secret-sync/aws-parameter-store/aws-parameter-store-sync-fns.tsindex 695640f52b..8081f0ccd8 100644--- a/backend/src/services/secret-sync/aws-parameter-store/aws-parameter-store-sync-fns.ts+++ b/backend/src/services/secret-sync/aws-parameter-store/aws-parameter-store-sync-fns.ts@@ -25,6 +25,7 @@ import { isAwsError } from "@app/lib/aws/error";import { getAwsConnectionConfig } from "@app/services/app-connection/aws/aws-connection-fns";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { TAwsParameterStoreSyncWithCredentials } from "./aws-parameter-store-sync-types";@@ -353,7 +354,8 @@ const deleteParametersBatch = async (};export const AwsParameterStoreSyncFns = {- syncSecrets: async (secretSync: TAwsParameterStoreSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TAwsParameterStoreSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { destinationConfig, syncOptions, environment } = secretSync;const ssm = await getSSM(secretSync);@@ -494,7 +496,8 @@ export const AwsParameterStoreSyncFns = {Object.entries(awsParameterStoreSecretsRecord).map(([key, value]) => [key, { value: value.Value ?? "" }]));},- removeSecrets: async (secretSync: TAwsParameterStoreSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TAwsParameterStoreSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { destinationConfig, syncOptions, environment } = secretSync;const ssm = await getSSM(secretSync);diff --git a/backend/src/services/secret-sync/aws-secrets-manager/aws-secrets-manager-sync-fns.ts b/backend/src/services/secret-sync/aws-secrets-manager/aws-secrets-manager-sync-fns.tsindex 7847920bfe..c3e680ede0 100644--- a/backend/src/services/secret-sync/aws-secrets-manager/aws-secrets-manager-sync-fns.ts+++ b/backend/src/services/secret-sync/aws-secrets-manager/aws-secrets-manager-sync-fns.ts@@ -29,7 +29,7 @@ import { getAwsConnectionConfig } from "@app/services/app-connection/aws/aws-conimport { AwsSecretsManagerSyncMappingBehavior } from "@app/services/secret-sync/aws-secrets-manager/aws-secrets-manager-sync-enums";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";-import { getKeyWithSchema } from "@app/services/secret-sync/secret-sync-payload";+import { getKeyWithSchema, TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { TAwsSecretsManagerSyncWithCredentials } from "./aws-secrets-manager-sync-types";@@ -591,7 +591,8 @@ export const AwsSecretsManagerSyncFns = {});}},- removeSecrets: async (secretSync: TAwsSecretsManagerSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TAwsSecretsManagerSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { destinationConfig, syncOptions, environment } = secretSync;const client = await getSecretsManagerClient(secretSync);diff --git a/backend/src/services/secret-sync/azure-app-configuration/azure-app-configuration-sync-fns.ts b/backend/src/services/secret-sync/azure-app-configuration/azure-app-configuration-sync-fns.tsindex f054d04b84..a3f11a8106 100644--- a/backend/src/services/secret-sync/azure-app-configuration/azure-app-configuration-sync-fns.ts+++ b/backend/src/services/secret-sync/azure-app-configuration/azure-app-configuration-sync-fns.ts@@ -8,6 +8,7 @@ import { getAzureConnectionAccessToken } from "@app/services/app-connection/azurimport { isAzureKeyVaultReference } from "@app/services/integration-auth/integration-sync-secret-fns";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { TAzureAppConfigurationSyncWithCredentials } from "./azure-app-configuration-sync-types";@@ -67,7 +68,8 @@ export const azureAppConfigurationSyncFactory = ({});};- const syncSecrets = async (secretSync: TAzureAppConfigurationSyncWithCredentials, secretMap: TSecretMap) => {+ const syncSecrets = async (secretSync: TAzureAppConfigurationSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();if (!secretSync.destinationConfig.configurationUrl.endsWith(".azconfig.io")) {throw new BadRequestError({message: "Invalid Azure App Configuration URL provided."@@ -155,7 +157,8 @@ export const azureAppConfigurationSyncFactory = ({}};- const removeSecrets = async (secretSync: TAzureAppConfigurationSyncWithCredentials, secretMap: TSecretMap) => {+ const removeSecrets = async (secretSync: TAzureAppConfigurationSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { accessToken } = await getAzureConnectionAccessToken(secretSync.connectionId, appConnectionDAL, kmsService);const azureAppConfigValuesUrl = `/kv?api-version=2023-11-01${diff --git a/backend/src/services/secret-sync/azure-devops/azure-devops-sync-fns.ts b/backend/src/services/secret-sync/azure-devops/azure-devops-sync-fns.tsindex e2447736b0..29bcc82092 100644--- a/backend/src/services/secret-sync/azure-devops/azure-devops-sync-fns.ts+++ b/backend/src/services/secret-sync/azure-devops/azure-devops-sync-fns.ts@@ -5,6 +5,7 @@ import { AzureDevOpsConnectionMethod } from "@app/services/app-connection/azure-import { getAzureDevopsConnection } from "@app/services/app-connection/azure-devops/azure-devops-fns";import { IntegrationUrls } from "@app/services/integration-auth/integration-list";import { TKmsServiceFactory } from "@app/services/kms/kms-service";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { TAzureDevOpsSyncWithCredentials } from "./azure-devops-sync-types";@@ -79,7 +80,8 @@ export const azureDevOpsSyncFactory = ({ kmsService, appConnectionDAL }: TAzureDreturn { groupId: "", groupName: "" };};- const syncSecrets = async (secretSync: TAzureDevOpsSyncWithCredentials, secretMap: TSecretMap) => {+ const syncSecrets = async (secretSync: TAzureDevOpsSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();if (!secretSync.destinationConfig.devopsProjectId) {throw new BadRequestError({message: "Azure DevOps: project ID is required"diff --git a/backend/src/services/secret-sync/azure-entra-id-scim/azure-entra-id-scim-sync-fns.ts b/backend/src/services/secret-sync/azure-entra-id-scim/azure-entra-id-scim-sync-fns.tsindex ad27329bc3..1547affcf9 100644--- a/backend/src/services/secret-sync/azure-entra-id-scim/azure-entra-id-scim-sync-fns.ts+++ b/backend/src/services/secret-sync/azure-entra-id-scim/azure-entra-id-scim-sync-fns.ts@@ -1,6 +1,7 @@import { request } from "@app/lib/config/request";import { BadRequestError } from "@app/lib/errors";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import {TPreSaveTransformDestinationConfigFn,TPreSaveTransformSyncOptionsFn,@@ -20,9 +21,10 @@ type TAzureEntraIdScimSyncFactoryDeps = {export const AzureEntraIdScimSyncFns = {syncSecrets: async (secretSync: TAzureEntraIdScimSyncWithCredentials,- secretMap: TSecretMap,+ payload: TSecretSyncPayload,{ appConnectionDAL, kmsService }: TAzureEntraIdScimSyncFactoryDeps): Promise<void> => {+ const secretMap = payload.flatten();const { servicePrincipalId } = secretSync.destinationConfig;const { secretId } = secretSync.syncOptions;diff --git a/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-sync-fns.ts b/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-sync-fns.tsindex aee8326090..6d60545767 100644--- a/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-sync-fns.ts+++ b/backend/src/services/secret-sync/azure-key-vault/azure-key-vault-sync-fns.ts@@ -11,6 +11,7 @@ import {} from "@app/services/app-connection/azure-key-vault/azure-key-vault-connection-fns";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SecretSyncError } from "../secret-sync-errors";@@ -128,7 +129,8 @@ export const azureKeyVaultSyncFactory = ({};};- const syncSecrets = async (secretSync: TAzureKeyVaultSyncWithCredentials, secretMap: TSecretMap) => {+ const syncSecrets = async (secretSync: TAzureKeyVaultSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { connection } = secretSync;const effectiveGatewayId = await gatewayPoolService.resolveEffectiveGatewayId({@@ -258,7 +260,8 @@ export const azureKeyVaultSyncFactory = ({}};- const removeSecrets = async (secretSync: TAzureKeyVaultSyncWithCredentials, secretMap: TSecretMap) => {+ const removeSecrets = async (secretSync: TAzureKeyVaultSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { connection } = secretSync;const effectiveGatewayId = await gatewayPoolService.resolveEffectiveGatewayId({diff --git a/backend/src/services/secret-sync/bitbucket/bitbucket-sync-fns.ts b/backend/src/services/secret-sync/bitbucket/bitbucket-sync-fns.tsindex 93b285c792..ca13552b4d 100644--- a/backend/src/services/secret-sync/bitbucket/bitbucket-sync-fns.ts+++ b/backend/src/services/secret-sync/bitbucket/bitbucket-sync-fns.ts@@ -10,6 +10,7 @@ import {} from "@app/services/secret-sync/bitbucket/bitbucket-sync-types";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";@@ -130,7 +131,8 @@ const deleteVariables = async ({};export const BitbucketSyncFns = {- syncSecrets: async (secretSync: TBitbucketSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TBitbucketSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,environment,@@ -183,7 +185,8 @@ export const BitbucketSyncFns = {}},- removeSecrets: async (secretSync: TBitbucketSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TBitbucketSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,destinationConfig: { workspaceSlug, repositorySlug, environmentId }diff --git a/backend/src/services/secret-sync/camunda/camunda-sync-fns.ts b/backend/src/services/secret-sync/camunda/camunda-sync-fns.tsindex b0d9f08a6a..296da5843e 100644--- a/backend/src/services/secret-sync/camunda/camunda-sync-fns.ts+++ b/backend/src/services/secret-sync/camunda/camunda-sync-fns.ts@@ -14,7 +14,7 @@ import {import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";-import { TSecretMap } from "../secret-sync-types";+import { TSecretSyncPayload } from "../secret-sync-payload";type TCamundaSecretSyncFactoryDeps = {appConnectionDAL: Pick<TAppConnectionDALFactory, "updateById">;@@ -73,7 +73,8 @@ const updateCamundaSecret = async ({ accessToken, clusterUUID, key, value }: TCa);export const camundaSyncFactory = ({ kmsService, appConnectionDAL }: TCamundaSecretSyncFactoryDeps) => {- const syncSecrets = async (secretSync: TCamundaSyncWithCredentials, secretMap: TSecretMap) => {+ const syncSecrets = async (secretSync: TCamundaSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {destinationConfig: { clusterUUID },connection@@ -137,7 +138,8 @@ export const camundaSyncFactory = ({ kmsService, appConnectionDAL }: TCamundaSec}};- const removeSecrets = async (secretSync: TCamundaSyncWithCredentials, secretMap: TSecretMap) => {+ const removeSecrets = async (secretSync: TCamundaSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {destinationConfig: { clusterUUID },connectiondiff --git a/backend/src/services/secret-sync/checkly/checkly-sync-fns.ts b/backend/src/services/secret-sync/checkly/checkly-sync-fns.tsindex 8227739486..22ec12b447 100644--- a/backend/src/services/secret-sync/checkly/checkly-sync-fns.ts+++ b/backend/src/services/secret-sync/checkly/checkly-sync-fns.ts@@ -7,7 +7,7 @@ import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SecretSyncError } from "../secret-sync-errors";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";-import { TSecretMap } from "../secret-sync-types";+import { TSecretSyncPayload } from "../secret-sync-payload";import { TChecklySyncWithCredentials } from "./checkly-sync-types";export const ChecklySyncFns = {@@ -15,7 +15,8 @@ export const ChecklySyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- async syncSecrets(secretSync: TChecklySyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TChecklySyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {environment,syncOptions: { disableSecretDeletion, keySchema }@@ -141,7 +142,8 @@ export const ChecklySyncFns = {}},- async removeSecrets(secretSync: TChecklySyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TChecklySyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const config = secretSync.destinationConfig;if (config.groupId) {diff --git a/backend/src/services/secret-sync/circleci/circleci-sync-fns.ts b/backend/src/services/secret-sync/circleci/circleci-sync-fns.tsindex f2442874ee..00fa061be0 100644--- a/backend/src/services/secret-sync/circleci/circleci-sync-fns.ts+++ b/backend/src/services/secret-sync/circleci/circleci-sync-fns.ts@@ -7,6 +7,7 @@ import { getCircleCIApiUrl } from "@app/services/app-connection/circleci";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import {@@ -129,7 +130,8 @@ const deleteEnvVar = async (projectId: string, apiToken: string, name: string, a};export const CircleCISyncFns = {- syncSecrets: async (secretSync: TCircleCISyncWithCredentials, secretMap: TSecretMap): Promise<void> => {+ syncSecrets: async (secretSync: TCircleCISyncWithCredentials, payload: TSecretSyncPayload): Promise<void> => {+ const secretMap = payload.flatten();const { destinationConfig, connection } = secretSync;const { projectId, projectName, orgName } = destinationConfig;const { apiToken } = connection.credentials;@@ -189,7 +191,8 @@ export const CircleCISyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- removeSecrets: async (secretSync: TCircleCISyncWithCredentials, secretMap: TSecretMap): Promise<void> => {+ removeSecrets: async (secretSync: TCircleCISyncWithCredentials, payload: TSecretSyncPayload): Promise<void> => {+ const secretMap = payload.flatten();const { destinationConfig, connection } = secretSync;const { projectId, projectName, orgName } = destinationConfig;const { apiToken } = connection.credentials;diff --git a/backend/src/services/secret-sync/cloud66/cloud66-sync-fns.ts b/backend/src/services/secret-sync/cloud66/cloud66-sync-fns.tsindex f881434edf..76d7a57191 100644--- a/backend/src/services/secret-sync/cloud66/cloud66-sync-fns.ts+++ b/backend/src/services/secret-sync/cloud66/cloud66-sync-fns.ts@@ -6,6 +6,7 @@ import {} from "@app/services/app-connection/cloud-66/cloud-66-connection-fns";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { TCloud66EnvVar, TCloud66SyncWithCredentials } from "./cloud66-sync-types";@@ -39,7 +40,8 @@ const deleteCloud66EnvVar = (accessToken: string, stackId: string, key: string));export const Cloud66SyncFns = {- async syncSecrets(secretSync: TCloud66SyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TCloud66SyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {connection,environment,@@ -113,7 +115,8 @@ export const Cloud66SyncFns = {return Object.fromEntries(existingEnvVars.map((envVar) => [envVar.key, { value: envVar.value }]));},- async removeSecrets(secretSync: TCloud66SyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TCloud66SyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {connection,destinationConfig: { stackId }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 e2754da7a2..31a39f979d 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@@ -1,6 +1,7 @@import { request } from "@app/lib/config/request";import { IntegrationUrls } from "@app/services/integration-auth/integration-list";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";@@ -42,7 +43,8 @@ const getProjectEnvironmentSecrets = async (secretSync: TCloudflarePagesSyncWith};export const CloudflarePagesSyncFns = {- syncSecrets: async (secretSync: TCloudflarePagesSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TCloudflarePagesSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {destinationConfig,connection: {@@ -95,7 +97,8 @@ export const CloudflarePagesSyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- removeSecrets: async (secretSync: TCloudflarePagesSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TCloudflarePagesSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {destinationConfig,connection: {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 b3aee8ce71..b2280b84f6 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@@ -6,6 +6,7 @@ import { chunkArray } from "@app/lib/fn";import { IntegrationUrls } from "@app/services/integration-auth/integration-list";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";@@ -148,7 +149,8 @@ const getCloudflareBindings = async (};export const CloudflareWorkersSyncFns = {- syncSecrets: async (secretSync: TCloudflareWorkersSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TCloudflareWorkersSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection: {credentials: { apiToken, accountId }@@ -348,7 +350,8 @@ export const CloudflareWorkersSyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- removeSecrets: async (secretSync: TCloudflareWorkersSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TCloudflareWorkersSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection: {credentials: { apiToken, accountId }diff --git a/backend/src/services/secret-sync/databricks/databricks-sync-fns.ts b/backend/src/services/secret-sync/databricks/databricks-sync-fns.tsindex 7d5273a4ea..ca74854ab6 100644--- a/backend/src/services/secret-sync/databricks/databricks-sync-fns.ts+++ b/backend/src/services/secret-sync/databricks/databricks-sync-fns.ts@@ -14,7 +14,7 @@ import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";-import { TSecretMap } from "../secret-sync-types";+import { TSecretSyncPayload } from "../secret-sync-payload";type TDatabricksSecretSyncFactoryDeps = {appConnectionDAL: Pick<TAppConnectionDALFactory, "updateById">;@@ -72,7 +72,8 @@ const deleteDatabricksSecrets = async ({ workspaceUrl, scope, key, accessToken });export const databricksSyncFactory = ({ kmsService, appConnectionDAL }: TDatabricksSecretSyncFactoryDeps) => {- const syncSecrets = async (secretSync: TDatabricksSyncWithCredentials, secretMap: TSecretMap) => {+ const syncSecrets = async (secretSync: TDatabricksSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();if (Object.keys(secretSync).length > DATABRICKS_SCOPE_SECRET_LIMIT) {throw new Error(`Databricks does not support storing more than ${DATABRICKS_SCOPE_SECRET_LIMIT} secrets per scope.`@@ -130,7 +131,8 @@ export const databricksSyncFactory = ({ kmsService, appConnectionDAL }: TDatabri}};- const removeSecrets = async (secretSync: TDatabricksSyncWithCredentials, secretMap: TSecretMap) => {+ const removeSecrets = async (secretSync: TDatabricksSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {destinationConfig: { scope },connectiondiff --git a/backend/src/services/secret-sync/daytona/daytona-sync-fns.ts b/backend/src/services/secret-sync/daytona/daytona-sync-fns.tsindex 424b93f5ca..c3d2dde142 100644--- a/backend/src/services/secret-sync/daytona/daytona-sync-fns.ts+++ b/backend/src/services/secret-sync/daytona/daytona-sync-fns.ts@@ -6,6 +6,7 @@ import { getDaytonaAuthHeaders } from "@app/services/app-connection/daytona";import { IntegrationUrls } from "@app/services/integration-auth/integration-list";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { DAYTONA_SECRET_NAME_PATTERN, DAYTONA_SECRET_NAME_RULE } from "./daytona-sync-schemas";@@ -62,7 +63,8 @@ const deleteDaytonaSecret = (apiKey: string, secretId: string) =>});export const DaytonaSyncFns = {- async syncSecrets(secretSync: TDaytonaSyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TDaytonaSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {connection,environment,@@ -139,7 +141,8 @@ export const DaytonaSyncFns = {throw new Error("Daytona does not support importing secrets.");},- async removeSecrets(secretSync: TDaytonaSyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TDaytonaSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const { apiKey } = secretSync.connection.credentials;const existingSecrets = await listDaytonaSecrets(apiKey);diff --git a/backend/src/services/secret-sync/devin/devin-sync-fns.ts b/backend/src/services/secret-sync/devin/devin-sync-fns.tsindex 317f8b7bb4..15ef2e3fab 100644--- a/backend/src/services/secret-sync/devin/devin-sync-fns.ts+++ b/backend/src/services/secret-sync/devin/devin-sync-fns.ts@@ -6,6 +6,7 @@ import { IntegrationUrls } from "@app/services/integration-auth/integration-listimport { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { TDevinListSecretsResponse, TDevinSecret, TDevinSyncWithCredentials } from "./devin-sync-types";@@ -118,7 +119,8 @@ const buildSyncNote = (secretSync: TDevinSyncWithCredentials) => {};export const DevinSyncFns = {- syncSecrets: async (secretSync: TDevinSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TDevinSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection: {credentials: { apiKey }@@ -157,7 +159,8 @@ export const DevinSyncFns = {}}},- removeSecrets: async (secretSync: TDevinSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TDevinSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection: {credentials: { apiKey }diff --git a/backend/src/services/secret-sync/digital-ocean-app-platform/digital-ocean-app-platform-sync-fns.ts b/backend/src/services/secret-sync/digital-ocean-app-platform/digital-ocean-app-platform-sync-fns.tsindex a2474fd2ca..c1e2637eb9 100644--- a/backend/src/services/secret-sync/digital-ocean-app-platform/digital-ocean-app-platform-sync-fns.ts+++ b/backend/src/services/secret-sync/digital-ocean-app-platform/digital-ocean-app-platform-sync-fns.ts@@ -8,7 +8,7 @@ import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SecretSyncError } from "../secret-sync-errors";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";-import { TSecretMap } from "../secret-sync-types";+import { TSecretSyncPayload } from "../secret-sync-payload";import { TDigitalOceanAppPlatformSyncWithCredentials } from "./digital-ocean-app-platform-sync-types";export const DigitalOceanAppPlatformSyncFns = {@@ -16,7 +16,8 @@ export const DigitalOceanAppPlatformSyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- async syncSecrets(secretSync: TDigitalOceanAppPlatformSyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TDigitalOceanAppPlatformSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {environment,syncOptions: { disableSecretDeletion, keySchema }@@ -55,7 +56,8 @@ export const DigitalOceanAppPlatformSyncFns = {}},- async removeSecrets(secretSync: TDigitalOceanAppPlatformSyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TDigitalOceanAppPlatformSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const config = secretSync.destinationConfig;try {diff --git a/backend/src/services/secret-sync/flyio/flyio-sync-fns.ts b/backend/src/services/secret-sync/flyio/flyio-sync-fns.tsindex 5acd1e5bcf..a020d12ed9 100644--- a/backend/src/services/secret-sync/flyio/flyio-sync-fns.ts+++ b/backend/src/services/secret-sync/flyio/flyio-sync-fns.ts@@ -11,7 +11,7 @@ import {} from "@app/services/secret-sync/flyio/flyio-sync-types";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";-import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";@@ -204,7 +204,8 @@ const deleteFlyioSecrets = async ({ accessToken, appId, keys }: TDeleteFlyioVari};export const FlyioSyncFns = {- syncSecrets: async (secretSync: TFlyioSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TFlyioSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,environment,@@ -243,7 +244,8 @@ export const FlyioSyncFns = {await deployAppMachines(secretSync, releaseVersion);}},- removeSecrets: async (secretSync: TFlyioSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TFlyioSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,destinationConfig: { appId }diff --git a/backend/src/services/secret-sync/gcp/gcp-sync-fns.ts b/backend/src/services/secret-sync/gcp/gcp-sync-fns.tsindex dc4ddcf452..e2e87fc002 100644--- a/backend/src/services/secret-sync/gcp/gcp-sync-fns.ts+++ b/backend/src/services/secret-sync/gcp/gcp-sync-fns.ts@@ -8,6 +8,7 @@ import { GcpSyncScope } from "@app/services/secret-sync/gcp/gcp-sync-enums";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SecretSyncError } from "../secret-sync-errors";+import { TSecretSyncPayload } from "../secret-sync-payload";import { TPreSaveTransformDestinationConfigFn, TSecretMap } from "../secret-sync-types";import {GCPLatestSecretVersionAccess,@@ -123,7 +124,8 @@ const getGcpSecrets = async (accessToken: string, secretSync: TGcpSyncWithCreden};export const GcpSyncFns = {- syncSecrets: async (secretSync: TGcpSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TGcpSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { destinationConfig, connection } = secretSync;const accessToken = await getGcpConnectionAuthToken(connection);@@ -236,7 +238,8 @@ export const GcpSyncFns = {return Object.fromEntries(Object.entries(gcpSecrets).map(([key, value]) => [key, { value: value ?? "" }]));},- removeSecrets: async (secretSync: TGcpSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TGcpSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { connection } = secretSync;const accessToken = await getGcpConnectionAuthToken(connection);diff --git a/backend/src/services/secret-sync/github/github-sync-fns.ts b/backend/src/services/secret-sync/github/github-sync-fns.tsindex 6aee7b669a..9b0a0005c4 100644--- a/backend/src/services/secret-sync/github/github-sync-fns.ts+++ b/backend/src/services/secret-sync/github/github-sync-fns.ts@@ -16,7 +16,7 @@ import { GitHubSyncScope, GitHubSyncVisibility } from "@app/services/secret-syncimport { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";-import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TGitHubPublicKey, TGitHubSecret, TGitHubSecretPayload, TGitHubSyncWithCredentials } from "./github-sync-types";@@ -233,12 +233,13 @@ const putSecret = async (export const GithubSyncFns = {syncSecrets: async (secretSync: TGitHubSyncWithCredentials,- ogSecretMap: TSecretMap,+ payload: TSecretSyncPayload,gatewayService: Pick<TGatewayServiceFactory, "fnGetGatewayClientTlsByGatewayId">,gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPlatformConnectionDetailsByGatewayId">,gatewayPoolService: Pick<TGatewayPoolServiceFactory, "resolveEffectiveGatewayId">,gitHubAppDeps: TGitHubAppCredentialResolverDeps) => {+ const ogSecretMap = payload.flatten();const secretMap = Object.fromEntries(Object.entries(ogSecretMap).map(([i, v]) => [i.toUpperCase(), v]));switch (secretSync.destinationConfig.scope) {@@ -342,12 +343,13 @@ export const GithubSyncFns = {},removeSecrets: async (secretSync: TGitHubSyncWithCredentials,- ogSecretMap: TSecretMap,+ payload: TSecretSyncPayload,gatewayService: Pick<TGatewayServiceFactory, "fnGetGatewayClientTlsByGatewayId">,gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPlatformConnectionDetailsByGatewayId">,gatewayPoolService: Pick<TGatewayPoolServiceFactory, "resolveEffectiveGatewayId">,gitHubAppDeps: TGitHubAppCredentialResolverDeps) => {+ const ogSecretMap = payload.flatten();const secretMap = Object.fromEntries(Object.entries(ogSecretMap).map(([i, v]) => [i.toUpperCase(), v]));const { connection: rawConnection } = secretSync;diff --git a/backend/src/services/secret-sync/gitlab/gitlab-sync-fns.ts b/backend/src/services/secret-sync/gitlab/gitlab-sync-fns.tsindex 3aa9ed9a93..47cf0015a1 100644--- a/backend/src/services/secret-sync/gitlab/gitlab-sync-fns.ts+++ b/backend/src/services/secret-sync/gitlab/gitlab-sync-fns.ts@@ -8,6 +8,7 @@ import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { TGitLabSyncWithCredentials, TGitLabVariable } from "@app/services/secret-sync/gitlab/gitlab-sync-types";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";@@ -289,9 +290,10 @@ const deleteGitLabVariable = async ({export const GitLabSyncFns = {syncSecrets: async (secretSync: TGitLabSyncWithCredentials,- secretMap: TSecretMap,+ payload: TSecretSyncPayload,{ appConnectionDAL, kmsService }: TGitLabSyncFactoryDeps): Promise<void> => {+ const secretMap = payload.flatten();const { connection, environment, destinationConfig } = secretSync;const { scope, targetEnvironment } = destinationConfig;@@ -405,9 +407,10 @@ export const GitLabSyncFns = {removeSecrets: async (secretSync: TGitLabSyncWithCredentials,- secretMap: TSecretMap,+ payload: TSecretSyncPayload,{ appConnectionDAL, kmsService }: TGitLabSyncFactoryDeps): Promise<void> => {+ const secretMap = payload.flatten();const { connection, destinationConfig } = secretSync;const { scope, targetEnvironment } = destinationConfig;diff --git a/backend/src/services/secret-sync/hasura-cloud/hasura-cloud-sync-fns.ts b/backend/src/services/secret-sync/hasura-cloud/hasura-cloud-sync-fns.tsindex 16d3504f29..18afe41e7b 100644--- a/backend/src/services/secret-sync/hasura-cloud/hasura-cloud-sync-fns.ts+++ b/backend/src/services/secret-sync/hasura-cloud/hasura-cloud-sync-fns.ts@@ -8,6 +8,7 @@ import {import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SecretSyncError } from "../secret-sync-errors";+import { TSecretSyncPayload } from "../secret-sync-payload";import { TSecretMap } from "../secret-sync-types";import { THasuraCloudSyncWithCredentials } from "./hasura-cloud-sync-types";@@ -138,7 +139,8 @@ export const HasuraCloudSyncFns = {}},- async syncSecrets(secretSync: THasuraCloudSyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: THasuraCloudSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {destinationConfig,connection,@@ -185,7 +187,8 @@ export const HasuraCloudSyncFns = {}},- async removeSecrets(secretSync: THasuraCloudSyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: THasuraCloudSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const { destinationConfig, connection } = secretSync;const { accessToken } = connection.credentials;const { projectId } = destinationConfig;diff --git a/backend/src/services/secret-sync/hc-vault/hc-vault-sync-fns.ts b/backend/src/services/secret-sync/hc-vault/hc-vault-sync-fns.tsindex 83bfb8d857..3066f36859 100644--- a/backend/src/services/secret-sync/hc-vault/hc-vault-sync-fns.ts+++ b/backend/src/services/secret-sync/hc-vault/hc-vault-sync-fns.ts@@ -20,7 +20,7 @@ import {} from "@app/services/secret-sync/hc-vault/hc-vault-sync-types";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";-import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";const getKvMountVersion = async ({instanceUrl,@@ -161,11 +161,12 @@ const updateHCVaultVariables = async (export const HCVaultSyncFns = {syncSecrets: async (secretSync: THCVaultSyncWithCredentials,- secretMap: TSecretMap,+ payload: TSecretSyncPayload,gatewayService: Pick<TGatewayServiceFactory, "fnGetGatewayClientTlsByGatewayId">,gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPlatformConnectionDetailsByGatewayId">,gatewayPoolService: Pick<TGatewayPoolServiceFactory, "resolveEffectiveGatewayId">) => {+ const secretMap = payload.flatten();const {connection: rawConnection,environment,@@ -264,11 +265,12 @@ export const HCVaultSyncFns = {},removeSecrets: async (secretSync: THCVaultSyncWithCredentials,- secretMap: TSecretMap,+ payload: TSecretSyncPayload,gatewayService: Pick<TGatewayServiceFactory, "fnGetGatewayClientTlsByGatewayId">,gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPlatformConnectionDetailsByGatewayId">,gatewayPoolService: Pick<TGatewayPoolServiceFactory, "resolveEffectiveGatewayId">) => {+ const secretMap = payload.flatten();const {connection: rawConnection,destinationConfig: { mount, path }diff --git a/backend/src/services/secret-sync/heroku/heroku-sync-fns.ts b/backend/src/services/secret-sync/heroku/heroku-sync-fns.tsindex 678c8c5cd5..476dae6df1 100644--- a/backend/src/services/secret-sync/heroku/heroku-sync-fns.ts+++ b/backend/src/services/secret-sync/heroku/heroku-sync-fns.ts@@ -12,6 +12,7 @@ import {} from "@app/services/secret-sync/heroku/heroku-sync-types";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";type THerokuSyncFactoryDeps = {@@ -69,9 +70,10 @@ const updateHerokuConfigVars = async ({ authToken, app, configVars }: THerokuUpdexport const HerokuSyncFns = {syncSecrets: async (secretSync: THerokuSyncWithCredentials,- secretMap: TSecretMap,+ payload: TSecretSyncPayload,{ appConnectionDAL, kmsService }: THerokuSyncFactoryDeps) => {+ const secretMap = payload.flatten();const {connection,environment,@@ -112,9 +114,10 @@ export const HerokuSyncFns = {removeSecrets: async (secretSync: THerokuSyncWithCredentials,- secretMap: TSecretMap,+ payload: TSecretSyncPayload,{ appConnectionDAL, kmsService }: THerokuSyncFactoryDeps) => {+ const secretMap = payload.flatten();const {connection,destinationConfig: { app }diff --git a/backend/src/services/secret-sync/humanitec/humanitec-sync-fns.ts b/backend/src/services/secret-sync/humanitec/humanitec-sync-fns.tsindex ccb6ac2bc8..d7e1803f14 100644--- a/backend/src/services/secret-sync/humanitec/humanitec-sync-fns.ts+++ b/backend/src/services/secret-sync/humanitec/humanitec-sync-fns.ts@@ -4,6 +4,7 @@ import { IntegrationUrls } from "@app/services/integration-auth/integration-listimport { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { HumanitecSyncScope } from "./humanitec-sync-enums";@@ -183,7 +184,8 @@ const updateSecret = async (};export const HumanitecSyncFns = {- syncSecrets: async (secretSync: THumanitecSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: THumanitecSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const humanitecSecrets = await getHumanitecSecrets(secretSync);const humanitecSecretsKeys = new Map(humanitecSecrets.map((s) => [s.key, s]));@@ -213,7 +215,8 @@ export const HumanitecSyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- removeSecrets: async (secretSync: THumanitecSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: THumanitecSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const encryptedSecrets = await getHumanitecSecrets(secretSync);for await (const encryptedSecret of encryptedSecrets) {diff --git a/backend/src/services/secret-sync/laravel-forge/laravel-forge-sync-fns.ts b/backend/src/services/secret-sync/laravel-forge/laravel-forge-sync-fns.tsindex bbb0f354ef..f1323ac471 100644--- a/backend/src/services/secret-sync/laravel-forge/laravel-forge-sync-fns.ts+++ b/backend/src/services/secret-sync/laravel-forge/laravel-forge-sync-fns.ts@@ -1,6 +1,7 @@import { request } from "@app/lib/config/request";import { IntegrationUrls } from "@app/services/integration-auth/integration-list";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import {@@ -153,7 +154,8 @@ const updateLaravelForgeSecrets = async (secretSync: TLaravelForgeSyncWithCreden};export const LaravelForgeSyncFns = {- async syncSecrets(secretSync: TLaravelForgeSyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TLaravelForgeSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {environment,syncOptions: { disableSecretDeletion, keySchema }@@ -191,7 +193,8 @@ export const LaravelForgeSyncFns = {return Object.fromEntries(secrets.map((secret) => [secret.key, { value: secret.value }]));},- async removeSecrets(secretSync: TLaravelForgeSyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TLaravelForgeSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const existingSecrets = await getLaravelForgeSecrets(secretSync);const newSecrets = existingSecrets.filter((secret) => !Object.hasOwn(secretMap, secret.key));diff --git a/backend/src/services/secret-sync/netlify/netlify-sync-fns.ts b/backend/src/services/secret-sync/netlify/netlify-sync-fns.tsindex 20df307200..4f4cbca7f5 100644--- a/backend/src/services/secret-sync/netlify/netlify-sync-fns.ts+++ b/backend/src/services/secret-sync/netlify/netlify-sync-fns.ts@@ -1,6 +1,7 @@/* eslint-disable no-continue */import { NetlifyPublicAPI } from "@app/services/app-connection/netlify/netlify-connection-public-client";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SecretSyncError } from "../secret-sync-errors";@@ -33,7 +34,8 @@ export const NetlifySyncFns = {return map;},- async syncSecrets(secretSync: TNetlifySyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TNetlifySyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {environment,syncOptions: { disableSecretDeletion, keySchema }@@ -113,7 +115,8 @@ export const NetlifySyncFns = {}},- async removeSecrets(secretSync: TNetlifySyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TNetlifySyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const config = secretSync.destinationConfig;const baseParams = {diff --git a/backend/src/services/secret-sync/northflank/northflank-sync-fns.ts b/backend/src/services/secret-sync/northflank/northflank-sync-fns.tsindex 396aa9ac8f..9337c4ed3d 100644--- a/backend/src/services/secret-sync/northflank/northflank-sync-fns.ts+++ b/backend/src/services/secret-sync/northflank/northflank-sync-fns.ts@@ -2,6 +2,7 @@ import { AxiosError } from "axios";import { request } from "@app/lib/config/request";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SecretSyncError } from "../secret-sync-errors";@@ -121,7 +122,8 @@ const updateNorthflankSecrets = async (};export const NorthflankSyncFns = {- syncSecrets: async (secretSync: TNorthflankSyncWithCredentials, secretMap: TSecretMap): Promise<void> => {+ syncSecrets: async (secretSync: TNorthflankSyncWithCredentials, payload: TSecretSyncPayload): Promise<void> => {+ const secretMap = payload.flatten();const northflankSecrets = await getNorthflankSecrets(secretSync);const updatedVariables: Record<string, string> = {};@@ -149,7 +151,8 @@ export const NorthflankSyncFns = {return Object.fromEntries(Object.entries(northflankSecrets).map(([key, value]) => [key, { value }]));},- removeSecrets: async (secretSync: TNorthflankSyncWithCredentials, secretMap: TSecretMap): Promise<void> => {+ removeSecrets: async (secretSync: TNorthflankSyncWithCredentials, payload: TSecretSyncPayload): Promise<void> => {+ const secretMap = payload.flatten();const northflankSecrets = await getNorthflankSecrets(secretSync);const updatedVariables: Record<string, string> = {};diff --git a/backend/src/services/secret-sync/octopus-deploy/octopus-deploy-sync-fns.ts b/backend/src/services/secret-sync/octopus-deploy/octopus-deploy-sync-fns.tsindex 7795464a3c..4a67a66cc3 100644--- a/backend/src/services/secret-sync/octopus-deploy/octopus-deploy-sync-fns.ts+++ b/backend/src/services/secret-sync/octopus-deploy/octopus-deploy-sync-fns.ts@@ -2,6 +2,7 @@ import { request } from "@app/lib/config/request";import { BadRequestError } from "@app/lib/errors";import { getOctopusDeployInstanceUrl } from "@app/services/app-connection/octopus-deploy";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";@@ -32,7 +33,8 @@ export const OctopusDeploySyncFns = {}},- async syncSecrets(secretSync: TOctopusDeploySyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TOctopusDeploySyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {connection,environment,@@ -112,7 +114,8 @@ export const OctopusDeploySyncFns = {});},- async removeSecrets(secretSync: TOctopusDeploySyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TOctopusDeploySyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {connection,destinationConfig: { spaceId, projectId, scope }diff --git a/backend/src/services/secret-sync/ona/ona-sync-fns.ts b/backend/src/services/secret-sync/ona/ona-sync-fns.tsindex 404d29c39c..0aa190aa3a 100644--- a/backend/src/services/secret-sync/ona/ona-sync-fns.ts+++ b/backend/src/services/secret-sync/ona/ona-sync-fns.ts@@ -3,6 +3,7 @@ import { AxiosError } from "axios";import { request } from "@app/lib/config/request";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { ONA_PAGE_SIZE } from "./ona-sync-enums";@@ -115,7 +116,8 @@ const deleteSecret = async (secretSync: TOnaSyncWithCredentials, secretId: strin};export const OnaSyncFns = {- syncSecrets: async (secretSync: TOnaSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TOnaSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const existingSecrets = await listEnvVarSecrets(secretSync);const existingByName = new Map(existingSecrets.map((s) => [s.name, s]));@@ -163,7 +165,8 @@ export const OnaSyncFns = {throw new Error("Ona does not support importing secrets.");},- removeSecrets: async (secretSync: TOnaSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TOnaSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const existingSecrets = await listEnvVarSecrets(secretSync);for (const existing of existingSecrets) {diff --git a/backend/src/services/secret-sync/ovh/ovh-sync-fns.ts b/backend/src/services/secret-sync/ovh/ovh-sync-fns.tsindex bc43669553..5b35450460 100644--- a/backend/src/services/secret-sync/ovh/ovh-sync-fns.ts+++ b/backend/src/services/secret-sync/ovh/ovh-sync-fns.ts@@ -7,6 +7,7 @@ import { validateSsrfUrl } from "@app/lib/validator";import { getOvhHttpsAgent } from "@app/services/app-connection/ovh";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { TOvhSyncWithCredentials } from "./ovh-sync-types";@@ -163,7 +164,8 @@ const writeSecretBundle = async (};export const OvhSyncFns = {- syncSecrets: async (secretSync: TOvhSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TOvhSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {syncOptions: { disableSecretDeletion, keySchema }} = secretSync;@@ -202,7 +204,8 @@ export const OvhSyncFns = {}},- removeSecrets: async (secretSync: TOvhSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TOvhSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();await writeSecretBundle(secretSync, (existing) => {const desired = { ...existing };for (const key of Object.keys(secretMap)) delete desired[key];diff --git a/backend/src/services/secret-sync/qovery/qovery-sync-fns.ts b/backend/src/services/secret-sync/qovery/qovery-sync-fns.tsindex 6f259a097e..aa1eeaeb56 100644--- a/backend/src/services/secret-sync/qovery/qovery-sync-fns.ts+++ b/backend/src/services/secret-sync/qovery/qovery-sync-fns.ts@@ -8,6 +8,7 @@ import {import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { QoverySyncScope, QoveryVariableType } from "./qovery-sync-enums";@@ -113,7 +114,8 @@ const deleteQoveryVariable = async (};export const QoverySyncFns = {- syncSecrets: async (secretSync: TQoverySyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TQoverySyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { connection, destinationConfig, environment, syncOptions } = secretSync;const { accessToken } = connection.credentials;const instanceUrl = QOVERY_DEFAULT_API_URL;@@ -166,7 +168,8 @@ export const QoverySyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- removeSecrets: async (secretSync: TQoverySyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TQoverySyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { connection, destinationConfig } = secretSync;const { accessToken } = connection.credentials;const instanceUrl = QOVERY_DEFAULT_API_URL;diff --git a/backend/src/services/secret-sync/railway/railway-sync-fns.ts b/backend/src/services/secret-sync/railway/railway-sync-fns.tsindex 51a6931f2d..66eb9fc7d8 100644--- a/backend/src/services/secret-sync/railway/railway-sync-fns.ts+++ b/backend/src/services/secret-sync/railway/railway-sync-fns.ts@@ -7,6 +7,7 @@ import { RailwayPublicAPI } from "@app/services/app-connection/railway/railway-cimport { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SecretSyncError } from "../secret-sync-errors";+import { TSecretSyncPayload } from "../secret-sync-payload";import { TSecretMap } from "../secret-sync-types";import { TRailwaySyncWithCredentials } from "./railway-sync-types";@@ -62,7 +63,8 @@ export const RailwaySyncFns = {* deletion is enabled, drift is removed explicitly via per-key deletes that skip sealed variables.* If there's a service, triggers a redeploy to pick up the changes.*/- async syncSecrets(secretSync: TRailwaySyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TRailwaySyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();try {const {syncOptions: { disableSecretDeletion, keySchema }@@ -160,7 +162,8 @@ export const RailwaySyncFns = {}},- async removeSecrets(secretSync: TRailwaySyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TRailwaySyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const config = secretSync.destinationConfig;try {diff --git a/backend/src/services/secret-sync/render/render-sync-fns.ts b/backend/src/services/secret-sync/render/render-sync-fns.tsindex d5bcf7d6ea..963d14c08f 100644--- a/backend/src/services/secret-sync/render/render-sync-fns.ts+++ b/backend/src/services/secret-sync/render/render-sync-fns.ts@@ -5,6 +5,7 @@ import { request } from "@app/lib/config/request";import { BadRequestError } from "@app/lib/errors";import { IntegrationUrls } from "@app/services/integration-auth/integration-list";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { RenderSyncScope } from "./render-sync-enums";@@ -273,7 +274,8 @@ const redeployService = async (secretSync: TRenderSyncWithCredentials) => {};export const RenderSyncFns = {- syncSecrets: async (secretSync: TRenderSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TRenderSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const renderSecrets = await getRenderEnvironmentSecrets(secretSync);const environmentSlug = secretSync.environment?.slug || "";const { disableSecretDeletion, keySchema } = secretSync.syncOptions;@@ -334,7 +336,8 @@ export const RenderSyncFns = {return Object.fromEntries(renderSecrets.map((secret) => [secret.key, { value: secret.value ?? "" }]));},- removeSecrets: async (secretSync: TRenderSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TRenderSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const renderSecrets = await getRenderEnvironmentSecrets(secretSync);const finalEnvVars: Array<{ key: string; value: string }> = [];diff --git a/backend/src/services/secret-sync/rundeck/rundeck-sync-fns.ts b/backend/src/services/secret-sync/rundeck/rundeck-sync-fns.tsindex 2c93730887..936a6ee786 100644--- a/backend/src/services/secret-sync/rundeck/rundeck-sync-fns.ts+++ b/backend/src/services/secret-sync/rundeck/rundeck-sync-fns.ts@@ -9,6 +9,7 @@ import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SecretSyncError } from "../secret-sync-errors";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";+import { TSecretSyncPayload } from "../secret-sync-payload";import { TSecretMap } from "../secret-sync-types";import { TRundeckSyncWithCredentials } from "./rundeck-sync-types";@@ -77,7 +78,8 @@ export const RundeckSyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- async syncSecrets(secretSync: TRundeckSyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TRundeckSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {environment,syncOptions: { disableSecretDeletion, keySchema }@@ -117,7 +119,8 @@ export const RundeckSyncFns = {}},- async removeSecrets(secretSync: TRundeckSyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TRundeckSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const { baseUrl, headers } = getRundeckClientDetails(secretSync);const existingSecretKeys = await listRundeckSecretKeys(baseUrl, headers);diff --git a/backend/src/services/secret-sync/snowflake/snowflake-sync-fns.ts b/backend/src/services/secret-sync/snowflake/snowflake-sync-fns.tsindex 6798dd8164..c47db7f3d9 100644--- a/backend/src/services/secret-sync/snowflake/snowflake-sync-fns.ts+++ b/backend/src/services/secret-sync/snowflake/snowflake-sync-fns.ts@@ -10,6 +10,7 @@ import {import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { TSnowflakeSyncWithCredentials } from "./snowflake-sync-types";@@ -78,7 +79,8 @@ const wrapSnowflakeError = (err: unknown, credentials: TSnowflakeConnection["cre};export const SnowflakeSyncFns = {- syncSecrets: async (secretSync: TSnowflakeSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TSnowflakeSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {destinationConfig: { database, schema },connection@@ -133,7 +135,8 @@ export const SnowflakeSyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- removeSecrets: async (secretSync: TSnowflakeSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TSnowflakeSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {destinationConfig: { database, schema },connectiondiff --git a/backend/src/services/secret-sync/spacelift/spacelift-sync-fns.ts b/backend/src/services/secret-sync/spacelift/spacelift-sync-fns.tsindex d503afad52..888cd5bf4b 100644--- a/backend/src/services/secret-sync/spacelift/spacelift-sync-fns.ts+++ b/backend/src/services/secret-sync/spacelift/spacelift-sync-fns.ts@@ -3,6 +3,7 @@ import { parseEnvFile, serializeEnvFile } from "@app/lib/dotenv";import { removeTrailingSlash } from "@app/lib/fn";import { safeRequest } from "@app/lib/validator";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SpaceliftConfigType, SpaceliftFileMountFormat } from "./spacelift-sync-constants";@@ -319,7 +320,8 @@ const removeDotEnvFile = async (};export const SpaceliftSyncFns = {- syncSecrets: async (secretSync: TSpaceliftSyncWithCredentials, secretMap: TSecretMap): Promise<void> => {+ syncSecrets: async (secretSync: TSpaceliftSyncWithCredentials, payload: TSecretSyncPayload): Promise<void> => {+ const secretMap = payload.flatten();const instanceUrl = removeTrailingSlash(secretSync.connection.credentials.apiUrl);const { apiKeyId, apiKeySecret } = secretSync.connection.credentials;const { contextId, configType, mountPath, fileMountFormat } = secretSync.destinationConfig;@@ -398,7 +400,8 @@ export const SpaceliftSyncFns = {return secretMap;},- removeSecrets: async (secretSync: TSpaceliftSyncWithCredentials, secretMap: TSecretMap): Promise<void> => {+ removeSecrets: async (secretSync: TSpaceliftSyncWithCredentials, payload: TSecretSyncPayload): Promise<void> => {+ const secretMap = payload.flatten();const instanceUrl = removeTrailingSlash(secretSync.connection.credentials.apiUrl);const { apiKeyId, apiKeySecret } = secretSync.connection.credentials;const { contextId, configType, mountPath, fileMountFormat } = secretSync.destinationConfig;diff --git a/backend/src/services/secret-sync/supabase/supabase-sync-fns.ts b/backend/src/services/secret-sync/supabase/supabase-sync-fns.tsindex b8106a0aef..a2171d3cf1 100644--- a/backend/src/services/secret-sync/supabase/supabase-sync-fns.ts+++ b/backend/src/services/secret-sync/supabase/supabase-sync-fns.ts@@ -9,7 +9,7 @@ import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";import { SecretSyncError } from "../secret-sync-errors";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";-import { TSecretMap } from "../secret-sync-types";+import { TSecretSyncPayload } from "../secret-sync-payload";import { TSupabaseSyncWithCredentials } from "./supabase-sync-types";const SUPABASE_INTERNAL_SECRETS = ["SUPABASE_URL", "SUPABASE_ANON_KEY", "SUPABASE_SERVICE_ROLE_KEY", "SUPABASE_DB_URL"];@@ -19,7 +19,8 @@ export const SupabaseSyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- async syncSecrets(secretSync: TSupabaseSyncWithCredentials, secretMap: TSecretMap) {+ async syncSecrets(secretSync: TSupabaseSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const {environment,syncOptions: { disableSecretDeletion, keySchema }@@ -73,7 +74,8 @@ export const SupabaseSyncFns = {}},- async removeSecrets(secretSync: TSupabaseSyncWithCredentials, secretMap: TSecretMap) {+ async removeSecrets(secretSync: TSupabaseSyncWithCredentials, payload: TSecretSyncPayload) {+ const secretMap = payload.flatten();const config = secretSync.destinationConfig;const variables = await SupabasePublicAPI.getVariables(secretSync.connection, config.projectId);diff --git a/backend/src/services/secret-sync/teamcity/teamcity-sync-fns.ts b/backend/src/services/secret-sync/teamcity/teamcity-sync-fns.tsindex 28ef2d0d34..128f1672ca 100644--- a/backend/src/services/secret-sync/teamcity/teamcity-sync-fns.ts+++ b/backend/src/services/secret-sync/teamcity/teamcity-sync-fns.ts@@ -2,7 +2,7 @@ import { request } from "@app/lib/config/request";import { getTeamCityInstanceUrl } from "@app/services/app-connection/teamcity";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";-import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import {TDeleteTeamCityVariable,TPostTeamCityVariable,@@ -88,7 +88,8 @@ const deleteTeamCityVariable = async ({};export const TeamCitySyncFns = {- syncSecrets: async (secretSync: TTeamCitySyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TTeamCitySyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,destinationConfig: { project, buildConfig }@@ -100,7 +101,7 @@ export const TeamCitySyncFns = {for await (const entry of Object.entries(secretMap)) {const [key, { value }] = entry;- const payload = {+ const requestPayload = {instanceUrl,accessToken,project,@@ -112,7 +113,7 @@ export const TeamCitySyncFns = {try {// Replace every secret since TeamCity does not return secret values that we can cross-check// No need to differenciate create / update because TeamCity uses the same method for both- await updateTeamCityVariable(payload);+ await updateTeamCityVariable(requestPayload);} catch (error) {throw new SecretSyncError({error,@@ -147,7 +148,8 @@ export const TeamCitySyncFns = {}}},- removeSecrets: async (secretSync: TTeamCitySyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TTeamCitySyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,destinationConfig: { project, buildConfig }diff --git a/backend/src/services/secret-sync/terraform-cloud/terraform-cloud-sync-fns.ts b/backend/src/services/secret-sync/terraform-cloud/terraform-cloud-sync-fns.tsindex 45c439a5a3..b1d00169a0 100644--- a/backend/src/services/secret-sync/terraform-cloud/terraform-cloud-sync-fns.ts+++ b/backend/src/services/secret-sync/terraform-cloud/terraform-cloud-sync-fns.ts@@ -5,6 +5,7 @@ import { request } from "@app/lib/config/request";import { IntegrationUrls } from "@app/services/integration-auth/integration-list";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";@@ -214,7 +215,8 @@ const updateVariable = async (};export const TerraformCloudSyncFns = {- syncSecrets: async (secretSync: TTerraformCloudSyncWithCredentials, secretMap: TSecretMap): Promise<void> => {+ syncSecrets: async (secretSync: TTerraformCloudSyncWithCredentials, payload: TSecretSyncPayload): Promise<void> => {+ const secretMap = payload.flatten();const terraformCloudVariables = await getTerraformCloudVariables(secretSync);const terraformCloudVariablesMap = new Map<string, TerraformCloudVariable>(terraformCloudVariables.map((v) => [v.key, v])@@ -250,7 +252,8 @@ export const TerraformCloudSyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- removeSecrets: async (secretSync: TTerraformCloudSyncWithCredentials, secretMap: TSecretMap): Promise<void> => {+ removeSecrets: async (secretSync: TTerraformCloudSyncWithCredentials, payload: TSecretSyncPayload): Promise<void> => {+ const secretMap = payload.flatten();const terraformCloudVariables = await getTerraformCloudVariables(secretSync);for (const variable of terraformCloudVariables) {diff --git a/backend/src/services/secret-sync/travis-ci/travis-ci-sync-fns.ts b/backend/src/services/secret-sync/travis-ci/travis-ci-sync-fns.tsindex 77022b5ec0..07ebf1eea0 100644--- a/backend/src/services/secret-sync/travis-ci/travis-ci-sync-fns.ts+++ b/backend/src/services/secret-sync/travis-ci/travis-ci-sync-fns.ts@@ -6,6 +6,7 @@ import { request } from "@app/lib/config/request";import { IntegrationUrls } from "@app/services/integration-auth/integration-list";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";@@ -124,7 +125,8 @@ export const TravisCISyncFns = {throw new Error(`${SECRET_SYNC_NAME_MAP[secretSync.destination]} does not support importing secrets.`);},- async syncSecrets(secretSync: TTravisCISyncWithCredentials, secretMap: TSecretMap): Promise<void> {+ async syncSecrets(secretSync: TTravisCISyncWithCredentials, payload: TSecretSyncPayload): Promise<void> {+ const secretMap = payload.flatten();const {connection: {credentials: { apiToken }@@ -189,7 +191,8 @@ export const TravisCISyncFns = {}},- async removeSecrets(secretSync: TTravisCISyncWithCredentials, secretMap: TSecretMap): Promise<void> {+ async removeSecrets(secretSync: TTravisCISyncWithCredentials, payload: TSecretSyncPayload): Promise<void> {+ const secretMap = payload.flatten();const {connection: {credentials: { apiToken }diff --git a/backend/src/services/secret-sync/trigger-dev/trigger-dev-sync-fns.ts b/backend/src/services/secret-sync/trigger-dev/trigger-dev-sync-fns.tsindex e74ff164a8..7b70668397 100644--- a/backend/src/services/secret-sync/trigger-dev/trigger-dev-sync-fns.ts+++ b/backend/src/services/secret-sync/trigger-dev/trigger-dev-sync-fns.ts@@ -2,6 +2,7 @@ import { request } from "@app/lib/config/request";import { getTriggerDevInstanceUrl } from "@app/services/app-connection/trigger-dev";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { SECRET_SYNC_NAME_MAP } from "../secret-sync-maps";@@ -109,7 +110,8 @@ const deleteTriggerDevEnvVar = async (};export const TriggerDevSyncFns = {- syncSecrets: async (secretSync: TTriggerDevSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TTriggerDevSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { environment, syncOptions } = secretSync;const variables: Record<string, string> = Object.fromEntries(@@ -149,7 +151,8 @@ export const TriggerDevSyncFns = {}},- removeSecrets: async (secretSync: TTriggerDevSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TTriggerDevSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const existing = await listTriggerDevEnvVars(secretSync);const keysToDelete = existing.map((envVar) => envVar.name).filter((key) => key in secretMap);diff --git a/backend/src/services/secret-sync/vercel/vercel-sync-fns.ts b/backend/src/services/secret-sync/vercel/vercel-sync-fns.tsindex 03c9f9b697..ca69993a84 100644--- a/backend/src/services/secret-sync/vercel/vercel-sync-fns.ts+++ b/backend/src/services/secret-sync/vercel/vercel-sync-fns.ts@@ -3,6 +3,7 @@ import { request } from "@app/lib/config/request";import { IntegrationUrls } from "@app/services/integration-auth/integration-list";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import { VercelEnvironmentType, VercelSyncScope } from "./vercel-sync-enums";@@ -870,7 +871,8 @@ const detachTeamSharedEnvVar = async (};export const VercelSyncFns = {- syncSecrets: async (secretSync: TVercelSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TVercelSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();if (secretSync.destinationConfig.scope === VercelSyncScope.Team) {const teamDestinationConfig = secretSync.destinationConfig;const allSharedEnvVars = await getTeamSharedEnvVars(secretSync);@@ -1031,7 +1033,8 @@ export const VercelSyncFns = {return Object.fromEntries(vercelSecrets.map((s) => [s.key, { value: s.value ?? "" }]));},- removeSecrets: async (secretSync: TVercelSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TVercelSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();if (secretSync.destinationConfig.scope === VercelSyncScope.Team) {const sharedEnvVars = await getOwnedTeamSharedEnvVars(secretSync);diff --git a/backend/src/services/secret-sync/windmill/windmill-sync-fns.ts b/backend/src/services/secret-sync/windmill/windmill-sync-fns.tsindex b5e11c9579..c2064d5ab6 100644--- a/backend/src/services/secret-sync/windmill/windmill-sync-fns.ts+++ b/backend/src/services/secret-sync/windmill/windmill-sync-fns.ts@@ -11,7 +11,7 @@ import {TWindmillVariable} from "@app/services/secret-sync/windmill/windmill-sync-types";-import { TSecretMap } from "../secret-sync-types";+import { TSecretSyncPayload } from "../secret-sync-payload";const PAGE_LIMIT = 100;@@ -125,7 +125,8 @@ const deleteWindmillVariable = async ({ path, instanceUrl, accessToken, workspac});export const WindmillSyncFns = {- syncSecrets: async (secretSync: TWindmillSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TWindmillSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,environment,@@ -146,7 +147,7 @@ export const WindmillSyncFns = {const [key, { value, comment = "" }] = entry;try {- const payload = {+ const requestPayload = {instanceUrl,workspace,path: path + key,@@ -156,9 +157,9 @@ export const WindmillSyncFns = {};if (key in variables) {if (variables[key].value !== value || variables[key].description !== comment)- await updateWindmillVariable(payload);+ await updateWindmillVariable(requestPayload);} else {- await createWindmillVariable(payload);+ await createWindmillVariable(requestPayload);}} catch (error) {throw new SecretSyncError({@@ -191,7 +192,8 @@ export const WindmillSyncFns = {}}},- removeSecrets: async (secretSync: TWindmillSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TWindmillSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const {connection,destinationConfig: { path }diff --git a/backend/src/services/secret-sync/zabbix/zabbix-sync-fns.ts b/backend/src/services/secret-sync/zabbix/zabbix-sync-fns.tsindex 18f9061ec7..5346c88477 100644--- a/backend/src/services/secret-sync/zabbix/zabbix-sync-fns.ts+++ b/backend/src/services/secret-sync/zabbix/zabbix-sync-fns.ts@@ -4,6 +4,7 @@ import { request } from "@app/lib/config/request";import { blockLocalAndPrivateIpAddresses } from "@app/lib/validator";import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";+import { TSecretSyncPayload } from "@app/services/secret-sync/secret-sync-payload";import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";import {TZabbixSecret,@@ -195,7 +196,8 @@ const deleteZabbixSecrets = async (};export const ZabbixSyncFns = {- syncSecrets: async (secretSync: TZabbixSyncWithCredentials, secretMap: TSecretMap) => {+ syncSecrets: async (secretSync: TZabbixSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { connection, environment, destinationConfig } = secretSync;const { apiToken, instanceUrl } = connection.credentials;await blockLocalAndPrivateIpAddresses(instanceUrl);@@ -239,7 +241,8 @@ export const ZabbixSyncFns = {}},- removeSecrets: async (secretSync: TZabbixSyncWithCredentials, secretMap: TSecretMap) => {+ removeSecrets: async (secretSync: TZabbixSyncWithCredentials, payload: TSecretSyncPayload) => {+ const secretMap = payload.flatten();const { connection, destinationConfig } = secretSync;const { apiToken, instanceUrl } = connection.credentials;await blockLocalAndPrivateIpAddresses(instanceUrl);