awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix greptile reviews

Browse Source
This commit is contained in:
x032205
2025-07-09 22:27:42 -04:00
parent f58de53995
commit 79d80fad08
10 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/server/routes/v1/app-connection-routers/cloudflare-connection-router.ts
View File

@@ -53,7 +53,7 @@ export const registerCloudflareConnectionRouter = async (server: FastifyZodProvi
server.route({ server.route({
method: "GET", method: "GET",
url: `/:connectionId/cloudflare-workers-projects`, url: `/:connectionId/cloudflare-workers-scripts`,
config: { config: {
rateLimit: readLimit rateLimit: readLimit
}, },
@@ -73,7 +73,7 @@ export const registerCloudflareConnectionRouter = async (server: FastifyZodProvi
handler: async (req) => { handler: async (req) => {
const { connectionId } = req.params; const { connectionId } = req.params;
const projects = await server.services.appConnection.cloudflare.listWorkersProjects(connectionId, req.permission); const projects = await server.services.appConnection.cloudflare.listWorkersScripts(connectionId, req.permission);
return projects; return projects;
} }

6
backend/src/services/app-connection/cloudflare/cloudflare-connection-fns.ts
View File

@@ -10,7 +10,7 @@ import {
TCloudflareConnection, TCloudflareConnection,
TCloudflareConnectionConfig, TCloudflareConnectionConfig,
TCloudflarePagesProject, TCloudflarePagesProject,
TCloudflareWorkersProject TCloudflareWorkersScript
} from "./cloudflare-connection-types"; } from "./cloudflare-connection-types";
export const getCloudflareConnectionListItem = () => { export const getCloudflareConnectionListItem = () => {
@@ -44,9 +44,9 @@ export const listCloudflarePagesProjects = async (
})); }));
}; };
export const listCloudflareWorkersProjects = async ( export const listCloudflareWorkersScripts = async (
appConnection: TCloudflareConnection appConnection: TCloudflareConnection
): Promise<TCloudflareWorkersProject[]> => { ): Promise<TCloudflareWorkersScript[]> => {
const { const {
credentials: { apiToken, accountId } credentials: { apiToken, accountId }
} = appConnection; } = appConnection;

18
backend/src/services/app-connection/cloudflare/cloudflare-connection-service.ts
View File

@@ -2,7 +2,7 @@ import { logger } from "@app/lib/logger";
import { OrgServiceActor } from "@app/lib/types"; import { OrgServiceActor } from "@app/lib/types";
import { AppConnection } from "../app-connection-enums"; import { AppConnection } from "../app-connection-enums";
import { listCloudflarePagesProjects, listCloudflareWorkersProjects } from "./cloudflare-connection-fns"; import { listCloudflarePagesProjects, listCloudflareWorkersScripts } from "./cloudflare-connection-fns";
import { TCloudflareConnection } from "./cloudflare-connection-types"; import { TCloudflareConnection } from "./cloudflare-connection-types";
type TGetAppConnectionFunc = ( type TGetAppConnectionFunc = (
@@ -19,25 +19,31 @@ export const cloudflareConnectionService = (getAppConnection: TGetAppConnectionF
return projects; return projects;
} catch (error) { } catch (error) {
logger.error(error, "Failed to list Cloudflare Pages projects for Cloudflare connection"); logger.error(
error,
`Failed to list Cloudflare Pages projects for Cloudflare connection [connectionId=${connectionId}]`
);
return []; return [];
} }
}; };
const listWorkersProjects = async (connectionId: string, actor: OrgServiceActor) => { const listWorkersScripts = async (connectionId: string, actor: OrgServiceActor) => {
const appConnection = await getAppConnection(AppConnection.Cloudflare, connectionId, actor); const appConnection = await getAppConnection(AppConnection.Cloudflare, connectionId, actor);
try { try {
const projects = await listCloudflareWorkersProjects(appConnection); const projects = await listCloudflareWorkersScripts(appConnection);
return projects; return projects;
} catch (error) { } catch (error) {
logger.error(error, "Failed to list Cloudflare Workers projects for Cloudflare connection"); logger.error(
error,
`Failed to list Cloudflare Workers scripts for Cloudflare connection [connectionId=${connectionId}]`
);
return []; return [];
} }
}; };
return { return {
listPagesProjects, listPagesProjects,
listWorkersProjects listWorkersScripts
}; };
}; };

2
backend/src/services/app-connection/cloudflare/cloudflare-connection-types.ts
View File

@@ -29,6 +29,6 @@ export type TCloudflarePagesProject = {
name: string; name: string;
}; };
export type TCloudflareWorkersProject = { export type TCloudflareWorkersScript = {
id: string; id: string;
}; };

3
backend/src/services/secret-sync/cloudflare-workers/cloudflare-workers-schemas.ts
View File

@@ -1,3 +1,4 @@
import RE2 from "re2";
import { z } from "zod"; import { z } from "zod";
import { SecretSyncs } from "@app/lib/api-docs"; import { SecretSyncs } from "@app/lib/api-docs";
@@ -14,6 +15,8 @@ const CloudflareWorkersSyncDestinationConfigSchema = z.object({
scriptId: z scriptId: z
.string() .string()
.min(1, "Script ID is required") .min(1, "Script ID is required")
.max(64)
.regex(new RE2(/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/), "Invalid script ID format")
.describe(SecretSyncs.DESTINATION_CONFIG.CLOUDFLARE_WORKERS.scriptId) .describe(SecretSyncs.DESTINATION_CONFIG.CLOUDFLARE_WORKERS.scriptId)
}); });

6
docs/integrations/secret-syncs/cloudflare-workers.mdx
View File

@@ -75,8 +75,7 @@ description: "Learn how to configure a Cloudflare Workers Sync for Infisical."
"initialSyncBehavior": "overwrite-destination" "initialSyncBehavior": "overwrite-destination"
}, },
"destinationConfig": { "destinationConfig": {
"projectId": "your-cloudflare-workers-project-id", "scriptId": "my-workers-script"
"scriptId": "my-workers-project"
} }
}' }'
``` ```
@@ -119,8 +118,7 @@ description: "Learn how to configure a Cloudflare Workers Sync for Infisical."
}, },
"destination": "cloudflare-workers", "destination": "cloudflare-workers",
"destinationConfig": { "destinationConfig": {
"projectId": "your-cloudflare-workers-project-id", "scriptId": "my-workers-script"
"scriptId": "my-workers-project"
} }
} }
} }

16
frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/CloudflareWorkersSyncFields.tsx
View File

@@ -4,8 +4,8 @@ import { SingleValue } from "react-select";
import { SecretSyncConnectionField } from "@app/components/secret-syncs/forms/SecretSyncConnectionField"; import { SecretSyncConnectionField } from "@app/components/secret-syncs/forms/SecretSyncConnectionField";
import { FilterableSelect, FormControl } from "@app/components/v2"; import { FilterableSelect, FormControl } from "@app/components/v2";
import { import {
TCloudflareWorkersProject, TCloudflareWorkersScript,
useCloudflareConnectionListWorkersProjects useCloudflareConnectionListWorkersScripts
} from "@app/hooks/api/appConnections/cloudflare"; } from "@app/hooks/api/appConnections/cloudflare";
import { SecretSync } from "@app/hooks/api/secretSyncs"; import { SecretSync } from "@app/hooks/api/secretSyncs";
@@ -18,8 +18,8 @@ export const CloudflareWorkersSyncFields = () => {
const connectionId = useWatch({ name: "connection.id", control }); const connectionId = useWatch({ name: "connection.id", control });
const { data: projects = [], isPending: isProjectsPending } = const { data: scripts = [], isPending: isScriptsPending } =
useCloudflareConnectionListWorkersProjects(connectionId, { useCloudflareConnectionListWorkersScripts(connectionId, {
enabled: Boolean(connectionId) enabled: Boolean(connectionId)
}); });
@@ -40,13 +40,13 @@ export const CloudflareWorkersSyncFields = () => {
label="Worker Script" label="Worker Script"
> >
<FilterableSelect <FilterableSelect
isLoading={isProjectsPending && Boolean(connectionId)} isLoading={isScriptsPending && Boolean(connectionId)}
isDisabled={!connectionId} isDisabled={!connectionId}
value={projects ? (projects.find((project) => project.id === value) ?? []) : []} value={scripts?.find((script) => script.id === value) || []}
onChange={(option) => { onChange={(option) => {
onChange((option as SingleValue<TCloudflareWorkersProject>)?.id ?? null); onChange((option as SingleValue<TCloudflareWorkersScript>)?.id ?? null);
}} }}
options={projects} options={scripts}
placeholder="Select a worker script..." placeholder="Select a worker script..."
getOptionLabel={(option) => option.id} getOptionLabel={(option) => option.id}
getOptionValue={(option) => option.id} getOptionValue={(option) => option.id}

7
frontend/src/components/secret-syncs/forms/schemas/cloudflare-workers-sync-destination-schema.ts
View File

@@ -7,7 +7,12 @@ export const CloudflareWorkersSyncDestinationSchema = BaseSecretSyncSchema().mer
z.object({ z.object({
destination: z.literal(SecretSync.CloudflareWorkers), destination: z.literal(SecretSync.CloudflareWorkers),
destinationConfig: z.object({ destinationConfig: z.object({
scriptId: z.string().trim().min(1, "Script ID is required") scriptId: z
.string()
.trim()
.min(1, "Script ID is required")
.max(64)
.regex(/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/, "Invalid script ID format")
}) })
}) })
); );

20
frontend/src/hooks/api/appConnections/cloudflare/queries.tsx
View File

@@ -3,14 +3,14 @@ import { useQuery, UseQueryOptions } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request"; import { apiRequest } from "@app/config/request";
import { appConnectionKeys } from "../queries"; import { appConnectionKeys } from "../queries";
import { TCloudflarePagesProject, TCloudflareWorkersProject } from "./types"; import { TCloudflarePagesProject, TCloudflareWorkersScript } from "./types";
const cloudflareConnectionKeys = { const cloudflareConnectionKeys = {
all: [...appConnectionKeys.all, "cloudflare"] as const, all: [...appConnectionKeys.all, "cloudflare"] as const,
listPagesProjects: (connectionId: string) => listPagesProjects: (connectionId: string) =>
[...cloudflareConnectionKeys.all, "pages-projects", connectionId] as const, [...cloudflareConnectionKeys.all, "pages-projects", connectionId] as const,
listWorkersProjects: (connectionId: string) => listWorkersScripts: (connectionId: string) =>
[...cloudflareConnectionKeys.all, "workers-projects", connectionId] as const [...cloudflareConnectionKeys.all, "workers-scripts", connectionId] as const
}; };
export const useCloudflareConnectionListPagesProjects = ( export const useCloudflareConnectionListPagesProjects = (
@@ -38,23 +38,23 @@ export const useCloudflareConnectionListPagesProjects = (
}); });
}; };
export const useCloudflareConnectionListWorkersProjects = ( export const useCloudflareConnectionListWorkersScripts = (
connectionId: string, connectionId: string,
options?: Omit< options?: Omit<
UseQueryOptions< UseQueryOptions<
TCloudflareWorkersProject[], TCloudflareWorkersScript[],
unknown, unknown,
TCloudflareWorkersProject[], TCloudflareWorkersScript[],
ReturnType<typeof cloudflareConnectionKeys.listWorkersProjects> ReturnType<typeof cloudflareConnectionKeys.listWorkersScripts>
>, >,
"queryKey" | "queryFn" "queryKey" | "queryFn"
> >
) => { ) => {
return useQuery({ return useQuery({
queryKey: cloudflareConnectionKeys.listWorkersProjects(connectionId), queryKey: cloudflareConnectionKeys.listWorkersScripts(connectionId),
queryFn: async () => { queryFn: async () => {
const { data } = await apiRequest.get<TCloudflareWorkersProject[]>( const { data } = await apiRequest.get<TCloudflareWorkersScript[]>(
`/api/v1/app-connections/cloudflare/${connectionId}/cloudflare-workers-projects` `/api/v1/app-connections/cloudflare/${connectionId}/cloudflare-workers-scripts`
); );
return data; return data;

2
frontend/src/hooks/api/appConnections/cloudflare/types.ts
View File

@@ -3,6 +3,6 @@ export type TCloudflarePagesProject = {
name: string; name: string;
}; };
export type TCloudflareWorkersProject = { export type TCloudflareWorkersScript = {
id: string; id: string;
}; };