7733e64b08
A dockerfile or static workload can opt in to reading its deploy config from a
.tinyforge.yml in its own repo. Tinyforge fetches the file, shows field-level
drift vs the live config, and an admin applies it with an explicit Sync. The
repo becomes the source of truth for the declared fields. Manual-sync only;
no auto-apply on deploy, no multi-workload reconcile, no create/delete in v1.
Scope is deliberately source-aware and source_config-resident: dockerfile
declares port/healthcheck/deploy_strategy, static declares deploy_strategy.
The file never carries repo coords or secrets (those stay in the encrypted
DB), which keeps credentials out of the repo.
Backend:
- internal/gitops: Spec/ParseSpec (KnownFields rejects unknown keys), a
source-aware ApplyPlan/BuildPlan, MergeAndValidate (omitted-field-preserving
deep merge + validate-the-merged-result-then-commit — never a partial
config), declared-only Drift with normalization, and Fetch with
ok/no_file/fetch_failed/invalid statuses and token-redacted messages.
- staticsite: DownloadFile added to GitProvider + Gitea/GitHub/GitLab impls,
reusing each provider's SSRF-safe client; 64 KiB cap; ErrFileNotFound.
- store: 4 additive gitops_* columns + setters (disjoint from UpdateWorkload
so the edit-form save and a sync never clobber each other).
- api: GET /workloads/{id}/gitops (status + raw + live drift + managed_fields),
PUT /gitops (admin, enable/path, traversal-safe), POST /gitops/sync (admin,
per-workload locked read->merge->validate->write, audited to event_log).
Frontend:
- GitOpsPanel.svelte: status pill, a purpose-built field-level drift view,
.tinyforge.yml preview, enable ToggleSwitch, Sync via ConfirmDialog; all five
statuses handled, admin affordances gated on the real viewer role.
- GitOps-managed badge (list + detail hero) and a read-only edit-form banner.
- api.ts fetchers + types; i18n apps.detail.gitops.* (en + ru parity).
Built phase-by-phase with an adversarial plan review (caught 5 design flaws
pre-implementation) and an independent review per phase (go / security / ts /
final) — all APPROVE, 0 CRITICAL/HIGH. docs/gitops.md documents the schema and
what's intentionally out of v1. Plan: plans/gitops/.
123 lines
3.1 KiB
Go
123 lines
3.1 KiB
Go
package gitops
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"strconv"
|
|
)
|
|
|
|
// DriftEntry is one field where the repo-declared value differs from the live
|
|
// stored value. Values are display strings; comparison is done on normalized
|
|
// forms so cosmetic differences (default coercion, YAML int vs JSON number)
|
|
// don't register as drift.
|
|
type DriftEntry struct {
|
|
Field string `json:"field"`
|
|
RepoValue string `json:"repo_value"`
|
|
LiveValue string `json:"live_value"`
|
|
}
|
|
|
|
// driftFieldOrder is the stable order drift entries are reported in.
|
|
var driftFieldOrder = []string{keyPort, keyHealthcheck, keyDeployStrategy}
|
|
|
|
// Drift compares the declared overlay (the present, source-supported fields)
|
|
// against the live source_config and returns the fields that differ. Only
|
|
// declared fields are considered — a key the file omits is "unmanaged",
|
|
// neither drift nor clean (review C5). Comparison is post-normalization.
|
|
func Drift(spec Spec, live json.RawMessage, sourceKind string) ([]DriftEntry, error) {
|
|
liveMap := map[string]any{}
|
|
if len(live) > 0 {
|
|
if err := json.Unmarshal(live, &liveMap); err != nil {
|
|
return nil, fmt.Errorf("gitops: decode live source_config: %w", err)
|
|
}
|
|
}
|
|
allowed := supportedKeys(sourceKind)
|
|
declared := declaredValues(spec)
|
|
|
|
var entries []DriftEntry
|
|
for _, k := range driftFieldOrder {
|
|
repoVal, ok := declared[k]
|
|
if !ok || !allowed[k] {
|
|
continue
|
|
}
|
|
liveVal, livePresent := liveMap[k]
|
|
if normalizeField(k, repoVal) == normalizeField(k, liveVal) {
|
|
continue
|
|
}
|
|
entries = append(entries, DriftEntry{
|
|
Field: k,
|
|
RepoValue: displayField(k, repoVal, true),
|
|
LiveValue: displayField(k, liveVal, livePresent),
|
|
})
|
|
}
|
|
return entries, nil
|
|
}
|
|
|
|
// normalizeField returns the canonical comparison form of a field value.
|
|
func normalizeField(key string, v any) string {
|
|
switch key {
|
|
case keyDeployStrategy:
|
|
// "" and "recreate" are the same effective strategy for dockerfile and
|
|
// static (see each source's effectiveStrategy).
|
|
s := toStr(v)
|
|
if s == "" || s == "recreate" {
|
|
return "recreate"
|
|
}
|
|
return s
|
|
case keyPort:
|
|
return canonInt(v)
|
|
default:
|
|
return toStr(v)
|
|
}
|
|
}
|
|
|
|
// displayField renders a value for the UI. present=false means the key is
|
|
// absent from the live config.
|
|
func displayField(key string, v any, present bool) string {
|
|
if !present {
|
|
return "(unset)"
|
|
}
|
|
if key == keyDeployStrategy {
|
|
if s := toStr(v); s == "" {
|
|
return "recreate (default)"
|
|
}
|
|
}
|
|
switch n := v.(type) {
|
|
case float64:
|
|
// JSON numbers decode as float64; show whole numbers without ".0".
|
|
return strconv.FormatInt(int64(n), 10)
|
|
case nil:
|
|
return "(unset)"
|
|
default:
|
|
return fmt.Sprint(v)
|
|
}
|
|
}
|
|
|
|
// canonInt coerces any numeric representation (YAML int, JSON float64, etc.)
|
|
// to a base-10 integer string for value-equality comparison.
|
|
func canonInt(v any) string {
|
|
switch n := v.(type) {
|
|
case int:
|
|
return strconv.Itoa(n)
|
|
case int64:
|
|
return strconv.FormatInt(n, 10)
|
|
case float64:
|
|
return strconv.FormatInt(int64(n), 10)
|
|
case json.Number:
|
|
return n.String()
|
|
case nil:
|
|
return "0"
|
|
default:
|
|
return fmt.Sprint(v)
|
|
}
|
|
}
|
|
|
|
func toStr(v any) string {
|
|
if v == nil {
|
|
return ""
|
|
}
|
|
if s, ok := v.(string); ok {
|
|
return s
|
|
}
|
|
return fmt.Sprint(v)
|
|
}
|