Skip to content

Commit

Permalink
Fix: Rebase errors
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielHougaard committed Mar 15, 2024
1 parent 14ce7a2 commit bc092cc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion backend/src/lib/api-docs/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const ORGANIZATIONS = {

export const PROJECTS = {
CREATE: {
organizationId: "The ID of the organization to create the project in.",
organizationSlug: "The slug of the organization to create the project in.",
projectName: "The name of the project to create.",
slug: "An optional slug for the project."
},
Expand Down Expand Up @@ -197,6 +197,7 @@ export const FOLDERS = {
export const RAW_SECRETS = {
LIST: {
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.",
secretPath: "The secret path to list secrets from.",
includeImports: "Weather to include imported secrets or not."
Expand Down
2 changes: 1 addition & 1 deletion backend/src/server/routes/v2/project-router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
})
.optional()
.describe(PROJECTS.CREATE.slug),
organizationId: z.string().trim().describe(PROJECTS.CREATE.organizationId)
organizationSlug: z.string().trim().describe(PROJECTS.CREATE.organizationSlug)
}),
response: {
200: z.object({
Expand Down
1 change: 1 addition & 0 deletions backend/src/server/routes/v3/secret-router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
],
querystring: z.object({
workspaceId: z.string().trim().optional().describe(RAW_SECRETS.LIST.workspaceId),
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),
include_imports: z
Expand Down

0 comments on commit bc092cc

Please sign in to comment.