feat(deploy): add webhook receiver and launchd service for push-to-deploy
- cmd/webhook/main.go: HMAC-validated webhook receiver on :9797 - launchd plist: keeps webhook running, PATH includes docker - Makefile: 'make webhook' target - Registered as Gitea webhook id 15 on dtoro/oikos Fixes: auto-deploy was not wired on mac-mini after the consolidation
This commit is contained in:
5
Makefile
5
Makefile
@@ -1,4 +1,4 @@
|
|||||||
.PHONY: build test test-db lint generate generate-check dev migrate seed export clean tidy
|
.PHONY: build webhook test test-db lint generate generate-check dev migrate seed export clean tidy
|
||||||
|
|
||||||
BINARY := oikos
|
BINARY := oikos
|
||||||
GO ?= go
|
GO ?= go
|
||||||
@@ -6,6 +6,9 @@ GO ?= go
|
|||||||
build:
|
build:
|
||||||
$(GO) build -o $(BINARY) -tags timetzdata ./cmd/oikos
|
$(GO) build -o $(BINARY) -tags timetzdata ./cmd/oikos
|
||||||
|
|
||||||
|
webhook:
|
||||||
|
$(GO) build -o webhook -tags timetzdata ./cmd/webhook
|
||||||
|
|
||||||
test:
|
test:
|
||||||
$(GO) test -race -cover ./...
|
$(GO) test -race -cover ./...
|
||||||
|
|
||||||
|
|||||||
96
cmd/webhook/main.go
Normal file
96
cmd/webhook/main.go
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/hmac"
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/dtoro/oikos/internal/safego"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
port := os.Getenv("WEBHOOK_LISTEN")
|
||||||
|
if port == "" {
|
||||||
|
port = ":9797"
|
||||||
|
}
|
||||||
|
|
||||||
|
secret := os.Getenv("WEBHOOK_HMAC_SECRET")
|
||||||
|
if secret == "" {
|
||||||
|
fmt.Fprintln(os.Stderr, "WEBHOOK_HMAC_SECRET must be set")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
repoDir := os.Getenv("WEBHOOK_REPO_DIR")
|
||||||
|
if repoDir == "" {
|
||||||
|
repoDir = os.Getenv("HOME") + "/Projects/oikos"
|
||||||
|
}
|
||||||
|
|
||||||
|
mux := http.NewServeMux()
|
||||||
|
mux.HandleFunc("/deploy", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
http.Error(w, "method not allowed", 405)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := io.ReadAll(r.Body)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "read body failed", 400)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
sigHex := r.Header.Get("X-Hub-Signature-256")
|
||||||
|
if sigHex == "" {
|
||||||
|
http.Error(w, "missing signature", 401)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
mac := hmac.New(sha256.New, []byte(secret))
|
||||||
|
mac.Write(body)
|
||||||
|
expected := "sha256=" + hex.EncodeToString(mac.Sum(nil))
|
||||||
|
|
||||||
|
if !hmac.Equal([]byte(sigHex), []byte(expected)) {
|
||||||
|
slog.Warn("webhook: invalid signature")
|
||||||
|
http.Error(w, "invalid signature", 401)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
slog.Info("webhook: deploy triggered")
|
||||||
|
w.WriteHeader(http.StatusAccepted)
|
||||||
|
w.Write([]byte(`{"status":"deploy started"}`))
|
||||||
|
|
||||||
|
safego.Go("webhook:deploy", func() {
|
||||||
|
cmd := exec.Command(repoDir + "/scripts/deploy.sh")
|
||||||
|
cmd.Dir = repoDir
|
||||||
|
cmd.Env = append(os.Environ(),
|
||||||
|
"REPO_DIR="+repoDir,
|
||||||
|
"PROFILE=full",
|
||||||
|
)
|
||||||
|
cmd.Stdout = os.Stdout
|
||||||
|
cmd.Stderr = os.Stderr
|
||||||
|
start := time.Now()
|
||||||
|
if err := cmd.Run(); err != nil {
|
||||||
|
slog.Error("webhook: deploy failed", "error", err, "duration", time.Since(start))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
slog.Info("webhook: deploy succeeded", "duration", time.Since(start))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(200)
|
||||||
|
w.Write([]byte("ok"))
|
||||||
|
})
|
||||||
|
|
||||||
|
slog.Info("webhook: listening", "port", port)
|
||||||
|
if err := http.ListenAndServe(port, mux); err != nil {
|
||||||
|
slog.Error("webhook: serve failed", "error", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
35
scripts/deploy/network.hubris.oikos-deploy-webhook.plist
Normal file
35
scripts/deploy/network.hubris.oikos-deploy-webhook.plist
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>Label</key>
|
||||||
|
<string>network.hubris.oikos-deploy-webhook</string>
|
||||||
|
<key>ProgramArguments</key>
|
||||||
|
<array>
|
||||||
|
<string>/Users/dtoro/Projects/oikos/webhook</string>
|
||||||
|
</array>
|
||||||
|
<key>EnvironmentVariables</key>
|
||||||
|
<dict>
|
||||||
|
<key>WEBHOOK_HMAC_SECRET</key>
|
||||||
|
<string>6502524162d6dbc3f6d137000395d401f1837d74ef9bb0a876f8e6bbd65d1ff2</string>
|
||||||
|
<key>WEBHOOK_REPO_DIR</key>
|
||||||
|
<string>/Users/dtoro/Projects/oikos</string>
|
||||||
|
<key>WEBHOOK_LISTEN</key>
|
||||||
|
<string>:9797</string>
|
||||||
|
<key>HOME</key>
|
||||||
|
<string>/Users/dtoro</string>
|
||||||
|
<key>PATH</key>
|
||||||
|
<string>/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
|
||||||
|
</dict>
|
||||||
|
<key>WorkingDirectory</key>
|
||||||
|
<string>/Users/dtoro/Projects/oikos</string>
|
||||||
|
<key>RunAtLoad</key>
|
||||||
|
<true/>
|
||||||
|
<key>KeepAlive</key>
|
||||||
|
<true/>
|
||||||
|
<key>StandardOutPath</key>
|
||||||
|
<string>/Users/dtoro/Library/Logs/oikos-webhook.log</string>
|
||||||
|
<key>StandardErrorPath</key>
|
||||||
|
<string>/Users/dtoro/Library/Logs/oikos-webhook.log</string>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
Reference in New Issue
Block a user