739b67856a
Build / build (push) Successful in 10m39s
The clean-break delete that closes the workload-first refactor arc.
Net diff: ~30 backend files deleted, ~20 modified, ~12k LOC removed
on the Go side; entire /projects /stacks /sites /deploy frontend
trees gone; ~6.7k LOC removed on the Svelte/TypeScript side.
Backend
- API handlers gone: internal/api/{projects,stages,stage_env,stacks,
static_sites,deploys,instances,volume_browser}.go
- Store CRUD + tests gone: internal/store/{projects,stages,stage_env,
stacks,static_sites,static_site_secrets,deploys,poll_state,volumes,
workload_sync}.go (+ _test.go siblings)
- Legacy deployer pipeline gone: internal/deployer/{bluegreen,promote,
rollback,subdomain,resolver_test}.go; deployer.go trimmed to just the
dispatch surface used by the plugin pipeline
- internal/staticsite/{manager,healthcheck}.go and
internal/stack/manager.go gone (the rest of those packages stay as
helpers imported by the static + compose plugins)
- internal/registry/poller.go gone (legacy registry poller)
- internal/volume.ResolvePath gone; ResolveWorkloadPath stays
- internal/webhook: handleWebhook (project) + handleSiteWebhook (site)
gone; only POST /api/webhook/triggers/{secret} remains
- workload-side webhook URL handlers (getWorkloadWebhook +
regenerateWorkloadWebhook + EnsureWorkloadWebhookSecret +
SetWorkloadWebhookSecret + GetWorkloadByWebhookSecret) gone — they
minted URLs that would 404 against the new trigger-only ingress
- cmd/server/main.go: dropped staticsite.Manager, stack.Manager,
staticsite.HealthChecker, registry poller, SetSiteSyncTriggerer,
SetStaticSiteManager, SetStackManager, wireStaticBackend
- store/store.go: idempotent DROP TABLE IF EXISTS for every legacy
table (projects, stages, stage_env, volumes, deploys, deploy_logs,
poll_states, stacks, stack_revisions, stack_deploys, static_sites,
static_site_secrets); FK order children-then-parents
- store/models.go: dropped Project, Stage, Deploy, DeployLog, StageEnv,
Volume, StaticSite, StaticSiteSecret, Stack, StackRevision,
StackDeploy types; kept WorkloadKind constants as documented strings
- internal/store/helpers.go (new): BoolToInt, rowScanner,
GenerateWebhookSecret extracted from deleted CRUD files
- internal/api/secrets.go (new): forwards to store.GenerateWebhookSecret
so api + store paths share one secret-generation impl (no
panic-vs-UUID-fallback divergence)
- internal/reconciler/reconciler.go: dropped legacy stack-by-compose
+ static-site label paths; only canonical tinyforge.workload.id
dispatch remains
- providers (gitea_content/github_provider/gitlab_provider) gained
path-traversal rejection on every tree entry
- internal/webhook ParsedImage / ParseImageRef demoted to package-
private (no external callers)
Frontend
- /projects /stacks /sites /deploy routes deleted (entire trees)
- ProjectCard / InstanceCard / StaleContainerCard components deleted
- api.ts: dropped every project/stage/stack/site/deploy/instance
helper + types (Project, Stage, Stack, StaticSite, Deploy,
Instance, Volume, etc.); kept Workload, Container, App, Settings,
Registry, EventTrigger, LogScanRule, webhook envelopes
- WorkloadWebhook type + getWorkloadWebhook/regenerateWorkloadWebhook
api functions gone (mirror of the backend deletion above)
- web/src/routes/+layout.svelte: dropped /projects /sites /stacks
/deploy nav entries, trimmed quick-nav keymap
- web/src/routes/+page.svelte: dashboard rewrite — reads
listWorkloads + listContainers only; 4-card stat grid
(workloads/running/failed/stale) + recent workloads strip
- navCounts.ts, SystemHealthCard.svelte, ContainerLogs.svelte,
ContainerStats.svelte, StatusBadge.svelte, TagCombobox.svelte,
proxies/+page.svelte, containers/+page.svelte all rewired to the
workload-first surface
- AbortController plumbing on dashboard, nav-counts, stale page,
SystemHealthCard so navigation doesn't leave dangling fetches
- i18n: dropped projects.*, projectDetail.*, envEditor.*,
volumeEditor.*, volumeBrowser.*, quickDeploy.*, sites.*, stacks.*,
instance.*, confirm.* namespaces; en/ru parity preserved (1042
keys each)
Hardening from go-reviewer + security-reviewer + typescript-reviewer
subagent passes (0 CRITICAL across all three; 1 HIGH + ~12 MEDIUM
addressed inline before commit):
- Sec H1: dead-end workload webhook URL handlers (would mint URLs
that 404 the new trigger-only ingress) deleted across backend +
frontend
- Go M1: IsTerminalDeployStatus dropped (no production callers)
- Go M2: ParsedImage/ParseImageRef lowercased (in-package only)
- Go M6: generateWebhookSecret unified — api shim forwards to
store.GenerateWebhookSecret
- Doc/comment freshness: stage_id (no longer FK), ProxyRoute legacy
field names, workloadIDRow rationale, webhook_deliveries.target_type
enum, WebhookDeliveryLog component header
Doc
- WORKLOAD_REFACTOR_TODO: cutover marked DONE; all three Priority 1
items are now shipped. Next focus is Priority 3 polish (apps.* i18n
+ codemap entries) and Priority 4 tests.
Behavioral notes for operators upgrading from a pre-cutover build
- Existing rows in the dropped tables disappear on first boot.
- Legacy webhook URLs at /api/webhook/{secret} and
/api/webhook/sites/{secret} return 404; CI configs must repoint to
/api/webhook/triggers/{secret} (the trigger-split boot backfill
lifted any embedded workload secret onto a Trigger row, so the
secret value itself carries over).
- Frontend routes /projects /stacks /sites /deploy are gone; nav
links replaced with /apps and /triggers.
286 lines
8.7 KiB
Go
286 lines
8.7 KiB
Go
package reconciler
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/alexei/tinyforge/internal/docker"
|
|
"github.com/alexei/tinyforge/internal/store"
|
|
)
|
|
|
|
// fakeDocker is a tiny stand-in for docker.Client. The reconciler depends on
|
|
// the DockerLister interface so we don't need a real daemon for unit tests.
|
|
type fakeDocker struct {
|
|
items []docker.ReconcileItem
|
|
}
|
|
|
|
func (f *fakeDocker) ListAllForReconciler(ctx context.Context) ([]docker.ReconcileItem, error) {
|
|
return f.items, nil
|
|
}
|
|
|
|
func newTestStore(t *testing.T) *store.Store {
|
|
t.Helper()
|
|
s, err := store.New(":memory:")
|
|
if err != nil {
|
|
t.Fatalf("create store: %v", err)
|
|
}
|
|
t.Cleanup(func() { s.Close() })
|
|
return s
|
|
}
|
|
|
|
// makeWorkload inserts a workload row with the given kind so reconciler
|
|
// dispatch can resolve it by ID.
|
|
func makeWorkload(t *testing.T, st *store.Store, name, kind string) store.Workload {
|
|
t.Helper()
|
|
w, err := st.CreateWorkload(store.Workload{
|
|
Kind: kind, RefID: name + "-ref", Name: name,
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("CreateWorkload: %v", err)
|
|
}
|
|
return w
|
|
}
|
|
|
|
func TestReconcileWorkloadLabelledStackContainer(t *testing.T) {
|
|
st := newTestStore(t)
|
|
|
|
w := makeWorkload(t, st, "wf-stack", "stack")
|
|
|
|
// One container with the canonical workload labels stamped.
|
|
fake := &fakeDocker{items: []docker.ReconcileItem{{
|
|
ID: "docker-abc",
|
|
Name: "wf-stack-web-1",
|
|
Image: "nginx:1.27",
|
|
State: "running",
|
|
Labels: map[string]string{
|
|
docker.LabelManaged: "true",
|
|
docker.LabelWorkloadID: w.ID,
|
|
docker.LabelWorkloadKind: "stack",
|
|
docker.LabelRole: "web",
|
|
},
|
|
Ports: []uint16{8080},
|
|
}}}
|
|
|
|
r := New(st, fake, 0)
|
|
if err := r.ReconcileOnce(context.Background()); err != nil {
|
|
t.Fatalf("ReconcileOnce: %v", err)
|
|
}
|
|
|
|
rows, _ := st.ListContainersByWorkload(w.ID)
|
|
if len(rows) != 1 {
|
|
t.Fatalf("expected 1 container row, got %d", len(rows))
|
|
}
|
|
got := rows[0]
|
|
if got.ContainerID != "docker-abc" {
|
|
t.Fatalf("container_id not bound: got %q", got.ContainerID)
|
|
}
|
|
if got.Role != "web" || got.WorkloadKind != "stack" {
|
|
t.Fatalf("dispatch wrong: %+v", got)
|
|
}
|
|
if got.State != "running" || got.Port != 8080 {
|
|
t.Fatalf("state/port wrong: %+v", got)
|
|
}
|
|
}
|
|
|
|
func TestReconcileMarksMissingRows(t *testing.T) {
|
|
st := newTestStore(t)
|
|
|
|
w := makeWorkload(t, st, "missing-stack", "stack")
|
|
|
|
// Pre-existing row with a real container_id that no longer exists.
|
|
if err := st.UpsertContainer(store.Container{
|
|
ID: w.ID + ":web", WorkloadID: w.ID, WorkloadKind: "stack",
|
|
Role: "web", ContainerID: "docker-gone", State: "running",
|
|
}); err != nil {
|
|
t.Fatalf("seed: %v", err)
|
|
}
|
|
|
|
// Reconciler sees nothing.
|
|
r := New(st, &fakeDocker{}, 0)
|
|
if err := r.ReconcileOnce(context.Background()); err != nil {
|
|
t.Fatalf("ReconcileOnce: %v", err)
|
|
}
|
|
|
|
got, _ := st.GetContainerByID(w.ID + ":web")
|
|
if got.State != "missing" {
|
|
t.Fatalf("expected state=missing, got %q", got.State)
|
|
}
|
|
}
|
|
|
|
func TestReconcileSkipsRowsAwaitingDocker(t *testing.T) {
|
|
st := newTestStore(t)
|
|
|
|
w := makeWorkload(t, st, "pending", "stack")
|
|
|
|
// A row with empty container_id (deployer placeholder, awaiting docker
|
|
// create). Reconciler must not mark this as missing.
|
|
if err := st.UpsertContainer(store.Container{
|
|
ID: w.ID + ":web", WorkloadID: w.ID, WorkloadKind: "stack",
|
|
Role: "web", ContainerID: "", State: "starting",
|
|
}); err != nil {
|
|
t.Fatalf("seed: %v", err)
|
|
}
|
|
|
|
r := New(st, &fakeDocker{}, 0)
|
|
if err := r.ReconcileOnce(context.Background()); err != nil {
|
|
t.Fatalf("ReconcileOnce: %v", err)
|
|
}
|
|
|
|
got, _ := st.GetContainerByID(w.ID + ":web")
|
|
if got.State != "starting" {
|
|
t.Fatalf("placeholder row should keep state, got %q", got.State)
|
|
}
|
|
}
|
|
|
|
func TestReconcileIgnoresUnmanagedContainers(t *testing.T) {
|
|
// A container without the canonical workload label is ignored even if
|
|
// it carries other labels — only tinyforge.workload.id is honored.
|
|
st := newTestStore(t)
|
|
fake := &fakeDocker{items: []docker.ReconcileItem{{
|
|
ID: "docker-foreign", Labels: map[string]string{"app": "other"},
|
|
}}}
|
|
r := New(st, fake, 0)
|
|
if err := r.ReconcileOnce(context.Background()); err != nil {
|
|
t.Fatalf("ReconcileOnce: %v", err)
|
|
}
|
|
rows, _ := st.ListContainers(store.ContainerFilter{})
|
|
if len(rows) != 0 {
|
|
t.Fatalf("foreign container should not produce rows, got %d", len(rows))
|
|
}
|
|
}
|
|
|
|
// TestReconcileDoesNotClobberDeployerFields guards against the regression where
|
|
// the reconciler's upsert wiped subdomain / proxy_route_id / npm_proxy_id /
|
|
// image_tag / stage_id on every tick because those columns were included in
|
|
// the ON CONFLICT DO UPDATE SET clause but never populated by the reconciler.
|
|
func TestReconcileDoesNotClobberDeployerFields(t *testing.T) {
|
|
st := newTestStore(t)
|
|
|
|
// Project workload — exercises the path most affected by the regression
|
|
// (proxies, blue-green slots, image-tag-based stale detection).
|
|
w := makeWorkload(t, st, "p", "project")
|
|
|
|
// Deployer wrote the row with proxy / subdomain / image_tag / stage_id.
|
|
deployerRow := store.Container{
|
|
ID: "deploy-uuid-1", WorkloadID: w.ID, WorkloadKind: "project",
|
|
Role: "prod", StageID: "stage-prod-id", ContainerID: "docker-aaa",
|
|
ImageRef: "nginx:1.27", ImageTag: "1.27", State: "running", Port: 8080,
|
|
Subdomain: "prod-p", ProxyRouteID: "route-42", NpmProxyID: 7,
|
|
}
|
|
if err := st.UpsertContainer(deployerRow); err != nil {
|
|
t.Fatalf("seed deployer row: %v", err)
|
|
}
|
|
|
|
// Reconciler sees the same docker container — no proxy fields in labels.
|
|
fake := &fakeDocker{items: []docker.ReconcileItem{{
|
|
ID: "docker-aaa", Image: "nginx:1.27", State: "running",
|
|
Labels: map[string]string{
|
|
docker.LabelManaged: "true",
|
|
docker.LabelWorkloadID: w.ID,
|
|
docker.LabelWorkloadKind: "project",
|
|
docker.LabelRole: "prod",
|
|
},
|
|
Ports: []uint16{8080},
|
|
}}}
|
|
r := New(st, fake, 0)
|
|
if err := r.ReconcileOnce(context.Background()); err != nil {
|
|
t.Fatalf("ReconcileOnce: %v", err)
|
|
}
|
|
|
|
got, _ := st.GetContainerByID("deploy-uuid-1")
|
|
if got.Subdomain != "prod-p" {
|
|
t.Fatalf("subdomain wiped: %q", got.Subdomain)
|
|
}
|
|
if got.ProxyRouteID != "route-42" {
|
|
t.Fatalf("proxy_route_id wiped: %q", got.ProxyRouteID)
|
|
}
|
|
if got.NpmProxyID != 7 {
|
|
t.Fatalf("npm_proxy_id wiped: %d", got.NpmProxyID)
|
|
}
|
|
if got.ImageTag != "1.27" {
|
|
t.Fatalf("image_tag wiped: %q", got.ImageTag)
|
|
}
|
|
if got.StageID != "stage-prod-id" {
|
|
t.Fatalf("stage_id wiped: %q", got.StageID)
|
|
}
|
|
}
|
|
|
|
// TestReconcileRejectsForgedWorkloadLabel guards C2 — a Docker container
|
|
// claiming a non-existent workload_id must be ignored, not adopted into the
|
|
// containers index.
|
|
func TestReconcileRejectsForgedWorkloadLabel(t *testing.T) {
|
|
st := newTestStore(t)
|
|
fake := &fakeDocker{items: []docker.ReconcileItem{{
|
|
ID: "docker-evil",
|
|
Labels: map[string]string{
|
|
docker.LabelManaged: "true",
|
|
docker.LabelWorkloadID: "wl-does-not-exist",
|
|
docker.LabelWorkloadKind: "project",
|
|
docker.LabelRole: "prod",
|
|
},
|
|
}}}
|
|
r := New(st, fake, 0)
|
|
if err := r.ReconcileOnce(context.Background()); err != nil {
|
|
t.Fatalf("ReconcileOnce: %v", err)
|
|
}
|
|
rows, _ := st.ListContainers(store.ContainerFilter{})
|
|
if len(rows) != 0 {
|
|
t.Fatalf("forged label should produce no row, got %d", len(rows))
|
|
}
|
|
}
|
|
|
|
// TestReconcileSkipsProjectInsertWithoutDeployerRow guards H3 — the reconciler
|
|
// must not invent a project container row, since the deployer is the
|
|
// authoritative writer and inventing rows races with MaxInstances > 1 deploys.
|
|
func TestReconcileSkipsProjectInsertWithoutDeployerRow(t *testing.T) {
|
|
st := newTestStore(t)
|
|
w := makeWorkload(t, st, "p2", "project")
|
|
|
|
// Reconciler sees a real container with project labels but no deployer
|
|
// row exists yet (race during deploy).
|
|
fake := &fakeDocker{items: []docker.ReconcileItem{{
|
|
ID: "docker-race", Image: "nginx", State: "running",
|
|
Labels: map[string]string{
|
|
docker.LabelManaged: "true",
|
|
docker.LabelWorkloadID: w.ID,
|
|
docker.LabelWorkloadKind: "project",
|
|
docker.LabelRole: "prod",
|
|
},
|
|
}}}
|
|
r := New(st, fake, 0)
|
|
if err := r.ReconcileOnce(context.Background()); err != nil {
|
|
t.Fatalf("ReconcileOnce: %v", err)
|
|
}
|
|
rows, _ := st.ListContainersByWorkload(w.ID)
|
|
if len(rows) != 0 {
|
|
t.Fatalf("project insert without deployer row should be skipped, got %d rows", len(rows))
|
|
}
|
|
}
|
|
|
|
func TestReconcileNormalizesState(t *testing.T) {
|
|
st := newTestStore(t)
|
|
w := makeWorkload(t, st, "norm", "stack")
|
|
|
|
fake := &fakeDocker{items: []docker.ReconcileItem{{
|
|
ID: "docker-1",
|
|
Image: "nginx",
|
|
State: "exited",
|
|
Labels: map[string]string{
|
|
docker.LabelManaged: "true",
|
|
docker.LabelWorkloadID: w.ID,
|
|
docker.LabelWorkloadKind: "stack",
|
|
docker.LabelRole: "web",
|
|
},
|
|
}}}
|
|
|
|
r := New(st, fake, 0)
|
|
if err := r.ReconcileOnce(context.Background()); err != nil {
|
|
t.Fatalf("ReconcileOnce: %v", err)
|
|
}
|
|
|
|
got, _ := st.GetContainerByID(w.ID + ":web")
|
|
if got.State != "stopped" {
|
|
t.Fatalf("docker 'exited' should normalize to 'stopped', got %q", got.State)
|
|
}
|
|
}
|