diff --git a/backend/src/lib/api-docs/constants.ts b/backend/src/lib/api-docs/constants.ts index bb1b73a77..4a45dfb41 100644 --- a/backend/src/lib/api-docs/constants.ts +++ b/backend/src/lib/api-docs/constants.ts @@ -215,7 +215,7 @@ export const SECRETS = { export const RAW_SECRETS = { LIST: { - deep: "Whether or not to fetch all secrets from the specified base path, and all of its subdirectories.", + recursive: "Whether or not to fetch all secrets from the specified base path, and all of its subdirectories.", workspaceId: "The ID of the project to list secrets from.", workspaceSlug: "The slug of the project to list secrets from. This parameter is only usable by machine identities.", environment: "The slug of the environment to list secrets from.", diff --git a/backend/src/server/routes/v3/secret-router.ts b/backend/src/server/routes/v3/secret-router.ts index 8d69f009c..5344be43d 100644 --- a/backend/src/server/routes/v3/secret-router.ts +++ b/backend/src/server/routes/v3/secret-router.ts @@ -157,11 +157,11 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => { workspaceSlug: z.string().trim().optional().describe(RAW_SECRETS.LIST.workspaceSlug), environment: z.string().trim().optional().describe(RAW_SECRETS.LIST.environment), secretPath: z.string().trim().default("/").transform(removeTrailingSlash).describe(RAW_SECRETS.LIST.secretPath), - deep: z + recursive: z .enum(["true", "false"]) .default("false") .transform((value) => value === "true") - .describe(RAW_SECRETS.LIST.deep), + .describe(RAW_SECRETS.LIST.recursive), include_imports: z .enum(["true", "false"]) .default("false") @@ -228,7 +228,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => { projectId: workspaceId, path: secretPath, includeImports: req.query.include_imports, - deep: req.query.deep + recursive: req.query.recursive }); await server.services.auditLog.createAuditLog({ @@ -606,7 +606,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => { workspaceId: z.string().trim(), environment: z.string().trim(), secretPath: z.string().trim().default("/").transform(removeTrailingSlash), - deep: z + recursive: z .enum(["true", "false"]) .default("false") .transform((value) => value === "true"), @@ -662,7 +662,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => { projectId: req.query.workspaceId, path: req.query.secretPath, includeImports: req.query.include_imports, - deep: req.query.deep + recursive: req.query.recursive }); await server.services.auditLog.createAuditLog({ diff --git a/backend/src/services/secret/secret-service.ts b/backend/src/services/secret/secret-service.ts index fb880e116..5b8c3c934 100644 --- a/backend/src/services/secret/secret-service.ts +++ b/backend/src/services/secret/secret-service.ts @@ -440,7 +440,7 @@ export const secretServiceFactory = ({ actorOrgId, actorAuthMethod, includeImports, - deep + recursive }: TGetSecretsDTO) => { const { permission } = await permissionService.getProjectPermission( actor, @@ -452,7 +452,7 @@ export const secretServiceFactory = ({ let paths: { folderId: string; path: string }[] = []; - if (deep) { + if (recursive) { const getPaths = recursivelyGetSecretPaths({ permissionService, folderDAL, @@ -852,7 +852,7 @@ export const secretServiceFactory = ({ actorAuthMethod, environment, includeImports, - deep + recursive }: TGetSecretsRawDTO) => { const botKey = await projectBotService.getBotKey(projectId); if (!botKey) throw new BadRequestError({ message: "Project bot not found", name: "bot_not_found_error" }); @@ -866,7 +866,7 @@ export const secretServiceFactory = ({ actorAuthMethod, path, includeImports, - deep + recursive }); return { diff --git a/backend/src/services/secret/secret-types.ts b/backend/src/services/secret/secret-types.ts index 33e46b67f..22347de4e 100644 --- a/backend/src/services/secret/secret-types.ts +++ b/backend/src/services/secret/secret-types.ts @@ -74,7 +74,7 @@ export type TGetSecretsDTO = { path: string; environment: string; includeImports?: boolean; - deep?: boolean; + recursive?: boolean; } & TProjectPermission; export type TGetASecretDTO = { @@ -141,7 +141,7 @@ export type TGetSecretsRawDTO = { path: string; environment: string; includeImports?: boolean; - deep?: boolean; + recursive?: boolean; } & TProjectPermission; export type TGetASecretRawDTO = {