From a43d4fd4305e85b6e73678030391347582f9e4b5 Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Fri, 20 Jun 2025 21:02:09 +0800 Subject: [PATCH] addressed greptie --- backend/src/server/routes/v1/secret-sync-routers/index.ts | 2 +- .../secret-sync/cloudflare-pages/cloudflare-pages-fns.ts | 2 +- .../secret-sync/cloudflare-pages/cloudflare-pages-schema.ts | 2 +- .../SecretSyncDestinationFields/CloudflarePagesSyncFields.tsx | 2 +- .../components/AppConnectionForm/AppConnectionForm.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/server/routes/v1/secret-sync-routers/index.ts b/backend/src/server/routes/v1/secret-sync-routers/index.ts index 8efae16a9..b55c63a92 100644 --- a/backend/src/server/routes/v1/secret-sync-routers/index.ts +++ b/backend/src/server/routes/v1/secret-sync-routers/index.ts @@ -8,6 +8,7 @@ import { registerAzureAppConfigurationSyncRouter } from "./azure-app-configurati import { registerAzureDevOpsSyncRouter } from "./azure-devops-sync-router"; import { registerAzureKeyVaultSyncRouter } from "./azure-key-vault-sync-router"; import { registerCamundaSyncRouter } from "./camunda-sync-router"; +import { registerCloudflarePagesSyncRouter } from "./cloudflare-pages-sync-router"; import { registerDatabricksSyncRouter } from "./databricks-sync-router"; import { registerFlyioSyncRouter } from "./flyio-sync-router"; import { registerGcpSyncRouter } from "./gcp-sync-router"; @@ -20,7 +21,6 @@ import { registerTeamCitySyncRouter } from "./teamcity-sync-router"; import { registerTerraformCloudSyncRouter } from "./terraform-cloud-sync-router"; import { registerVercelSyncRouter } from "./vercel-sync-router"; import { registerWindmillSyncRouter } from "./windmill-sync-router"; -import { registerCloudflarePagesSyncRouter } from "./cloudflare-pages-sync-router"; export * from "./secret-sync-router"; 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.ts index 7acb59107..e2754da7a 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 @@ -35,7 +35,7 @@ const getProjectEnvironmentSecrets = async (secretSync: TCloudflarePagesSyncWith ) ).data.result.deployment_configs[destinationConfig.environment].env_vars; - return Object.entries(secrets ?? []).map(([key, envVar]) => ({ + return Object.entries(secrets ?? {}).map(([key, envVar]) => ({ key, value: envVar.value })); 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.ts index 243dbffb2..f0d814fb6 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,7 +21,7 @@ const CloudflarePagesSyncDestinationConfigSchema = z.object({ .describe(SecretSyncs.DESTINATION_CONFIG.CLOUDFLARE_PAGES.environment) }); -const CloudflarePagesSyncOptionsConfig: TSyncOptionsConfig = { canImportSecrets: true }; +const CloudflarePagesSyncOptionsConfig: TSyncOptionsConfig = { canImportSecrets: false }; export const CloudflarePagesSyncSchema = BaseSecretSyncSchema( SecretSync.CloudflarePages, diff --git a/frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/CloudflarePagesSyncFields.tsx b/frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/CloudflarePagesSyncFields.tsx index eef8de3cb..d19092d63 100644 --- a/frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/CloudflarePagesSyncFields.tsx +++ b/frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/CloudflarePagesSyncFields.tsx @@ -78,7 +78,7 @@ export const CloudflarePagesSyncFields = () => { onValueChange={(val) => onChange(val)} className="w-full border border-mineshaft-500 capitalize" position="popper" - placeholder="Select a scope..." + placeholder="Select an environment..." dropdownContainerClassName="max-w-none" > {CLOUDFLARE_ENVIRONMENTS.map(({ name, value: envValue }) => ( diff --git a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx index 79c888974..1a90085e4 100644 --- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx +++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx @@ -17,6 +17,7 @@ import { AzureClientSecretsConnectionForm } from "./AzureClientSecretsConnection import { AzureDevOpsConnectionForm } from "./AzureDevOpsConnectionForm"; import { AzureKeyVaultConnectionForm } from "./AzureKeyVaultConnectionForm"; import { CamundaConnectionForm } from "./CamundaConnectionForm"; +import { CloudflareConnectionForm } from "./CloudflareConnectionForm"; import { DatabricksConnectionForm } from "./DatabricksConnectionForm"; import { FlyioConnectionForm } from "./FlyioConnectionForm"; import { GcpConnectionForm } from "./GcpConnectionForm"; @@ -36,7 +37,6 @@ import { TeamCityConnectionForm } from "./TeamCityConnectionForm"; import { TerraformCloudConnectionForm } from "./TerraformCloudConnectionForm"; import { VercelConnectionForm } from "./VercelConnectionForm"; import { WindmillConnectionForm } from "./WindmillConnectionForm"; -import { CloudflareConnectionForm } from "./CloudflareConnectionForm"; type FormProps = { onComplete: (appConnection: TAppConnection) => void;