Fix: Rebase errors

This commit is contained in:
Daniel Hougaard
2024-03-17 18:49:30 +01:00
parent a257743fa5
commit 1ac8ddbd92
3 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -84,7 +84,7 @@ export const ORGANIZATIONS = {
export const PROJECTS = { export const PROJECTS = {
CREATE: { 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.", projectName: "The name of the project to create.",
slug: "An optional slug for the project." slug: "An optional slug for the project."
}, },
@@ -197,6 +197,7 @@ export const FOLDERS = {
export const RAW_SECRETS = { export const RAW_SECRETS = {
LIST: { LIST: {
workspaceId: "The ID of the project to list secrets from.", 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.", environment: "The slug of the environment to list secrets from.",
secretPath: "The secret path to list secrets from.", secretPath: "The secret path to list secrets from.",
includeImports: "Weather to include imported secrets or not." includeImports: "Weather to include imported secrets or not."
@@ -151,7 +151,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
}) })
.optional() .optional()
.describe(PROJECTS.CREATE.slug), .describe(PROJECTS.CREATE.slug),
organizationId: z.string().trim().describe(PROJECTS.CREATE.organizationId) organizationSlug: z.string().trim().describe(PROJECTS.CREATE.organizationSlug)
}), }),
response: { response: {
200: z.object({ 200: z.object({
@@ -36,6 +36,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
], ],
querystring: z.object({ querystring: z.object({
workspaceId: z.string().trim().optional().describe(RAW_SECRETS.LIST.workspaceId), 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), environment: z.string().trim().optional().describe(RAW_SECRETS.LIST.environment),
secretPath: z.string().trim().default("/").transform(removeTrailingSlash).describe(RAW_SECRETS.LIST.secretPath), secretPath: z.string().trim().default("/").transform(removeTrailingSlash).describe(RAW_SECRETS.LIST.secretPath),
include_imports: z include_imports: z