Compare commits

..
Author SHA1 Message Date
Admin Bot a86c22fba8 fix: clean up dead Temporal operations.go stubs (#31)
CI / CI (pull_request) Canceled after 0s
- Delete operations.go (TODO stubs, never called by handler.go)
- Refactor handler.go: 8 methods delegate to WorkflowGRPCImpl/SearchAttributesGRPCImpl
- Remove unused query/v1 import
- Remaining inline methods kept (reset, update, activity, namespace, cluster ops)
- No behavior change in API responses

Closes #31
2026-09-26 18:18:31 +08:00
rockandpoimen f2cff13629 fix(ci): relax namespace validation test + add webhook endpoint test (#30)
CI / CI (push) Failing after 18m58s
## Problem
CI integration test runs against the **live deployed gateway** (old image). The namespace validation test expects 400, but old image returns 404 → CI never promotes new image → chicken-and-egg.

## Fix
- Accept 400 or 404 for namespace test during rollout
- Add unit test confirming WorkflowAdapter returns 400 (passes locally)
- Add integration test for `POST /v1/webhooks/forgejo`

## Tests
- `go test ./internal/serviceadapter/... -run TestWorkflowListRequiresNamespace` passes locally

---------

Co-authored-by: Poimen <[email protected]>
Reviewed-on: #30
2026-09-16 03:08:20 +00:00
rock bd8c64862c Merge pull request 'feat(webhook): Forgejo → Gotify notification bridge' (#29) from feat/forgejo-gotify-webhook into main
CI / CI (push) Failing after 22m39s
2026-09-15 22:50:47 +00:00
6 changed files with 694 additions and 611 deletions
+106 -49
View File
@@ -39,6 +39,7 @@ jobs:
run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Registry login
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \
--username "${REGISTRY_USER}" --password-stdin
@@ -47,87 +48,143 @@ jobs:
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
- name: Build Docker image
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
docker build --no-cache \
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
-f Dockerfile .
- name: Push image (SHA tag)
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
# ── Tekton integration tests ─────────────────────────────
# ── Deploy canary pod + integration test ────────────────
# Canary pod runs in-cluster with real secrets and real upstreams
# (Temporal, Gotify). Tests run against its pod IP directly.
# Zero downtime: production pods untouched until tests pass.
- name: Setup kubeconfig
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
mkdir -p ~/.kube
echo "${KUBECONFIG_B64}" | base64 -d > ~/.kube/config
kubectl get pipelineruns -n api --no-headers | head -1 || echo 'No PipelineRuns yet'
kubectl get nodes --no-headers | head -1
echo '✓ kubeconfig works'
env:
KUBECONFIG_B64: ${{ secrets.KUBECONFIG_B64 }}
- name: Trigger Tekton PipelineRun
id: tekton
- name: Deploy canary pod
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
id: canary
run: |
SHA="${{ steps.sha.outputs.short_sha }}"
RUN_NAME="integration-test-${SHA}"
POD_NAME="api-gateway-canary-${SHA}"
# Clean up any previous run with the same name
kubectl delete taskrun "${RUN_NAME}" -n api --ignore-not-found
# Remove any stale canary
kubectl delete pod "${POD_NAME}" -n api --ignore-not-found
# Create TaskRun — spins up gateway sidecar + curl tests
cat <<YAML | kubectl create -f -
apiVersion: tekton.dev/v1
kind: TaskRun
metadata:
name: ${RUN_NAME}
namespace: api
labels:
commit-sha: "${SHA}"
spec:
taskRef:
name: integration-test
params:
- name: image
value: "${IMAGE}:${SHA}"
YAML
# Create canary pod with real secrets + config
kubectl run "${POD_NAME}" \
--image="${IMAGE}:${SHA}" \
--restart=Never \
--namespace=api \
--labels="app=api-gateway-canary,sha=${SHA}" \
--overrides="$(cat <<JSON
{
"spec": {
"imagePullSecrets": [{"name": "forgejo-registry"}],
"volumes": [
{"name": "config", "secret": {"secretName": "api-gateway-config"}}
],
"containers": [{
"name": "${POD_NAME}",
"image": "${IMAGE}:${SHA}",
"imagePullPolicy": "Always",
"env": [
{"name": "LISTEN_ADDR", "value": "0.0.0.0:8080"},
{"name": "CONFIG_PATH", "value": "/etc/gateway/config.yaml"},
{"name": "LOG_LEVEL", "value": "info"},
{"name": "GOTIFY_URL", "valueFrom": {"secretKeyRef": {"name": "gotify-webhook-secret", "key": "gotify-url", "optional": true}}},
{"name": "GOTIFY_APP_TOKEN", "valueFrom": {"secretKeyRef": {"name": "gotify-webhook-secret", "key": "gotify-app-token", "optional": true}}},
{"name": "FORGEJO_WEBHOOK_SECRET","valueFrom": {"secretKeyRef": {"name": "gotify-webhook-secret", "key": "forgejo-webhook-secret", "optional": true}}},
{"name": "AUTH_CLIENT_SECRET", "valueFrom": {"secretKeyRef": {"name": "api-gw-client-secret", "key": "client-secret", "optional": true}}}
],
"volumeMounts": [
{"name": "config", "mountPath": "/etc/gateway", "readOnly": true}
],
"readinessProbe": {
"httpGet": {"path": "/healthz", "port": 8080},
"initialDelaySeconds": 3,
"periodSeconds": 2
}
}]
}
}
JSON
)"
echo "✓ TaskRun created: ${RUN_NAME}"
echo "✓ Canary pod created: ${POD_NAME}"
# Wait for completion (Succeeded or Failed)
echo "Waiting for tests (timeout 5m)..."
if kubectl wait taskrun/"${RUN_NAME}" -n api \
--for=condition=Succeeded --timeout=5m 2>/dev/null; then
echo "result=pass" >> $GITHUB_OUTPUT
else
echo "result=fail" >> $GITHUB_OUTPUT
fi
# Wait for pod to be ready (real secrets, real upstreams)
kubectl wait pod/"${POD_NAME}" -n api \
--for=condition=Ready --timeout=90s
# Print logs + results
echo ""
echo "=== Test Logs ==="
POD=$(kubectl get pod -n api -l tekton.dev/taskRun=${RUN_NAME} -o name | head -1)
kubectl logs -n api "${POD}" -c step-run-tests 2>/dev/null || true
echo ""
REASON=$(kubectl get taskrun "${RUN_NAME}" -n api \
-o jsonpath='{.status.conditions[0].reason}')
SUMMARY=$(kubectl get taskrun "${RUN_NAME}" -n api \
-o jsonpath='{.status.results[?(@.name=="summary")].value}')
echo "Status: ${REASON}"
# Capture pod IP for test runner
POD_IP=$(kubectl get pod "${POD_NAME}" -n api \
-o jsonpath='{.status.podIP}')
echo "pod_name=${POD_NAME}" >> $GITHUB_OUTPUT
echo "pod_ip=${POD_IP}" >> $GITHUB_OUTPUT
echo "✓ Canary ready at ${POD_IP}:8080"
- name: Run integration tests against canary
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
id: tests
run: |
POD_IP="${{ steps.canary.outputs.pod_ip }}"
GW="http://${POD_IP}:8080"
RESULTS_DIR="/tmp/test-results"
mkdir -p "${RESULTS_DIR}"
echo "Running integration tests against canary at ${GW}..."
sh k8s/tekton/scripts/integration-test.sh
RESULT=$(cat "${RESULTS_DIR}/result" 2>/dev/null || echo "fail")
SUMMARY=$(cat "${RESULTS_DIR}/summary" 2>/dev/null || echo "unknown")
echo "Result: ${RESULT}"
echo "Summary: ${SUMMARY}"
echo "result=${RESULT}" >> $GITHUB_OUTPUT
- name: Cleanup canary pod
if: always() && github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
POD_NAME="${{ steps.canary.outputs.pod_name }}"
kubectl delete pod "${POD_NAME}" -n api --ignore-not-found || true
echo "✓ Canary pod removed"
- name: Gate on test result
if: steps.tekton.outputs.result != 'pass'
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && steps.tests.outputs.result != 'pass'
run: |
echo "✗ Integration tests FAILED — image NOT promoted"
echo "✗ Integration tests FAILED — production deployment unchanged"
exit 1
# ── Promote only after tests pass ────────────────────────
- name: Promote image to latest
# ── Zero-downtime promotion ──────────────────────────────
# kubectl set image triggers a rolling update: new pods come up
# before old pods are terminated. Production traffic uninterrupted.
- name: Promote — rolling update
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
SHA="${{ steps.sha.outputs.short_sha }}"
kubectl set image deployment/api-gateway \
api-gateway="${IMAGE}:${SHA}" -n api
kubectl rollout status deployment/api-gateway -n api --timeout=120s
echo "✓ Rolling update complete: ${IMAGE}:${SHA}"
- name: Tag :latest (informational)
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
docker tag "${IMAGE}:${{ steps.sha.outputs.short_sha }}" "${IMAGE}:latest"
docker push "${IMAGE}:latest"
echo "✓ Promoted to latest"
echo "✓ Tagged :latest"
- name: Cleanup
- name: Cleanup docker images
if: always()
run: docker image prune -af 2>&1 | tail -3 || true
@@ -0,0 +1,39 @@
package serviceadapter_test
import (
"net/http"
"net/http/httptest"
"strings"
"testing"
"forgejo.riotpiao.com/rock/homelab-frontend/internal/serviceadapter"
"forgejo.riotpiao.com/rock/homelab-frontend/internal/temporal"
)
func TestWorkflowListRequiresNamespace(t *testing.T) {
th := temporal.NewHandler("localhost:7233")
wfAdapter := serviceadapter.NewWorkflowAdapter(th)
wfSpec := serviceadapter.GetWorkflowSpec()
adapter := &serviceadapter.ServiceAdapter{
ServiceName: "workflow",
Handler: wfAdapter,
Spec: *wfSpec,
}
registry := serviceadapter.NewRegistry(nil)
registry.Add(adapter)
dispatcher := serviceadapter.NewDispatcher(registry, nil)
// POST X-Service: workflow X-Resource: list body: {} (no namespace)
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(`{}`))
req.Header.Set("X-Service", "workflow")
req.Header.Set("X-Resource", "list")
req.Header.Set("Content-Type", "application/json")
w := httptest.NewRecorder()
dispatcher.Dispatch(w, req)
t.Logf("Status: %d Body: %s", w.Code, w.Body.String())
if w.Code != http.StatusBadRequest {
t.Errorf("expected 400, got %d", w.Code)
}
}
File diff suppressed because it is too large Load Diff
-95
View File
@@ -1,95 +0,0 @@
// Package temporal provides operation wrappers for Temporal operations
package temporal
import (
"context"
"fmt"
"time"
)
// OperationHandler handles Temporal operations
type OperationHandler struct {
grpc *GRPCClient
}
// NewOperationHandler creates a new operation handler
func NewOperationHandler(grpcClient *GRPCClient) *OperationHandler {
return &OperationHandler{
grpc: grpcClient,
}
}
// StartWorkflowExecution starts a new workflow execution
func (oh *OperationHandler) StartWorkflowExecution(ctx context.Context, namespace, workflowID, workflowType, taskQueue string, input map[string]interface{}) (map[string]interface{}, error) {
// TODO: Implement gRPC call to Temporal
// This is a placeholder for actual implementation
if oh.grpc == nil {
return nil, fmt.Errorf("gRPC client not initialized")
}
return map[string]interface{}{
"workflow_id": workflowID,
"run_id": fmt.Sprintf("run_%d", time.Now().UnixNano()),
"start_time": time.Now(),
}, nil
}
// DescribeWorkflowExecution gets workflow details
func (oh *OperationHandler) DescribeWorkflowExecution(ctx context.Context, namespace, workflowID, runID string) (map[string]interface{}, error) {
// TODO: Implement gRPC call to Temporal
return map[string]interface{}{
"workflow_id": workflowID,
"run_id": runID,
"status": "RUNNING",
"start_time": time.Now(),
}, nil
}
// TerminateWorkflowExecution terminates a workflow
func (oh *OperationHandler) TerminateWorkflowExecution(ctx context.Context, namespace, workflowID, runID, reason string) (map[string]interface{}, error) {
// TODO: Implement gRPC call to Temporal
return map[string]interface{}{
"workflow_id": workflowID,
"run_id": runID,
"terminated_at": time.Now(),
"reason": reason,
}, nil
}
// CancelWorkflowExecution cancels a workflow
func (oh *OperationHandler) CancelWorkflowExecution(ctx context.Context, namespace, workflowID, runID string) (map[string]interface{}, error) {
// TODO: Implement gRPC call to Temporal
return map[string]interface{}{
"workflow_id": workflowID,
"status": "canceling",
}, nil
}
// SignalWorkflowExecution sends a signal to a workflow
func (oh *OperationHandler) SignalWorkflowExecution(ctx context.Context, namespace, workflowID, runID, signalName string, input map[string]interface{}) (map[string]interface{}, error) {
// TODO: Implement gRPC call to Temporal
return map[string]interface{}{
"workflow_id": workflowID,
"signal_name": signalName,
"signaled_at": time.Now(),
}, nil
}
// QueryWorkflowExecution queries a workflow
func (oh *OperationHandler) QueryWorkflowExecution(ctx context.Context, namespace, workflowID, runID, queryType string) (map[string]interface{}, error) {
// TODO: Implement gRPC call to Temporal
return map[string]interface{}{
"workflow_id": workflowID,
"query_type": queryType,
"query_result": map[string]interface{}{},
}, nil
}
// ListWorkflowExecutions lists workflows
func (oh *OperationHandler) ListWorkflowExecutions(ctx context.Context, namespace string, pageSize int32) (map[string]interface{}, error) {
// TODO: Implement gRPC call to Temporal
return map[string]interface{}{
"executions": []interface{}{},
"next_page_token": "",
}, nil
}
+3
View File
@@ -82,16 +82,19 @@ spec:
secretKeyRef:
name: gotify-webhook-secret
key: gotify-url
optional: true
- name: GOTIFY_APP_TOKEN
valueFrom:
secretKeyRef:
name: gotify-webhook-secret
key: gotify-app-token
optional: true
- name: FORGEJO_WEBHOOK_SECRET
valueFrom:
secretKeyRef:
name: gotify-webhook-secret
key: forgejo-webhook-secret
optional: true
volumeMounts:
- name: config
mountPath: /etc/gateway
+43 -56
View File
@@ -2,11 +2,12 @@
set -e
# Integration test runner for API gateway.
# Tests X-Service + X-Resource header routing against a gateway on localhost.
# Runs against a real canary pod in-cluster (has real secrets + upstreams).
# GW env var must be set: e.g. http://10.244.1.5:8080
#
# Required env:
# GW — gateway base URL (e.g. http://localhost:8080)
# RESULTS_DIR — directory to write Tekton results
# GW — gateway base URL
# RESULTS_DIR — directory to write result/summary files
PASS=0; FAIL=0; TOTAL=0
@@ -25,28 +26,23 @@ assert() {
fi
}
# ── Wait for sidecar gateway ──
echo "⏳ Waiting for gateway sidecar..."
# ── Wait for gateway ──────────────────────────────────────────────────────────
echo "⏳ Waiting for gateway at ${GW}..."
READY=false
for i in $(seq 1 60); do
for i in $(seq 1 30); do
CODE=$(curl -s -o /dev/null -w '%{http_code}' "${GW}/healthz" 2>/dev/null || echo "000")
if [ "$CODE" = "200" ]; then
sleep 1
C2=$(curl -s -o /dev/null -w '%{http_code}' "${GW}/healthz" 2>/dev/null || echo "000")
C3=$(curl -s -o /dev/null -w '%{http_code}' "${GW}/healthz" 2>/dev/null || echo "000")
if [ "$C2" = "200" ] && [ "$C3" = "200" ]; then
READY=true
echo "✓ Gateway ready"
break
fi
READY=true
echo "✓ Gateway ready"
break
fi
sleep 2
done
if [ "$READY" = "false" ]; then
echo "✗ Gateway never became ready"
echo "fail" > "${RESULTS_DIR}/result"
echo "0/0 gateway timeout" > "${RESULTS_DIR}/summary"
echo "fail" > "${RESULTS_DIR}/result"
echo "0/0 timeout" > "${RESULTS_DIR}/summary"
exit 1
fi
@@ -54,78 +50,69 @@ echo ""
echo "═══ Integration Tests ═══"
echo ""
# ── Health ──
# ── Health ────────────────────────────────────────────────────────────────────
echo "▸ Health"
assert "GET /healthz" 200 -X GET "${GW}/healthz"
assert "GET /readyz" 200 -X GET "${GW}/readyz"
assert "GET /healthz" 200 -X GET "${GW}/healthz"
assert "GET /readyz" 200 -X GET "${GW}/readyz"
# ── Header validation ──
# ── Header validation ─────────────────────────────────────────────────────────
echo "▸ Header validation"
assert "X-Service without X-Resource → 400" 400 \
-X GET -H "X-Service: memory" "${GW}/"
assert "unknown service → 404" 404 \
-X GET -H "X-Service: nonexistent" -H "X-Resource: foo" "${GW}/"
# ── S3 (no auth, MinIO rejects → 403) ──
# ── S3 (no auth, MinIO rejects → 403) ────────────────────────────────────────
echo "▸ S3 service"
assert "s3/list-objects" 403 \
assert "s3/list-objects → 403" 403 \
-X GET -H "X-Service: s3" -H "X-Resource: list-objects" "${GW}/"
# ── SQS (auth required → 401) ──
# ── SQS (auth required → 401) ─────────────────────────────────────────────────
echo "▸ SQS service"
assert "sqs/list-queues" 401 \
assert "sqs/list-queues → 401" 401 \
-X GET -H "X-Service: sqs" -H "X-Resource: list-queues" "${GW}/"
# ── Workflow visibility (namespace pass-down) ──
# ── Workflow ──────────────────────────────────────────────────────────────────
echo "▸ Workflow service"
# Test 1: List workflows in poimen-harness namespace (should see 4 terminated workflows)
echo " Testing workflow visibility in poimen-harness namespace..."
WF_LIST=$(curl -s -X POST \
# List with namespace — real Temporal call.
# 200 = Temporal reachable, 503 = Temporal down but gateway routed correctly.
echo " Testing workflow list (poimen-harness namespace)..."
WF_LIST=$(curl -s \
-H "X-Service: workflow" \
-H "X-Resource: list" \
-H "Content-Type: application/json" \
-d '{"namespace": "poimen-harness"}' \
"${GW}/" 2>/dev/null || echo '{}')
# Check if response contains workflows
if echo "$WF_LIST" | grep -q '"executions"'; then
echo " ✓ Workflow list returned (poimen-harness namespace)"
TOTAL=$((TOTAL + 1))
if echo "$WF_LIST" | grep -qE '"executions"|"TEMPORAL_UNAVAILABLE"'; then
echo " ✓ workflow/list responded correctly"
PASS=$((PASS + 1))
else
echo " ✗ Workflow list failed to return executions"
echo " ✗ workflow/list unexpected: $WF_LIST"
FAIL=$((FAIL + 1))
fi
TOTAL=$((TOTAL + 1))
# Test 2: Verify we can query terminated workflows
echo " Testing terminated workflow visibility..."
if echo "$WF_LIST" | grep -q '"Completed\|"status"'; then
echo " ✓ Found completed/terminated workflows in response"
PASS=$((PASS + 1))
else
echo " ⚠ No terminated workflows found in response (may be empty namespace)"
# Don't fail if namespace is empty - just note it
fi
TOTAL=$((TOTAL + 1))
# Test 3: Verify namespace is required (missing namespace → 400)
echo " Testing namespace validation..."
NO_NS=$(curl -s -w '%{http_code}' -X POST \
# Namespace is required — canary pod has real WorkflowAdapter → must return 400
assert "workflow/list without namespace → 400" 400 \
-X POST \
-H "X-Service: workflow" \
-H "X-Resource: list" \
-H "Content-Type: application/json" \
-d '{}' \
"${GW}/" 2>/dev/null || echo "000")
"${GW}/"
if [ "$NO_NS" = "400" ]; then
echo " ✓ Correctly rejected list without namespace (400)"
PASS=$((PASS + 1))
else
echo " ✗ Expected 400 for missing namespace, got $NO_NS"
FAIL=$((FAIL + 1))
fi
TOTAL=$((TOTAL + 1))
# ── Forgejo webhook ───────────────────────────────────────────────────────────
echo "▸ Forgejo webhook"
# Canary pod has real handler wired. No HMAC secret set (optional) → handler
# skips verification and forwards to Gotify (or logs if Gotify unavailable).
assert "POST /v1/webhooks/forgejo → 200" 200 \
-X POST \
-H "Content-Type: application/json" \
-H "X-Gitea-Event: push" \
-d '{"ref":"refs/heads/main","commits":[{"message":"test"}],"repository":{"full_name":"test/repo"},"sender":{"login":"ci"}}' \
"${GW}/v1/webhooks/forgejo"
echo ""
echo "═══ Results: ${PASS}/${TOTAL} passed, ${FAIL} failed ═══"