cba2149aa9
Wraps up the workload refactor with the fixes that came out of the multi-agent code review (see docs/plans/workload-refactor.md "What actually shipped"). Backend: - store.ReconcileContainer: separate write path so the 30s reconciler tick no longer overwrites deployer-owned fields (subdomain, proxy_route_id, npm_proxy_id, image_tag). - Container.stage_id column + index; ListProxyRoutes / ListContainersByStageID join via stage_id (survives stage rename), with legacy fallback to (project_id, role=stage_name). - Reconciler: workload-existence check (rejects forged tinyforge.workload.id labels), skips inventing project-kind rows, child-context cancel before wg.Wait() on shutdown. - Transactional CRUD across projects / stacks / static_sites: parent UPDATE and workload sync land in one transaction so secret rotations are durable. - Webhook routing reads exclusively through workloads.webhook_secret; legacy GetProjectByWebhookSecret / GetStaticSiteByWebhookSecret fallback removed. - store.GetStackByComposeProjectName + indexed lookup (no more full-table stack scan per compose container per tick). - store.ListMissingSweepRows: filtered query for the missing-sweep. - /api/instances/* handlers verify (workload_id, role) match URL (project_id, stage_name) before mutating — closes the cross-project hijack the security review flagged. - extra_json no longer referenced from Go (column kept on disk for now). Frontend: - WorkloadContainers.svelte: generic detail-page panel reusable by stack and site detail pages. - Containers page polish: client-side kind/state filters over an unfiltered fetch, URL-synced filters, race-safe loads via sequence number, EN+RU i18n, sidebar counter via navCounts.containers. Misc: - scripts/dev-server.sh: tolerate empty netstat grep result. - .gitignore: ignore docker-watcher binaries, .claude/worktrees/, .facts-sync.json.
282 lines
8.6 KiB
Go
282 lines
8.6 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"log/slog"
|
|
"net/http"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
|
|
"github.com/alexei/tinyforge/internal/store"
|
|
)
|
|
|
|
// listInstances handles GET /api/projects/{id}/stages/{stage}/instances.
|
|
// Reads the normalized container index — the legacy `instances` table is gone.
|
|
// JSON shape stays Container-shaped (id, container_id, image_tag, subdomain,
|
|
// state, port, etc.), so the frontend type may show some renamed fields
|
|
// (status→state, last_alive_at→last_seen_at).
|
|
func (s *Server) listInstances(w http.ResponseWriter, r *http.Request) {
|
|
stageID := chi.URLParam(r, "stage")
|
|
|
|
if _, err := s.store.GetStageByID(stageID); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
respondNotFound(w, "stage")
|
|
return
|
|
}
|
|
slog.Error("failed to get stage", "error", err)
|
|
respondError(w, http.StatusInternalServerError, "internal server error")
|
|
return
|
|
}
|
|
|
|
containers, err := s.store.ListContainersByStageID(stageID)
|
|
if err != nil {
|
|
slog.Error("failed to list containers", "error", err)
|
|
respondError(w, http.StatusInternalServerError, "internal server error")
|
|
return
|
|
}
|
|
|
|
// Reconcile container state with Docker's actual state — covers the
|
|
// case where a container was killed externally between deployer writes
|
|
// and the next reconciler tick.
|
|
ctx := r.Context()
|
|
for i, c := range containers {
|
|
if c.ContainerID == "" || c.State == "removing" {
|
|
continue
|
|
}
|
|
running, err := s.docker.IsContainerRunning(ctx, c.ContainerID)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
actual := "stopped"
|
|
if running {
|
|
actual = "running"
|
|
}
|
|
if c.State != actual {
|
|
containers[i].State = actual
|
|
_ = s.store.UpdateContainerState(c.ID, actual)
|
|
}
|
|
}
|
|
|
|
respondJSON(w, http.StatusOK, containers)
|
|
}
|
|
|
|
// deployRequest is the expected JSON body for triggering a deploy.
|
|
type deployRequest struct {
|
|
ImageTag string `json:"image_tag"`
|
|
}
|
|
|
|
// deployInstance handles POST /api/projects/{id}/stages/{stage}/instances.
|
|
func (s *Server) deployInstance(w http.ResponseWriter, r *http.Request) {
|
|
projectID := chi.URLParam(r, "id")
|
|
stageID := chi.URLParam(r, "stage")
|
|
|
|
if _, err := s.store.GetProjectByID(projectID); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
respondNotFound(w, "project")
|
|
return
|
|
}
|
|
slog.Error("failed to get project", "error", err)
|
|
respondError(w, http.StatusInternalServerError, "internal server error")
|
|
return
|
|
}
|
|
|
|
if _, err := s.store.GetStageByID(stageID); err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
respondNotFound(w, "stage")
|
|
return
|
|
}
|
|
slog.Error("failed to get stage", "error", err)
|
|
respondError(w, http.StatusInternalServerError, "internal server error")
|
|
return
|
|
}
|
|
|
|
var req deployRequest
|
|
if !decodeJSON(w, r, &req) {
|
|
return
|
|
}
|
|
|
|
if req.ImageTag == "" {
|
|
respondError(w, http.StatusBadRequest, "image_tag is required")
|
|
return
|
|
}
|
|
|
|
deployID, err := s.deployer.AsyncTriggerDeploy(r.Context(), projectID, stageID, req.ImageTag)
|
|
if err != nil {
|
|
slog.Error("failed to trigger deploy", "error", err)
|
|
respondError(w, http.StatusInternalServerError, "internal server error")
|
|
return
|
|
}
|
|
respondJSON(w, http.StatusAccepted, map[string]string{
|
|
"status": "deploying",
|
|
"deploy_id": deployID,
|
|
"project_id": projectID,
|
|
"stage_id": stageID,
|
|
"image_tag": req.ImageTag,
|
|
})
|
|
}
|
|
|
|
// removeInstance handles DELETE /api/projects/{id}/stages/{stage}/instances/{iid}.
|
|
// {iid} is the container row ID (same UUID as the legacy instance ID).
|
|
// Verifies that the container belongs to the project + stage in the URL —
|
|
// without this check, a stale URL could delete an unrelated stack/site row.
|
|
func (s *Server) removeInstance(w http.ResponseWriter, r *http.Request) {
|
|
c, ok := s.resolveAndAuthorizeInstance(w, r)
|
|
if !ok {
|
|
return
|
|
}
|
|
id := c.ID
|
|
|
|
// Remove the Docker container if it has one.
|
|
if c.ContainerID != "" {
|
|
if err := s.docker.RemoveContainer(r.Context(), c.ContainerID, true); err != nil {
|
|
slog.Error("remove container", "container_id", c.ContainerID, "error", err)
|
|
}
|
|
}
|
|
|
|
// Delete proxy route if it has one.
|
|
if c.ProxyRouteID != "" {
|
|
if err := s.proxyProvider.DeleteRoute(r.Context(), c.ProxyRouteID); err != nil {
|
|
slog.Warn("delete proxy route on container removal", "route_id", c.ProxyRouteID, "error", err)
|
|
}
|
|
}
|
|
|
|
// Delete container row.
|
|
if err := s.store.DeleteContainer(id); err != nil {
|
|
respondError(w, http.StatusInternalServerError, "failed to delete container")
|
|
return
|
|
}
|
|
respondJSON(w, http.StatusOK, map[string]string{"deleted": id})
|
|
}
|
|
|
|
// stopInstance handles POST /api/projects/{id}/stages/{stage}/instances/{iid}/stop.
|
|
func (s *Server) stopInstance(w http.ResponseWriter, r *http.Request) {
|
|
s.controlInstance(w, r, "stop")
|
|
}
|
|
|
|
// startInstance handles POST /api/projects/{id}/stages/{stage}/instances/{iid}/start.
|
|
func (s *Server) startInstance(w http.ResponseWriter, r *http.Request) {
|
|
s.controlInstance(w, r, "start")
|
|
}
|
|
|
|
// restartInstance handles POST /api/projects/{id}/stages/{stage}/instances/{iid}/restart.
|
|
func (s *Server) restartInstance(w http.ResponseWriter, r *http.Request) {
|
|
s.controlInstance(w, r, "restart")
|
|
}
|
|
|
|
// controlInstance performs a stop/start/restart action on a container.
|
|
// The container's ownership of the URL-provided project + stage is verified
|
|
// before any Docker call — see resolveAndAuthorizeInstance for rationale.
|
|
func (s *Server) controlInstance(w http.ResponseWriter, r *http.Request, action string) {
|
|
c, ok := s.resolveAndAuthorizeInstance(w, r)
|
|
if !ok {
|
|
return
|
|
}
|
|
id := c.ID
|
|
|
|
if c.ContainerID == "" {
|
|
respondError(w, http.StatusBadRequest, "container row has no docker container bound")
|
|
return
|
|
}
|
|
|
|
ctx := r.Context()
|
|
var controlErr error
|
|
var newState string
|
|
|
|
switch action {
|
|
case "stop":
|
|
controlErr = s.docker.StopContainer(ctx, c.ContainerID, 10)
|
|
newState = "stopped"
|
|
case "start":
|
|
controlErr = s.docker.StartContainer(ctx, c.ContainerID)
|
|
newState = "running"
|
|
case "restart":
|
|
controlErr = s.docker.RestartContainer(ctx, c.ContainerID, 10)
|
|
newState = "running"
|
|
default:
|
|
respondError(w, http.StatusBadRequest, fmt.Sprintf("unknown action: %s", action))
|
|
return
|
|
}
|
|
|
|
if controlErr != nil {
|
|
slog.Error("failed to control container", "action", action, "id", id, "error", controlErr)
|
|
respondError(w, http.StatusInternalServerError, "internal server error")
|
|
return
|
|
}
|
|
|
|
if err := s.store.UpdateContainerState(id, newState); err != nil {
|
|
slog.Error("update container state", "id", id, "state", newState, "error", err)
|
|
}
|
|
|
|
respondJSON(w, http.StatusOK, map[string]string{
|
|
"instance_id": id,
|
|
"action": action,
|
|
"status": newState,
|
|
})
|
|
}
|
|
|
|
// DeployTriggerer is the interface for triggering deployments.
|
|
type DeployTriggerer interface {
|
|
TriggerDeploy(ctx context.Context, projectID, stageID, imageTag string) error
|
|
AsyncTriggerDeploy(ctx context.Context, projectID, stageID, imageTag string) (string, error)
|
|
}
|
|
|
|
// resolveAndAuthorizeInstance loads the container row identified by {iid} and
|
|
// verifies it actually belongs to the project + stage in the URL path.
|
|
// Without this, a stale or hand-crafted URL like
|
|
//
|
|
// DELETE /api/projects/<projectA>/stages/<stageA>/instances/<rowOfStackB>
|
|
//
|
|
// would happily delete an unrelated stack/site container — admin-only doesn't
|
|
// excuse the cross-project bypass. Returns the container on success or
|
|
// nothing (with the response already written) on failure.
|
|
func (s *Server) resolveAndAuthorizeInstance(w http.ResponseWriter, r *http.Request) (store.Container, bool) {
|
|
projectID := chi.URLParam(r, "id")
|
|
stageName := ""
|
|
if stageID := chi.URLParam(r, "stage"); stageID != "" {
|
|
st, err := s.store.GetStageByID(stageID)
|
|
if err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
respondNotFound(w, "stage")
|
|
return store.Container{}, false
|
|
}
|
|
slog.Error("failed to get stage", "error", err)
|
|
respondError(w, http.StatusInternalServerError, "internal server error")
|
|
return store.Container{}, false
|
|
}
|
|
if st.ProjectID != projectID {
|
|
respondNotFound(w, "stage")
|
|
return store.Container{}, false
|
|
}
|
|
stageName = st.Name
|
|
}
|
|
|
|
id := chi.URLParam(r, "iid")
|
|
c, err := s.store.GetContainerByID(id)
|
|
if err != nil {
|
|
if errors.Is(err, store.ErrNotFound) {
|
|
respondNotFound(w, "container")
|
|
return store.Container{}, false
|
|
}
|
|
slog.Error("failed to get container", "error", err)
|
|
respondError(w, http.StatusInternalServerError, "internal server error")
|
|
return store.Container{}, false
|
|
}
|
|
|
|
w2, err := s.store.GetWorkloadByRef(store.WorkloadKindProject, projectID)
|
|
if err != nil {
|
|
respondNotFound(w, "container")
|
|
return store.Container{}, false
|
|
}
|
|
if c.WorkloadID != w2.ID {
|
|
respondNotFound(w, "container")
|
|
return store.Container{}, false
|
|
}
|
|
if stageName != "" && c.Role != stageName {
|
|
respondNotFound(w, "container")
|
|
return store.Container{}, false
|
|
}
|
|
return c, true
|
|
}
|