mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 15:51:26 +00:00
fix(git): webhook receiver — fork-sync events + missing deployment version (#47)
CI / Changed paths (push) Canceled after 0s
CI / Infra (Compose + Scripts) (push) Canceled after 0s
CI / Backend (Go) (push) Canceled after 0s
CI / Frontend (React) (push) Canceled after 0s
CI / Mobile (Expo) (push) Canceled after 0s
CI / Compose boot smoke (push) Canceled after 0s
CI / Build & publish images (push) Canceled after 0s
CI / Release (push) Canceled after 0s
CI / Changed paths (push) Canceled after 0s
CI / Infra (Compose + Scripts) (push) Canceled after 0s
CI / Backend (Go) (push) Canceled after 0s
CI / Frontend (React) (push) Canceled after 0s
CI / Mobile (Expo) (push) Canceled after 0s
CI / Compose boot smoke (push) Canceled after 0s
CI / Build & publish images (push) Canceled after 0s
CI / Release (push) Canceled after 0s
Two fixes in the push receiver: - Accept repo-sync events (`sync`, `repository_dispatch`, `workflow_run`) that carry no ref — fork-sync bots and Actions dispatch these instead of pushes. Branch falls back to the webhook filter then the service's own git_branch; repo-only match when no branch is known. - The deployment INSERT omitted the NOT NULL `version` column, so every webhook-triggered deploy failed the insert silently and enqueued nothing. Push-triggered deploys have been dead since the receiver shipped. Now set `v<unix>` like the manual deploy path. Verified live: repository_dispatch → branch=main, 1 deployment enqueued; push → 1; star → ignored. Generated with [Devin](https://devin.ai) Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
612520bbff
commit
8cfe2ca826
2 files changed
+37
-9
No files matched your search
+7
-2
@@ -332,8 +332,13 @@ and wired refs, one click or one CLI call.
|
|||||||
events (HMAC-verified) and enqueues matching services. Settings→env
|
events (HMAC-verified) and enqueues matching services. Settings→env
|
||||||
fallback wired into install-URL + installation-token paths.
|
fallback wired into install-URL + installation-token paths.
|
||||||
`containr admin github-app` CLI + MCP + OpenAPI.
|
`containr admin github-app` CLI + MCP + OpenAPI.
|
||||||
- [ ] **fork-sync trigger** — accept repo-sync events on webhook
|
- [x] **fork-sync trigger** — webhook receiver accepts `sync`,
|
||||||
receiver.
|
`repository_dispatch`, and `workflow_run` events (no `ref`) alongside
|
||||||
|
pushes: branch falls back to the webhook filter, then the service's
|
||||||
|
own `git_branch`; repo-only matching when no branch is known.
|
||||||
|
Also fixed a latent bug where the webhook's deployment insert omitted
|
||||||
|
the NOT NULL `version` column — push-triggered deploys silently
|
||||||
|
failed for every service.
|
||||||
- [ ] **Dynamic filter framework** — port dflow's `filter.utils`
|
- [ ] **Dynamic filter framework** — port dflow's `filter.utils`
|
||||||
pattern (typed filter configs → URL state → client filtering) for
|
pattern (typed filter configs → URL state → client filtering) for
|
||||||
audit logs, deployments, notifications tables.
|
audit logs, deployments, notifications tables.
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"crypto/subtle"
|
"crypto/subtle"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -90,11 +91,24 @@ func handleGitWebhookPush(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if !strings.HasPrefix(payload.Ref, "refs/heads/") {
|
// Non-push events that still mean "the repo changed": fork-sync bots
|
||||||
|
// (sync), repository_dispatch, workflow_run completions. They carry no
|
||||||
|
// `ref`, so fall back to the webhook's branch filter (or the service's
|
||||||
|
// own git_branch via the repo match below).
|
||||||
|
event := c.Request.Header.Get("X-GitHub-Event")
|
||||||
|
if event == "" {
|
||||||
|
event = c.Request.Header.Get("X-Gitea-Event")
|
||||||
|
}
|
||||||
|
syncEvent := event == "sync" || event == "repository_dispatch" || event == "workflow_run"
|
||||||
|
|
||||||
|
if !strings.HasPrefix(payload.Ref, "refs/heads/") && !syncEvent {
|
||||||
c.JSON(http.StatusAccepted, gin.H{"received": true, "ignored": "not a branch push"})
|
c.JSON(http.StatusAccepted, gin.H{"received": true, "ignored": "not a branch push"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
branch := strings.TrimPrefix(payload.Ref, "refs/heads/")
|
branch := strings.TrimPrefix(payload.Ref, "refs/heads/")
|
||||||
|
if branch == "" {
|
||||||
|
branch = branchFilter
|
||||||
|
}
|
||||||
if branchFilter != "" && branchFilter != branch {
|
if branchFilter != "" && branchFilter != branch {
|
||||||
c.JSON(http.StatusAccepted, gin.H{"received": true, "ignored": "branch not watched"})
|
c.JSON(http.StatusAccepted, gin.H{"received": true, "ignored": "branch not watched"})
|
||||||
return
|
return
|
||||||
@@ -133,12 +147,17 @@ func handleGitWebhookPush(c *gin.Context) {
|
|||||||
// the pushed repo+branch. Shared by the per-repo webhook receiver and the
|
// the pushed repo+branch. Shared by the per-repo webhook receiver and the
|
||||||
// GitHub App webhook endpoint.
|
// GitHub App webhook endpoint.
|
||||||
func dispatchPushToServices(c *gin.Context, db *database.DB, engine *deployment.DeploymentEngine, cloneURL, fullName, branch, commit, repoUserID string) (int, error) {
|
func dispatchPushToServices(c *gin.Context, db *database.DB, engine *deployment.DeploymentEngine, cloneURL, fullName, branch, commit, repoUserID string) (int, error) {
|
||||||
rows, err := db.Query(`
|
// Sync-style events may carry no branch — match services on repo only.
|
||||||
|
branchClause := "s.git_branch = $1"
|
||||||
|
if branch == "" {
|
||||||
|
branchClause = "TRUE"
|
||||||
|
}
|
||||||
|
rows, err := db.Query(fmt.Sprintf(`
|
||||||
SELECT s.id, s.project_id, s.name, s.type, s.status, s.image, s.command,
|
SELECT s.id, s.project_id, s.name, s.type, s.status, s.image, s.command,
|
||||||
s.environment, s.git_repo, s.git_branch, s.build_path, s.cpu, s.memory,
|
s.environment, s.git_repo, s.git_branch, s.build_path, s.cpu, s.memory,
|
||||||
s.created_at, s.updated_at
|
s.created_at, s.updated_at
|
||||||
FROM services s
|
FROM services s
|
||||||
WHERE s.git_branch = $1 AND (s.git_repo = $2 OR s.git_repo = $3)`,
|
WHERE %s AND (s.git_repo = $2 OR s.git_repo = $3)`, branchClause),
|
||||||
branch, cloneURL, fullName)
|
branch, cloneURL, fullName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
@@ -175,9 +194,9 @@ func dispatchPushToServices(c *gin.Context, db *database.DB, engine *deployment.
|
|||||||
}
|
}
|
||||||
if _, err := db.Exec(
|
if _, err := db.Exec(
|
||||||
`INSERT INTO deployments
|
`INSERT INTO deployments
|
||||||
(id, service_id, commit_hash, status, image_name, image_tag, created_at, updated_at)
|
(id, service_id, version, commit_hash, status, image_name, image_tag, created_at, updated_at)
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
|
||||||
d.ID, d.ServiceID, d.CommitHash, d.Status, d.ImageName, d.ImageTag, d.CreatedAt, d.UpdatedAt,
|
d.ID, d.ServiceID, fmt.Sprintf("v%d", now.Unix()), d.CommitHash, d.Status, d.ImageName, d.ImageTag, d.CreatedAt, d.UpdatedAt,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -196,7 +215,11 @@ func dispatchPushToServices(c *gin.Context, db *database.DB, engine *deployment.
|
|||||||
)
|
)
|
||||||
// Webhook pushes default to a clean build — stale layers are the
|
// Webhook pushes default to a clean build — stale layers are the
|
||||||
// classic silent-rollback failure (dflow convention).
|
// classic silent-rollback failure (dflow convention).
|
||||||
webhookReq := CreateDeploymentRequest{CommitHash: commit, Branch: branch, Trigger: "webhook", NoCache: true}
|
branchForBuild := branch
|
||||||
|
if branchForBuild == "" {
|
||||||
|
branchForBuild = service.GitBranch
|
||||||
|
}
|
||||||
|
webhookReq := CreateDeploymentRequest{CommitHash: commit, Branch: branchForBuild, Trigger: "webhook", NoCache: true}
|
||||||
if pos := getDeployQueue(c).Enqueue(service.ID, deployqueue.Job{
|
if pos := getDeployQueue(c).Enqueue(service.ID, deployqueue.Job{
|
||||||
DeploymentID: d.ID,
|
DeploymentID: d.ID,
|
||||||
Run: func(jctx context.Context) {
|
Run: func(jctx context.Context) {
|
||||||
|
|||||||
Reference in new issue
Block a user