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.
85 lines
3.1 KiB
Go
85 lines
3.1 KiB
Go
package store
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
// WebhookDelivery is one persisted inbound webhook hit. Recorded after the
|
|
// handler decides what to do so the row reflects the final outcome.
|
|
type WebhookDelivery struct {
|
|
ID int64 `json:"id"`
|
|
TargetType string `json:"target_type"` // "trigger" today; legacy rows may carry "project" or "site"
|
|
TargetID string `json:"target_id"`
|
|
TargetName string `json:"target_name"`
|
|
ReceivedAt string `json:"received_at"`
|
|
SourceIP string `json:"source_ip"`
|
|
SignatureState string `json:"signature_state"` // "valid" / "invalid" / "missing" / "unconfigured"
|
|
StatusCode int `json:"status_code"`
|
|
Outcome string `json:"outcome"` // "deploy" / "skip" / "rejected" / etc.
|
|
Detail string `json:"detail"`
|
|
BodySize int `json:"body_size"`
|
|
}
|
|
|
|
// InsertWebhookDelivery persists a single webhook delivery record. Best-effort
|
|
// — failures here must not block the actual webhook handler, so callers
|
|
// should log and continue rather than propagate.
|
|
func (s *Store) InsertWebhookDelivery(d WebhookDelivery) error {
|
|
_, err := s.db.Exec(
|
|
`INSERT INTO webhook_deliveries
|
|
(target_type, target_id, target_name, source_ip, signature_state,
|
|
status_code, outcome, detail, body_size)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
|
d.TargetType, d.TargetID, d.TargetName, d.SourceIP, d.SignatureState,
|
|
d.StatusCode, d.Outcome, d.Detail, d.BodySize,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("insert webhook delivery: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ListWebhookDeliveriesByTarget returns the most recent N deliveries for
|
|
// a specific target. Used by the trigger detail panel after the legacy
|
|
// project / site detail pages were removed.
|
|
func (s *Store) ListWebhookDeliveriesByTarget(targetType, targetID string, limit int) ([]WebhookDelivery, error) {
|
|
if limit <= 0 || limit > 200 {
|
|
limit = 50
|
|
}
|
|
rows, err := s.db.Query(
|
|
`SELECT id, target_type, target_id, target_name, received_at, source_ip,
|
|
signature_state, status_code, outcome, detail, body_size
|
|
FROM webhook_deliveries
|
|
WHERE target_type = ? AND target_id = ?
|
|
ORDER BY id DESC
|
|
LIMIT ?`,
|
|
targetType, targetID, limit,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("query webhook deliveries: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
out := []WebhookDelivery{}
|
|
for rows.Next() {
|
|
var d WebhookDelivery
|
|
if err := rows.Scan(&d.ID, &d.TargetType, &d.TargetID, &d.TargetName, &d.ReceivedAt,
|
|
&d.SourceIP, &d.SignatureState, &d.StatusCode, &d.Outcome, &d.Detail, &d.BodySize); err != nil {
|
|
return nil, fmt.Errorf("scan webhook delivery: %w", err)
|
|
}
|
|
out = append(out, d)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// PruneWebhookDeliveriesBefore deletes rows older than the given timestamp.
|
|
// Returns the number of rows removed. Run on the same daily cron as the
|
|
// event log to keep the table from growing without bound.
|
|
func (s *Store) PruneWebhookDeliveriesBefore(beforeTS string) (int64, error) {
|
|
res, err := s.db.Exec(`DELETE FROM webhook_deliveries WHERE received_at < ?`, beforeTS)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("prune webhook deliveries: %w", err)
|
|
}
|
|
n, _ := res.RowsAffected()
|
|
return n, nil
|
|
}
|