d8ab22876f
Build / build (push) Successful in 10m41s
End-to-end extraction of the Instance concept. After this commit:
* internal/store/instances.go — DELETED
* internal/store/models.go — Instance struct gone, ProxyRoute moved here
* containers table is the single source of truth for project/stack/site
container state. instances table is dropped via DROP TABLE migration
(idempotent; re-runnable on every boot).
* Legacy tinyforge.project / tinyforge.stage / tinyforge.instance-id
Docker labels are no longer emitted; only tinyforge.workload.{id,kind},
tinyforge.role, and tinyforge.managed are stamped on new containers.
Backend rewrites:
- internal/deployer: executeDeploy + blueGreenDeploy + rollback +
promote use store.Container natively. New
removeContainer() replaces removeInstance().
enforceMaxInstances reads via
ListContainersByStageID.
- internal/reconciler: legacy tinyforge.instance-id dispatch removed;
upsertByWorkloadLabel now finds existing rows
by docker container ID first and falls back to
the deterministic workloadID:role key.
- internal/stale/scanner: Scan + new FindStaleContainers walk the
containers table; emit StaleContainer JSON.
- internal/stats/collector: ListContainers replaces ListAllInstances.
- internal/webhook/handler: workload-secret lookup tried first; falls back
to project / static_site secret column.
- internal/api: instances.go, stale.go, stats.go, stats_history.go,
projects.go, settings.go, docker.go, dns.go all read /
write through Container.
Docker layer:
- ManagedContainer exposes WorkloadID/Kind/Role from the canonical labels.
- ListContainers filters by tinyforge.managed=true.
- Network creation uses LabelManaged instead of LabelProject.
Frontend:
- Instance type is now a Container alias; .status → .state,
.last_alive_at → .last_seen_at.
- InstanceCard takes stageId as a prop (no longer derived from Instance).
- StaleContainer JSON shape rewritten: { container, workload_name, role,
days_stale }. StaleContainerCard + /containers/stale page updated.
- ProjectCard / homepage / SystemHealthCard filter by .state.
The migration loop now tolerates "no such table" alongside "duplicate
column" / "already exists" so obsolete ALTER TABLE entries targeting the
dropped instances table no-op cleanly on first boot.
Tests: store + deployer + reconciler + webhook + staticsite + notify all
still pass. Frontend svelte-check: zero errors.
50 lines
1.4 KiB
Go
50 lines
1.4 KiB
Go
package deployer
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/alexei/tinyforge/internal/store"
|
|
)
|
|
|
|
// validatePromoteFrom checks that a tag is running in the promote_from stage
|
|
// before allowing it to be deployed to the target stage.
|
|
// Returns nil if no promote_from is configured or if the tag is eligible.
|
|
func (d *Deployer) validatePromoteFrom(stage store.Stage, imageTag string) error {
|
|
if stage.PromoteFrom == "" {
|
|
return nil
|
|
}
|
|
|
|
// Look up the source stage by name within the same project.
|
|
stages, err := d.store.GetStagesByProjectID(stage.ProjectID)
|
|
if err != nil {
|
|
return fmt.Errorf("get stages for project: %w", err)
|
|
}
|
|
|
|
var sourceStage *store.Stage
|
|
for _, s := range stages {
|
|
if s.Name == stage.PromoteFrom {
|
|
sCopy := s
|
|
sourceStage = &sCopy
|
|
break
|
|
}
|
|
}
|
|
|
|
if sourceStage == nil {
|
|
return fmt.Errorf("promote_from stage %q not found in project", stage.PromoteFrom)
|
|
}
|
|
|
|
// Check if the tag is running in the source stage.
|
|
containers, err := d.store.ListContainersByStageID(sourceStage.ID)
|
|
if err != nil {
|
|
return fmt.Errorf("get containers for source stage: %w", err)
|
|
}
|
|
|
|
for _, c := range containers {
|
|
if c.ImageTag == imageTag && (c.State == "running" || c.State == "stopped") {
|
|
return nil // Tag found in source stage, promotion is allowed.
|
|
}
|
|
}
|
|
|
|
return fmt.Errorf("tag %q is not running in stage %q; promotion denied", imageTag, stage.PromoteFrom)
|
|
}
|