pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-20 11:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix blueprints zod update

Browse Source
This commit is contained in:
Owen
2025-12-07 22:00:55 -05:00
parent 1d7f4322e3
commit e10f7efcbe
1 changed files with 79 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
server/lib/blueprints/types.ts
View File

@@ -328,111 +328,103 @@ export const ConfigSchema = z
sites: Record<string, z.infer<typeof SiteSchema>>; sites: Record<string, z.infer<typeof SiteSchema>>;
}; };
}) })
.refine( .superRefine((config, ctx) => {
// Enforce the full-domain uniqueness across resources in the same stack // Enforce the full-domain uniqueness across resources in the same stack
(config) => { const fullDomainMap = new Map<string, string[]>();
// Extract duplicates for error message
const fullDomainMap = new Map<string, string[]>();
Object.entries(config["proxy-resources"]).forEach( Object.entries(config["proxy-resources"]).forEach(
([resourceKey, resource]) => { ([resourceKey, resource]) => {
const fullDomain = resource["full-domain"]; const fullDomain = resource["full-domain"];
if (fullDomain) { if (fullDomain) {
// Only process if full-domain is defined // Only process if full-domain is defined
if (!fullDomainMap.has(fullDomain)) { if (!fullDomainMap.has(fullDomain)) {
fullDomainMap.set(fullDomain, []); fullDomainMap.set(fullDomain, []);
}
fullDomainMap.get(fullDomain)!.push(resourceKey);
} }
fullDomainMap.get(fullDomain)!.push(resourceKey);
} }
);
const duplicates = Array.from(fullDomainMap.entries())
.filter(([_, resourceKeys]) => resourceKeys.length > 1)
.map(
([fullDomain, resourceKeys]) =>
`'${fullDomain}' used by resources: ${resourceKeys.join(", ")}`
)
.join("; ");
if (duplicates.length !== 0) {
return {
path: ["resources"],
error: `Duplicate 'full-domain' values found: ${duplicates}`
};
} }
);
const fullDomainDuplicates = Array.from(fullDomainMap.entries())
.filter(([_, resourceKeys]) => resourceKeys.length > 1)
.map(
([fullDomain, resourceKeys]) =>
`'${fullDomain}' used by resources: ${resourceKeys.join(", ")}`
)
.join("; ");
if (fullDomainDuplicates.length !== 0) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
path: ["proxy-resources"],
message: `Duplicate 'full-domain' values found: ${fullDomainDuplicates}`
});
} }
)
.refine(
// Enforce proxy-port uniqueness within proxy-resources per protocol // Enforce proxy-port uniqueness within proxy-resources per protocol
(config) => { const protocolPortMap = new Map<string, string[]>();
// Extract duplicates for error message
const protocolPortMap = new Map<string, string[]>();
Object.entries(config["proxy-resources"]).forEach( Object.entries(config["proxy-resources"]).forEach(
([resourceKey, resource]) => { ([resourceKey, resource]) => {
const proxyPort = resource["proxy-port"]; const proxyPort = resource["proxy-port"];
const protocol = resource.protocol; const protocol = resource.protocol;
if (proxyPort !== undefined && protocol !== undefined) { if (proxyPort !== undefined && protocol !== undefined) {
const key = `${protocol}:${proxyPort}`; const key = `${protocol}:${proxyPort}`;
if (!protocolPortMap.has(key)) { if (!protocolPortMap.has(key)) {
protocolPortMap.set(key, []); protocolPortMap.set(key, []);
}
protocolPortMap.get(key)!.push(resourceKey);
} }
protocolPortMap.get(key)!.push(resourceKey);
} }
);
const duplicates = Array.from(protocolPortMap.entries())
.filter(([_, resourceKeys]) => resourceKeys.length > 1)
.map(([protocolPort, resourceKeys]) => {
const [protocol, port] = protocolPort.split(":");
return `${protocol.toUpperCase()} port ${port} used by proxy-resources: ${resourceKeys.join(", ")}`;
})
.join("; ");
if (duplicates.length !== 0) {
return {
path: ["proxy-resources"],
error: `Duplicate 'proxy-port' values found in proxy-resources: ${duplicates}`
};
} }
);
const portDuplicates = Array.from(protocolPortMap.entries())
.filter(([_, resourceKeys]) => resourceKeys.length > 1)
.map(([protocolPort, resourceKeys]) => {
const [protocol, port] = protocolPort.split(":");
return `${protocol.toUpperCase()} port ${port} used by proxy-resources: ${resourceKeys.join(", ")}`;
})
.join("; ");
if (portDuplicates.length !== 0) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
path: ["proxy-resources"],
message: `Duplicate 'proxy-port' values found in proxy-resources: ${portDuplicates}`
});
} }
)
.refine(
// Enforce alias uniqueness within client-resources // Enforce alias uniqueness within client-resources
(config) => { const aliasMap = new Map<string, string[]>();
// Extract duplicates for error message
const aliasMap = new Map<string, string[]>();
Object.entries(config["client-resources"]).forEach( Object.entries(config["client-resources"]).forEach(
([resourceKey, resource]) => { ([resourceKey, resource]) => {
const alias = resource.alias; const alias = resource.alias;
if (alias !== undefined) { if (alias !== undefined) {
if (!aliasMap.has(alias)) { if (!aliasMap.has(alias)) {
aliasMap.set(alias, []); aliasMap.set(alias, []);
}
aliasMap.get(alias)!.push(resourceKey);
} }
aliasMap.get(alias)!.push(resourceKey);
} }
);
const duplicates = Array.from(aliasMap.entries())
.filter(([_, resourceKeys]) => resourceKeys.length > 1)
.map(
([alias, resourceKeys]) =>
`alias '${alias}' used by client-resources: ${resourceKeys.join(", ")}`
)
.join("; ");
if (duplicates.length !== 0) {
return {
path: ["client-resources"],
error: `Duplicate 'alias' values found in client-resources: ${duplicates}`
};
} }
);
const aliasDuplicates = Array.from(aliasMap.entries())
.filter(([_, resourceKeys]) => resourceKeys.length > 1)
.map(
([alias, resourceKeys]) =>
`alias '${alias}' used by client-resources: ${resourceKeys.join(", ")}`
)
.join("; ");
if (aliasDuplicates.length !== 0) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
path: ["client-resources"],
message: `Duplicate 'alias' values found in client-resources: ${aliasDuplicates}`
});
} }
); });
// Type inference from the schema // Type inference from the schema
export type Site = z.infer<typeof SiteSchema>; export type Site = z.infer<typeof SiteSchema>;