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.
175 lines
5.2 KiB
Go
175 lines
5.2 KiB
Go
package api
|
|
|
|
import (
|
|
"errors"
|
|
"log/slog"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
|
|
"github.com/alexei/tinyforge/internal/store"
|
|
)
|
|
|
|
// workloadVolumeRequest is the body shape accepted by the upsert
|
|
// endpoint. Defaults to scope=absolute when unset.
|
|
type workloadVolumeRequest struct {
|
|
Source string `json:"source"`
|
|
Target string `json:"target"`
|
|
Scope string `json:"scope"`
|
|
Name string `json:"name"`
|
|
}
|
|
|
|
// scopeInfo carries one volume scope plus its operator-facing description.
|
|
// The UI uses NeedsName to decide whether to show the name input.
|
|
type scopeInfo struct {
|
|
Scope string `json:"scope"`
|
|
Description string `json:"description"`
|
|
NeedsName bool `json:"needs_name"`
|
|
PathExample string `json:"path_example"`
|
|
}
|
|
|
|
// listVolumeScopes handles GET /api/volumes/scopes. Returns the catalogue
|
|
// of supported volume scopes so the workload-volume editor can render
|
|
// scope-specific help text without baking the list into the frontend.
|
|
func (s *Server) listVolumeScopes(w http.ResponseWriter, r *http.Request) {
|
|
scopes := []scopeInfo{
|
|
{
|
|
Scope: "instance",
|
|
Description: "Each deploy gets its own isolated directory keyed by image tag.",
|
|
NeedsName: false,
|
|
PathExample: "{base}/{workload}/instance-{tag}/{source}",
|
|
},
|
|
{
|
|
Scope: "stage",
|
|
Description: "Shared across all instances of this workload (alias of project scope).",
|
|
NeedsName: false,
|
|
PathExample: "{base}/{workload}/{source}",
|
|
},
|
|
{
|
|
Scope: "project",
|
|
Description: "Shared across all instances of this workload.",
|
|
NeedsName: false,
|
|
PathExample: "{base}/{workload}/{source}",
|
|
},
|
|
{
|
|
Scope: "project_named",
|
|
Description: "A named volume within the workload — multiple mounts can share the name.",
|
|
NeedsName: true,
|
|
PathExample: "{base}/{workload}/_named/{name}/{source}",
|
|
},
|
|
{
|
|
Scope: "named",
|
|
Description: "Globally named volume shared across workloads (e.g. shared databases).",
|
|
NeedsName: true,
|
|
PathExample: "{base}/_named/{name}/{source}",
|
|
},
|
|
{
|
|
Scope: "ephemeral",
|
|
Description: "In-memory tmpfs mount. Fast but data is lost when the container stops.",
|
|
NeedsName: false,
|
|
PathExample: "(tmpfs — no host path)",
|
|
},
|
|
{
|
|
Scope: "absolute",
|
|
Description: "Direct host path. Must be under an allowed path configured in settings.",
|
|
NeedsName: false,
|
|
PathExample: "/mnt/nfs/data (must match allowed paths)",
|
|
},
|
|
}
|
|
respondJSON(w, http.StatusOK, scopes)
|
|
}
|
|
|
|
func (s *Server) listWorkloadVolumes(w http.ResponseWriter, r *http.Request) {
|
|
id := chi.URLParam(r, "id")
|
|
if _, err := s.store.GetWorkloadByID(id); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
respondNotFound(w, "workload")
|
|
return
|
|
}
|
|
respondError(w, http.StatusInternalServerError, "get workload")
|
|
return
|
|
}
|
|
rows, err := s.store.ListWorkloadVolumes(id)
|
|
if err != nil {
|
|
respondError(w, http.StatusInternalServerError, "list workload volumes")
|
|
return
|
|
}
|
|
respondJSON(w, http.StatusOK, rows)
|
|
}
|
|
|
|
func (s *Server) setWorkloadVolume(w http.ResponseWriter, r *http.Request) {
|
|
id := chi.URLParam(r, "id")
|
|
if _, err := s.store.GetWorkloadByID(id); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
respondNotFound(w, "workload")
|
|
return
|
|
}
|
|
respondError(w, http.StatusInternalServerError, "get workload")
|
|
return
|
|
}
|
|
var req workloadVolumeRequest
|
|
if !decodeJSONStrict(w, r, &req) {
|
|
return
|
|
}
|
|
req.Target = strings.TrimSpace(req.Target)
|
|
if req.Target == "" {
|
|
respondError(w, http.StatusBadRequest, "target is required")
|
|
return
|
|
}
|
|
if !strings.HasPrefix(req.Target, "/") {
|
|
respondError(w, http.StatusBadRequest, "target must be an absolute container path")
|
|
return
|
|
}
|
|
if strings.Contains(req.Target, "..") {
|
|
respondError(w, http.StatusBadRequest, "target may not contain path traversal segments")
|
|
return
|
|
}
|
|
scope := req.Scope
|
|
if scope == "" {
|
|
scope = string(store.VolumeScopeAbsolute)
|
|
}
|
|
if !store.IsValidVolumeScope(scope) {
|
|
respondError(w, http.StatusBadRequest, "invalid scope")
|
|
return
|
|
}
|
|
// Absolute-scope mounts must reference a real host path; allow-list
|
|
// enforcement happens at deploy time against settings.AllowedVolumePaths.
|
|
if scope == string(store.VolumeScopeAbsolute) {
|
|
if strings.TrimSpace(req.Source) == "" {
|
|
respondError(w, http.StatusBadRequest, "source is required for absolute scope")
|
|
return
|
|
}
|
|
if strings.Contains(req.Source, "..") {
|
|
respondError(w, http.StatusBadRequest, "source may not contain path traversal segments")
|
|
return
|
|
}
|
|
}
|
|
row, err := s.store.SetWorkloadVolume(store.WorkloadVolume{
|
|
WorkloadID: id,
|
|
Source: req.Source,
|
|
Target: req.Target,
|
|
Scope: scope,
|
|
Name: req.Name,
|
|
})
|
|
if err != nil {
|
|
slog.Error("set workload volume", "workload", id, "target", req.Target, "error", err)
|
|
respondError(w, http.StatusInternalServerError, "set workload volume")
|
|
return
|
|
}
|
|
respondJSON(w, http.StatusOK, row)
|
|
}
|
|
|
|
func (s *Server) deleteWorkloadVolume(w http.ResponseWriter, r *http.Request) {
|
|
volID := chi.URLParam(r, "volID")
|
|
if err := s.store.DeleteWorkloadVolume(volID); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
respondNotFound(w, "workload volume")
|
|
return
|
|
}
|
|
respondError(w, http.StatusInternalServerError, "delete workload volume")
|
|
return
|
|
}
|
|
respondJSON(w, http.StatusOK, map[string]string{"deleted": volID})
|
|
}
|