Fix: Replaced merge with extend as proposed by Akhil

This commit is contained in:
Daniel Hougaard
2024-04-01 09:52:49 -07:00
parent 4c496d5e3d
commit b9482966cf

View File

@@ -171,11 +171,9 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
response: {
200: z.object({
secrets: secretRawSchema
.merge(
z.object({
secretPath: z.string().optional()
})
)
.extend({
secretPath: z.string().optional()
})
.array(),
imports: z
.object({
@@ -620,20 +618,18 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
response: {
200: z.object({
secrets: SecretsSchema.omit({ secretBlindIndex: true })
.merge(
z.object({
_id: z.string(),
workspace: z.string(),
environment: z.string(),
secretPath: z.string().optional(),
tags: SecretTagsSchema.pick({
id: true,
slug: true,
name: true,
color: true
}).array()
})
)
.extend({
_id: z.string(),
workspace: z.string(),
environment: z.string(),
secretPath: z.string().optional(),
tags: SecretTagsSchema.pick({
id: true,
slug: true,
name: true,
color: true
}).array()
})
.array(),
imports: z
.object({