mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 15:51:26 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19e096f8ae |
No files matched your search
+1
-1
@@ -537,7 +537,7 @@ and wired refs, one click or one CLI call.
|
|||||||
workspace, CLI `environments` + MCP parity. Per-env vars/domains ride the
|
workspace, CLI `environments` + MCP parity. Per-env vars/domains ride the
|
||||||
service's own scope (one env per service); promote ships via preview
|
service's own scope (one env per service); promote ships via preview
|
||||||
promote.
|
promote.
|
||||||
- [ ] **sqlc port** — ~265 raw `database/sql` sites → `sqlc/queries/`. Done in tranches (dynamic queries stay raw). Tranches merged: metrics storage + service domains (#75), service clone/move ops (#76), preview environments (#77), deployments + rollback (#78). Remaining: runtime, compliance, cron, git, security, auth, sleeper, scanner, gateway, and smaller files.
|
- [ ] **sqlc port** — ~300 raw `database/sql` sites → `sqlc/queries/`. Done in tranches (dynamic queries stay raw): metrics storage + service domains ported.
|
||||||
- [ ] **Tests** — canvas/wizard frontend coverage, deployment/template/
|
- [ ] **Tests** — canvas/wizard frontend coverage, deployment/template/
|
||||||
webhook table tests, Playwright e2e golden path.
|
webhook table tests, Playwright e2e golden path.
|
||||||
- [x] **First-run wizard** — public `GET /setup/status` + authed
|
- [x] **First-run wizard** — public `GET /setup/status` + authed
|
||||||
|
|||||||
+123
-147
@@ -65,47 +65,13 @@ type UpdateCronJobRequest struct {
|
|||||||
Retention int `json:"retention"`
|
Retention int `json:"retention"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// cronJobFrom maps the sqlc row onto the string-ID API model.
|
|
||||||
func cronJobFrom(j sqlcdb.CronJob) CronJob {
|
|
||||||
return CronJob{
|
|
||||||
ID: j.ID.String(),
|
|
||||||
ProjectID: j.ProjectID.String(),
|
|
||||||
ServiceID: j.ServiceID.String(),
|
|
||||||
Name: j.Name,
|
|
||||||
Schedule: j.Schedule,
|
|
||||||
Command: j.Command,
|
|
||||||
Timezone: j.Timezone.String,
|
|
||||||
Enabled: j.Enabled.Bool,
|
|
||||||
LastRunAt: timePtrNT(j.LastRunAt),
|
|
||||||
NextRunAt: timePtrNT(j.NextRunAt),
|
|
||||||
LastStatus: j.LastStatus.String,
|
|
||||||
LastOutput: j.LastOutput.String,
|
|
||||||
Retention: int(j.Retention.Int32),
|
|
||||||
CreatedAt: j.CreatedAt.Time,
|
|
||||||
UpdatedAt: j.UpdatedAt.Time,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// cronExecutionFrom maps the sqlc row onto the string-ID API model.
|
|
||||||
func cronExecutionFrom(e sqlcdb.CronExecution) CronExecution {
|
|
||||||
return CronExecution{
|
|
||||||
ID: e.ID.String(),
|
|
||||||
CronJobID: e.CronJobID.String(),
|
|
||||||
StartedAt: e.StartedAt,
|
|
||||||
FinishedAt: timePtrNT(e.FinishedAt),
|
|
||||||
Status: e.Status.String,
|
|
||||||
Output: e.Output.String,
|
|
||||||
Error: e.Error.String,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// cronJobProjectID resolves the project a cron job belongs to.
|
// cronJobProjectID resolves the project a cron job belongs to.
|
||||||
func cronJobProjectID(db *database.DB, jobID string) (uuid.UUID, bool) {
|
func cronJobProjectID(db *database.DB, jobID string) (uuid.UUID, bool) {
|
||||||
id, err := uuid.Parse(jobID)
|
var projectID uuid.UUID
|
||||||
if err != nil {
|
err := db.QueryRow(
|
||||||
return uuid.Nil, false
|
`SELECT cj.project_id FROM cron_jobs cj WHERE cj.id = $1`,
|
||||||
}
|
jobID,
|
||||||
projectID, err := sqlcdb.New(db.DB).GetCronJobProjectID(context.Background(), id)
|
).Scan(&projectID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return uuid.Nil, false
|
return uuid.Nil, false
|
||||||
}
|
}
|
||||||
@@ -171,14 +137,15 @@ func handleCreateCronJob(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
svcID, err := uuid.Parse(req.ServiceID)
|
var ownerCheck string
|
||||||
if err != nil {
|
err := db.QueryRow(
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
`SELECT p.owner_id FROM projects p
|
||||||
return
|
JOIN services s ON s.project_id = p.id
|
||||||
}
|
WHERE s.id = $1`,
|
||||||
ownerCheck, err := sqlcdb.New(db.DB).GetCronOwnerViaService(context.Background(), svcID)
|
req.ServiceID,
|
||||||
|
).Scan(&ownerCheck)
|
||||||
|
|
||||||
if err != nil || (ownerCheck.String() != userID && !contextIsAdmin(c)) {
|
if err != nil || (ownerCheck != userID && !contextIsAdmin(c)) {
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -211,20 +178,11 @@ func handleCreateCronJob(c *gin.Context) {
|
|||||||
UpdatedAt: time.Now(),
|
UpdatedAt: time.Now(),
|
||||||
}
|
}
|
||||||
|
|
||||||
err = sqlcdb.New(db.DB).InsertCronJob(context.Background(), sqlcdb.InsertCronJobParams{
|
_, err = db.Exec(
|
||||||
ID: uuid.MustParse(job.ID),
|
`INSERT INTO cron_jobs (id, project_id, service_id, name, schedule, command, timezone, enabled, next_run_at, retention, created_at, updated_at)
|
||||||
ProjectID: uuid.MustParse(job.ProjectID),
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`,
|
||||||
ServiceID: uuid.MustParse(job.ServiceID),
|
job.ID, job.ProjectID, job.ServiceID, job.Name, job.Schedule, job.Command, job.Timezone, job.Enabled, job.NextRunAt, job.Retention, job.CreatedAt, job.UpdatedAt,
|
||||||
Name: job.Name,
|
)
|
||||||
Schedule: job.Schedule,
|
|
||||||
Command: job.Command,
|
|
||||||
Timezone: sql.NullString{String: job.Timezone, Valid: true},
|
|
||||||
Enabled: sql.NullBool{Bool: job.Enabled, Valid: true},
|
|
||||||
NextRunAt: ntPtr(job.NextRunAt),
|
|
||||||
Retention: sql.NullInt32{Int32: int32(job.Retention), Valid: true},
|
|
||||||
CreatedAt: sql.NullTime{Time: job.CreatedAt, Valid: true},
|
|
||||||
UpdatedAt: sql.NullTime{Time: job.UpdatedAt, Valid: true},
|
|
||||||
})
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create cron job"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create cron job"})
|
||||||
@@ -243,17 +201,22 @@ func handleGetCronJob(c *gin.Context) {
|
|||||||
db := c.MustGet("db").(*database.DB)
|
db := c.MustGet("db").(*database.DB)
|
||||||
jobID := c.Param("id")
|
jobID := c.Param("id")
|
||||||
|
|
||||||
jid, err := uuid.Parse(jobID)
|
var job CronJob
|
||||||
|
err := db.QueryRow(
|
||||||
|
`SELECT cj.id, cj.project_id, cj.service_id, cj.name, cj.schedule, cj.timezone,
|
||||||
|
cj.enabled, cj.last_run_at, cj.next_run_at, cj.last_status, cj.last_output,
|
||||||
|
cj.retention, cj.created_at, cj.updated_at
|
||||||
|
FROM cron_jobs cj
|
||||||
|
WHERE cj.id = $1`,
|
||||||
|
jobID,
|
||||||
|
).Scan(&job.ID, &job.ProjectID, &job.ServiceID, &job.Name, &job.Schedule, &job.Timezone,
|
||||||
|
&job.Enabled, &job.LastRunAt, &job.NextRunAt, &job.LastStatus, &job.LastOutput,
|
||||||
|
&job.Retention, &job.CreatedAt, &job.UpdatedAt)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": "Cron job not found"})
|
c.JSON(http.StatusNotFound, gin.H{"error": "Cron job not found"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
row, err := sqlcdb.New(db.DB).GetCronJob(context.Background(), jid)
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": "Cron job not found"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
job := cronJobFrom(row)
|
|
||||||
|
|
||||||
projectID, found := cronJobProjectID(db, jobID)
|
projectID, found := cronJobProjectID(db, jobID)
|
||||||
if !found {
|
if !found {
|
||||||
@@ -279,14 +242,15 @@ func handleUpdateCronJob(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
jid, err := uuid.Parse(jobID)
|
var ownerCheck string
|
||||||
if err != nil {
|
err := db.QueryRow(
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
`SELECT p.owner_id FROM cron_jobs cj
|
||||||
return
|
JOIN projects p ON cj.project_id = p.id
|
||||||
}
|
WHERE cj.id = $1`,
|
||||||
ownerCheck, err := sqlcdb.New(db.DB).GetCronJobOwner(context.Background(), jid)
|
jobID,
|
||||||
|
).Scan(&ownerCheck)
|
||||||
|
|
||||||
if err != nil || (ownerCheck.String() != userID && !contextIsAdmin(c)) {
|
if err != nil || (ownerCheck != userID && !contextIsAdmin(c)) {
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -348,19 +312,21 @@ func handleDeleteCronJob(c *gin.Context) {
|
|||||||
db := c.MustGet("db").(*database.DB)
|
db := c.MustGet("db").(*database.DB)
|
||||||
jobID := c.Param("id")
|
jobID := c.Param("id")
|
||||||
|
|
||||||
jid, err := uuid.Parse(jobID)
|
var ownerCheck string
|
||||||
|
err := db.QueryRow(
|
||||||
|
`SELECT p.owner_id FROM cron_jobs cj
|
||||||
|
JOIN projects p ON cj.project_id = p.id
|
||||||
|
WHERE cj.id = $1`,
|
||||||
|
jobID,
|
||||||
|
).Scan(&ownerCheck)
|
||||||
|
|
||||||
|
if err != nil || (ownerCheck != userID && !contextIsAdmin(c)) {
|
||||||
|
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = db.Exec("DELETE FROM cron_jobs WHERE id = $1", jobID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
ownerCheck, err := sqlcdb.New(db.DB).GetCronJobOwner(context.Background(), jid)
|
|
||||||
|
|
||||||
if err != nil || (ownerCheck.String() != userID && !contextIsAdmin(c)) {
|
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := sqlcdb.New(db.DB).DeleteCronJob(context.Background(), jid); err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete cron job"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete cron job"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -384,20 +350,29 @@ func handleGetCronExecutions(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
jid, err := uuid.Parse(jobID)
|
rows, err := db.Query(
|
||||||
if err != nil {
|
`SELECT id, cron_job_id, started_at, finished_at, status, output, error
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to fetch executions"})
|
FROM cron_executions
|
||||||
return
|
WHERE cron_job_id = $1
|
||||||
}
|
ORDER BY started_at DESC
|
||||||
rows, err := sqlcdb.New(db.DB).ListCronExecutions(context.Background(), jid)
|
LIMIT 100`,
|
||||||
|
jobID,
|
||||||
|
)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to fetch executions"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to fetch executions"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
var executions []CronExecution
|
var executions []CronExecution
|
||||||
for _, e := range rows {
|
for rows.Next() {
|
||||||
executions = append(executions, cronExecutionFrom(e))
|
var exec CronExecution
|
||||||
|
err := rows.Scan(&exec.ID, &exec.CronJobID, &exec.StartedAt, &exec.FinishedAt, &exec.Status, &exec.Output, &exec.Error)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
executions = append(executions, exec)
|
||||||
}
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{"executions": executions})
|
c.JSON(http.StatusOK, gin.H{"executions": executions})
|
||||||
@@ -408,33 +383,29 @@ func handleTriggerCronJob(c *gin.Context) {
|
|||||||
db := c.MustGet("db").(*database.DB)
|
db := c.MustGet("db").(*database.DB)
|
||||||
jobID := c.Param("id")
|
jobID := c.Param("id")
|
||||||
|
|
||||||
jid, err := uuid.Parse(jobID)
|
var job CronJob
|
||||||
if err != nil {
|
var ownerCheck string
|
||||||
|
err := db.QueryRow(
|
||||||
|
`SELECT cj.service_id, cj.command, cj.schedule, cj.timezone, cj.retention, p.owner_id
|
||||||
|
FROM cron_jobs cj
|
||||||
|
JOIN projects p ON cj.project_id = p.id
|
||||||
|
WHERE cj.id = $1`,
|
||||||
|
jobID,
|
||||||
|
).Scan(&job.ServiceID, &job.Command, &job.Schedule, &job.Timezone, &job.Retention, &ownerCheck)
|
||||||
|
|
||||||
|
if err != nil || (ownerCheck != userID && !contextIsAdmin(c)) {
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
trig, err := sqlcdb.New(db.DB).GetCronJobForTrigger(context.Background(), jid)
|
|
||||||
if err != nil || (trig.OwnerID.String() != userID && !contextIsAdmin(c)) {
|
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
job := CronJob{
|
|
||||||
ServiceID: trig.ServiceID.String(),
|
|
||||||
Command: trig.Command,
|
|
||||||
Schedule: trig.Schedule,
|
|
||||||
Timezone: trig.Timezone.String,
|
|
||||||
Retention: int(trig.Retention.Int32),
|
|
||||||
}
|
|
||||||
|
|
||||||
execID := uuid.New().String()
|
execID := uuid.New().String()
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
|
|
||||||
_ = sqlcdb.New(db.DB).InsertCronExecution(context.Background(), sqlcdb.InsertCronExecutionParams{
|
_, err = db.Exec(
|
||||||
ID: uuid.MustParse(execID),
|
`INSERT INTO cron_executions (id, cron_job_id, started_at, status)
|
||||||
CronJobID: jid,
|
VALUES ($1, $2, $3, $4)`,
|
||||||
StartedAt: now,
|
execID, jobID, now, "running",
|
||||||
Status: sql.NullString{String: "running", Valid: true},
|
)
|
||||||
})
|
|
||||||
|
|
||||||
dockerClient, _ := c.Get("docker_client")
|
dockerClient, _ := c.Get("docker_client")
|
||||||
dockerCli, _ := dockerClient.(*docker.Client)
|
dockerCli, _ := dockerClient.(*docker.Client)
|
||||||
@@ -487,25 +458,39 @@ func StartCronScheduler(ctx context.Context, db *database.DB, dockerClient *dock
|
|||||||
}
|
}
|
||||||
|
|
||||||
func runDueCronJobs(db *database.DB, dockerClient *docker.Client) {
|
func runDueCronJobs(db *database.DB, dockerClient *docker.Client) {
|
||||||
q := sqlcdb.New(db.DB)
|
rows, err := db.Query(
|
||||||
jobs, err := q.ListDueCronJobs(context.Background())
|
`SELECT id, project_id, service_id, name, schedule, command, timezone, enabled, retention
|
||||||
|
FROM cron_jobs
|
||||||
|
WHERE enabled = TRUE AND next_run_at IS NOT NULL AND next_run_at <= NOW()`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("cron scheduler: failed to list due jobs: %v", err)
|
log.Printf("cron scheduler: failed to list due jobs: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
type dueJob struct {
|
||||||
|
CronJob
|
||||||
|
Command string
|
||||||
|
}
|
||||||
|
var jobs []dueJob
|
||||||
|
for rows.Next() {
|
||||||
|
var j dueJob
|
||||||
|
if err := rows.Scan(&j.ID, &j.ProjectID, &j.ServiceID, &j.Name, &j.Schedule,
|
||||||
|
&j.Command, &j.Timezone, &j.Enabled, &j.Retention); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
jobs = append(jobs, j)
|
||||||
|
}
|
||||||
|
|
||||||
for _, j := range jobs {
|
for _, j := range jobs {
|
||||||
execID := uuid.New().String()
|
execID := uuid.New().String()
|
||||||
if err := q.InsertCronExecution(context.Background(), sqlcdb.InsertCronExecutionParams{
|
if _, err := db.Exec(
|
||||||
ID: uuid.MustParse(execID),
|
`INSERT INTO cron_executions (id, cron_job_id, started_at, status) VALUES ($1, $2, $3, $4)`,
|
||||||
CronJobID: j.ID,
|
execID, j.ID, time.Now(), "running"); err != nil {
|
||||||
StartedAt: time.Now(),
|
|
||||||
Status: sql.NullString{String: "running", Valid: true},
|
|
||||||
}); err != nil {
|
|
||||||
log.Printf("cron scheduler: failed to record execution for %s: %v", j.ID, err)
|
log.Printf("cron scheduler: failed to record execution for %s: %v", j.ID, err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
go executeCronJob(db, dockerClient, j.ID.String(), j.ServiceID.String(), execID, j.Command, j.Schedule, j.Timezone.String, int(j.Retention.Int32))
|
go executeCronJob(db, dockerClient, j.ID, j.ServiceID, execID, j.Command, j.Schedule, j.Timezone, j.Retention)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -599,32 +584,23 @@ func executeCronJob(db *database.DB, dockerClient *docker.Client, jobID, service
|
|||||||
}
|
}
|
||||||
|
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
q := sqlcdb.New(db.DB)
|
db.Exec(
|
||||||
if eid, err := uuid.Parse(execID); err == nil {
|
`UPDATE cron_executions SET finished_at = $1, status = $2, output = $3, error = $4 WHERE id = $5`,
|
||||||
_ = q.FinishCronExecution(context.Background(), sqlcdb.FinishCronExecutionParams{
|
now, status, output, errText, execID,
|
||||||
FinishedAt: sql.NullTime{Time: now, Valid: true},
|
)
|
||||||
Status: sql.NullString{String: status, Valid: true},
|
|
||||||
Output: sql.NullString{String: output, Valid: true},
|
|
||||||
Error: sql.NullString{String: errText, Valid: true},
|
|
||||||
ID: eid,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
next, _ := calculateNextRun(schedule, timezone)
|
next, _ := calculateNextRun(schedule, timezone)
|
||||||
if jid, err := uuid.Parse(jobID); err == nil {
|
db.Exec(
|
||||||
_ = q.UpdateCronJobRun(context.Background(), sqlcdb.UpdateCronJobRunParams{
|
`UPDATE cron_jobs SET last_run_at = $1, last_status = $2, last_output = $3, next_run_at = $4 WHERE id = $5`,
|
||||||
LastRunAt: sql.NullTime{Time: now, Valid: true},
|
now, status, output, next, jobID,
|
||||||
LastStatus: sql.NullString{String: status, Valid: true},
|
)
|
||||||
LastOutput: sql.NullString{String: output, Valid: true},
|
|
||||||
NextRunAt: ntPtr(next),
|
|
||||||
ID: jid,
|
|
||||||
})
|
|
||||||
|
|
||||||
if retention > 0 {
|
if retention > 0 {
|
||||||
_ = q.TrimCronExecutions(context.Background(), sqlcdb.TrimCronExecutionsParams{
|
db.Exec(
|
||||||
CronJobID: jid,
|
`DELETE FROM cron_executions WHERE cron_job_id = $1 AND id NOT IN (
|
||||||
Limit: int32(retention),
|
SELECT id FROM cron_executions WHERE cron_job_id = $1
|
||||||
})
|
ORDER BY started_at DESC LIMIT $2)`,
|
||||||
}
|
jobID, retention,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,16 +1,9 @@
|
|||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"database/sql"
|
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"containr/internal/database"
|
|
||||||
"containr/internal/database/sqlcdb"
|
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCalculateNextRun(t *testing.T) {
|
func TestCalculateNextRun(t *testing.T) {
|
||||||
@@ -71,123 +64,3 @@ func TestCalculateNextRunTimezone(t *testing.T) {
|
|||||||
t.Logf("utc next: %v / tokyo next: %v", utcNext, tokyoNext)
|
t.Logf("utc next: %v / tokyo next: %v", utcNext, tokyoNext)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestCronLiveInvariants exercises the cron.sql queries on live Postgres:
|
|
||||||
// insert/read/owner join, execution lifecycle, run bookkeeping, retention trim.
|
|
||||||
func TestCronLiveInvariants(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()
|
|
||||||
jobID := uuid.New()
|
|
||||||
suffix := strings.ReplaceAll(jobID.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, "cron-"+suffix+"@test.local")
|
|
||||||
must(err)
|
|
||||||
_, err = db.Exec(`INSERT INTO projects (id, name, owner_id, is_approved) VALUES ($1, $2, $3, true)`,
|
|
||||||
projectID, "cron-"+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)
|
|
||||||
VALUES ($1, $2, $3, $4, 'web', 'image')`,
|
|
||||||
serviceID, "cron-"+suffix, projectID, envID)
|
|
||||||
must(err)
|
|
||||||
defer func() { _, _ = db.Exec(`DELETE FROM users WHERE id = $1`, userID) }()
|
|
||||||
|
|
||||||
next, err := calculateNextRun("0 4 * * *", "UTC")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("schedule: %v", err)
|
|
||||||
}
|
|
||||||
must(q.InsertCronJob(ctx, sqlcdb.InsertCronJobParams{
|
|
||||||
ID: jobID, ProjectID: projectID, ServiceID: serviceID,
|
|
||||||
Name: "job-" + suffix, Schedule: "0 4 * * *", Command: "echo hi",
|
|
||||||
Timezone: sql.NullString{String: "UTC", Valid: true},
|
|
||||||
Enabled: sql.NullBool{Bool: true, Valid: true},
|
|
||||||
NextRunAt: ntPtr(next),
|
|
||||||
}))
|
|
||||||
job, err := q.GetCronJob(ctx, jobID)
|
|
||||||
if err != nil || job.Name != "job-"+suffix || job.Command != "echo hi" {
|
|
||||||
t.Fatalf("job: %v %+v", err, job)
|
|
||||||
}
|
|
||||||
owner, err := q.GetCronJobOwner(ctx, jobID)
|
|
||||||
if err != nil || owner != userID {
|
|
||||||
t.Fatalf("owner: %v %v", err, owner)
|
|
||||||
}
|
|
||||||
owner2, err := q.GetCronOwnerViaService(ctx, serviceID)
|
|
||||||
if err != nil || owner2 != userID {
|
|
||||||
t.Fatalf("owner via service: %v %v", err, owner2)
|
|
||||||
}
|
|
||||||
pid, err := q.GetCronJobProjectID(ctx, jobID)
|
|
||||||
if err != nil || pid != projectID {
|
|
||||||
t.Fatalf("project: %v %v", err, pid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Trigger-shaped read.
|
|
||||||
trig, err := q.GetCronJobForTrigger(ctx, jobID)
|
|
||||||
if err != nil || trig.ServiceID != serviceID || trig.OwnerID != userID {
|
|
||||||
t.Fatalf("trigger: %v %+v", err, trig)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Execution lifecycle + retention trim.
|
|
||||||
for i := 0; i < 3; i++ {
|
|
||||||
execID := uuid.New()
|
|
||||||
must(q.InsertCronExecution(ctx, sqlcdb.InsertCronExecutionParams{
|
|
||||||
ID: execID, CronJobID: jobID,
|
|
||||||
StartedAt: time.Now().Add(time.Duration(i) * time.Second),
|
|
||||||
Status: sql.NullString{String: "running", Valid: true},
|
|
||||||
}))
|
|
||||||
must(q.FinishCronExecution(ctx, sqlcdb.FinishCronExecutionParams{
|
|
||||||
FinishedAt: sql.NullTime{Time: time.Now(), Valid: true},
|
|
||||||
Status: sql.NullString{String: "success", Valid: true},
|
|
||||||
Output: sql.NullString{String: "ok", Valid: true},
|
|
||||||
Error: sql.NullString{String: "", Valid: true},
|
|
||||||
ID: execID,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
execs, err := q.ListCronExecutions(ctx, jobID)
|
|
||||||
if err != nil || len(execs) != 3 {
|
|
||||||
t.Fatalf("execs: %v %d", err, len(execs))
|
|
||||||
}
|
|
||||||
if execs[0].Status.String != "success" || !execs[0].FinishedAt.Valid {
|
|
||||||
t.Fatalf("exec row: %+v", execs[0])
|
|
||||||
}
|
|
||||||
must(q.TrimCronExecutions(ctx, sqlcdb.TrimCronExecutionsParams{CronJobID: jobID, Limit: 1}))
|
|
||||||
execs, _ = q.ListCronExecutions(ctx, jobID)
|
|
||||||
if len(execs) != 1 {
|
|
||||||
t.Fatalf("trim kept %d, want 1", len(execs))
|
|
||||||
}
|
|
||||||
|
|
||||||
must(q.UpdateCronJobRun(ctx, sqlcdb.UpdateCronJobRunParams{
|
|
||||||
LastRunAt: sql.NullTime{Time: time.Now(), Valid: true},
|
|
||||||
LastStatus: sql.NullString{String: "success", Valid: true},
|
|
||||||
LastOutput: sql.NullString{String: "ok", Valid: true},
|
|
||||||
NextRunAt: ntPtr(next),
|
|
||||||
ID: jobID,
|
|
||||||
}))
|
|
||||||
job, _ = q.GetCronJob(ctx, jobID)
|
|
||||||
if job.LastStatus.String != "success" || !job.LastRunAt.Valid {
|
|
||||||
t.Fatalf("post-run job: %+v", job)
|
|
||||||
}
|
|
||||||
|
|
||||||
must(q.DeleteCronJob(ctx, jobID))
|
|
||||||
if _, err := q.GetCronJob(ctx, jobID); err == nil {
|
|
||||||
t.Fatal("deleted job still readable")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -444,158 +444,3 @@ func TestDeploymentsLiveInvariants(t *testing.T) {
|
|||||||
t.Fatalf("post-fail row: %+v", r)
|
t.Fatalf("post-fail row: %+v", r)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestRuntimeLiveInvariants exercises the runtime.sql queries: the
|
|
||||||
// legacy-column COALESCE chain in GetServiceRuntimeWithOwner, the
|
|
||||||
// deployed-image concat, and the conditional published-port update.
|
|
||||||
func TestRuntimeLiveInvariants(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, "rt-"+suffix+"@test.local")
|
|
||||||
must(err)
|
|
||||||
_, err = db.Exec(`INSERT INTO projects (id, name, owner_id, is_approved) VALUES ($1, $2, $3, true)`,
|
|
||||||
projectID, "rt-"+suffix, userID)
|
|
||||||
must(err)
|
|
||||||
_, err = db.Exec(`INSERT INTO environments (id, name, project_id) VALUES ($1, 'production', $2)`,
|
|
||||||
envID, projectID)
|
|
||||||
must(err)
|
|
||||||
// Only legacy columns populated — the COALESCE chain must surface them.
|
|
||||||
_, err = db.Exec(`INSERT INTO services (id, name, project_id, environment_id, service_type, source_type,
|
|
||||||
source_url, image_name, start_command, port) VALUES ($1, $2, $3, $4, 'worker', 'git', $5, $6, 'run.sh', 8080)`,
|
|
||||||
serviceID, "rt-"+suffix, projectID, envID, "https://git.example/x.git", "repo/img:latest")
|
|
||||||
must(err)
|
|
||||||
defer func() { _, _ = db.Exec(`DELETE FROM users WHERE id = $1`, userID) }()
|
|
||||||
|
|
||||||
row, err := q.GetServiceRuntimeWithOwner(ctx, serviceID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("runtime row: %v", err)
|
|
||||||
}
|
|
||||||
if row.Type != "worker" || row.Image != "repo/img:latest" || row.Command != "run.sh" ||
|
|
||||||
row.GitRepo != "https://git.example/x.git" || row.OwnerID != userID {
|
|
||||||
t.Fatalf("COALESCE chain lost legacy columns: %+v", row)
|
|
||||||
}
|
|
||||||
svc := serviceFromRuntimeRow(row)
|
|
||||||
if svc.Type != "worker" || svc.Image != "repo/img:latest" || svc.Port != 8080 {
|
|
||||||
t.Fatalf("mapped service wrong: %+v", svc)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sibling refs + port lookup.
|
|
||||||
refs, err := q.ListProjectServiceRefs(ctx, projectID)
|
|
||||||
if err != nil || len(refs) != 1 || refs[0].Name != "rt-"+suffix {
|
|
||||||
t.Fatalf("refs: %v %+v", err, refs)
|
|
||||||
}
|
|
||||||
port, err := q.GetServicePort(ctx, serviceID)
|
|
||||||
if err != nil || port != 8080 {
|
|
||||||
t.Fatalf("port: %v %d", err, port)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Variables round-trip.
|
|
||||||
_, err = db.Exec(`INSERT INTO environment_variables (id, service_id, key, value, is_secret)
|
|
||||||
VALUES (gen_random_uuid(), $1, 'API_KEY', 'shh', true), (gen_random_uuid(), $1, 'PLAIN', 'p', false)`,
|
|
||||||
serviceID)
|
|
||||||
must(err)
|
|
||||||
vars, err := q.ListServiceVariablesWithSecret(ctx, serviceID)
|
|
||||||
if err != nil || len(vars) != 2 {
|
|
||||||
t.Fatalf("vars: %v %+v", err, vars)
|
|
||||||
}
|
|
||||||
vals, err := q.ListServiceVariableValues(ctx, serviceID)
|
|
||||||
if err != nil || len(vals) != 2 {
|
|
||||||
t.Fatalf("vals: %v %+v", err, vals)
|
|
||||||
}
|
|
||||||
got, err := q.GetServiceVariableValue(ctx, sqlcdb.GetServiceVariableValueParams{ServiceID: serviceID, Key: "API_KEY"})
|
|
||||||
if err != nil || got != "shh" {
|
|
||||||
t.Fatalf("var value: %v %q", err, got)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Node agent listing through container_instances.
|
|
||||||
_, err = db.Exec(`INSERT INTO node_agents (id, name, hostname, ip_address, port) VALUES ($1, $2, 'h', '127.0.0.1', 9999)`,
|
|
||||||
"agent-"+suffix, "agent-"+suffix)
|
|
||||||
must(err)
|
|
||||||
_, err = db.Exec(`INSERT INTO container_instances (id, name, image, project_id, service_id, node_agent_id)
|
|
||||||
VALUES ($1, 'c', 'img', $2, $3, $4)`,
|
|
||||||
"ci-"+suffix, projectID.String(), serviceID.String(), "agent-"+suffix)
|
|
||||||
must(err)
|
|
||||||
agents, err := q.ListNodeAgentsForService(ctx, serviceID.String())
|
|
||||||
if err != nil || len(agents) != 1 || agents[0] != "agent-"+suffix {
|
|
||||||
t.Fatalf("agents: %v %+v", err, agents)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Last deployed image: only 'deployed' rows, latest first.
|
|
||||||
d1, d2 := uuid.New(), uuid.New()
|
|
||||||
must(q.InsertDeployment(ctx, sqlcdb.InsertDeploymentParams{
|
|
||||||
ID: d1, ServiceID: serviceID, Version: "v1",
|
|
||||||
Status: sql.NullString{String: "failed", Valid: true},
|
|
||||||
}))
|
|
||||||
must(q.InsertDeployment(ctx, sqlcdb.InsertDeploymentParams{
|
|
||||||
ID: d2, ServiceID: serviceID, Version: "v2",
|
|
||||||
Status: sql.NullString{String: "deployed", Valid: true},
|
|
||||||
}))
|
|
||||||
must(q.SyncDeploymentProgress(ctx, sqlcdb.SyncDeploymentProgressParams{
|
|
||||||
Status: sql.NullString{String: "deployed", Valid: true},
|
|
||||||
ImageName: sql.NullString{String: "app", Valid: true},
|
|
||||||
ImageTag: sql.NullString{String: "v2", Valid: true},
|
|
||||||
UpdatedAt: sql.NullTime{Time: time.Now(), Valid: true},
|
|
||||||
ID: d2,
|
|
||||||
}))
|
|
||||||
img, err := q.GetLastDeployedImage(ctx, serviceID)
|
|
||||||
if err != nil || img != "app:v2" {
|
|
||||||
t.Fatalf("last image: %v %q", err, img)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Conditional published-port update: writes once, no-ops on repeat.
|
|
||||||
must(q.SetServicePublishedPort(ctx, sqlcdb.SetServicePublishedPortParams{PublishedPort: 30001, ID: serviceID}))
|
|
||||||
p, err := q.GetServicePublishedPort(ctx, serviceID)
|
|
||||||
if err != nil || p != 30001 {
|
|
||||||
t.Fatalf("published port: %v %d", err, p)
|
|
||||||
}
|
|
||||||
must(q.SetServiceReplicas(ctx, sqlcdb.SetServiceReplicasParams{
|
|
||||||
Replicas: 3, UpdatedAt: sql.NullTime{Time: time.Now(), Valid: true}, ID: serviceID}))
|
|
||||||
row, _ = q.GetServiceRuntimeWithOwner(ctx, serviceID)
|
|
||||||
if row.Replicas != 3 {
|
|
||||||
t.Fatalf("replicas: %+v", row)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sleeper reads: candidate sweep + domain/status text lookups.
|
|
||||||
_, err = db.Exec(`UPDATE services SET sleep_enabled = true, domain = 'rt.example.com', status = 'running' WHERE id = $1`, serviceID)
|
|
||||||
must(err)
|
|
||||||
cands, err := q.ListSleepCandidates(ctx)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("sleep candidates: %v", err)
|
|
||||||
}
|
|
||||||
var mine *sqlcdb.ListSleepCandidatesRow
|
|
||||||
for i := range cands {
|
|
||||||
if cands[i].ID == serviceID {
|
|
||||||
mine = &cands[i]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if mine == nil || mine.SleepIdleMinutes != 15 {
|
|
||||||
t.Fatalf("candidate missing/idle wrong: %+v", mine)
|
|
||||||
}
|
|
||||||
dom, err := q.GetServiceDomainText(ctx, serviceID)
|
|
||||||
if err != nil || dom != "rt.example.com" {
|
|
||||||
t.Fatalf("domain text: %v %q", err, dom)
|
|
||||||
}
|
|
||||||
st, err := q.GetServiceStatusText(ctx, serviceID)
|
|
||||||
if err != nil || st != "running" {
|
|
||||||
t.Fatalf("status text: %v %q", err, st)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+197
-103
@@ -2,7 +2,6 @@ package api
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"database/sql"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"regexp"
|
"regexp"
|
||||||
@@ -11,7 +10,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"containr/internal/database"
|
"containr/internal/database"
|
||||||
"containr/internal/database/sqlcdb"
|
|
||||||
"containr/internal/deployment"
|
"containr/internal/deployment"
|
||||||
"containr/internal/deployqueue"
|
"containr/internal/deployqueue"
|
||||||
"containr/internal/secrets"
|
"containr/internal/secrets"
|
||||||
@@ -24,17 +22,22 @@ import (
|
|||||||
// service — covers pinned placements, spread replicas, and leftovers from a
|
// service — covers pinned placements, spread replicas, and leftovers from a
|
||||||
// since-cleared pin.
|
// since-cleared pin.
|
||||||
func remoteAgentsForService(ctx context.Context, db *database.DB, serviceID uuid.UUID) []string {
|
func remoteAgentsForService(ctx context.Context, db *database.DB, serviceID uuid.UUID) []string {
|
||||||
ids, err := sqlcdb.New(db.DB).ListNodeAgentsForService(ctx, serviceID.String())
|
rows, err := db.Query(
|
||||||
|
`SELECT DISTINCT node_agent_id FROM container_instances WHERE service_id = $1`,
|
||||||
|
serviceID,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
out := make([]string, 0, len(ids))
|
defer rows.Close()
|
||||||
for _, id := range ids {
|
var ids []string
|
||||||
if id != "" {
|
for rows.Next() {
|
||||||
out = append(out, id)
|
var id string
|
||||||
|
if rows.Scan(&id) == nil && id != "" {
|
||||||
|
ids = append(ids, id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return out
|
return ids
|
||||||
}
|
}
|
||||||
|
|
||||||
// serviceLifecycle routes a start/stop/restart action to every agent holding
|
// serviceLifecycle routes a start/stop/restart action to every agent holding
|
||||||
@@ -96,9 +99,7 @@ func serviceRuntimeSpec(db *database.DB, service Service) (deployment.RuntimeSpe
|
|||||||
// Best effort: reuse the host port from the last live deployment so the
|
// Best effort: reuse the host port from the last live deployment so the
|
||||||
// public URL survives restarts. Column exists post-migration; older DBs
|
// public URL survives restarts. Column exists post-migration; older DBs
|
||||||
// silently get ephemeral ports.
|
// silently get ephemeral ports.
|
||||||
if p, err := sqlcdb.New(db.DB).GetServicePublishedPort(context.Background(), service.ID); err == nil {
|
_ = db.QueryRow(`SELECT published_port FROM services WHERE id = $1`, service.ID).Scan(&spec.PublishedPort)
|
||||||
spec.PublishedPort = p
|
|
||||||
}
|
|
||||||
if cmd := strings.TrimSpace(service.Command); cmd != "" {
|
if cmd := strings.TrimSpace(service.Command); cmd != "" {
|
||||||
spec.Command = strings.Fields(cmd)
|
spec.Command = strings.Fields(cmd)
|
||||||
}
|
}
|
||||||
@@ -136,23 +137,42 @@ var refVarPattern = regexp.MustCompile(`\$\{\{\s*([A-Za-z0-9_-]+)\.([A-Za-z_][A-
|
|||||||
// secrets) and expands ${{service.KEY}} references. KEY may be a variable on
|
// secrets) and expands ${{service.KEY}} references. KEY may be a variable on
|
||||||
// the referenced service, or the builtins HOST (service name alias) and PORT.
|
// the referenced service, or the builtins HOST (service name alias) and PORT.
|
||||||
func resolveServiceEnv(db *database.DB, service Service) (map[string]string, error) {
|
func resolveServiceEnv(db *database.DB, service Service) (map[string]string, error) {
|
||||||
q := sqlcdb.New(db.DB)
|
rows, err := db.Query(
|
||||||
vars, err := q.ListServiceVariableValues(context.Background(), service.ID)
|
`SELECT key, value FROM environment_variables WHERE service_id = $1`,
|
||||||
|
service.ID,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
env := map[string]string{}
|
env := map[string]string{}
|
||||||
for _, v := range vars {
|
for rows.Next() {
|
||||||
env[v.Key] = secrets.Decrypt(v.Value)
|
var k, v string
|
||||||
|
if err := rows.Scan(&k, &v); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
env[k] = secrets.Decrypt(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
refServices, err := q.ListProjectServiceRefs(context.Background(), service.ProjectID)
|
var refServices []struct{ ID, Name string }
|
||||||
|
svcRows, err := db.Query(
|
||||||
|
`SELECT id, name FROM services WHERE project_id = $1`,
|
||||||
|
service.ProjectID,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
defer svcRows.Close()
|
||||||
|
for svcRows.Next() {
|
||||||
|
var s struct{ ID, Name string }
|
||||||
|
if err := svcRows.Scan(&s.ID, &s.Name); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
refServices = append(refServices, s)
|
||||||
|
}
|
||||||
|
|
||||||
byName := map[string]uuid.UUID{}
|
byName := map[string]string{}
|
||||||
for _, s := range refServices {
|
for _, s := range refServices {
|
||||||
byName[strings.ToLower(s.Name)] = s.ID
|
byName[strings.ToLower(s.Name)] = s.ID
|
||||||
}
|
}
|
||||||
@@ -169,15 +189,17 @@ func resolveServiceEnv(db *database.DB, service Service) (map[string]string, err
|
|||||||
case "HOST":
|
case "HOST":
|
||||||
return serviceName, true
|
return serviceName, true
|
||||||
case "PORT":
|
case "PORT":
|
||||||
if port, err := q.GetServicePort(context.Background(), id); err == nil && port > 0 {
|
var port int
|
||||||
return strconv.Itoa(int(port)), true
|
if err := db.QueryRow(`SELECT COALESCE(port, 0) FROM services WHERE id = $1`, id).Scan(&port); err == nil && port > 0 {
|
||||||
|
return strconv.Itoa(port), true
|
||||||
}
|
}
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
value, err := q.GetServiceVariableValue(context.Background(), sqlcdb.GetServiceVariableValueParams{
|
var value string
|
||||||
ServiceID: id,
|
err := db.QueryRow(
|
||||||
Key: key,
|
`SELECT value FROM environment_variables WHERE service_id = $1 AND key = $2`,
|
||||||
})
|
id, key,
|
||||||
|
).Scan(&value)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
@@ -250,15 +272,6 @@ func parseMemoryLimit(mem string) int64 {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// setServiceStatusNow writes the stored status with a fresh updated_at.
|
|
||||||
func setServiceStatusNow(db *database.DB, id uuid.UUID, status string) {
|
|
||||||
_ = sqlcdb.New(db.DB).SetServiceStatus(context.Background(), sqlcdb.SetServiceStatusParams{
|
|
||||||
Status: sql.NullString{String: status, Valid: true},
|
|
||||||
UpdatedAt: sql.NullTime{Time: time.Now(), Valid: true},
|
|
||||||
ID: id,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func getRuntimeEngine(c *gin.Context) (*deployment.DeploymentEngine, *database.DB, bool) {
|
func getRuntimeEngine(c *gin.Context) (*deployment.DeploymentEngine, *database.DB, bool) {
|
||||||
dbValue, exists := c.Get("db")
|
dbValue, exists := c.Get("db")
|
||||||
if !exists {
|
if !exists {
|
||||||
@@ -273,22 +286,6 @@ func getRuntimeEngine(c *gin.Context) (*deployment.DeploymentEngine, *database.D
|
|||||||
return engineValue.(*deployment.DeploymentEngine), dbValue.(*database.DB), true
|
return engineValue.(*deployment.DeploymentEngine), dbValue.(*database.DB), true
|
||||||
}
|
}
|
||||||
|
|
||||||
// serviceFromRuntimeRow maps the sqlc runtime row (with legacy-column
|
|
||||||
// fallbacks applied in SQL) onto the API Service model.
|
|
||||||
func serviceFromRuntimeRow(r sqlcdb.GetServiceRuntimeWithOwnerRow) Service {
|
|
||||||
return Service{
|
|
||||||
ID: r.ID, ProjectID: r.ProjectID, Name: r.Name, Type: r.Type,
|
|
||||||
Status: r.Status, Image: r.Image, Command: r.Command,
|
|
||||||
Environment: r.Environment, GitRepo: r.GitRepo, GitBranch: r.GitBranch,
|
|
||||||
BuildPath: r.BuildPath, CPU: r.Cpu, Memory: r.Memory,
|
|
||||||
Replicas: int(r.Replicas), Port: int(r.Port), Domain: r.Domain,
|
|
||||||
HealthCheckPath: r.HealthcheckPath, RestartPolicy: r.RestartPolicy,
|
|
||||||
Builder: r.Builder, CPUReserve: r.CpuReserve,
|
|
||||||
MemoryReserve: r.MemoryReserve, StaticBuildCmd: r.StaticBuildCmd,
|
|
||||||
StaticDir: r.StaticDir, CreatedAt: r.CreatedAt.Time, UpdatedAt: r.UpdatedAt.Time,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func loadOwnedService(c *gin.Context, db *database.DB) (Service, bool) {
|
func loadOwnedService(c *gin.Context, db *database.DB) (Service, bool) {
|
||||||
serviceID, err := uuid.Parse(c.Param("id"))
|
serviceID, err := uuid.Parse(c.Param("id"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -301,16 +298,43 @@ func loadOwnedService(c *gin.Context, db *database.DB) (Service, bool) {
|
|||||||
return Service{}, false
|
return Service{}, false
|
||||||
}
|
}
|
||||||
|
|
||||||
row, err := sqlcdb.New(db.DB).GetServiceRuntimeWithOwner(context.Background(), serviceID)
|
var service Service
|
||||||
|
var owner string
|
||||||
|
err = db.QueryRow(
|
||||||
|
`SELECT s.id, s.project_id, s.name,
|
||||||
|
COALESCE(s.type, s.service_type, ''), COALESCE(s.status, ''),
|
||||||
|
COALESCE(s.image, s.image_name, ''), COALESCE(s.command, s.start_command, ''),
|
||||||
|
COALESCE(s.environment, ''), COALESCE(s.git_repo, s.source_url, ''),
|
||||||
|
COALESCE(s.git_branch, ''), COALESCE(s.build_path, ''),
|
||||||
|
COALESCE(s.cpu, ''), COALESCE(s.memory, ''),
|
||||||
|
COALESCE(s.replicas, 1), COALESCE(s.port, 0),
|
||||||
|
COALESCE(s.domain, ''), COALESCE(s.healthcheck_path, ''),
|
||||||
|
COALESCE(s.restart_policy, 'unless-stopped'),
|
||||||
|
COALESCE(s.builder, 'auto'), COALESCE(s.cpu_reserve, ''),
|
||||||
|
COALESCE(s.memory_reserve, ''), COALESCE(s.static_build_cmd, ''),
|
||||||
|
COALESCE(s.static_dir, ''),
|
||||||
|
s.created_at, s.updated_at, p.owner_id
|
||||||
|
FROM services s JOIN projects p ON s.project_id = p.id
|
||||||
|
WHERE s.id = $1`,
|
||||||
|
serviceID,
|
||||||
|
).Scan(
|
||||||
|
&service.ID, &service.ProjectID, &service.Name, &service.Type, &service.Status,
|
||||||
|
&service.Image, &service.Command, &service.Environment, &service.GitRepo,
|
||||||
|
&service.GitBranch, &service.BuildPath, &service.CPU, &service.Memory,
|
||||||
|
&service.Replicas, &service.Port, &service.Domain, &service.HealthCheckPath,
|
||||||
|
&service.RestartPolicy, &service.Builder, &service.CPUReserve,
|
||||||
|
&service.MemoryReserve, &service.StaticBuildCmd, &service.StaticDir,
|
||||||
|
&service.CreatedAt, &service.UpdatedAt, &owner,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": "Service not found"})
|
c.JSON(http.StatusNotFound, gin.H{"error": "Service not found"})
|
||||||
return Service{}, false
|
return Service{}, false
|
||||||
}
|
}
|
||||||
if row.OwnerID.String() != userID.(string) && !isAdminUser(db, userID.(string)) {
|
if owner != userID.(string) && !isAdminUser(db, userID.(string)) {
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
||||||
return Service{}, false
|
return Service{}, false
|
||||||
}
|
}
|
||||||
return serviceFromRuntimeRow(row), true
|
return service, true
|
||||||
}
|
}
|
||||||
|
|
||||||
// loadReadableService loads a service when the caller may read its project:
|
// loadReadableService loads a service when the caller may read its project:
|
||||||
@@ -322,13 +346,39 @@ func loadReadableService(c *gin.Context, db *database.DB) (Service, bool) {
|
|||||||
return Service{}, false
|
return Service{}, false
|
||||||
}
|
}
|
||||||
|
|
||||||
row, err := sqlcdb.New(db.DB).GetServiceRuntimeWithOwner(context.Background(), serviceID)
|
var service Service
|
||||||
|
var projectID uuid.UUID
|
||||||
|
err = db.QueryRow(
|
||||||
|
`SELECT s.id, s.project_id, s.name,
|
||||||
|
COALESCE(s.type, s.service_type, ''), COALESCE(s.status, ''),
|
||||||
|
COALESCE(s.image, s.image_name, ''), COALESCE(s.command, s.start_command, ''),
|
||||||
|
COALESCE(s.environment, ''), COALESCE(s.git_repo, s.source_url, ''),
|
||||||
|
COALESCE(s.git_branch, ''), COALESCE(s.build_path, ''),
|
||||||
|
COALESCE(s.cpu, ''), COALESCE(s.memory, ''),
|
||||||
|
COALESCE(s.replicas, 1), COALESCE(s.port, 0),
|
||||||
|
COALESCE(s.domain, ''), COALESCE(s.healthcheck_path, ''),
|
||||||
|
COALESCE(s.restart_policy, 'unless-stopped'),
|
||||||
|
COALESCE(s.builder, 'auto'), COALESCE(s.cpu_reserve, ''),
|
||||||
|
COALESCE(s.memory_reserve, ''), COALESCE(s.static_build_cmd, ''),
|
||||||
|
COALESCE(s.static_dir, ''),
|
||||||
|
s.created_at, s.updated_at, s.project_id
|
||||||
|
FROM services s
|
||||||
|
WHERE s.id = $1`,
|
||||||
|
serviceID,
|
||||||
|
).Scan(
|
||||||
|
&service.ID, &service.ProjectID, &service.Name, &service.Type, &service.Status,
|
||||||
|
&service.Image, &service.Command, &service.Environment, &service.GitRepo,
|
||||||
|
&service.GitBranch, &service.BuildPath, &service.CPU, &service.Memory,
|
||||||
|
&service.Replicas, &service.Port, &service.Domain, &service.HealthCheckPath,
|
||||||
|
&service.RestartPolicy, &service.Builder, &service.CPUReserve,
|
||||||
|
&service.MemoryReserve, &service.StaticBuildCmd, &service.StaticDir,
|
||||||
|
&service.CreatedAt, &service.UpdatedAt, &projectID,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": "Service not found"})
|
c.JSON(http.StatusNotFound, gin.H{"error": "Service not found"})
|
||||||
return Service{}, false
|
return Service{}, false
|
||||||
}
|
}
|
||||||
service := serviceFromRuntimeRow(row)
|
if _, allowed := projectReadAccess(c, db, projectID); !allowed {
|
||||||
if _, allowed := projectReadAccess(c, db, service.ProjectID); !allowed {
|
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": "Service not found"})
|
c.JSON(http.StatusNotFound, gin.H{"error": "Service not found"})
|
||||||
return Service{}, false
|
return Service{}, false
|
||||||
}
|
}
|
||||||
@@ -379,7 +429,7 @@ func reconcileNow(c *gin.Context, engine *deployment.DeploymentEngine, db *datab
|
|||||||
status = state.Status
|
status = state.Status
|
||||||
persistPublishedPort(db, service.ID, state.Ports)
|
persistPublishedPort(db, service.ID, state.Ports)
|
||||||
}
|
}
|
||||||
setServiceStatusNow(db, service.ID, status)
|
_, _ = db.Exec(`UPDATE services SET status = $1, updated_at = $2 WHERE id = $3`, status, time.Now(), service.ID)
|
||||||
c.JSON(http.StatusOK, gin.H{"runtime": state})
|
c.JSON(http.StatusOK, gin.H{"runtime": state})
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -398,7 +448,7 @@ func handleServiceStart(c *gin.Context) {
|
|||||||
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
setServiceStatusNow(db, service.ID, "running")
|
_, _ = db.Exec(`UPDATE services SET status = 'running', updated_at = $1 WHERE id = $2`, time.Now(), service.ID)
|
||||||
c.JSON(http.StatusOK, gin.H{"status": "running"})
|
c.JSON(http.StatusOK, gin.H{"status": "running"})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -416,7 +466,7 @@ func handleServiceStop(c *gin.Context) {
|
|||||||
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
setServiceStatusNow(db, service.ID, "stopped")
|
_, _ = db.Exec(`UPDATE services SET status = 'stopped', updated_at = $1 WHERE id = $2`, time.Now(), service.ID)
|
||||||
c.JSON(http.StatusOK, gin.H{"status": "stopped"})
|
c.JSON(http.StatusOK, gin.H{"status": "stopped"})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -435,7 +485,7 @@ func handleServiceRestart(c *gin.Context) {
|
|||||||
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
setServiceStatusNow(db, service.ID, "running")
|
_, _ = db.Exec(`UPDATE services SET status = 'running', updated_at = $1 WHERE id = $2`, time.Now(), service.ID)
|
||||||
c.JSON(http.StatusOK, gin.H{"status": "running"})
|
c.JSON(http.StatusOK, gin.H{"status": "running"})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -455,8 +505,12 @@ func handleServiceRedeploy(c *gin.Context) {
|
|||||||
image := service.Image
|
image := service.Image
|
||||||
if image == "" {
|
if image == "" {
|
||||||
// Git-sourced service: reuse the last successful deployment image.
|
// Git-sourced service: reuse the last successful deployment image.
|
||||||
var err error
|
err := db.QueryRow(
|
||||||
image, err = sqlcdb.New(db.DB).GetLastDeployedImage(context.Background(), service.ID)
|
`SELECT image_name || ':' || image_tag FROM deployments
|
||||||
|
WHERE service_id = $1 AND status = 'deployed' AND image_name <> ''
|
||||||
|
ORDER BY created_at DESC LIMIT 1`,
|
||||||
|
service.ID,
|
||||||
|
).Scan(&image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "No deployable image yet — run a deployment first"})
|
c.JSON(http.StatusBadRequest, gin.H{"error": "No deployable image yet — run a deployment first"})
|
||||||
return
|
return
|
||||||
@@ -502,7 +556,7 @@ func reconcileServiceJob(ctx context.Context, db *database.DB, engine *deploymen
|
|||||||
if state.Status != "" {
|
if state.Status != "" {
|
||||||
status = state.Status
|
status = state.Status
|
||||||
}
|
}
|
||||||
setServiceStatusNow(db, service.ID, status)
|
_, _ = db.Exec(`UPDATE services SET status = $1, updated_at = $2 WHERE id = $3`, status, time.Now(), service.ID)
|
||||||
}
|
}
|
||||||
return state, nil
|
return state, nil
|
||||||
}
|
}
|
||||||
@@ -521,9 +575,12 @@ func enqueueServiceRedeploy(c *gin.Context, db *database.DB, service Service) bo
|
|||||||
}
|
}
|
||||||
image := service.Image
|
image := service.Image
|
||||||
if image == "" {
|
if image == "" {
|
||||||
var err error
|
if err := db.QueryRow(
|
||||||
image, err = sqlcdb.New(db.DB).GetLastDeployedImage(context.Background(), service.ID)
|
`SELECT image_name || ':' || image_tag FROM deployments
|
||||||
if err != nil {
|
WHERE service_id = $1 AND status = 'deployed' AND image_name <> ''
|
||||||
|
ORDER BY created_at DESC LIMIT 1`,
|
||||||
|
service.ID,
|
||||||
|
).Scan(&image); err != nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -571,10 +628,10 @@ func persistPublishedPort(db *database.DB, serviceID uuid.UUID, ports []uint16)
|
|||||||
if len(ports) == 0 {
|
if len(ports) == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
_ = sqlcdb.New(db.DB).SetServicePublishedPort(context.Background(), sqlcdb.SetServicePublishedPortParams{
|
_, _ = db.Exec(
|
||||||
PublishedPort: int32(ports[0]),
|
`UPDATE services SET published_port = $1 WHERE id = $2 AND published_port <> $1`,
|
||||||
ID: serviceID,
|
int(ports[0]), serviceID,
|
||||||
})
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// liveServiceStatus reconciles the stored status with real container state.
|
// liveServiceStatus reconciles the stored status with real container state.
|
||||||
@@ -597,7 +654,7 @@ func liveServiceStatus(c *gin.Context, db *database.DB, service *Service) {
|
|||||||
}
|
}
|
||||||
if state.Status != service.Status {
|
if state.Status != service.Status {
|
||||||
service.Status = state.Status
|
service.Status = state.Status
|
||||||
setServiceStatusNow(db, service.ID, state.Status)
|
_, _ = db.Exec(`UPDATE services SET status = $1, updated_at = $2 WHERE id = $3`, state.Status, time.Now(), service.ID)
|
||||||
}
|
}
|
||||||
persistPublishedPort(db, service.ID, state.Ports)
|
persistPublishedPort(db, service.ID, state.Ports)
|
||||||
if service.Domain != "" {
|
if service.Domain != "" {
|
||||||
@@ -619,22 +676,44 @@ func runtimeScaleService(c *gin.Context, serviceID string, replicas int) error {
|
|||||||
return fmt.Errorf("runtime unavailable")
|
return fmt.Errorf("runtime unavailable")
|
||||||
}
|
}
|
||||||
|
|
||||||
q := sqlcdb.New(db.DB)
|
var service Service
|
||||||
sid, err := uuid.Parse(serviceID)
|
var owner string
|
||||||
|
err := db.QueryRow(
|
||||||
|
`SELECT s.id, s.project_id, s.name,
|
||||||
|
COALESCE(s.type, s.service_type, ''), COALESCE(s.status, ''),
|
||||||
|
COALESCE(s.image, s.image_name, ''), COALESCE(s.command, s.start_command, ''),
|
||||||
|
COALESCE(s.environment, ''), COALESCE(s.git_repo, s.source_url, ''),
|
||||||
|
COALESCE(s.git_branch, ''), COALESCE(s.build_path, ''),
|
||||||
|
COALESCE(s.cpu, ''), COALESCE(s.memory, ''),
|
||||||
|
COALESCE(s.replicas, 1), COALESCE(s.port, 0),
|
||||||
|
COALESCE(s.domain, ''), COALESCE(s.healthcheck_path, ''),
|
||||||
|
COALESCE(s.restart_policy, 'unless-stopped'),
|
||||||
|
COALESCE(s.builder, 'auto'), COALESCE(s.cpu_reserve, ''),
|
||||||
|
COALESCE(s.memory_reserve, ''), COALESCE(s.static_build_cmd, ''),
|
||||||
|
COALESCE(s.static_dir, ''),
|
||||||
|
s.created_at, s.updated_at, p.owner_id
|
||||||
|
FROM services s JOIN projects p ON s.project_id = p.id
|
||||||
|
WHERE s.id = $1`, serviceID,
|
||||||
|
).Scan(
|
||||||
|
&service.ID, &service.ProjectID, &service.Name, &service.Type, &service.Status,
|
||||||
|
&service.Image, &service.Command, &service.Environment, &service.GitRepo,
|
||||||
|
&service.GitBranch, &service.BuildPath, &service.CPU, &service.Memory,
|
||||||
|
&service.Replicas, &service.Port, &service.Domain, &service.HealthCheckPath,
|
||||||
|
&service.RestartPolicy, &service.Builder, &service.CPUReserve,
|
||||||
|
&service.MemoryReserve, &service.StaticBuildCmd, &service.StaticDir,
|
||||||
|
&service.CreatedAt, &service.UpdatedAt, &owner,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
row, err := q.GetServiceRuntimeWithOwner(context.Background(), sid)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
service := serviceFromRuntimeRow(row)
|
|
||||||
if service.Image == "" {
|
if service.Image == "" {
|
||||||
image, err := q.GetLastDeployedImage(context.Background(), service.ID)
|
if err := db.QueryRow(
|
||||||
if err != nil {
|
`SELECT image_name || ':' || image_tag FROM deployments
|
||||||
|
WHERE service_id = $1 AND status = 'deployed' AND image_name <> ''
|
||||||
|
ORDER BY created_at DESC LIMIT 1`, service.ID,
|
||||||
|
).Scan(&service.Image); err != nil {
|
||||||
return fmt.Errorf("no deployed image to scale")
|
return fmt.Errorf("no deployed image to scale")
|
||||||
}
|
}
|
||||||
service.Image = image
|
|
||||||
}
|
}
|
||||||
|
|
||||||
spec, err := serviceRuntimeSpec(db, service)
|
spec, err := serviceRuntimeSpec(db, service)
|
||||||
@@ -652,11 +731,7 @@ func runtimeScaleService(c *gin.Context, serviceID string, replicas int) error {
|
|||||||
if state != nil {
|
if state != nil {
|
||||||
persistPublishedPort(db, service.ID, state.Ports)
|
persistPublishedPort(db, service.ID, state.Ports)
|
||||||
}
|
}
|
||||||
_ = q.SetServiceReplicas(context.Background(), sqlcdb.SetServiceReplicasParams{
|
_, _ = db.Exec(`UPDATE services SET replicas = $1, updated_at = $2 WHERE id = $3`, replicas, time.Now(), service.ID)
|
||||||
Replicas: int32(replicas),
|
|
||||||
UpdatedAt: sql.NullTime{Time: time.Now(), Valid: true},
|
|
||||||
ID: service.ID,
|
|
||||||
})
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -675,34 +750,47 @@ func handleServiceEnvCheck(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
q := sqlcdb.New(db.DB)
|
rows, err := db.Query(
|
||||||
vars, err := q.ListServiceVariablesWithSecret(context.Background(), service.ID)
|
`SELECT key, value, COALESCE(is_secret, false) FROM environment_variables WHERE service_id = $1`,
|
||||||
|
service.ID,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
var unresolved, empty, unreadable []string
|
var unresolved, empty, unreadable []string
|
||||||
var raw []struct{ key, val string }
|
var raw []struct{ key, val string }
|
||||||
for _, v := range vars {
|
for rows.Next() {
|
||||||
decrypted := secrets.Decrypt(v.Value)
|
var k, v string
|
||||||
if v.IsSecret && secrets.IsEncrypted(v.Value) && decrypted == v.Value {
|
var secret bool
|
||||||
|
if err := rows.Scan(&k, &v, &secret); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
decrypted := secrets.Decrypt(v)
|
||||||
|
if secret && secrets.IsEncrypted(v) && decrypted == v {
|
||||||
// Ciphertext failed to decrypt — Decrypt returns the input.
|
// Ciphertext failed to decrypt — Decrypt returns the input.
|
||||||
unreadable = append(unreadable, v.Key)
|
unreadable = append(unreadable, k)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(decrypted) == "" {
|
if strings.TrimSpace(decrypted) == "" {
|
||||||
empty = append(empty, v.Key)
|
empty = append(empty, k)
|
||||||
}
|
}
|
||||||
raw = append(raw, struct{ key, val string }{v.Key, decrypted})
|
raw = append(raw, struct{ key, val string }{k, decrypted})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Project siblings for ${{name.KEY}} resolution.
|
// Project siblings for ${{name.KEY}} resolution.
|
||||||
siblingIDs := map[string]uuid.UUID{}
|
siblingIDs := map[string]string{}
|
||||||
if refs, err := q.ListProjectServiceRefs(context.Background(), service.ProjectID); err == nil {
|
svcRows, err := db.Query(`SELECT id, name FROM services WHERE project_id = $1`, service.ProjectID)
|
||||||
for _, s := range refs {
|
if err == nil {
|
||||||
siblingIDs[strings.ToLower(s.Name)] = s.ID
|
for svcRows.Next() {
|
||||||
|
var id, name string
|
||||||
|
if err := svcRows.Scan(&id, &name); err == nil {
|
||||||
|
siblingIDs[strings.ToLower(name)] = id
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
svcRows.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
resolvable := func(serviceName, key string) bool {
|
resolvable := func(serviceName, key string) bool {
|
||||||
@@ -714,14 +802,20 @@ func handleServiceEnvCheck(c *gin.Context) {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
if strings.EqualFold(key, "PORT") {
|
if strings.EqualFold(key, "PORT") {
|
||||||
port, err := q.GetServicePort(context.Background(), id)
|
var port int
|
||||||
return err == nil && port > 0
|
if err := db.QueryRow(`SELECT COALESCE(port, 0) FROM services WHERE id = $1`, id).Scan(&port); err == nil {
|
||||||
|
return port > 0
|
||||||
|
}
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
_, err := q.GetServiceVariableValue(context.Background(), sqlcdb.GetServiceVariableValueParams{
|
var n int
|
||||||
ServiceID: id,
|
if err := db.QueryRow(
|
||||||
Key: key,
|
`SELECT COUNT(*) FROM environment_variables WHERE service_id = $1 AND key = $2`,
|
||||||
})
|
id, key,
|
||||||
return err == nil
|
).Scan(&n); err == nil {
|
||||||
|
return n > 0
|
||||||
|
}
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, kv := range raw {
|
for _, kv := range raw {
|
||||||
|
|||||||
@@ -86,17 +86,20 @@ type sleepCandidate struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func sweepSleeping(ctx context.Context, db *database.DB, dc *docker.Client, engine *deployment.DeploymentEngine, apiPort int) {
|
func sweepSleeping(ctx context.Context, db *database.DB, dc *docker.Client, engine *deployment.DeploymentEngine, apiPort int) {
|
||||||
sweepRows, err := sqlcdb.New(db.DB).ListSleepCandidates(ctx)
|
rows, err := db.QueryContext(ctx,
|
||||||
|
`SELECT id, project_id, name, COALESCE(status,''), COALESCE(sleep_idle_minutes,15)
|
||||||
|
FROM services WHERE sleep_enabled AND COALESCE(status,'') IN ('running','deployed','degraded','starting')`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var candidates []sleepCandidate
|
var candidates []sleepCandidate
|
||||||
for _, r := range sweepRows {
|
for rows.Next() {
|
||||||
candidates = append(candidates, sleepCandidate{
|
var s sleepCandidate
|
||||||
ID: r.ID, ProjectID: r.ProjectID, Name: r.Name,
|
if err := rows.Scan(&s.ID, &s.ProjectID, &s.Name, &s.Status, &s.IdleMinutes); err == nil {
|
||||||
Status: r.Status, IdleMinutes: int(r.SleepIdleMinutes),
|
candidates = append(candidates, s)
|
||||||
})
|
}
|
||||||
}
|
}
|
||||||
|
rows.Close()
|
||||||
|
|
||||||
q := sqlcdb.New(db.DB)
|
q := sqlcdb.New(db.DB)
|
||||||
for _, svc := range candidates {
|
for _, svc := range candidates {
|
||||||
@@ -184,10 +187,11 @@ func putToSleepRemote(ctx context.Context, db *database.DB, q *sqlcdb.Queries, s
|
|||||||
tracker.mu.Lock()
|
tracker.mu.Lock()
|
||||||
delete(tracker.activity, svc.ID)
|
delete(tracker.activity, svc.ID)
|
||||||
tracker.mu.Unlock()
|
tracker.mu.Unlock()
|
||||||
setServiceStatusNow(db, svc.ID, "sleeping")
|
_, _ = db.Exec(`UPDATE services SET status = 'sleeping', updated_at = $1 WHERE id = $2`, time.Now(), svc.ID)
|
||||||
log.Printf("sleep: %s (%s) remote replicas removed after idle timeout", svc.Name, svc.ID)
|
log.Printf("sleep: %s (%s) remote replicas removed after idle timeout", svc.Name, svc.ID)
|
||||||
|
|
||||||
domain, _ := q.GetServiceDomainText(ctx, svc.ID)
|
var domain string
|
||||||
|
_ = db.QueryRow(`SELECT COALESCE(domain,'') FROM services WHERE id = $1`, svc.ID).Scan(&domain)
|
||||||
domains := serviceDomainNames(db, svc.ID, domain)
|
domains := serviceDomainNames(db, svc.ID, domain)
|
||||||
if len(domains) > 0 {
|
if len(domains) > 0 {
|
||||||
writeWakeIngress(svc.ID.String(), domains, apiPort)
|
writeWakeIngress(svc.ID.String(), domains, apiPort)
|
||||||
@@ -246,10 +250,11 @@ func putToSleep(ctx context.Context, db *database.DB, dc *docker.Client, engine
|
|||||||
tracker.mu.Lock()
|
tracker.mu.Lock()
|
||||||
delete(tracker.activity, svc.ID)
|
delete(tracker.activity, svc.ID)
|
||||||
tracker.mu.Unlock()
|
tracker.mu.Unlock()
|
||||||
setServiceStatusNow(db, svc.ID, "sleeping")
|
_, _ = db.Exec(`UPDATE services SET status = 'sleeping', updated_at = $1 WHERE id = $2`, time.Now(), svc.ID)
|
||||||
log.Printf("sleep: %s (%s) scaled to zero after idle timeout", svc.Name, svc.ID)
|
log.Printf("sleep: %s (%s) scaled to zero after idle timeout", svc.Name, svc.ID)
|
||||||
|
|
||||||
domain, _ := sqlcdb.New(db.DB).GetServiceDomainText(ctx, svc.ID)
|
var domain string
|
||||||
|
_ = db.QueryRow(`SELECT COALESCE(domain,'') FROM services WHERE id = $1`, svc.ID).Scan(&domain)
|
||||||
domains := serviceDomainNames(db, svc.ID, domain)
|
domains := serviceDomainNames(db, svc.ID, domain)
|
||||||
if len(domains) == 0 {
|
if len(domains) == 0 {
|
||||||
return
|
return
|
||||||
@@ -439,9 +444,7 @@ func pruneWakeContainers(ctx context.Context, db *database.DB, dc *docker.Client
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
var status string
|
var status string
|
||||||
if sid, err := uuid.Parse(svcID); err == nil {
|
_ = db.QueryRow(`SELECT COALESCE(status,'') FROM services WHERE id = $1`, svcID).Scan(&status)
|
||||||
status, _ = sqlcdb.New(db.DB).GetServiceStatusText(ctx, sid)
|
|
||||||
}
|
|
||||||
if live > 0 || status == "stopped" || status == "" {
|
if live > 0 || status == "stopped" || status == "" {
|
||||||
_ = dc.RemoveContainer(ctx, c.ID, true)
|
_ = dc.RemoveContainer(ctx, c.ID, true)
|
||||||
}
|
}
|
||||||
@@ -488,11 +491,34 @@ func triggerServiceWake(c *gin.Context) (int, gin.H) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return http.StatusBadRequest, gin.H{"error": "invalid service id"}
|
return http.StatusBadRequest, gin.H{"error": "invalid service id"}
|
||||||
}
|
}
|
||||||
row, err := sqlcdb.New(db.DB).GetServiceRuntimeWithOwner(context.Background(), id)
|
var service Service
|
||||||
|
err = db.QueryRow(
|
||||||
|
`SELECT s.id, s.project_id, s.name,
|
||||||
|
COALESCE(s.type, s.service_type, ''), COALESCE(s.status, ''),
|
||||||
|
COALESCE(s.image, s.image_name, ''), COALESCE(s.command, s.start_command, ''),
|
||||||
|
COALESCE(s.environment, ''), COALESCE(s.git_repo, s.source_url, ''),
|
||||||
|
COALESCE(s.git_branch, ''), COALESCE(s.build_path, ''),
|
||||||
|
COALESCE(s.cpu, ''), COALESCE(s.memory, ''),
|
||||||
|
COALESCE(s.replicas, 1), COALESCE(s.port, 0),
|
||||||
|
COALESCE(s.domain, ''), COALESCE(s.healthcheck_path, ''),
|
||||||
|
COALESCE(s.restart_policy, 'unless-stopped'),
|
||||||
|
COALESCE(s.builder, 'auto'), COALESCE(s.cpu_reserve, ''),
|
||||||
|
COALESCE(s.memory_reserve, ''), COALESCE(s.static_build_cmd, ''),
|
||||||
|
COALESCE(s.static_dir, ''),
|
||||||
|
s.created_at, s.updated_at
|
||||||
|
FROM services s WHERE s.id = $1`, id,
|
||||||
|
).Scan(
|
||||||
|
&service.ID, &service.ProjectID, &service.Name, &service.Type, &service.Status,
|
||||||
|
&service.Image, &service.Command, &service.Environment, &service.GitRepo,
|
||||||
|
&service.GitBranch, &service.BuildPath, &service.CPU, &service.Memory,
|
||||||
|
&service.Replicas, &service.Port, &service.Domain, &service.HealthCheckPath,
|
||||||
|
&service.RestartPolicy, &service.Builder, &service.CPUReserve,
|
||||||
|
&service.MemoryReserve, &service.StaticBuildCmd, &service.StaticDir,
|
||||||
|
&service.CreatedAt, &service.UpdatedAt,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return http.StatusNotFound, gin.H{"error": "service not found"}
|
return http.StatusNotFound, gin.H{"error": "service not found"}
|
||||||
}
|
}
|
||||||
service := serviceFromRuntimeRow(row)
|
|
||||||
if service.Status == "running" || service.Status == "deployed" {
|
if service.Status == "running" || service.Status == "deployed" {
|
||||||
return http.StatusOK, gin.H{"status": service.Status}
|
return http.StatusOK, gin.H{"status": service.Status}
|
||||||
}
|
}
|
||||||
@@ -502,13 +528,13 @@ func triggerServiceWake(c *gin.Context) (int, gin.H) {
|
|||||||
spec, err := serviceRuntimeSpec(db, service)
|
spec, err := serviceRuntimeSpec(db, service)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("wake: runtime spec for %s failed: %v", service.ID, err)
|
log.Printf("wake: runtime spec for %s failed: %v", service.ID, err)
|
||||||
setServiceStatusNow(db, service.ID, "failed")
|
_, _ = db.Exec(`UPDATE services SET status = 'failed', updated_at = $1 WHERE id = $2`, time.Now(), service.ID)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
state, err := engine.ReconcileService(ctx, spec)
|
state, err := engine.ReconcileService(ctx, spec)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("wake: reconcile for %s failed: %v", service.ID, err)
|
log.Printf("wake: reconcile for %s failed: %v", service.ID, err)
|
||||||
setServiceStatusNow(db, service.ID, "failed")
|
_, _ = db.Exec(`UPDATE services SET status = 'failed', updated_at = $1 WHERE id = $2`, time.Now(), service.ID)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
status := "running"
|
status := "running"
|
||||||
@@ -516,7 +542,7 @@ func triggerServiceWake(c *gin.Context) (int, gin.H) {
|
|||||||
status = state.Status
|
status = state.Status
|
||||||
persistPublishedPort(db, service.ID, state.Ports)
|
persistPublishedPort(db, service.ID, state.Ports)
|
||||||
}
|
}
|
||||||
setServiceStatusNow(db, service.ID, status)
|
_, _ = db.Exec(`UPDATE services SET status = $1, updated_at = $2 WHERE id = $3`, status, time.Now(), service.ID)
|
||||||
}()
|
}()
|
||||||
return http.StatusAccepted, gin.H{"status": "waking"}
|
return http.StatusAccepted, gin.H{"status": "waking"}
|
||||||
}
|
}
|
||||||
@@ -537,6 +563,8 @@ func handleServiceSleep(c *gin.Context) {
|
|||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
var port int
|
||||||
|
_ = db.QueryRow(`SELECT COALESCE(port,0) FROM services WHERE id = $1`, service.ID).Scan(&port)
|
||||||
svc := sleepCandidate{
|
svc := sleepCandidate{
|
||||||
ID: service.ID,
|
ID: service.ID,
|
||||||
ProjectID: service.ProjectID,
|
ProjectID: service.ProjectID,
|
||||||
|
|||||||
@@ -1,332 +0,0 @@
|
|||||||
// Code generated by sqlc. DO NOT EDIT.
|
|
||||||
// versions:
|
|
||||||
// sqlc v1.31.1
|
|
||||||
// source: cron.sql
|
|
||||||
|
|
||||||
package sqlcdb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"database/sql"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
)
|
|
||||||
|
|
||||||
const deleteCronJob = `-- name: DeleteCronJob :exec
|
|
||||||
DELETE FROM cron_jobs WHERE id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) DeleteCronJob(ctx context.Context, id uuid.UUID) error {
|
|
||||||
_, err := q.db.ExecContext(ctx, deleteCronJob, id)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
const finishCronExecution = `-- name: FinishCronExecution :exec
|
|
||||||
UPDATE cron_executions SET finished_at = $1, status = $2, output = $3, error = $4 WHERE id = $5
|
|
||||||
`
|
|
||||||
|
|
||||||
type FinishCronExecutionParams struct {
|
|
||||||
FinishedAt sql.NullTime `json:"finished_at"`
|
|
||||||
Status sql.NullString `json:"status"`
|
|
||||||
Output sql.NullString `json:"output"`
|
|
||||||
Error sql.NullString `json:"error"`
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) FinishCronExecution(ctx context.Context, arg FinishCronExecutionParams) error {
|
|
||||||
_, err := q.db.ExecContext(ctx, finishCronExecution,
|
|
||||||
arg.FinishedAt,
|
|
||||||
arg.Status,
|
|
||||||
arg.Output,
|
|
||||||
arg.Error,
|
|
||||||
arg.ID,
|
|
||||||
)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getCronJob = `-- name: GetCronJob :one
|
|
||||||
SELECT id, project_id, service_id, name, schedule, command, timezone,
|
|
||||||
enabled, last_run_at, next_run_at, last_status, last_output,
|
|
||||||
retention, created_at, updated_at
|
|
||||||
FROM cron_jobs WHERE id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) GetCronJob(ctx context.Context, id uuid.UUID) (CronJob, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getCronJob, id)
|
|
||||||
var i CronJob
|
|
||||||
err := row.Scan(
|
|
||||||
&i.ID,
|
|
||||||
&i.ProjectID,
|
|
||||||
&i.ServiceID,
|
|
||||||
&i.Name,
|
|
||||||
&i.Schedule,
|
|
||||||
&i.Command,
|
|
||||||
&i.Timezone,
|
|
||||||
&i.Enabled,
|
|
||||||
&i.LastRunAt,
|
|
||||||
&i.NextRunAt,
|
|
||||||
&i.LastStatus,
|
|
||||||
&i.LastOutput,
|
|
||||||
&i.Retention,
|
|
||||||
&i.CreatedAt,
|
|
||||||
&i.UpdatedAt,
|
|
||||||
)
|
|
||||||
return i, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getCronJobForTrigger = `-- name: GetCronJobForTrigger :one
|
|
||||||
SELECT cj.service_id, cj.command, cj.schedule, cj.timezone, cj.retention, p.owner_id
|
|
||||||
FROM cron_jobs cj
|
|
||||||
JOIN projects p ON cj.project_id = p.id
|
|
||||||
WHERE cj.id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
type GetCronJobForTriggerRow struct {
|
|
||||||
ServiceID uuid.UUID `json:"service_id"`
|
|
||||||
Command string `json:"command"`
|
|
||||||
Schedule string `json:"schedule"`
|
|
||||||
Timezone sql.NullString `json:"timezone"`
|
|
||||||
Retention sql.NullInt32 `json:"retention"`
|
|
||||||
OwnerID uuid.UUID `json:"owner_id"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) GetCronJobForTrigger(ctx context.Context, id uuid.UUID) (GetCronJobForTriggerRow, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getCronJobForTrigger, id)
|
|
||||||
var i GetCronJobForTriggerRow
|
|
||||||
err := row.Scan(
|
|
||||||
&i.ServiceID,
|
|
||||||
&i.Command,
|
|
||||||
&i.Schedule,
|
|
||||||
&i.Timezone,
|
|
||||||
&i.Retention,
|
|
||||||
&i.OwnerID,
|
|
||||||
)
|
|
||||||
return i, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getCronJobOwner = `-- name: GetCronJobOwner :one
|
|
||||||
SELECT p.owner_id FROM cron_jobs cj
|
|
||||||
JOIN projects p ON cj.project_id = p.id
|
|
||||||
WHERE cj.id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) GetCronJobOwner(ctx context.Context, id uuid.UUID) (uuid.UUID, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getCronJobOwner, id)
|
|
||||||
var owner_id uuid.UUID
|
|
||||||
err := row.Scan(&owner_id)
|
|
||||||
return owner_id, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getCronJobProjectID = `-- name: GetCronJobProjectID :one
|
|
||||||
SELECT project_id FROM cron_jobs WHERE id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) GetCronJobProjectID(ctx context.Context, id uuid.UUID) (uuid.UUID, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getCronJobProjectID, id)
|
|
||||||
var project_id uuid.UUID
|
|
||||||
err := row.Scan(&project_id)
|
|
||||||
return project_id, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getCronOwnerViaService = `-- name: GetCronOwnerViaService :one
|
|
||||||
SELECT p.owner_id FROM projects p
|
|
||||||
JOIN services s ON s.project_id = p.id
|
|
||||||
WHERE s.id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) GetCronOwnerViaService(ctx context.Context, id uuid.UUID) (uuid.UUID, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getCronOwnerViaService, id)
|
|
||||||
var owner_id uuid.UUID
|
|
||||||
err := row.Scan(&owner_id)
|
|
||||||
return owner_id, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const insertCronExecution = `-- name: InsertCronExecution :exec
|
|
||||||
INSERT INTO cron_executions (id, cron_job_id, started_at, status)
|
|
||||||
VALUES ($1, $2, $3, $4)
|
|
||||||
`
|
|
||||||
|
|
||||||
type InsertCronExecutionParams struct {
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
CronJobID uuid.UUID `json:"cron_job_id"`
|
|
||||||
StartedAt time.Time `json:"started_at"`
|
|
||||||
Status sql.NullString `json:"status"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) InsertCronExecution(ctx context.Context, arg InsertCronExecutionParams) error {
|
|
||||||
_, err := q.db.ExecContext(ctx, insertCronExecution,
|
|
||||||
arg.ID,
|
|
||||||
arg.CronJobID,
|
|
||||||
arg.StartedAt,
|
|
||||||
arg.Status,
|
|
||||||
)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
const insertCronJob = `-- name: InsertCronJob :exec
|
|
||||||
INSERT INTO cron_jobs (id, project_id, service_id, name, schedule, command, timezone, enabled, next_run_at, retention, created_at, updated_at)
|
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
|
|
||||||
`
|
|
||||||
|
|
||||||
type InsertCronJobParams struct {
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
ProjectID uuid.UUID `json:"project_id"`
|
|
||||||
ServiceID uuid.UUID `json:"service_id"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
Schedule string `json:"schedule"`
|
|
||||||
Command string `json:"command"`
|
|
||||||
Timezone sql.NullString `json:"timezone"`
|
|
||||||
Enabled sql.NullBool `json:"enabled"`
|
|
||||||
NextRunAt sql.NullTime `json:"next_run_at"`
|
|
||||||
Retention sql.NullInt32 `json:"retention"`
|
|
||||||
CreatedAt sql.NullTime `json:"created_at"`
|
|
||||||
UpdatedAt sql.NullTime `json:"updated_at"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) InsertCronJob(ctx context.Context, arg InsertCronJobParams) error {
|
|
||||||
_, err := q.db.ExecContext(ctx, insertCronJob,
|
|
||||||
arg.ID,
|
|
||||||
arg.ProjectID,
|
|
||||||
arg.ServiceID,
|
|
||||||
arg.Name,
|
|
||||||
arg.Schedule,
|
|
||||||
arg.Command,
|
|
||||||
arg.Timezone,
|
|
||||||
arg.Enabled,
|
|
||||||
arg.NextRunAt,
|
|
||||||
arg.Retention,
|
|
||||||
arg.CreatedAt,
|
|
||||||
arg.UpdatedAt,
|
|
||||||
)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
const listCronExecutions = `-- name: ListCronExecutions :many
|
|
||||||
SELECT id, cron_job_id, started_at, finished_at, status, output, error
|
|
||||||
FROM cron_executions
|
|
||||||
WHERE cron_job_id = $1
|
|
||||||
ORDER BY started_at DESC
|
|
||||||
LIMIT 100
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) ListCronExecutions(ctx context.Context, cronJobID uuid.UUID) ([]CronExecution, error) {
|
|
||||||
rows, err := q.db.QueryContext(ctx, listCronExecutions, cronJobID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
items := []CronExecution{}
|
|
||||||
for rows.Next() {
|
|
||||||
var i CronExecution
|
|
||||||
if err := rows.Scan(
|
|
||||||
&i.ID,
|
|
||||||
&i.CronJobID,
|
|
||||||
&i.StartedAt,
|
|
||||||
&i.FinishedAt,
|
|
||||||
&i.Status,
|
|
||||||
&i.Output,
|
|
||||||
&i.Error,
|
|
||||||
); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
items = append(items, i)
|
|
||||||
}
|
|
||||||
if err := rows.Close(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return items, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
const listDueCronJobs = `-- name: ListDueCronJobs :many
|
|
||||||
SELECT id, project_id, service_id, name, schedule, command, timezone, enabled, retention
|
|
||||||
FROM cron_jobs
|
|
||||||
WHERE enabled = TRUE AND next_run_at IS NOT NULL AND next_run_at <= NOW()
|
|
||||||
`
|
|
||||||
|
|
||||||
type ListDueCronJobsRow struct {
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
ProjectID uuid.UUID `json:"project_id"`
|
|
||||||
ServiceID uuid.UUID `json:"service_id"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
Schedule string `json:"schedule"`
|
|
||||||
Command string `json:"command"`
|
|
||||||
Timezone sql.NullString `json:"timezone"`
|
|
||||||
Enabled sql.NullBool `json:"enabled"`
|
|
||||||
Retention sql.NullInt32 `json:"retention"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) ListDueCronJobs(ctx context.Context) ([]ListDueCronJobsRow, error) {
|
|
||||||
rows, err := q.db.QueryContext(ctx, listDueCronJobs)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
items := []ListDueCronJobsRow{}
|
|
||||||
for rows.Next() {
|
|
||||||
var i ListDueCronJobsRow
|
|
||||||
if err := rows.Scan(
|
|
||||||
&i.ID,
|
|
||||||
&i.ProjectID,
|
|
||||||
&i.ServiceID,
|
|
||||||
&i.Name,
|
|
||||||
&i.Schedule,
|
|
||||||
&i.Command,
|
|
||||||
&i.Timezone,
|
|
||||||
&i.Enabled,
|
|
||||||
&i.Retention,
|
|
||||||
); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
items = append(items, i)
|
|
||||||
}
|
|
||||||
if err := rows.Close(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return items, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
const trimCronExecutions = `-- name: TrimCronExecutions :exec
|
|
||||||
DELETE FROM cron_executions WHERE cron_executions.cron_job_id = $1 AND cron_executions.id NOT IN (
|
|
||||||
SELECT ce.id FROM cron_executions ce WHERE ce.cron_job_id = $1
|
|
||||||
ORDER BY ce.started_at DESC LIMIT $2)
|
|
||||||
`
|
|
||||||
|
|
||||||
type TrimCronExecutionsParams struct {
|
|
||||||
CronJobID uuid.UUID `json:"cron_job_id"`
|
|
||||||
Limit int32 `json:"limit"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) TrimCronExecutions(ctx context.Context, arg TrimCronExecutionsParams) error {
|
|
||||||
_, err := q.db.ExecContext(ctx, trimCronExecutions, arg.CronJobID, arg.Limit)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateCronJobRun = `-- name: UpdateCronJobRun :exec
|
|
||||||
UPDATE cron_jobs SET last_run_at = $1, last_status = $2, last_output = $3, next_run_at = $4 WHERE id = $5
|
|
||||||
`
|
|
||||||
|
|
||||||
type UpdateCronJobRunParams struct {
|
|
||||||
LastRunAt sql.NullTime `json:"last_run_at"`
|
|
||||||
LastStatus sql.NullString `json:"last_status"`
|
|
||||||
LastOutput sql.NullString `json:"last_output"`
|
|
||||||
NextRunAt sql.NullTime `json:"next_run_at"`
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) UpdateCronJobRun(ctx context.Context, arg UpdateCronJobRunParams) error {
|
|
||||||
_, err := q.db.ExecContext(ctx, updateCronJobRun,
|
|
||||||
arg.LastRunAt,
|
|
||||||
arg.LastStatus,
|
|
||||||
arg.LastOutput,
|
|
||||||
arg.NextRunAt,
|
|
||||||
arg.ID,
|
|
||||||
)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
@@ -98,34 +98,6 @@ type ContainerInstance struct {
|
|||||||
UpdatedAt sql.NullTime `json:"updated_at"`
|
UpdatedAt sql.NullTime `json:"updated_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type CronExecution struct {
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
CronJobID uuid.UUID `json:"cron_job_id"`
|
|
||||||
StartedAt time.Time `json:"started_at"`
|
|
||||||
FinishedAt sql.NullTime `json:"finished_at"`
|
|
||||||
Status sql.NullString `json:"status"`
|
|
||||||
Output sql.NullString `json:"output"`
|
|
||||||
Error sql.NullString `json:"error"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type CronJob struct {
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
ProjectID uuid.UUID `json:"project_id"`
|
|
||||||
ServiceID uuid.UUID `json:"service_id"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
Schedule string `json:"schedule"`
|
|
||||||
Command string `json:"command"`
|
|
||||||
Timezone sql.NullString `json:"timezone"`
|
|
||||||
Enabled sql.NullBool `json:"enabled"`
|
|
||||||
LastRunAt sql.NullTime `json:"last_run_at"`
|
|
||||||
NextRunAt sql.NullTime `json:"next_run_at"`
|
|
||||||
LastStatus sql.NullString `json:"last_status"`
|
|
||||||
LastOutput sql.NullString `json:"last_output"`
|
|
||||||
Retention sql.NullInt32 `json:"retention"`
|
|
||||||
CreatedAt sql.NullTime `json:"created_at"`
|
|
||||||
UpdatedAt sql.NullTime `json:"updated_at"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type DatabaseBackup struct {
|
type DatabaseBackup struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
DatabaseID string `json:"database_id"`
|
DatabaseID string `json:"database_id"`
|
||||||
@@ -358,53 +330,51 @@ type Registry struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Service struct {
|
type Service struct {
|
||||||
ID uuid.UUID `json:"id"`
|
ID uuid.UUID `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Description sql.NullString `json:"description"`
|
Description sql.NullString `json:"description"`
|
||||||
ProjectID uuid.UUID `json:"project_id"`
|
ProjectID uuid.UUID `json:"project_id"`
|
||||||
EnvironmentID uuid.UUID `json:"environment_id"`
|
EnvironmentID uuid.UUID `json:"environment_id"`
|
||||||
ServiceType string `json:"service_type"`
|
ServiceType string `json:"service_type"`
|
||||||
SourceType string `json:"source_type"`
|
SourceType string `json:"source_type"`
|
||||||
SourceUrl sql.NullString `json:"source_url"`
|
SourceUrl sql.NullString `json:"source_url"`
|
||||||
ImageName sql.NullString `json:"image_name"`
|
ImageName sql.NullString `json:"image_name"`
|
||||||
BuildCommand sql.NullString `json:"build_command"`
|
BuildCommand sql.NullString `json:"build_command"`
|
||||||
StartCommand sql.NullString `json:"start_command"`
|
StartCommand sql.NullString `json:"start_command"`
|
||||||
CpuLimit sql.NullInt32 `json:"cpu_limit"`
|
CpuLimit sql.NullInt32 `json:"cpu_limit"`
|
||||||
MemoryLimit sql.NullInt32 `json:"memory_limit"`
|
MemoryLimit sql.NullInt32 `json:"memory_limit"`
|
||||||
PublicUrl sql.NullString `json:"public_url"`
|
PublicUrl sql.NullString `json:"public_url"`
|
||||||
HealthCheckUrl sql.NullString `json:"health_check_url"`
|
HealthCheckUrl sql.NullString `json:"health_check_url"`
|
||||||
Status sql.NullString `json:"status"`
|
Status sql.NullString `json:"status"`
|
||||||
CreatedAt sql.NullTime `json:"created_at"`
|
CreatedAt sql.NullTime `json:"created_at"`
|
||||||
UpdatedAt sql.NullTime `json:"updated_at"`
|
UpdatedAt sql.NullTime `json:"updated_at"`
|
||||||
Type sql.NullString `json:"type"`
|
Type sql.NullString `json:"type"`
|
||||||
Image sql.NullString `json:"image"`
|
Image sql.NullString `json:"image"`
|
||||||
Command sql.NullString `json:"command"`
|
Command sql.NullString `json:"command"`
|
||||||
Environment sql.NullString `json:"environment"`
|
Environment sql.NullString `json:"environment"`
|
||||||
GitRepo sql.NullString `json:"git_repo"`
|
GitRepo sql.NullString `json:"git_repo"`
|
||||||
GitBranch sql.NullString `json:"git_branch"`
|
GitBranch sql.NullString `json:"git_branch"`
|
||||||
BuildPath sql.NullString `json:"build_path"`
|
BuildPath sql.NullString `json:"build_path"`
|
||||||
Cpu sql.NullString `json:"cpu"`
|
Cpu sql.NullString `json:"cpu"`
|
||||||
Memory sql.NullString `json:"memory"`
|
Memory sql.NullString `json:"memory"`
|
||||||
Replicas int32 `json:"replicas"`
|
Replicas int32 `json:"replicas"`
|
||||||
Port int32 `json:"port"`
|
Port int32 `json:"port"`
|
||||||
Domain string `json:"domain"`
|
Domain string `json:"domain"`
|
||||||
HealthcheckPath string `json:"healthcheck_path"`
|
HealthcheckPath string `json:"healthcheck_path"`
|
||||||
RestartPolicy string `json:"restart_policy"`
|
RestartPolicy string `json:"restart_policy"`
|
||||||
PublishedPort int32 `json:"published_port"`
|
PublishedPort int32 `json:"published_port"`
|
||||||
Volumes json.RawMessage `json:"volumes"`
|
Volumes json.RawMessage `json:"volumes"`
|
||||||
MaintenanceMode bool `json:"maintenance_mode"`
|
MaintenanceMode bool `json:"maintenance_mode"`
|
||||||
BasicAuthUsers string `json:"basic_auth_users"`
|
BasicAuthUsers string `json:"basic_auth_users"`
|
||||||
Builder string `json:"builder"`
|
Builder string `json:"builder"`
|
||||||
CpuReserve string `json:"cpu_reserve"`
|
CpuReserve string `json:"cpu_reserve"`
|
||||||
MemoryReserve string `json:"memory_reserve"`
|
MemoryReserve string `json:"memory_reserve"`
|
||||||
StaticBuildCmd string `json:"static_build_cmd"`
|
StaticBuildCmd string `json:"static_build_cmd"`
|
||||||
StaticDir string `json:"static_dir"`
|
StaticDir string `json:"static_dir"`
|
||||||
NodeID sql.NullString `json:"node_id"`
|
NodeID sql.NullString `json:"node_id"`
|
||||||
Spread bool `json:"spread"`
|
Spread bool `json:"spread"`
|
||||||
SleepEnabled bool `json:"sleep_enabled"`
|
PlacementTags json.RawMessage `json:"placement_tags"`
|
||||||
SleepIdleMinutes int32 `json:"sleep_idle_minutes"`
|
TraefikLabels json.RawMessage `json:"traefik_labels"`
|
||||||
PlacementTags json.RawMessage `json:"placement_tags"`
|
|
||||||
TraefikLabels json.RawMessage `json:"traefik_labels"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ServiceDomain struct {
|
type ServiceDomain struct {
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ type Querier interface {
|
|||||||
DeleteAllServiceDomains(ctx context.Context, serviceID uuid.UUID) error
|
DeleteAllServiceDomains(ctx context.Context, serviceID uuid.UUID) error
|
||||||
DeleteBackupTargetByIDAndUser(ctx context.Context, arg DeleteBackupTargetByIDAndUserParams) error
|
DeleteBackupTargetByIDAndUser(ctx context.Context, arg DeleteBackupTargetByIDAndUserParams) error
|
||||||
DeleteBanner(ctx context.Context, id uuid.UUID) error
|
DeleteBanner(ctx context.Context, id uuid.UUID) error
|
||||||
DeleteCronJob(ctx context.Context, id uuid.UUID) error
|
|
||||||
DeleteDatabaseServiceByID(ctx context.Context, id string) error
|
DeleteDatabaseServiceByID(ctx context.Context, id string) error
|
||||||
DeleteDatabaseServiceByIDAndUser(ctx context.Context, arg DeleteDatabaseServiceByIDAndUserParams) error
|
DeleteDatabaseServiceByIDAndUser(ctx context.Context, arg DeleteDatabaseServiceByIDAndUserParams) error
|
||||||
DeleteNotificationChannel(ctx context.Context, arg DeleteNotificationChannelParams) (int64, error)
|
DeleteNotificationChannel(ctx context.Context, arg DeleteNotificationChannelParams) (int64, error)
|
||||||
@@ -73,7 +72,6 @@ type Querier interface {
|
|||||||
DeleteUserInvite(ctx context.Context, id uuid.UUID) error
|
DeleteUserInvite(ctx context.Context, id uuid.UUID) error
|
||||||
DeleteUserTemplate(ctx context.Context, arg DeleteUserTemplateParams) (int64, error)
|
DeleteUserTemplate(ctx context.Context, arg DeleteUserTemplateParams) (int64, error)
|
||||||
FailDeployment(ctx context.Context, arg FailDeploymentParams) error
|
FailDeployment(ctx context.Context, arg FailDeploymentParams) error
|
||||||
FinishCronExecution(ctx context.Context, arg FinishCronExecutionParams) error
|
|
||||||
GetActiveAgentAuthTokenByHash(ctx context.Context, tokenHash string) (AgentAuthToken, error)
|
GetActiveAgentAuthTokenByHash(ctx context.Context, tokenHash string) (AgentAuthToken, error)
|
||||||
GetAgent(ctx context.Context, id string) (NodeAgent, error)
|
GetAgent(ctx context.Context, id string) (NodeAgent, error)
|
||||||
GetAgentByHostAndIP(ctx context.Context, arg GetAgentByHostAndIPParams) (NodeAgent, error)
|
GetAgentByHostAndIP(ctx context.Context, arg GetAgentByHostAndIPParams) (NodeAgent, error)
|
||||||
@@ -83,11 +81,6 @@ type Querier interface {
|
|||||||
GetCommandForAgent(ctx context.Context, arg GetCommandForAgentParams) (AgentCommand, error)
|
GetCommandForAgent(ctx context.Context, arg GetCommandForAgentParams) (AgentCommand, error)
|
||||||
GetContainer(ctx context.Context, id string) (ContainerInstance, error)
|
GetContainer(ctx context.Context, id string) (ContainerInstance, error)
|
||||||
GetContainerForAgent(ctx context.Context, arg GetContainerForAgentParams) (ContainerInstance, error)
|
GetContainerForAgent(ctx context.Context, arg GetContainerForAgentParams) (ContainerInstance, error)
|
||||||
GetCronJob(ctx context.Context, id uuid.UUID) (CronJob, error)
|
|
||||||
GetCronJobForTrigger(ctx context.Context, id uuid.UUID) (GetCronJobForTriggerRow, error)
|
|
||||||
GetCronJobOwner(ctx context.Context, id uuid.UUID) (uuid.UUID, error)
|
|
||||||
GetCronJobProjectID(ctx context.Context, id uuid.UUID) (uuid.UUID, error)
|
|
||||||
GetCronOwnerViaService(ctx context.Context, id uuid.UUID) (uuid.UUID, error)
|
|
||||||
GetDatabaseBackupByIDAndDatabaseAndUser(ctx context.Context, arg GetDatabaseBackupByIDAndDatabaseAndUserParams) (DatabaseBackup, error)
|
GetDatabaseBackupByIDAndDatabaseAndUser(ctx context.Context, arg GetDatabaseBackupByIDAndDatabaseAndUserParams) (DatabaseBackup, error)
|
||||||
GetDatabaseServiceByID(ctx context.Context, id string) (DatabaseService, error)
|
GetDatabaseServiceByID(ctx context.Context, id string) (DatabaseService, error)
|
||||||
GetDatabaseServiceByIDAndUser(ctx context.Context, arg GetDatabaseServiceByIDAndUserParams) (DatabaseService, error)
|
GetDatabaseServiceByIDAndUser(ctx context.Context, arg GetDatabaseServiceByIDAndUserParams) (DatabaseService, error)
|
||||||
@@ -96,7 +89,6 @@ type Querier interface {
|
|||||||
GetDeploymentForRollback(ctx context.Context, id uuid.UUID) (GetDeploymentForRollbackRow, error)
|
GetDeploymentForRollback(ctx context.Context, id uuid.UUID) (GetDeploymentForRollbackRow, error)
|
||||||
GetDeploymentWithProject(ctx context.Context, id uuid.UUID) (GetDeploymentWithProjectRow, error)
|
GetDeploymentWithProject(ctx context.Context, id uuid.UUID) (GetDeploymentWithProjectRow, error)
|
||||||
GetLastAgentCommandByType(ctx context.Context, arg GetLastAgentCommandByTypeParams) (AgentCommand, error)
|
GetLastAgentCommandByType(ctx context.Context, arg GetLastAgentCommandByTypeParams) (AgentCommand, error)
|
||||||
GetLastDeployedImage(ctx context.Context, serviceID uuid.UUID) (string, error)
|
|
||||||
GetOutboundWebhookByID(ctx context.Context, id uuid.UUID) (OutboundWebhook, error)
|
GetOutboundWebhookByID(ctx context.Context, id uuid.UUID) (OutboundWebhook, error)
|
||||||
GetOutboundWebhookByIDAndUser(ctx context.Context, arg GetOutboundWebhookByIDAndUserParams) (OutboundWebhook, error)
|
GetOutboundWebhookByIDAndUser(ctx context.Context, arg GetOutboundWebhookByIDAndUserParams) (OutboundWebhook, error)
|
||||||
GetPreviewEnvironment(ctx context.Context, arg GetPreviewEnvironmentParams) (GetPreviewEnvironmentRow, error)
|
GetPreviewEnvironment(ctx context.Context, arg GetPreviewEnvironmentParams) (GetPreviewEnvironmentRow, error)
|
||||||
@@ -114,23 +106,16 @@ type Querier interface {
|
|||||||
GetServiceAccess(ctx context.Context, id uuid.UUID) (GetServiceAccessRow, error)
|
GetServiceAccess(ctx context.Context, id uuid.UUID) (GetServiceAccessRow, error)
|
||||||
GetServiceDomainDefault(ctx context.Context, serviceID uuid.UUID) (string, error)
|
GetServiceDomainDefault(ctx context.Context, serviceID uuid.UUID) (string, error)
|
||||||
GetServiceDomainFirst(ctx context.Context, serviceID uuid.UUID) (string, error)
|
GetServiceDomainFirst(ctx context.Context, serviceID uuid.UUID) (string, error)
|
||||||
GetServiceDomainText(ctx context.Context, id uuid.UUID) (string, error)
|
|
||||||
GetServiceEnvironment(ctx context.Context, id uuid.UUID) (string, error)
|
GetServiceEnvironment(ctx context.Context, id uuid.UUID) (string, error)
|
||||||
GetServiceForDeploy(ctx context.Context, id uuid.UUID) (GetServiceForDeployRow, error)
|
GetServiceForDeploy(ctx context.Context, id uuid.UUID) (GetServiceForDeployRow, error)
|
||||||
GetServiceForDeployWithOwner(ctx context.Context, id uuid.UUID) (GetServiceForDeployWithOwnerRow, error)
|
GetServiceForDeployWithOwner(ctx context.Context, id uuid.UUID) (GetServiceForDeployWithOwnerRow, error)
|
||||||
GetServicePlacementBrief(ctx context.Context, id uuid.UUID) (GetServicePlacementBriefRow, error)
|
GetServicePlacementBrief(ctx context.Context, id uuid.UUID) (GetServicePlacementBriefRow, error)
|
||||||
GetServicePort(ctx context.Context, id uuid.UUID) (int32, error)
|
|
||||||
GetServicePublishedPort(ctx context.Context, id uuid.UUID) (int32, error)
|
GetServicePublishedPort(ctx context.Context, id uuid.UUID) (int32, error)
|
||||||
GetServiceRuntimeWithOwner(ctx context.Context, id uuid.UUID) (GetServiceRuntimeWithOwnerRow, error)
|
|
||||||
GetServiceStatusText(ctx context.Context, id uuid.UUID) (string, error)
|
|
||||||
GetServiceTemplateByID(ctx context.Context, id string) (ServiceTemplate, error)
|
GetServiceTemplateByID(ctx context.Context, id string) (ServiceTemplate, error)
|
||||||
GetServiceTypeBrief(ctx context.Context, arg GetServiceTypeBriefParams) (GetServiceTypeBriefRow, error)
|
GetServiceTypeBrief(ctx context.Context, arg GetServiceTypeBriefParams) (GetServiceTypeBriefRow, error)
|
||||||
GetServiceVariableValue(ctx context.Context, arg GetServiceVariableValueParams) (string, error)
|
|
||||||
GetUserInviteByTokenHash(ctx context.Context, tokenHash string) (UserInvite, error)
|
GetUserInviteByTokenHash(ctx context.Context, tokenHash string) (UserInvite, error)
|
||||||
GetUserTokenByHash(ctx context.Context, tokenHash string) (UserToken, error)
|
GetUserTokenByHash(ctx context.Context, tokenHash string) (UserToken, error)
|
||||||
InsertAgentHeartbeat(ctx context.Context, arg InsertAgentHeartbeatParams) error
|
InsertAgentHeartbeat(ctx context.Context, arg InsertAgentHeartbeatParams) error
|
||||||
InsertCronExecution(ctx context.Context, arg InsertCronExecutionParams) error
|
|
||||||
InsertCronJob(ctx context.Context, arg InsertCronJobParams) error
|
|
||||||
InsertDeployment(ctx context.Context, arg InsertDeploymentParams) error
|
InsertDeployment(ctx context.Context, arg InsertDeploymentParams) error
|
||||||
InsertNotificationChannel(ctx context.Context, arg InsertNotificationChannelParams) (NotificationChannel, error)
|
InsertNotificationChannel(ctx context.Context, arg InsertNotificationChannelParams) (NotificationChannel, error)
|
||||||
InsertPendingDeployment(ctx context.Context, arg InsertPendingDeploymentParams) error
|
InsertPendingDeployment(ctx context.Context, arg InsertPendingDeploymentParams) error
|
||||||
@@ -145,17 +130,14 @@ type Querier interface {
|
|||||||
ListBanners(ctx context.Context) ([]Banner, error)
|
ListBanners(ctx context.Context) ([]Banner, error)
|
||||||
ListCommandsForAgent(ctx context.Context, nodeAgentID string) ([]AgentCommand, error)
|
ListCommandsForAgent(ctx context.Context, nodeAgentID string) ([]AgentCommand, error)
|
||||||
ListContainersForAgent(ctx context.Context, nodeAgentID string) ([]ContainerInstance, error)
|
ListContainersForAgent(ctx context.Context, nodeAgentID string) ([]ContainerInstance, error)
|
||||||
ListCronExecutions(ctx context.Context, cronJobID uuid.UUID) ([]CronExecution, error)
|
|
||||||
ListDatabaseBackupsByDatabaseAndUser(ctx context.Context, arg ListDatabaseBackupsByDatabaseAndUserParams) ([]DatabaseBackup, error)
|
ListDatabaseBackupsByDatabaseAndUser(ctx context.Context, arg ListDatabaseBackupsByDatabaseAndUserParams) ([]DatabaseBackup, error)
|
||||||
ListDatabaseServicesByProject(ctx context.Context, projectID uuid.NullUUID) ([]DatabaseService, error)
|
ListDatabaseServicesByProject(ctx context.Context, projectID uuid.NullUUID) ([]DatabaseService, error)
|
||||||
ListDatabaseServicesByUser(ctx context.Context, userID string) ([]DatabaseService, error)
|
ListDatabaseServicesByUser(ctx context.Context, userID string) ([]DatabaseService, error)
|
||||||
ListDeploymentsForService(ctx context.Context, arg ListDeploymentsForServiceParams) ([]ListDeploymentsForServiceRow, error)
|
ListDeploymentsForService(ctx context.Context, arg ListDeploymentsForServiceParams) ([]ListDeploymentsForServiceRow, error)
|
||||||
ListDueCronJobs(ctx context.Context) ([]ListDueCronJobsRow, error)
|
|
||||||
ListDueDatabaseBackups(ctx context.Context) ([]ListDueDatabaseBackupsRow, error)
|
ListDueDatabaseBackups(ctx context.Context) ([]ListDueDatabaseBackupsRow, error)
|
||||||
ListEnabledOutboundWebhooks(ctx context.Context) ([]OutboundWebhook, error)
|
ListEnabledOutboundWebhooks(ctx context.Context) ([]OutboundWebhook, error)
|
||||||
ListExpiredPreviewsForUser(ctx context.Context, arg ListExpiredPreviewsForUserParams) ([]ListExpiredPreviewsForUserRow, error)
|
ListExpiredPreviewsForUser(ctx context.Context, arg ListExpiredPreviewsForUserParams) ([]ListExpiredPreviewsForUserRow, error)
|
||||||
ListInstanceMetrics(ctx context.Context, arg ListInstanceMetricsParams) ([]ListInstanceMetricsRow, error)
|
ListInstanceMetrics(ctx context.Context, arg ListInstanceMetricsParams) ([]ListInstanceMetricsRow, error)
|
||||||
ListNodeAgentsForService(ctx context.Context, serviceID string) ([]string, error)
|
|
||||||
ListNodeMetrics(ctx context.Context, arg ListNodeMetricsParams) ([]ListNodeMetricsRow, error)
|
ListNodeMetrics(ctx context.Context, arg ListNodeMetricsParams) ([]ListNodeMetricsRow, error)
|
||||||
ListNotificationChannelsByUser(ctx context.Context, userID uuid.UUID) ([]NotificationChannel, error)
|
ListNotificationChannelsByUser(ctx context.Context, userID uuid.UUID) ([]NotificationChannel, error)
|
||||||
ListNotificationsByUser(ctx context.Context, arg ListNotificationsByUserParams) ([]Notification, error)
|
ListNotificationsByUser(ctx context.Context, arg ListNotificationsByUserParams) ([]Notification, error)
|
||||||
@@ -164,7 +146,6 @@ type Querier interface {
|
|||||||
ListPendingProjects(ctx context.Context) ([]Project, error)
|
ListPendingProjects(ctx context.Context) ([]Project, error)
|
||||||
ListPreviewEnvironmentsForProject(ctx context.Context, projectID uuid.UUID) ([]ListPreviewEnvironmentsForProjectRow, error)
|
ListPreviewEnvironmentsForProject(ctx context.Context, projectID uuid.UUID) ([]ListPreviewEnvironmentsForProjectRow, error)
|
||||||
ListProjectEnvironments(ctx context.Context, projectID uuid.UUID) ([]ListProjectEnvironmentsRow, error)
|
ListProjectEnvironments(ctx context.Context, projectID uuid.UUID) ([]ListProjectEnvironmentsRow, error)
|
||||||
ListProjectServiceRefs(ctx context.Context, projectID uuid.UUID) ([]ListProjectServiceRefsRow, error)
|
|
||||||
// Visibility model: a project is readable when it is approved for public
|
// Visibility model: a project is readable when it is approved for public
|
||||||
// display, when the caller owns or is a member of it, or when the caller is a
|
// display, when the caller owns or is a member of it, or when the caller is a
|
||||||
// platform admin. Anonymous callers pass user_id = uuid.Nil, is_admin = false.
|
// platform admin. Anonymous callers pass user_id = uuid.Nil, is_admin = false.
|
||||||
@@ -183,9 +164,6 @@ type Querier interface {
|
|||||||
ListServiceMetrics(ctx context.Context, arg ListServiceMetricsParams) ([]ListServiceMetricsRow, error)
|
ListServiceMetrics(ctx context.Context, arg ListServiceMetricsParams) ([]ListServiceMetricsRow, error)
|
||||||
ListServiceTemplatesByCategoryForUser(ctx context.Context, arg ListServiceTemplatesByCategoryForUserParams) ([]ServiceTemplate, error)
|
ListServiceTemplatesByCategoryForUser(ctx context.Context, arg ListServiceTemplatesByCategoryForUserParams) ([]ServiceTemplate, error)
|
||||||
ListServiceTemplatesForUser(ctx context.Context, ownerID uuid.NullUUID) ([]ServiceTemplate, error)
|
ListServiceTemplatesForUser(ctx context.Context, ownerID uuid.NullUUID) ([]ServiceTemplate, error)
|
||||||
ListServiceVariableValues(ctx context.Context, serviceID uuid.UUID) ([]ListServiceVariableValuesRow, error)
|
|
||||||
ListServiceVariablesWithSecret(ctx context.Context, serviceID uuid.UUID) ([]ListServiceVariablesWithSecretRow, error)
|
|
||||||
ListSleepCandidates(ctx context.Context) ([]ListSleepCandidatesRow, error)
|
|
||||||
ListSweepablePreviews(ctx context.Context) ([]ListSweepablePreviewsRow, error)
|
ListSweepablePreviews(ctx context.Context) ([]ListSweepablePreviewsRow, error)
|
||||||
ListUserInvites(ctx context.Context) ([]UserInvite, error)
|
ListUserInvites(ctx context.Context) ([]UserInvite, error)
|
||||||
ListUserTokens(ctx context.Context, userID uuid.UUID) ([]UserToken, error)
|
ListUserTokens(ctx context.Context, userID uuid.UUID) ([]UserToken, error)
|
||||||
@@ -221,15 +199,12 @@ type Querier interface {
|
|||||||
SetProjectApproved(ctx context.Context, arg SetProjectApprovedParams) (int64, error)
|
SetProjectApproved(ctx context.Context, arg SetProjectApprovedParams) (int64, error)
|
||||||
SetServiceDomainDefault(ctx context.Context, arg SetServiceDomainDefaultParams) (int64, error)
|
SetServiceDomainDefault(ctx context.Context, arg SetServiceDomainDefaultParams) (int64, error)
|
||||||
SetServiceLegacyDomain(ctx context.Context, arg SetServiceLegacyDomainParams) error
|
SetServiceLegacyDomain(ctx context.Context, arg SetServiceLegacyDomainParams) error
|
||||||
SetServicePublishedPort(ctx context.Context, arg SetServicePublishedPortParams) error
|
|
||||||
SetServiceReplicas(ctx context.Context, arg SetServiceReplicasParams) error
|
|
||||||
SetServiceStatus(ctx context.Context, arg SetServiceStatusParams) error
|
SetServiceStatus(ctx context.Context, arg SetServiceStatusParams) error
|
||||||
SyncDeploymentProgress(ctx context.Context, arg SyncDeploymentProgressParams) error
|
SyncDeploymentProgress(ctx context.Context, arg SyncDeploymentProgressParams) error
|
||||||
SyncPreviewStatuses(ctx context.Context) error
|
SyncPreviewStatuses(ctx context.Context) error
|
||||||
TouchAgentAuthToken(ctx context.Context, tokenHash string) error
|
TouchAgentAuthToken(ctx context.Context, tokenHash string) error
|
||||||
TouchServiceDomainChecked(ctx context.Context, id uuid.UUID) error
|
TouchServiceDomainChecked(ctx context.Context, id uuid.UUID) error
|
||||||
TouchUserToken(ctx context.Context, id uuid.UUID) error
|
TouchUserToken(ctx context.Context, id uuid.UUID) error
|
||||||
TrimCronExecutions(ctx context.Context, arg TrimCronExecutionsParams) error
|
|
||||||
UpdateAgent(ctx context.Context, arg UpdateAgentParams) (NodeAgent, error)
|
UpdateAgent(ctx context.Context, arg UpdateAgentParams) (NodeAgent, error)
|
||||||
UpdateAgentHeartbeat(ctx context.Context, arg UpdateAgentHeartbeatParams) error
|
UpdateAgentHeartbeat(ctx context.Context, arg UpdateAgentHeartbeatParams) error
|
||||||
UpdateBackupTargetByIDAndUser(ctx context.Context, arg UpdateBackupTargetByIDAndUserParams) error
|
UpdateBackupTargetByIDAndUser(ctx context.Context, arg UpdateBackupTargetByIDAndUserParams) error
|
||||||
@@ -242,7 +217,6 @@ type Querier interface {
|
|||||||
// removed replica. $4 is the cumulative rx+tx byte counter.
|
// removed replica. $4 is the cumulative rx+tx byte counter.
|
||||||
UpdateContainerStateByName(ctx context.Context, arg UpdateContainerStateByNameParams) error
|
UpdateContainerStateByName(ctx context.Context, arg UpdateContainerStateByNameParams) error
|
||||||
UpdateContainerStatus(ctx context.Context, arg UpdateContainerStatusParams) error
|
UpdateContainerStatus(ctx context.Context, arg UpdateContainerStatusParams) error
|
||||||
UpdateCronJobRun(ctx context.Context, arg UpdateCronJobRunParams) error
|
|
||||||
UpdateDatabaseServiceNameAndPlanByIDAndUser(ctx context.Context, arg UpdateDatabaseServiceNameAndPlanByIDAndUserParams) error
|
UpdateDatabaseServiceNameAndPlanByIDAndUser(ctx context.Context, arg UpdateDatabaseServiceNameAndPlanByIDAndUserParams) error
|
||||||
UpdateDatabaseServiceNameByIDAndUser(ctx context.Context, arg UpdateDatabaseServiceNameByIDAndUserParams) error
|
UpdateDatabaseServiceNameByIDAndUser(ctx context.Context, arg UpdateDatabaseServiceNameByIDAndUserParams) error
|
||||||
UpdateDatabaseServicePlanByIDAndUser(ctx context.Context, arg UpdateDatabaseServicePlanByIDAndUserParams) error
|
UpdateDatabaseServicePlanByIDAndUser(ctx context.Context, arg UpdateDatabaseServicePlanByIDAndUserParams) error
|
||||||
|
|||||||
@@ -1,355 +0,0 @@
|
|||||||
// Code generated by sqlc. DO NOT EDIT.
|
|
||||||
// versions:
|
|
||||||
// sqlc v1.31.1
|
|
||||||
// source: runtime.sql
|
|
||||||
|
|
||||||
package sqlcdb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"database/sql"
|
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
)
|
|
||||||
|
|
||||||
const getLastDeployedImage = `-- name: GetLastDeployedImage :one
|
|
||||||
SELECT (image_name || ':' || image_tag)::text AS image FROM deployments
|
|
||||||
WHERE service_id = $1 AND status = 'deployed' AND image_name <> ''
|
|
||||||
ORDER BY created_at DESC LIMIT 1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) GetLastDeployedImage(ctx context.Context, serviceID uuid.UUID) (string, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getLastDeployedImage, serviceID)
|
|
||||||
var image string
|
|
||||||
err := row.Scan(&image)
|
|
||||||
return image, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getServiceDomainText = `-- name: GetServiceDomainText :one
|
|
||||||
SELECT COALESCE(domain,'') AS domain FROM services WHERE id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) GetServiceDomainText(ctx context.Context, id uuid.UUID) (string, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getServiceDomainText, id)
|
|
||||||
var domain string
|
|
||||||
err := row.Scan(&domain)
|
|
||||||
return domain, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getServicePort = `-- name: GetServicePort :one
|
|
||||||
SELECT COALESCE(port, 0) AS port FROM services WHERE id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) GetServicePort(ctx context.Context, id uuid.UUID) (int32, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getServicePort, id)
|
|
||||||
var port int32
|
|
||||||
err := row.Scan(&port)
|
|
||||||
return port, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getServiceRuntimeWithOwner = `-- name: GetServiceRuntimeWithOwner :one
|
|
||||||
SELECT s.id, s.project_id, s.name,
|
|
||||||
COALESCE(s.type, s.service_type, '') AS type, COALESCE(s.status, '') AS status,
|
|
||||||
COALESCE(s.image, s.image_name, '') AS image, COALESCE(s.command, s.start_command, '') AS command,
|
|
||||||
COALESCE(s.environment, '') AS environment, COALESCE(s.git_repo, s.source_url, '') AS git_repo,
|
|
||||||
COALESCE(s.git_branch, '') AS git_branch, COALESCE(s.build_path, '') AS build_path,
|
|
||||||
COALESCE(s.cpu, '') AS cpu, COALESCE(s.memory, '') AS memory,
|
|
||||||
COALESCE(s.replicas, 1) AS replicas, COALESCE(s.port, 0) AS port,
|
|
||||||
COALESCE(s.domain, '') AS domain, COALESCE(s.healthcheck_path, '') AS healthcheck_path,
|
|
||||||
COALESCE(s.restart_policy, 'unless-stopped') AS restart_policy,
|
|
||||||
COALESCE(s.builder, 'auto') AS builder, COALESCE(s.cpu_reserve, '') AS cpu_reserve,
|
|
||||||
COALESCE(s.memory_reserve, '') AS memory_reserve, COALESCE(s.static_build_cmd, '') AS static_build_cmd,
|
|
||||||
COALESCE(s.static_dir, '') AS static_dir,
|
|
||||||
s.created_at, s.updated_at, p.owner_id
|
|
||||||
FROM services s
|
|
||||||
JOIN projects p ON s.project_id = p.id
|
|
||||||
WHERE s.id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
type GetServiceRuntimeWithOwnerRow struct {
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
ProjectID uuid.UUID `json:"project_id"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
Type string `json:"type"`
|
|
||||||
Status string `json:"status"`
|
|
||||||
Image string `json:"image"`
|
|
||||||
Command string `json:"command"`
|
|
||||||
Environment string `json:"environment"`
|
|
||||||
GitRepo string `json:"git_repo"`
|
|
||||||
GitBranch string `json:"git_branch"`
|
|
||||||
BuildPath string `json:"build_path"`
|
|
||||||
Cpu string `json:"cpu"`
|
|
||||||
Memory string `json:"memory"`
|
|
||||||
Replicas int32 `json:"replicas"`
|
|
||||||
Port int32 `json:"port"`
|
|
||||||
Domain string `json:"domain"`
|
|
||||||
HealthcheckPath string `json:"healthcheck_path"`
|
|
||||||
RestartPolicy string `json:"restart_policy"`
|
|
||||||
Builder string `json:"builder"`
|
|
||||||
CpuReserve string `json:"cpu_reserve"`
|
|
||||||
MemoryReserve string `json:"memory_reserve"`
|
|
||||||
StaticBuildCmd string `json:"static_build_cmd"`
|
|
||||||
StaticDir string `json:"static_dir"`
|
|
||||||
CreatedAt sql.NullTime `json:"created_at"`
|
|
||||||
UpdatedAt sql.NullTime `json:"updated_at"`
|
|
||||||
OwnerID uuid.UUID `json:"owner_id"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) GetServiceRuntimeWithOwner(ctx context.Context, id uuid.UUID) (GetServiceRuntimeWithOwnerRow, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getServiceRuntimeWithOwner, id)
|
|
||||||
var i GetServiceRuntimeWithOwnerRow
|
|
||||||
err := row.Scan(
|
|
||||||
&i.ID,
|
|
||||||
&i.ProjectID,
|
|
||||||
&i.Name,
|
|
||||||
&i.Type,
|
|
||||||
&i.Status,
|
|
||||||
&i.Image,
|
|
||||||
&i.Command,
|
|
||||||
&i.Environment,
|
|
||||||
&i.GitRepo,
|
|
||||||
&i.GitBranch,
|
|
||||||
&i.BuildPath,
|
|
||||||
&i.Cpu,
|
|
||||||
&i.Memory,
|
|
||||||
&i.Replicas,
|
|
||||||
&i.Port,
|
|
||||||
&i.Domain,
|
|
||||||
&i.HealthcheckPath,
|
|
||||||
&i.RestartPolicy,
|
|
||||||
&i.Builder,
|
|
||||||
&i.CpuReserve,
|
|
||||||
&i.MemoryReserve,
|
|
||||||
&i.StaticBuildCmd,
|
|
||||||
&i.StaticDir,
|
|
||||||
&i.CreatedAt,
|
|
||||||
&i.UpdatedAt,
|
|
||||||
&i.OwnerID,
|
|
||||||
)
|
|
||||||
return i, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getServiceStatusText = `-- name: GetServiceStatusText :one
|
|
||||||
SELECT COALESCE(status,'') AS status FROM services WHERE id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) GetServiceStatusText(ctx context.Context, id uuid.UUID) (string, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getServiceStatusText, id)
|
|
||||||
var status string
|
|
||||||
err := row.Scan(&status)
|
|
||||||
return status, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const getServiceVariableValue = `-- name: GetServiceVariableValue :one
|
|
||||||
SELECT value FROM environment_variables WHERE service_id = $1 AND key = $2
|
|
||||||
`
|
|
||||||
|
|
||||||
type GetServiceVariableValueParams struct {
|
|
||||||
ServiceID uuid.UUID `json:"service_id"`
|
|
||||||
Key string `json:"key"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) GetServiceVariableValue(ctx context.Context, arg GetServiceVariableValueParams) (string, error) {
|
|
||||||
row := q.db.QueryRowContext(ctx, getServiceVariableValue, arg.ServiceID, arg.Key)
|
|
||||||
var value string
|
|
||||||
err := row.Scan(&value)
|
|
||||||
return value, err
|
|
||||||
}
|
|
||||||
|
|
||||||
const listNodeAgentsForService = `-- name: ListNodeAgentsForService :many
|
|
||||||
SELECT DISTINCT node_agent_id FROM container_instances WHERE service_id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
func (q *Queries) ListNodeAgentsForService(ctx context.Context, serviceID string) ([]string, error) {
|
|
||||||
rows, err := q.db.QueryContext(ctx, listNodeAgentsForService, serviceID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
items := []string{}
|
|
||||||
for rows.Next() {
|
|
||||||
var node_agent_id string
|
|
||||||
if err := rows.Scan(&node_agent_id); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
items = append(items, node_agent_id)
|
|
||||||
}
|
|
||||||
if err := rows.Close(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return items, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
const listProjectServiceRefs = `-- name: ListProjectServiceRefs :many
|
|
||||||
SELECT id, name FROM services WHERE project_id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
type ListProjectServiceRefsRow struct {
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) ListProjectServiceRefs(ctx context.Context, projectID uuid.UUID) ([]ListProjectServiceRefsRow, error) {
|
|
||||||
rows, err := q.db.QueryContext(ctx, listProjectServiceRefs, projectID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
items := []ListProjectServiceRefsRow{}
|
|
||||||
for rows.Next() {
|
|
||||||
var i ListProjectServiceRefsRow
|
|
||||||
if err := rows.Scan(&i.ID, &i.Name); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
items = append(items, i)
|
|
||||||
}
|
|
||||||
if err := rows.Close(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return items, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
const listServiceVariableValues = `-- name: ListServiceVariableValues :many
|
|
||||||
SELECT key, value FROM environment_variables WHERE service_id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
type ListServiceVariableValuesRow struct {
|
|
||||||
Key string `json:"key"`
|
|
||||||
Value string `json:"value"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) ListServiceVariableValues(ctx context.Context, serviceID uuid.UUID) ([]ListServiceVariableValuesRow, error) {
|
|
||||||
rows, err := q.db.QueryContext(ctx, listServiceVariableValues, serviceID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
items := []ListServiceVariableValuesRow{}
|
|
||||||
for rows.Next() {
|
|
||||||
var i ListServiceVariableValuesRow
|
|
||||||
if err := rows.Scan(&i.Key, &i.Value); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
items = append(items, i)
|
|
||||||
}
|
|
||||||
if err := rows.Close(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return items, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
const listServiceVariablesWithSecret = `-- name: ListServiceVariablesWithSecret :many
|
|
||||||
SELECT key, value, COALESCE(is_secret, false) AS is_secret
|
|
||||||
FROM environment_variables WHERE service_id = $1
|
|
||||||
`
|
|
||||||
|
|
||||||
type ListServiceVariablesWithSecretRow struct {
|
|
||||||
Key string `json:"key"`
|
|
||||||
Value string `json:"value"`
|
|
||||||
IsSecret bool `json:"is_secret"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) ListServiceVariablesWithSecret(ctx context.Context, serviceID uuid.UUID) ([]ListServiceVariablesWithSecretRow, error) {
|
|
||||||
rows, err := q.db.QueryContext(ctx, listServiceVariablesWithSecret, serviceID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
items := []ListServiceVariablesWithSecretRow{}
|
|
||||||
for rows.Next() {
|
|
||||||
var i ListServiceVariablesWithSecretRow
|
|
||||||
if err := rows.Scan(&i.Key, &i.Value, &i.IsSecret); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
items = append(items, i)
|
|
||||||
}
|
|
||||||
if err := rows.Close(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return items, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
const listSleepCandidates = `-- name: ListSleepCandidates :many
|
|
||||||
SELECT id, project_id, name, COALESCE(status,'') AS status,
|
|
||||||
COALESCE(sleep_idle_minutes, 15) AS sleep_idle_minutes
|
|
||||||
FROM services
|
|
||||||
WHERE sleep_enabled AND COALESCE(status,'') IN ('running','deployed','degraded','starting')
|
|
||||||
`
|
|
||||||
|
|
||||||
type ListSleepCandidatesRow struct {
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
ProjectID uuid.UUID `json:"project_id"`
|
|
||||||
Name string `json:"name"`
|
|
||||||
Status string `json:"status"`
|
|
||||||
SleepIdleMinutes int32 `json:"sleep_idle_minutes"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) ListSleepCandidates(ctx context.Context) ([]ListSleepCandidatesRow, error) {
|
|
||||||
rows, err := q.db.QueryContext(ctx, listSleepCandidates)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
items := []ListSleepCandidatesRow{}
|
|
||||||
for rows.Next() {
|
|
||||||
var i ListSleepCandidatesRow
|
|
||||||
if err := rows.Scan(
|
|
||||||
&i.ID,
|
|
||||||
&i.ProjectID,
|
|
||||||
&i.Name,
|
|
||||||
&i.Status,
|
|
||||||
&i.SleepIdleMinutes,
|
|
||||||
); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
items = append(items, i)
|
|
||||||
}
|
|
||||||
if err := rows.Close(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return items, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
const setServicePublishedPort = `-- name: SetServicePublishedPort :exec
|
|
||||||
UPDATE services SET published_port = $1 WHERE id = $2 AND published_port <> $1
|
|
||||||
`
|
|
||||||
|
|
||||||
type SetServicePublishedPortParams struct {
|
|
||||||
PublishedPort int32 `json:"published_port"`
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) SetServicePublishedPort(ctx context.Context, arg SetServicePublishedPortParams) error {
|
|
||||||
_, err := q.db.ExecContext(ctx, setServicePublishedPort, arg.PublishedPort, arg.ID)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
const setServiceReplicas = `-- name: SetServiceReplicas :exec
|
|
||||||
UPDATE services SET replicas = $1, updated_at = $2 WHERE id = $3
|
|
||||||
`
|
|
||||||
|
|
||||||
type SetServiceReplicasParams struct {
|
|
||||||
Replicas int32 `json:"replicas"`
|
|
||||||
UpdatedAt sql.NullTime `json:"updated_at"`
|
|
||||||
ID uuid.UUID `json:"id"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (q *Queries) SetServiceReplicas(ctx context.Context, arg SetServiceReplicasParams) error {
|
|
||||||
_, err := q.db.ExecContext(ctx, setServiceReplicas, arg.Replicas, arg.UpdatedAt, arg.ID)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
-- name: GetCronJobProjectID :one
|
|
||||||
SELECT project_id FROM cron_jobs WHERE id = $1;
|
|
||||||
|
|
||||||
-- name: GetCronOwnerViaService :one
|
|
||||||
SELECT p.owner_id FROM projects p
|
|
||||||
JOIN services s ON s.project_id = p.id
|
|
||||||
WHERE s.id = $1;
|
|
||||||
|
|
||||||
-- name: InsertCronJob :exec
|
|
||||||
INSERT INTO cron_jobs (id, project_id, service_id, name, schedule, command, timezone, enabled, next_run_at, retention, created_at, updated_at)
|
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12);
|
|
||||||
|
|
||||||
-- name: GetCronJob :one
|
|
||||||
SELECT id, project_id, service_id, name, schedule, command, timezone,
|
|
||||||
enabled, last_run_at, next_run_at, last_status, last_output,
|
|
||||||
retention, created_at, updated_at
|
|
||||||
FROM cron_jobs WHERE id = $1;
|
|
||||||
|
|
||||||
-- name: GetCronJobOwner :one
|
|
||||||
SELECT p.owner_id FROM cron_jobs cj
|
|
||||||
JOIN projects p ON cj.project_id = p.id
|
|
||||||
WHERE cj.id = $1;
|
|
||||||
|
|
||||||
-- name: DeleteCronJob :exec
|
|
||||||
DELETE FROM cron_jobs WHERE id = $1;
|
|
||||||
|
|
||||||
-- name: ListCronExecutions :many
|
|
||||||
SELECT id, cron_job_id, started_at, finished_at, status, output, error
|
|
||||||
FROM cron_executions
|
|
||||||
WHERE cron_job_id = $1
|
|
||||||
ORDER BY started_at DESC
|
|
||||||
LIMIT 100;
|
|
||||||
|
|
||||||
-- name: GetCronJobForTrigger :one
|
|
||||||
SELECT cj.service_id, cj.command, cj.schedule, cj.timezone, cj.retention, p.owner_id
|
|
||||||
FROM cron_jobs cj
|
|
||||||
JOIN projects p ON cj.project_id = p.id
|
|
||||||
WHERE cj.id = $1;
|
|
||||||
|
|
||||||
-- name: InsertCronExecution :exec
|
|
||||||
INSERT INTO cron_executions (id, cron_job_id, started_at, status)
|
|
||||||
VALUES ($1, $2, $3, $4);
|
|
||||||
|
|
||||||
-- name: ListDueCronJobs :many
|
|
||||||
SELECT id, project_id, service_id, name, schedule, command, timezone, enabled, retention
|
|
||||||
FROM cron_jobs
|
|
||||||
WHERE enabled = TRUE AND next_run_at IS NOT NULL AND next_run_at <= NOW();
|
|
||||||
|
|
||||||
-- name: FinishCronExecution :exec
|
|
||||||
UPDATE cron_executions SET finished_at = $1, status = $2, output = $3, error = $4 WHERE id = $5;
|
|
||||||
|
|
||||||
-- name: UpdateCronJobRun :exec
|
|
||||||
UPDATE cron_jobs SET last_run_at = $1, last_status = $2, last_output = $3, next_run_at = $4 WHERE id = $5;
|
|
||||||
|
|
||||||
-- name: TrimCronExecutions :exec
|
|
||||||
DELETE FROM cron_executions WHERE cron_executions.cron_job_id = $1 AND cron_executions.id NOT IN (
|
|
||||||
SELECT ce.id FROM cron_executions ce WHERE ce.cron_job_id = $1
|
|
||||||
ORDER BY ce.started_at DESC LIMIT $2);
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
-- name: ListNodeAgentsForService :many
|
|
||||||
SELECT DISTINCT node_agent_id FROM container_instances WHERE service_id = $1;
|
|
||||||
|
|
||||||
-- name: ListServiceVariableValues :many
|
|
||||||
SELECT key, value FROM environment_variables WHERE service_id = $1;
|
|
||||||
|
|
||||||
-- name: ListServiceVariablesWithSecret :many
|
|
||||||
SELECT key, value, COALESCE(is_secret, false) AS is_secret
|
|
||||||
FROM environment_variables WHERE service_id = $1;
|
|
||||||
|
|
||||||
-- name: ListProjectServiceRefs :many
|
|
||||||
SELECT id, name FROM services WHERE project_id = $1;
|
|
||||||
|
|
||||||
-- name: GetServicePort :one
|
|
||||||
SELECT COALESCE(port, 0) AS port FROM services WHERE id = $1;
|
|
||||||
|
|
||||||
-- name: GetServiceVariableValue :one
|
|
||||||
SELECT value FROM environment_variables WHERE service_id = $1 AND key = $2;
|
|
||||||
|
|
||||||
-- name: GetServiceRuntimeWithOwner :one
|
|
||||||
SELECT s.id, s.project_id, s.name,
|
|
||||||
COALESCE(s.type, s.service_type, '') AS type, COALESCE(s.status, '') AS status,
|
|
||||||
COALESCE(s.image, s.image_name, '') AS image, COALESCE(s.command, s.start_command, '') AS command,
|
|
||||||
COALESCE(s.environment, '') AS environment, COALESCE(s.git_repo, s.source_url, '') AS git_repo,
|
|
||||||
COALESCE(s.git_branch, '') AS git_branch, COALESCE(s.build_path, '') AS build_path,
|
|
||||||
COALESCE(s.cpu, '') AS cpu, COALESCE(s.memory, '') AS memory,
|
|
||||||
COALESCE(s.replicas, 1) AS replicas, COALESCE(s.port, 0) AS port,
|
|
||||||
COALESCE(s.domain, '') AS domain, COALESCE(s.healthcheck_path, '') AS healthcheck_path,
|
|
||||||
COALESCE(s.restart_policy, 'unless-stopped') AS restart_policy,
|
|
||||||
COALESCE(s.builder, 'auto') AS builder, COALESCE(s.cpu_reserve, '') AS cpu_reserve,
|
|
||||||
COALESCE(s.memory_reserve, '') AS memory_reserve, COALESCE(s.static_build_cmd, '') AS static_build_cmd,
|
|
||||||
COALESCE(s.static_dir, '') AS static_dir,
|
|
||||||
s.created_at, s.updated_at, p.owner_id
|
|
||||||
FROM services s
|
|
||||||
JOIN projects p ON s.project_id = p.id
|
|
||||||
WHERE s.id = $1;
|
|
||||||
|
|
||||||
-- name: GetLastDeployedImage :one
|
|
||||||
SELECT (image_name || ':' || image_tag)::text AS image FROM deployments
|
|
||||||
WHERE service_id = $1 AND status = 'deployed' AND image_name <> ''
|
|
||||||
ORDER BY created_at DESC LIMIT 1;
|
|
||||||
|
|
||||||
-- name: SetServicePublishedPort :exec
|
|
||||||
UPDATE services SET published_port = $1 WHERE id = $2 AND published_port <> $1;
|
|
||||||
|
|
||||||
-- name: SetServiceReplicas :exec
|
|
||||||
UPDATE services SET replicas = $1, updated_at = $2 WHERE id = $3;
|
|
||||||
|
|
||||||
-- name: ListSleepCandidates :many
|
|
||||||
SELECT id, project_id, name, COALESCE(status,'') AS status,
|
|
||||||
COALESCE(sleep_idle_minutes, 15) AS sleep_idle_minutes
|
|
||||||
FROM services
|
|
||||||
WHERE sleep_enabled AND COALESCE(status,'') IN ('running','deployed','degraded','starting');
|
|
||||||
|
|
||||||
-- name: GetServiceDomainText :one
|
|
||||||
SELECT COALESCE(domain,'') AS domain FROM services WHERE id = $1;
|
|
||||||
|
|
||||||
-- name: GetServiceStatusText :one
|
|
||||||
SELECT COALESCE(status,'') AS status FROM services WHERE id = $1;
|
|
||||||
@@ -69,8 +69,6 @@ CREATE TABLE services (
|
|||||||
static_dir VARCHAR(255) NOT NULL DEFAULT '',
|
static_dir VARCHAR(255) NOT NULL DEFAULT '',
|
||||||
node_id VARCHAR(255),
|
node_id VARCHAR(255),
|
||||||
spread BOOLEAN NOT NULL DEFAULT false,
|
spread BOOLEAN NOT NULL DEFAULT false,
|
||||||
sleep_enabled BOOLEAN NOT NULL DEFAULT false,
|
|
||||||
sleep_idle_minutes INTEGER NOT NULL DEFAULT 15,
|
|
||||||
placement_tags JSONB NOT NULL DEFAULT '[]',
|
placement_tags JSONB NOT NULL DEFAULT '[]',
|
||||||
traefik_labels JSONB NOT NULL DEFAULT '{}'
|
traefik_labels JSONB NOT NULL DEFAULT '{}'
|
||||||
);
|
);
|
||||||
@@ -461,31 +459,3 @@ CREATE TABLE instance_metrics (
|
|||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||||
PRIMARY KEY (service_id, timestamp, instance_id)
|
PRIMARY KEY (service_id, timestamp, instance_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE cron_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
|
|
||||||
service_id UUID NOT NULL REFERENCES services(id) ON DELETE CASCADE,
|
|
||||||
name VARCHAR(255) NOT NULL,
|
|
||||||
schedule VARCHAR(100) NOT NULL,
|
|
||||||
command TEXT NOT NULL,
|
|
||||||
timezone VARCHAR(50) DEFAULT 'UTC',
|
|
||||||
enabled BOOLEAN DEFAULT true,
|
|
||||||
last_run_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
next_run_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
last_status VARCHAR(50),
|
|
||||||
last_output TEXT,
|
|
||||||
retention INTEGER DEFAULT 30,
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE cron_executions (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
cron_job_id UUID NOT NULL REFERENCES cron_jobs(id) ON DELETE CASCADE,
|
|
||||||
started_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
|
||||||
finished_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
status VARCHAR(50) DEFAULT 'pending',
|
|
||||||
output TEXT,
|
|
||||||
error TEXT
|
|
||||||
);
|
|
||||||
Reference in new issue
Block a user