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
8 changes: 7 additions & 1 deletion src/router/container-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,13 @@ async function createAndMonitorContainer(
*/
export async function spawnWorker(job: Job<CascadeJob>): Promise<void> {
const jobId = job.id ?? `unknown-${Date.now()}`;
const containerName = `cascade-worker-${jobId}`;
// Docker container names accept only `[a-zA-Z0-9][a-zA-Z0-9_.-]`. PR #1226
// introduced coalesced-job IDs shaped `coalesce:${projectId}:${workItemId}`
// where the colons crashed `createContainer` with HTTP 400 β€” every coalesced
// job that fired post-deploy failed to spawn. Sanitize disallowed chars to
// underscores; the original `jobId` stays intact in logs and dedup keys.
const containerSafeJobId = jobId.replace(/[^a-zA-Z0-9_.-]/g, '_');
const containerName = `cascade-worker-${containerSafeJobId}`;

// Resolve projectId once β€” used for both credential env and work-item lock tracking
const projectId = await extractProjectIdFromJob(job.data);
Expand Down
37 changes: 37 additions & 0 deletions tests/unit/router/container-manager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,43 @@ describe('spawnWorker', () => {
resolveWait();
});

it('sanitizes Docker-invalid characters in jobId when building the container name', async () => {
// Live regression: PR #1226 introduced jobIds shaped `coalesce:${projectId}:${workItemId}`
// (e.g. `coalesce:ucho:MNG-413`). Docker container names allow only
// `[a-zA-Z0-9][a-zA-Z0-9_.-]`, so the colons crashed `createContainer`
// with HTTP 400 "bad parameter β€” Invalid container name". Every
// coalesced job that fired post-deploy failed to spawn its worker.
// Sanitization replaces the rejected chars (colons here, plus any future
// shape-shift) with underscores.
const { resolveWait } = setupMockContainer();

await spawnWorker(makeJob({ id: 'coalesce:ucho:MNG-413' }) as never);

expect(mockDockerCreateContainer).toHaveBeenCalledWith(
expect.objectContaining({
name: 'cascade-worker-coalesce_ucho_MNG-413',
}),
);

resolveWait();
});

it('passes through Docker-safe jobIds unchanged in the container name', async () => {
// Regression pin: ordinary jobIds (BullMQ default UUIDs, plain strings,
// hyphens, dots, underscores) must not be mangled by the sanitizer.
const { resolveWait } = setupMockContainer();

await spawnWorker(makeJob({ id: 'github-1234567890abcdef' }) as never);

expect(mockDockerCreateContainer).toHaveBeenCalledWith(
expect.objectContaining({
name: 'cascade-worker-github-1234567890abcdef',
}),
);

resolveWait();
});

it('cleans up worker after container exits', async () => {
const { resolveWait } = setupMockContainer();

Expand Down
Loading