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.
121 lines
3.5 KiB
Go
121 lines
3.5 KiB
Go
// Package config loads and exports seed configuration. After the hard
|
|
// cutover the seed shape covers only what survives the workload-first
|
|
// refactor: global settings and registries. Project / stage / volume
|
|
// seeding is gone; the new way to bootstrap a workload is the plugin
|
|
// pipeline (POST /api/workloads).
|
|
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"log/slog"
|
|
"os"
|
|
|
|
"github.com/alexei/tinyforge/internal/crypto"
|
|
"github.com/alexei/tinyforge/internal/store"
|
|
"github.com/google/uuid"
|
|
)
|
|
|
|
// ImportSeed loads the seed YAML file and imports its contents into the store.
|
|
// Import is idempotent: it is skipped if any registries already exist.
|
|
// Credential fields (registry tokens, NPM password) are encrypted before storage.
|
|
func ImportSeed(db *store.Store, seedPath string) error {
|
|
if _, err := os.Stat(seedPath); os.IsNotExist(err) {
|
|
slog.Info("no seed file, skipping import", "path", seedPath)
|
|
return nil
|
|
}
|
|
|
|
populated, err := isPopulated(db)
|
|
if err != nil {
|
|
return fmt.Errorf("check if db is populated: %w", err)
|
|
}
|
|
if populated {
|
|
slog.Info("database already has data, skipping seed import")
|
|
return nil
|
|
}
|
|
|
|
cfg, err := LoadSeedFile(seedPath)
|
|
if err != nil {
|
|
return fmt.Errorf("load seed file: %w", err)
|
|
}
|
|
|
|
encKey, err := crypto.KeyFromEnv()
|
|
if err != nil {
|
|
return fmt.Errorf("encryption key: %w", err)
|
|
}
|
|
|
|
if err := importAll(db, cfg, encKey); err != nil {
|
|
return fmt.Errorf("import seed: %w", err)
|
|
}
|
|
|
|
slog.Info("seed config imported", "path", seedPath)
|
|
return nil
|
|
}
|
|
|
|
// isPopulated returns true if the store already contains any registries.
|
|
// Workloads / apps are intentionally not consulted — they get created
|
|
// through the API, not seeded.
|
|
func isPopulated(db *store.Store) (bool, error) {
|
|
registries, err := db.GetAllRegistries()
|
|
if err != nil {
|
|
return false, fmt.Errorf("get registries: %w", err)
|
|
}
|
|
return len(registries) > 0, nil
|
|
}
|
|
|
|
// importAll runs the seed import inside a database transaction.
|
|
func importAll(db *store.Store, cfg SeedConfig, encKey [32]byte) error {
|
|
tx, err := db.DB().Begin()
|
|
if err != nil {
|
|
return fmt.Errorf("begin transaction: %w", err)
|
|
}
|
|
defer tx.Rollback() //nolint:errcheck // rollback after commit is a no-op
|
|
|
|
timestamp := store.Now()
|
|
|
|
for name, regDef := range cfg.Registries {
|
|
encToken, err := crypto.EncryptIfNotEmpty(encKey, regDef.Token)
|
|
if err != nil {
|
|
return fmt.Errorf("encrypt registry %q token: %w", name, err)
|
|
}
|
|
|
|
id := uuid.New().String()
|
|
_, err = tx.Exec(
|
|
`INSERT INTO registries (id, name, url, type, token, created_at, updated_at)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?)`,
|
|
id, name, regDef.URL, regDef.Type, encToken, timestamp, timestamp,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("insert registry %q: %w", name, err)
|
|
}
|
|
}
|
|
|
|
encNpmPassword, err := crypto.EncryptIfNotEmpty(encKey, cfg.Global.Npm.Password)
|
|
if err != nil {
|
|
return fmt.Errorf("encrypt npm password: %w", err)
|
|
}
|
|
|
|
subdomainPattern := cfg.Global.SubdomainPattern
|
|
if subdomainPattern == "" {
|
|
subdomainPattern = "stage-{stage}-{project}"
|
|
}
|
|
|
|
_, err = tx.Exec(
|
|
`UPDATE settings SET
|
|
domain=?, server_ip=?, network=?, subdomain_pattern=?, notification_url=?,
|
|
npm_url=?, npm_email=?, npm_password=?, updated_at=?
|
|
WHERE id = 1`,
|
|
cfg.Global.Domain, cfg.Global.ServerIP, cfg.Global.Network,
|
|
subdomainPattern, cfg.Global.NotificationURL,
|
|
cfg.Global.Npm.URL, cfg.Global.Npm.Email, encNpmPassword, timestamp,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("update settings: %w", err)
|
|
}
|
|
|
|
if err := tx.Commit(); err != nil {
|
|
return fmt.Errorf("commit transaction: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|