mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 07:41:27 +00:00
refactor(db): port service clone/move ops to sqlc (#76)
Tranche 2: cloneServiceRow's INSERT...SELECT (volumes and traefik_labels now read straight from the source row — traefik_labels was silently dropped before, and the jsonb param round-trip goes away), domain and variable copies, name-conflict counts, move UPDATE, project owner check. Also fixes serviceWriteAccess: user_id is a context string, not a uuid.UUID — the tranche-1 cast silently failed owner checks for non-admins. Live tests cover the domain invariants and a full clone round-trip (config, domains, variables). Generated with [Devin](https://devin.ai) Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
302c595380
commit
687555fc78
6 files changed
+328
-61
No files matched your search
@@ -143,3 +143,83 @@ func TestServiceDomainsLiveInvariants(t *testing.T) {
|
||||
t.Fatalf("legacy after delete = %q, want %q", legacy, d1.Domain)
|
||||
}
|
||||
}
|
||||
|
||||
// Live clone test: cloneServiceRow must copy config, domains, and variables
|
||||
// verbatim, start stopped, and land in the target project/environment.
|
||||
func TestCloneServiceRowLive(t *testing.T) {
|
||||
dsn := testDSNString(t)
|
||||
db, err := database.NewConnection(dsn)
|
||||
if err != nil {
|
||||
t.Fatalf("connect: %v", err)
|
||||
}
|
||||
defer db.Close()
|
||||
ctx := context.Background()
|
||||
q := sqlcdb.New(db.DB)
|
||||
|
||||
userID := uuid.New()
|
||||
projectID := uuid.New()
|
||||
envID := uuid.New()
|
||||
serviceID := uuid.New()
|
||||
suffix := strings.ReplaceAll(serviceID.String()[:8], "-", "")
|
||||
must := func(err error) {
|
||||
t.Helper()
|
||||
if err != nil {
|
||||
t.Fatalf("setup: %v", err)
|
||||
}
|
||||
}
|
||||
_, err = db.Exec(`INSERT INTO users (id, email, password_hash, name) VALUES ($1, $2, 'x', 'test')`,
|
||||
userID, "clone-"+suffix+"@test.local")
|
||||
must(err)
|
||||
_, err = db.Exec(`INSERT INTO projects (id, name, owner_id, is_approved) VALUES ($1, $2, $3, true)`,
|
||||
projectID, "clone-"+suffix, userID)
|
||||
must(err)
|
||||
_, err = db.Exec(`INSERT INTO environments (id, name, project_id) VALUES ($1, 'production', $2)`,
|
||||
envID, projectID)
|
||||
must(err)
|
||||
_, err = db.Exec(`INSERT INTO services (id, name, project_id, environment_id, service_type, source_type,
|
||||
image_name, port, volumes, traefik_labels, maintenance_mode)
|
||||
VALUES ($1, $2, $3, $4, 'web', 'image', 'traefik/whoami:latest', 80,
|
||||
'[{"mount":"/data"}]'::jsonb,
|
||||
'{"middlewares.rl.ratelimit.average":"100"}'::jsonb, true)`,
|
||||
serviceID, "clonesrc-"+suffix, projectID, envID)
|
||||
must(err)
|
||||
defer func() { _, _ = db.Exec(`DELETE FROM users WHERE id = $1`, userID) }()
|
||||
|
||||
if _, err := q.CreateServiceDomain(ctx, sqlcdb.CreateServiceDomainParams{
|
||||
ServiceID: serviceID, Domain: "src-" + suffix + ".example.com", IsDefault: true}); err != nil {
|
||||
t.Fatalf("seed domain: %v", err)
|
||||
}
|
||||
if _, err := db.Exec(`INSERT INTO environment_variables (id, service_id, key, value, is_secret)
|
||||
VALUES ($1, $2, 'FOO', 'bar', false)`, uuid.New(), serviceID); err != nil {
|
||||
t.Fatalf("seed var: %v", err)
|
||||
}
|
||||
|
||||
cloneID, err := cloneServiceRow(db, serviceID, projectID, "clone-"+suffix, "")
|
||||
if err != nil {
|
||||
t.Fatalf("clone: %v", err)
|
||||
}
|
||||
|
||||
var status, imageName, env string
|
||||
var maintenance bool
|
||||
var volumes, labels []byte
|
||||
if err := db.QueryRow(`SELECT status, image_name, COALESCE(environment,''), maintenance_mode,
|
||||
volumes, traefik_labels FROM services WHERE id = $1`, cloneID).
|
||||
Scan(&status, &imageName, &env, &maintenance, &volumes, &labels); err != nil {
|
||||
t.Fatalf("read clone: %v", err)
|
||||
}
|
||||
if status != "stopped" || imageName != "traefik/whoami:latest" || env != "production" {
|
||||
t.Fatalf("clone mismatch: %v %v %v", status, imageName, env)
|
||||
}
|
||||
if !maintenance || string(volumes) == "[]" || string(labels) == "{}" {
|
||||
t.Fatalf("clone dropped config: maint=%v vol=%s labels=%s", maintenance, volumes, labels)
|
||||
}
|
||||
doms := loadServiceDomains(db, cloneID)
|
||||
if len(doms) != 1 || doms[0].Domain != "src-"+suffix+".example.com" || !doms[0].IsDefault {
|
||||
t.Fatalf("domains not cloned: %+v", doms)
|
||||
}
|
||||
var varVal string
|
||||
if err := db.QueryRow(`SELECT value FROM environment_variables WHERE service_id = $1 AND key = 'FOO'`,
|
||||
cloneID).Scan(&varVal); err != nil || varVal != "bar" {
|
||||
t.Fatalf("vars not cloned: %v %q", err, varVal)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user