Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions web/lib/agent/expected-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -594,15 +594,16 @@ async function buildTraefikConfig(server: Server, allServices: Service[]) {
),
);

const routePorts = buildRuntimeRoutePorts(allServices, ports);
const routes = buildTraefikRoutes({
serverId: server.id,
ports: buildRuntimeRoutePorts(allServices, ports),
ports: routePorts,
routableDeployments,
serverlessServiceIds,
serverlessRouteSuppressedServiceIds,
});
const routedDomains = routes.httpRoutes.map((r) => r.domain);
const certificates = await getAllCertificatesForDomains(routedDomains);
const certificateDomains = buildTraefikCertificateDomains(routePorts);
const certificates = await getAllCertificatesForDomains(certificateDomains);
const controlPlaneUrl = process.env.APP_URL;

if (!controlPlaneUrl) {
Expand Down Expand Up @@ -722,6 +723,17 @@ export function buildTraefikRoutes({
return { httpRoutes, tcpRoutes, udpRoutes };
}

export function buildTraefikCertificateDomains(ports: RouteServicePort[]) {
return Array.from(
new Set(
ports
.filter((port) => port.isPublic && port.protocol === "http")
.map((port) => port.domain?.trim())
.filter((domain): domain is string => Boolean(domain)),
),
).sort();
}

function buildHealthCheck(service: Service): ExpectedContainer["healthCheck"] {
if (!service.healthCheckCmd) return null;

Expand Down
28 changes: 28 additions & 0 deletions web/tests/expected-state.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
buildExpectedContainersFromRows,
buildRuntimeRoutePorts,
buildServerlessRoutesFromRows,
buildTraefikCertificateDomains,
buildTraefikRoutes,
} from "@/lib/agent/expected-state";

Expand Down Expand Up @@ -358,6 +359,33 @@ describe("expected-state pure builders", () => {
expect(routes.httpRoutes).toEqual([]);
});

it("keeps suppressed serverless HTTP domains in certificate selection", () => {
const ports: Parameters<typeof buildTraefikCertificateDomains>[0] = [
{
id: "port_1",
serviceId: "svc_serverless",
port: 3000,
isPublic: true,
protocol: "http",
domain: "sleepy.example.com",
externalPort: null,
tlsPassthrough: false,
},
];

const routes = buildTraefikRoutes({
serverId: "proxy_2",
ports,
routableDeployments: [],
serverlessRouteSuppressedServiceIds: new Set(["svc_serverless"]),
});

expect(routes.httpRoutes).toEqual([]);
expect(buildTraefikCertificateDomains(ports)).toEqual([
"sleepy.example.com",
]);
});

it("keeps worker-only serverless services on direct routes", () => {
const routes = buildTraefikRoutes({
serverId: "proxy_1",
Expand Down
Loading