Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db09d546e0 | ||
|
|
cc9a32f53a |
@@ -38,22 +38,22 @@ Production API gateway for the homelab cluster. Single entry point (`api.riotpia
|
|||||||
│ (routing, auth, limits) │
|
│ (routing, auth, limits) │
|
||||||
└──────┬───────────────────────┘
|
└──────┬───────────────────────┘
|
||||||
│
|
│
|
||||||
┌──────┴───────────────────────────────────┐
|
┌──────┴──────────────────────────────────┐
|
||||||
│ │
|
│ │
|
||||||
/v1/* X-Service header routing /
|
/v1/* /workflow /sqs /
|
||||||
(LLM) (workflow, sqs, s3, iam, memory) /
|
(LLM) (Temporal gRPC) (Queues) (X-Service)
|
||||||
│ │ │
|
│ │ │ │
|
||||||
▼ ▼ ▼
|
▼ ▼ ▼ ▼
|
||||||
llm-serving temporal:7233 kmsvc/Kafka, MinIO,
|
llm-serving temporal:7233 kmsvc/Kafka IAM, S3
|
||||||
(vLLM, Ollama) (gRPC) Authentik, poimen-memory
|
(vLLM, Ollama) (WorkflowService) Memory
|
||||||
(TEI)
|
(TEI) (gRPC bridge) (poimen)
|
||||||
```
|
```
|
||||||
|
|
||||||
**Design principles:**
|
**Design principles:**
|
||||||
- ✅ Single hostname, unified X-Service + X-Resource header routing
|
- ✅ Single hostname, multiple path prefixes
|
||||||
- ✅ HTTP REST gateway → gRPC Temporal bridge (via X-Service: workflow)
|
- ✅ HTTP REST gateway → gRPC Temporal bridge
|
||||||
- ✅ Bearer token auth via Authentik (JWT + RBAC)
|
- ✅ Bearer token auth via Authentik (JWT + RBAC)
|
||||||
- ✅ Streaming unbuffered (SSE, WebSocket, HTTP/2 multiplexing)
|
- ✅ Streaming unbuffered (SSE, WebSocket)
|
||||||
- ✅ Per-route timeouts & rate limits
|
- ✅ Per-route timeouts & rate limits
|
||||||
- ✅ No cluster credentials held by gateway
|
- ✅ No cluster credentials held by gateway
|
||||||
|
|
||||||
@@ -61,16 +61,16 @@ llm-serving temporal:7233 kmsvc/Kafka, MinIO,
|
|||||||
|
|
||||||
## Services & Capabilities
|
## Services & Capabilities
|
||||||
|
|
||||||
| Service | Method | Upstream | Status |
|
| Service | Prefix | Upstream | Status |
|
||||||
|---------|--------|----------|--------|
|
|---------|--------|----------|--------|
|
||||||
| **LLM Chat** | `POST /v1/chat/completions` | llm-serving (vLLM) | ✅ Live |
|
| **LLM Chat** | `/v1/chat/completions` | llm-serving (vLLM) | ✅ Live |
|
||||||
| **Embeddings** | `POST /v1/embeddings` | llm-serving (TEI) | ✅ Live |
|
| **Embeddings** | `/v1/embeddings` | llm-serving (TEI) | ✅ Live |
|
||||||
| **Reranking** | `POST /v1/rerank` | llm-serving (TEI) | ✅ Live |
|
| **Reranking** | `/v1/rerank` | llm-serving (TEI) | ✅ Live |
|
||||||
| **Workflows** | `X-Service: workflow` + `X-Resource: {action}` | Temporal gRPC (7233) | ✅ Live (START, DESCRIBE, SIGNAL, QUERY, etc) |
|
| **Workflows** | `/workflow` | Temporal gRPC (7233) | ✅ Live (START, DESCRIBE, SIGNAL, QUERY, etc) |
|
||||||
| **Queues** | `X-Service: sqs` + `X-Resource: {action}` | kmsvc/Kafka | ✅ Live |
|
| **Queues** | `/` + `X-Service: sqs` | kmsvc/Kafka | ⏳ Ready (ServiceAdapter) |
|
||||||
| **Memory** | `X-Service: memory` + `X-Resource: {action}` | poimen-memory | ✅ Live |
|
| **Memory** | `/` + `X-Service: memory` | poimen-memory | ✅ Live |
|
||||||
| **IAM** | `X-Service: iam` + `X-Resource: {action}` | Authentik API | ✅ Live |
|
| **IAM** | `/` + `X-Service: iam` | Authentik API | ✅ Live |
|
||||||
| **S3** | `X-Service: s3` + `X-Resource: {action}` | MinIO | ✅ Live |
|
| **S3** | `/` + `X-Service: s3` | MinIO | ✅ Live |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -102,17 +102,18 @@ curl -X POST https://api.riotpiao.com/v1/chat/completions \
|
|||||||
}'
|
}'
|
||||||
```
|
```
|
||||||
|
|
||||||
**Workflow (via X-Service header):**
|
**Workflow:**
|
||||||
```bash
|
```bash
|
||||||
curl -X POST https://api.riotpiao.com/ \
|
curl -X POST https://api.riotpiao.com/workflow \
|
||||||
-H "Authorization: Bearer $TOKEN" \
|
-H "Authorization: Bearer $TOKEN" \
|
||||||
-H "X-Service: workflow" \
|
|
||||||
-H "X-Resource: start" \
|
|
||||||
-d '{
|
-d '{
|
||||||
|
"action": "START_WORKFLOW",
|
||||||
"namespace": "default",
|
"namespace": "default",
|
||||||
"workflow_id": "my-workflow",
|
"payload": {
|
||||||
"workflow_type": "MyWorkflow",
|
"workflow_id": "my-workflow",
|
||||||
"task_queue": "default"
|
"workflow_type": "MyWorkflow",
|
||||||
|
"task_queue": "default"
|
||||||
|
}
|
||||||
}'
|
}'
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -72,17 +72,6 @@ func main() {
|
|||||||
|
|
||||||
// Create ServiceAdapter registry and dispatcher (phase 8)
|
// Create ServiceAdapter registry and dispatcher (phase 8)
|
||||||
registry := serviceadapter.NewRegistry(nil)
|
registry := serviceadapter.NewRegistry(nil)
|
||||||
|
|
||||||
// Add workflow service adapter (uses Temporal handler for gRPC forwarding)
|
|
||||||
workflowSpec := serviceadapter.GetWorkflowSpec()
|
|
||||||
workflowAdapter := &serviceadapter.ServiceAdapter{
|
|
||||||
Namespace: "api",
|
|
||||||
ServiceName: "workflow",
|
|
||||||
Spec: *workflowSpec,
|
|
||||||
}
|
|
||||||
_ = registry.Add(workflowAdapter)
|
|
||||||
|
|
||||||
// Add other adapters from config
|
|
||||||
for _, a := range cfg.Adapters {
|
for _, a := range cfg.Adapters {
|
||||||
_ = registry.Add(a)
|
_ = registry.Add(a)
|
||||||
}
|
}
|
||||||
@@ -94,10 +83,6 @@ func main() {
|
|||||||
jwtValidator = auth.NewValidator(cfg.Auth.Issuer, cfg.Auth.Audience, cfg.Auth.JWKSURL)
|
jwtValidator = auth.NewValidator(cfg.Auth.Issuer, cfg.Auth.Audience, cfg.Auth.JWKSURL)
|
||||||
}
|
}
|
||||||
dispatcher := serviceadapter.NewDispatcher(registry, jwtValidator)
|
dispatcher := serviceadapter.NewDispatcher(registry, jwtValidator)
|
||||||
|
|
||||||
// Wire workflow adapter to temporal handler for proper request forwarding
|
|
||||||
workflowAdapterImpl := serviceadapter.NewWorkflowAdapter(temporalHandler)
|
|
||||||
_ = workflowAdapterImpl // The dispatcher will call temporal handler directly for gRPC
|
|
||||||
|
|
||||||
// Create router that handles health endpoints, X-Service (ServiceAdapter) routing,
|
// Create router that handles health endpoints, X-Service (ServiceAdapter) routing,
|
||||||
// temporal endpoints, and passes others to upstream handler
|
// temporal endpoints, and passes others to upstream handler
|
||||||
|
|||||||
@@ -165,6 +165,20 @@ func (v *Validator) CheckPermissions(claims jwt.MapClaims, required ...string) b
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fall back to scope claim (for client_credentials tokens)
|
||||||
|
// Authentik client_credentials tokens carry capabilities as space-separated scopes
|
||||||
|
if scopeIface, ok := claims["scope"]; ok {
|
||||||
|
if scopeStr, ok := scopeIface.(string); ok {
|
||||||
|
for _, s := range strings.Split(scopeStr, " ") {
|
||||||
|
for _, req := range required {
|
||||||
|
if s == req {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -271,8 +271,13 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to find a matching route (including body-based dispatch for /v1/chat/completions).
|
// Handle /workflows endpoint (workflow orchestration)
|
||||||
// Note: /workflows endpoint is deprecated. Use X-Service: workflow + X-Resource headers instead.
|
if r.URL.Path == "/workflows" {
|
||||||
|
h.handleWorkflow(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try to find a matching route (including body-based dispatch for /v1/chat/completions)
|
||||||
route, err := h.RouteRequest(r)
|
route, err := h.RouteRequest(r)
|
||||||
|
|
||||||
// Check if this is a model validation error (from body-based dispatch)
|
// Check if this is a model validation error (from body-based dispatch)
|
||||||
|
|||||||
@@ -0,0 +1,484 @@
|
|||||||
|
// Package proxy provides request routing and forwarding.
|
||||||
|
package proxy
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// WorkflowRequest represents a workflow execution request
|
||||||
|
type WorkflowRequest struct {
|
||||||
|
// Workflow ID or name
|
||||||
|
Workflow string `json:"workflow"`
|
||||||
|
|
||||||
|
// Input parameters for the workflow
|
||||||
|
Input map[string]interface{} `json:"input"`
|
||||||
|
|
||||||
|
// Optional: timeout in seconds
|
||||||
|
Timeout int `json:"timeout,omitempty"`
|
||||||
|
|
||||||
|
// Optional: wait for result (default: true)
|
||||||
|
Wait *bool `json:"wait,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// WorkflowResponse represents the response from workflow execution
|
||||||
|
type WorkflowResponse struct {
|
||||||
|
// Workflow execution ID
|
||||||
|
ID string `json:"id"`
|
||||||
|
|
||||||
|
// Workflow name
|
||||||
|
Workflow string `json:"workflow"`
|
||||||
|
|
||||||
|
// Execution status: pending, running, completed, failed
|
||||||
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Output of the workflow
|
||||||
|
Output interface{} `json:"output,omitempty"`
|
||||||
|
|
||||||
|
// Error message if workflow failed
|
||||||
|
Error string `json:"error,omitempty"`
|
||||||
|
|
||||||
|
// Timestamp when workflow was created
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
|
||||||
|
// Timestamp when workflow completed
|
||||||
|
CompletedAt *time.Time `json:"completed_at,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PredefinedWorkflow defines a workflow template that combines multiple API calls
|
||||||
|
type PredefinedWorkflow struct {
|
||||||
|
Name string
|
||||||
|
Description string
|
||||||
|
Handler func(*http.Request, *Handler, map[string]interface{}) (interface{}, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleWorkflow handles the /workflows endpoint
|
||||||
|
// It accepts workflow definitions and orchestrates API calls
|
||||||
|
func (h *Handler) handleWorkflow(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Only POST is supported
|
||||||
|
if r.Method != "POST" {
|
||||||
|
w.Header().Set("Content-Type", "application/problem+json")
|
||||||
|
w.WriteHeader(http.StatusMethodNotAllowed)
|
||||||
|
fmt.Fprintf(w, `{"type":"https://api.example.com/problems/method-not-allowed","title":"Method Not Allowed","status":405,"detail":"Only POST is supported for /workflows"}`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse request body
|
||||||
|
var workflowReq WorkflowRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&workflowReq); err != nil {
|
||||||
|
writeProblemDetail(w, http.StatusBadRequest, "https://api.example.com/problems/invalid-workflow-request", "Invalid Workflow Request", "Failed to parse workflow request: "+err.Error(), nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate workflow name
|
||||||
|
if workflowReq.Workflow == "" {
|
||||||
|
writeProblemDetail(w, http.StatusBadRequest, "https://api.example.com/problems/missing-workflow", "Missing Workflow", "The 'workflow' field is required", nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get predefined workflow
|
||||||
|
workflow, ok := h.getWorkflow(workflowReq.Workflow)
|
||||||
|
if !ok {
|
||||||
|
availableWorkflows := h.getAvailableWorkflows()
|
||||||
|
writeProblemDetail(w, http.StatusBadRequest, "https://api.example.com/problems/unknown-workflow", "Unknown Workflow", fmt.Sprintf("Workflow %q is not available", workflowReq.Workflow), availableWorkflows)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default wait to true
|
||||||
|
wait := true
|
||||||
|
if workflowReq.Wait != nil {
|
||||||
|
wait = *workflowReq.Wait
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set default timeout if not provided
|
||||||
|
timeout := time.Duration(30) * time.Second
|
||||||
|
if workflowReq.Timeout > 0 {
|
||||||
|
timeout = time.Duration(workflowReq.Timeout) * time.Second
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a context with timeout for workflow execution
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
// Execute workflow
|
||||||
|
output, err := workflow.Handler(r.WithContext(ctx), h, workflowReq.Input)
|
||||||
|
|
||||||
|
// Build response
|
||||||
|
workflowResp := WorkflowResponse{
|
||||||
|
ID: generateWorkflowID(),
|
||||||
|
Workflow: workflowReq.Workflow,
|
||||||
|
CreatedAt: time.Now(),
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
workflowResp.Status = "failed"
|
||||||
|
workflowResp.Error = err.Error()
|
||||||
|
} else {
|
||||||
|
if wait {
|
||||||
|
workflowResp.Status = "completed"
|
||||||
|
workflowResp.Output = output
|
||||||
|
now := time.Now()
|
||||||
|
workflowResp.CompletedAt = &now
|
||||||
|
} else {
|
||||||
|
workflowResp.Status = "pending"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write response
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
} else {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}
|
||||||
|
json.NewEncoder(w).Encode(workflowResp)
|
||||||
|
}
|
||||||
|
|
||||||
|
// getWorkflow returns a predefined workflow by name
|
||||||
|
func (h *Handler) getWorkflow(name string) (*PredefinedWorkflow, bool) {
|
||||||
|
workflows := h.getPredefinedWorkflows()
|
||||||
|
for _, wf := range workflows {
|
||||||
|
if wf.Name == name {
|
||||||
|
return &wf, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// getPredefinedWorkflows returns all available workflows
|
||||||
|
func (h *Handler) getPredefinedWorkflows() []PredefinedWorkflow {
|
||||||
|
return []PredefinedWorkflow{
|
||||||
|
{
|
||||||
|
Name: "chat-and-embed",
|
||||||
|
Description: "Chat with a model and then embed the response",
|
||||||
|
Handler: h.chatAndEmbedWorkflow,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "multi-model-chat",
|
||||||
|
Description: "Chat with multiple models sequentially",
|
||||||
|
Handler: h.multiModelChatWorkflow,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "rag-pipeline",
|
||||||
|
Description: "RAG pipeline: embed query, rerank, then chat with context",
|
||||||
|
Handler: h.ragPipelineWorkflow,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "batch-embeddings",
|
||||||
|
Description: "Generate embeddings for multiple texts",
|
||||||
|
Handler: h.batchEmbeddingsWorkflow,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// getAvailableWorkflows returns a list of available workflow names
|
||||||
|
func (h *Handler) getAvailableWorkflows() []string {
|
||||||
|
workflows := h.getPredefinedWorkflows()
|
||||||
|
names := make([]string, len(workflows))
|
||||||
|
for i, wf := range workflows {
|
||||||
|
names[i] = wf.Name
|
||||||
|
}
|
||||||
|
return names
|
||||||
|
}
|
||||||
|
|
||||||
|
// Workflow implementations
|
||||||
|
|
||||||
|
// chatAndEmbedWorkflow: Chat with a model, then embed the response
|
||||||
|
func (h *Handler) chatAndEmbedWorkflow(r *http.Request, handler *Handler, input map[string]interface{}) (interface{}, error) {
|
||||||
|
model, ok := input["model"].(string)
|
||||||
|
if !ok || model == "" {
|
||||||
|
return nil, fmt.Errorf("missing required parameter: model")
|
||||||
|
}
|
||||||
|
|
||||||
|
embedModel, ok := input["embed_model"].(string)
|
||||||
|
if !ok {
|
||||||
|
embedModel = "nomic-ai/nomic-embed-text-v2-moe"
|
||||||
|
}
|
||||||
|
|
||||||
|
messages, ok := input["messages"].([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("missing required parameter: messages")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 1: Chat
|
||||||
|
chatReq := map[string]interface{}{
|
||||||
|
"model": model,
|
||||||
|
"messages": messages,
|
||||||
|
}
|
||||||
|
|
||||||
|
chatBody, _ := json.Marshal(chatReq)
|
||||||
|
chatHTTPReq, _ := http.NewRequest("POST", "/v1/chat/completions", io.NopCloser(bytes.NewReader(chatBody)))
|
||||||
|
chatHTTPReq.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
// Create a response writer to capture the chat response
|
||||||
|
chatResp := &responseCapture{}
|
||||||
|
handler.ServeHTTP(chatResp, chatHTTPReq)
|
||||||
|
|
||||||
|
var chatResult map[string]interface{}
|
||||||
|
if err := json.Unmarshal(chatResp.body.Bytes(), &chatResult); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse chat response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract message content
|
||||||
|
var messageContent string
|
||||||
|
if choices, ok := chatResult["choices"].([]interface{}); ok && len(choices) > 0 {
|
||||||
|
if choice, ok := choices[0].(map[string]interface{}); ok {
|
||||||
|
if message, ok := choice["message"].(map[string]interface{}); ok {
|
||||||
|
if content, ok := message["content"].(string); ok {
|
||||||
|
messageContent = content
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 2: Embed the response
|
||||||
|
embedReq := map[string]interface{}{
|
||||||
|
"model": embedModel,
|
||||||
|
"input": messageContent,
|
||||||
|
}
|
||||||
|
|
||||||
|
embedBody, _ := json.Marshal(embedReq)
|
||||||
|
embedHTTPReq, _ := http.NewRequest("POST", "/v1/embeddings", io.NopCloser(bytes.NewReader(embedBody)))
|
||||||
|
embedHTTPReq.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
embedResp := &responseCapture{}
|
||||||
|
handler.ServeHTTP(embedResp, embedHTTPReq)
|
||||||
|
|
||||||
|
var embedResult map[string]interface{}
|
||||||
|
if err := json.Unmarshal(embedResp.body.Bytes(), &embedResult); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse embedding response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return map[string]interface{}{
|
||||||
|
"chat_response": chatResult,
|
||||||
|
"embedding_response": embedResult,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// multiModelChatWorkflow: Chat with multiple models sequentially
|
||||||
|
func (h *Handler) multiModelChatWorkflow(r *http.Request, handler *Handler, input map[string]interface{}) (interface{}, error) {
|
||||||
|
models, ok := input["models"].([]interface{})
|
||||||
|
if !ok || len(models) == 0 {
|
||||||
|
return nil, fmt.Errorf("missing required parameter: models (array)")
|
||||||
|
}
|
||||||
|
|
||||||
|
messages, ok := input["messages"].([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("missing required parameter: messages")
|
||||||
|
}
|
||||||
|
|
||||||
|
results := make([]map[string]interface{}, 0)
|
||||||
|
|
||||||
|
for _, modelInterface := range models {
|
||||||
|
model, ok := modelInterface.(string)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
chatReq := map[string]interface{}{
|
||||||
|
"model": model,
|
||||||
|
"messages": messages,
|
||||||
|
}
|
||||||
|
|
||||||
|
chatBody, _ := json.Marshal(chatReq)
|
||||||
|
chatHTTPReq, _ := http.NewRequest("POST", "/v1/chat/completions", io.NopCloser(bytes.NewReader(chatBody)))
|
||||||
|
chatHTTPReq.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
chatResp := &responseCapture{}
|
||||||
|
handler.ServeHTTP(chatResp, chatHTTPReq)
|
||||||
|
|
||||||
|
var chatResult map[string]interface{}
|
||||||
|
if err := json.Unmarshal(chatResp.body.Bytes(), &chatResult); err != nil {
|
||||||
|
results = append(results, map[string]interface{}{
|
||||||
|
"model": model,
|
||||||
|
"error": err.Error(),
|
||||||
|
})
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
results = append(results, map[string]interface{}{
|
||||||
|
"model": model,
|
||||||
|
"result": chatResult,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return results, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ragPipelineWorkflow: RAG pipeline - embed query, rerank, chat with context
|
||||||
|
func (h *Handler) ragPipelineWorkflow(r *http.Request, handler *Handler, input map[string]interface{}) (interface{}, error) {
|
||||||
|
query, ok := input["query"].(string)
|
||||||
|
if !ok || query == "" {
|
||||||
|
return nil, fmt.Errorf("missing required parameter: query")
|
||||||
|
}
|
||||||
|
|
||||||
|
documents, ok := input["documents"].([]interface{})
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("missing required parameter: documents")
|
||||||
|
}
|
||||||
|
|
||||||
|
model, ok := input["model"].(string)
|
||||||
|
if !ok {
|
||||||
|
model = "reasoning"
|
||||||
|
}
|
||||||
|
|
||||||
|
rerankModel, ok := input["rerank_model"].(string)
|
||||||
|
if !ok {
|
||||||
|
rerankModel = "BAAI/bge-reranker-base"
|
||||||
|
}
|
||||||
|
|
||||||
|
topK := 3
|
||||||
|
if tk, ok := input["top_k"].(float64); ok {
|
||||||
|
topK = int(tk)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 1: Rerank documents based on query
|
||||||
|
rerankReq := map[string]interface{}{
|
||||||
|
"model": rerankModel,
|
||||||
|
"query": query,
|
||||||
|
"texts": documents,
|
||||||
|
"top_k": topK,
|
||||||
|
}
|
||||||
|
|
||||||
|
rerankBody, _ := json.Marshal(rerankReq)
|
||||||
|
rerankHTTPReq, _ := http.NewRequest("POST", "/v1/rerank", io.NopCloser(bytes.NewReader(rerankBody)))
|
||||||
|
rerankHTTPReq.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
rerankResp := &responseCapture{}
|
||||||
|
handler.ServeHTTP(rerankResp, rerankHTTPReq)
|
||||||
|
|
||||||
|
var rerankResult map[string]interface{}
|
||||||
|
if err := json.Unmarshal(rerankResp.body.Bytes(), &rerankResult); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse rerank response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract top documents
|
||||||
|
var topDocs []string
|
||||||
|
if results, ok := rerankResult["results"].([]interface{}); ok {
|
||||||
|
for i, resultInterface := range results {
|
||||||
|
if i >= topK {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if result, ok := resultInterface.(map[string]interface{}); ok {
|
||||||
|
if text, ok := result["text"].(string); ok {
|
||||||
|
topDocs = append(topDocs, text)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 2: Chat with context
|
||||||
|
context := fmt.Sprintf("Context from documents:\n%v\n\nQuery: %s", topDocs, query)
|
||||||
|
|
||||||
|
chatReq := map[string]interface{}{
|
||||||
|
"model": model,
|
||||||
|
"messages": []interface{}{
|
||||||
|
map[string]interface{}{
|
||||||
|
"role": "user",
|
||||||
|
"content": context,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
chatBody, _ := json.Marshal(chatReq)
|
||||||
|
chatHTTPReq, _ := http.NewRequest("POST", "/v1/chat/completions", io.NopCloser(bytes.NewReader(chatBody)))
|
||||||
|
chatHTTPReq.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
chatResp := &responseCapture{}
|
||||||
|
handler.ServeHTTP(chatResp, chatHTTPReq)
|
||||||
|
|
||||||
|
var chatResult map[string]interface{}
|
||||||
|
if err := json.Unmarshal(chatResp.body.Bytes(), &chatResult); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse chat response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return map[string]interface{}{
|
||||||
|
"reranked_documents": topDocs,
|
||||||
|
"chat_response": chatResult,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// batchEmbeddingsWorkflow: Generate embeddings for multiple texts
|
||||||
|
func (h *Handler) batchEmbeddingsWorkflow(r *http.Request, handler *Handler, input map[string]interface{}) (interface{}, error) {
|
||||||
|
texts, ok := input["texts"].([]interface{})
|
||||||
|
if !ok || len(texts) == 0 {
|
||||||
|
return nil, fmt.Errorf("missing required parameter: texts (array)")
|
||||||
|
}
|
||||||
|
|
||||||
|
model, ok := input["model"].(string)
|
||||||
|
if !ok {
|
||||||
|
model = "nomic-ai/nomic-embed-text-v2-moe"
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert interface{} to []string
|
||||||
|
textStrings := make([]string, 0)
|
||||||
|
for _, t := range texts {
|
||||||
|
if str, ok := t.(string); ok {
|
||||||
|
textStrings = append(textStrings, str)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(textStrings) == 0 {
|
||||||
|
return nil, fmt.Errorf("no valid text strings in texts array")
|
||||||
|
}
|
||||||
|
|
||||||
|
embedReq := map[string]interface{}{
|
||||||
|
"model": model,
|
||||||
|
"input": textStrings,
|
||||||
|
}
|
||||||
|
|
||||||
|
embedBody, _ := json.Marshal(embedReq)
|
||||||
|
embedHTTPReq, _ := http.NewRequest("POST", "/v1/embeddings", io.NopCloser(bytes.NewReader(embedBody)))
|
||||||
|
embedHTTPReq.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
embedResp := &responseCapture{}
|
||||||
|
handler.ServeHTTP(embedResp, embedHTTPReq)
|
||||||
|
|
||||||
|
var embedResult map[string]interface{}
|
||||||
|
if err := json.Unmarshal(embedResp.body.Bytes(), &embedResult); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse embedding response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return embedResult, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Utility functions
|
||||||
|
|
||||||
|
// responseCapture captures HTTP response for reuse within workflows
|
||||||
|
type responseCapture struct {
|
||||||
|
status int
|
||||||
|
header http.Header
|
||||||
|
body bytes.Buffer
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *responseCapture) Header() http.Header {
|
||||||
|
if w.header == nil {
|
||||||
|
w.header = make(http.Header)
|
||||||
|
}
|
||||||
|
return w.header
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *responseCapture) Write(b []byte) (int, error) {
|
||||||
|
if w.status == 0 {
|
||||||
|
w.status = http.StatusOK
|
||||||
|
}
|
||||||
|
return w.body.Write(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *responseCapture) WriteHeader(statusCode int) {
|
||||||
|
if w.status == 0 {
|
||||||
|
w.status = statusCode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// generateWorkflowID generates a unique workflow execution ID
|
||||||
|
func generateWorkflowID() string {
|
||||||
|
return fmt.Sprintf("wf_%d", time.Now().UnixNano())
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,258 @@
|
|||||||
|
package proxy
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"forgejo.riotpiao.com/rock/homelab-frontend/internal/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestWorkflowEndpointNotFound(t *testing.T) {
|
||||||
|
// Create a minimal config
|
||||||
|
cfg := &config.Config{
|
||||||
|
Routes: make(map[string]*config.Route),
|
||||||
|
Models: map[string]*config.ModelUpstream{
|
||||||
|
"reasoning": {
|
||||||
|
Address: "localhost:8001",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
handler := New(cfg)
|
||||||
|
|
||||||
|
// Test POST /workflows with unknown workflow
|
||||||
|
body := map[string]interface{}{
|
||||||
|
"workflow": "unknown-workflow",
|
||||||
|
"input": map[string]interface{}{},
|
||||||
|
}
|
||||||
|
|
||||||
|
bodyBytes, _ := json.Marshal(body)
|
||||||
|
req := httptest.NewRequest("POST", "/workflows", bytes.NewReader(bodyBytes))
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusBadRequest {
|
||||||
|
t.Errorf("Expected 400, got %d", w.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
var response map[string]interface{}
|
||||||
|
json.Unmarshal(w.Body.Bytes(), &response)
|
||||||
|
|
||||||
|
if response["type"] != "https://api.example.com/problems/unknown-workflow" {
|
||||||
|
t.Errorf("Expected unknown-workflow error, got %v", response["type"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWorkflowEndpointMissingWorkflow(t *testing.T) {
|
||||||
|
cfg := &config.Config{
|
||||||
|
Routes: make(map[string]*config.Route),
|
||||||
|
Models: make(map[string]*config.ModelUpstream),
|
||||||
|
}
|
||||||
|
|
||||||
|
handler := New(cfg)
|
||||||
|
|
||||||
|
// Test POST /workflows with missing workflow field
|
||||||
|
body := map[string]interface{}{
|
||||||
|
"input": map[string]interface{}{},
|
||||||
|
}
|
||||||
|
|
||||||
|
bodyBytes, _ := json.Marshal(body)
|
||||||
|
req := httptest.NewRequest("POST", "/workflows", bytes.NewReader(bodyBytes))
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusBadRequest {
|
||||||
|
t.Errorf("Expected 400, got %d", w.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
var response map[string]interface{}
|
||||||
|
json.Unmarshal(w.Body.Bytes(), &response)
|
||||||
|
|
||||||
|
if response["type"] != "https://api.example.com/problems/missing-workflow" {
|
||||||
|
t.Errorf("Expected missing-workflow error, got %v", response["type"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWorkflowEndpointInvalidMethod(t *testing.T) {
|
||||||
|
cfg := &config.Config{
|
||||||
|
Routes: make(map[string]*config.Route),
|
||||||
|
Models: make(map[string]*config.ModelUpstream),
|
||||||
|
}
|
||||||
|
|
||||||
|
handler := New(cfg)
|
||||||
|
|
||||||
|
// Test GET /workflows (should be 405)
|
||||||
|
req := httptest.NewRequest("GET", "/workflows", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusMethodNotAllowed {
|
||||||
|
t.Errorf("Expected 405, got %d", w.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWorkflowEndpointInvalidJSON(t *testing.T) {
|
||||||
|
cfg := &config.Config{
|
||||||
|
Routes: make(map[string]*config.Route),
|
||||||
|
Models: make(map[string]*config.ModelUpstream),
|
||||||
|
}
|
||||||
|
|
||||||
|
handler := New(cfg)
|
||||||
|
|
||||||
|
// Test POST /workflows with invalid JSON
|
||||||
|
req := httptest.NewRequest("POST", "/workflows", bytes.NewReader([]byte("not json")))
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusBadRequest {
|
||||||
|
t.Errorf("Expected 400, got %d", w.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetAvailableWorkflows(t *testing.T) {
|
||||||
|
cfg := &config.Config{
|
||||||
|
Routes: make(map[string]*config.Route),
|
||||||
|
Models: make(map[string]*config.ModelUpstream),
|
||||||
|
}
|
||||||
|
|
||||||
|
handler := New(cfg)
|
||||||
|
|
||||||
|
workflows := handler.getAvailableWorkflows()
|
||||||
|
|
||||||
|
expectedWorkflows := []string{
|
||||||
|
"chat-and-embed",
|
||||||
|
"multi-model-chat",
|
||||||
|
"rag-pipeline",
|
||||||
|
"batch-embeddings",
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(workflows) != len(expectedWorkflows) {
|
||||||
|
t.Errorf("Expected %d workflows, got %d", len(expectedWorkflows), len(workflows))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check that all expected workflows are present
|
||||||
|
for _, expected := range expectedWorkflows {
|
||||||
|
found := false
|
||||||
|
for _, actual := range workflows {
|
||||||
|
if actual == expected {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Errorf("Expected workflow %q not found", expected)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetWorkflow(t *testing.T) {
|
||||||
|
cfg := &config.Config{
|
||||||
|
Routes: make(map[string]*config.Route),
|
||||||
|
Models: make(map[string]*config.ModelUpstream),
|
||||||
|
}
|
||||||
|
|
||||||
|
handler := New(cfg)
|
||||||
|
|
||||||
|
// Test getting a valid workflow
|
||||||
|
workflow, ok := handler.getWorkflow("chat-and-embed")
|
||||||
|
if !ok {
|
||||||
|
t.Error("Expected to find chat-and-embed workflow")
|
||||||
|
}
|
||||||
|
if workflow.Name != "chat-and-embed" {
|
||||||
|
t.Errorf("Expected workflow name chat-and-embed, got %s", workflow.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test getting an invalid workflow
|
||||||
|
workflow, ok = handler.getWorkflow("invalid-workflow")
|
||||||
|
if ok {
|
||||||
|
t.Error("Expected not to find invalid-workflow")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGenerateWorkflowID(t *testing.T) {
|
||||||
|
id1 := generateWorkflowID()
|
||||||
|
id2 := generateWorkflowID()
|
||||||
|
|
||||||
|
if id1 == id2 {
|
||||||
|
t.Error("Generated workflow IDs should be unique")
|
||||||
|
}
|
||||||
|
|
||||||
|
if !bytes.HasPrefix([]byte(id1), []byte("wf_")) {
|
||||||
|
t.Errorf("Workflow ID should start with 'wf_', got %s", id1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestResponseCapture(t *testing.T) {
|
||||||
|
rc := &responseCapture{}
|
||||||
|
|
||||||
|
// Test Header
|
||||||
|
rc.Header().Set("X-Test", "value")
|
||||||
|
if rc.Header().Get("X-Test") != "value" {
|
||||||
|
t.Error("Header not set correctly")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test Write
|
||||||
|
n, err := rc.Write([]byte("test content"))
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if n != 12 {
|
||||||
|
t.Errorf("Expected 12 bytes written, got %d", n)
|
||||||
|
}
|
||||||
|
if rc.body.String() != "test content" {
|
||||||
|
t.Errorf("Expected 'test content', got %s", rc.body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test WriteHeader
|
||||||
|
rc.WriteHeader(http.StatusOK)
|
||||||
|
if rc.status != http.StatusOK {
|
||||||
|
t.Errorf("Expected status 200, got %d", rc.status)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test WriteHeader doesn't override
|
||||||
|
rc.WriteHeader(http.StatusInternalServerError)
|
||||||
|
if rc.status != http.StatusOK {
|
||||||
|
t.Error("WriteHeader should not override existing status")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWorkflowResponseSerialization(t *testing.T) {
|
||||||
|
resp := WorkflowResponse{
|
||||||
|
ID: "wf_123",
|
||||||
|
Workflow: "test-workflow",
|
||||||
|
Status: "completed",
|
||||||
|
Output: map[string]interface{}{
|
||||||
|
"key": "value",
|
||||||
|
},
|
||||||
|
Error: "",
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := json.Marshal(resp)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Failed to marshal response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var unmarshaled WorkflowResponse
|
||||||
|
if err := json.Unmarshal(data, &unmarshaled); err != nil {
|
||||||
|
t.Errorf("Failed to unmarshal response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if unmarshaled.ID != resp.ID {
|
||||||
|
t.Errorf("Expected ID %s, got %s", resp.ID, unmarshaled.ID)
|
||||||
|
}
|
||||||
|
if unmarshaled.Workflow != resp.Workflow {
|
||||||
|
t.Errorf("Expected Workflow %s, got %s", resp.Workflow, unmarshaled.Workflow)
|
||||||
|
}
|
||||||
|
if unmarshaled.Status != resp.Status {
|
||||||
|
t.Errorf("Expected Status %s, got %s", resp.Status, unmarshaled.Status)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
package serviceadapter
|
package serviceadapter
|
||||||
|
|
||||||
|
// WorkflowAdapter handles X-Service: workflow requests.
|
||||||
|
type WorkflowAdapter struct{}
|
||||||
|
|
||||||
// SQSAdapter handles X-Service: sqs requests.
|
// SQSAdapter handles X-Service: sqs requests.
|
||||||
type SQSAdapter struct{}
|
type SQSAdapter struct{}
|
||||||
|
|
||||||
|
|||||||
@@ -1,288 +0,0 @@
|
|||||||
package serviceadapter
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"forgejo.riotpiao.com/rock/homelab-frontend/internal/temporal"
|
|
||||||
)
|
|
||||||
|
|
||||||
// WorkflowAdapter handles X-Service: workflow requests.
|
|
||||||
// It forwards workflow operations to the Temporal gRPC service.
|
|
||||||
// Users can specify namespace via the request payload.
|
|
||||||
type WorkflowAdapter struct {
|
|
||||||
temporalHandler *temporal.Handler
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewWorkflowAdapter creates a new WorkflowAdapter.
|
|
||||||
func NewWorkflowAdapter(handler *temporal.Handler) *WorkflowAdapter {
|
|
||||||
return &WorkflowAdapter{
|
|
||||||
temporalHandler: handler,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleStart handles workflow start requests.
|
|
||||||
// Expects payload: { "namespace": "default", "workflow_id": "...", "workflow_type": "...", "task_queue": "...", "input": {...} }
|
|
||||||
func (wa *WorkflowAdapter) HandleStart(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleDescribe handles workflow describe requests.
|
|
||||||
// Expects payload: { "namespace": "default", "workflow_id": "..." }
|
|
||||||
func (wa *WorkflowAdapter) HandleDescribe(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleList handles workflow list requests.
|
|
||||||
// Expects payload: { "namespace": "default", "query": "..." (optional) }
|
|
||||||
func (wa *WorkflowAdapter) HandleList(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleHistory handles workflow history requests.
|
|
||||||
// Expects payload: { "namespace": "default", "workflow_id": "..." }
|
|
||||||
func (wa *WorkflowAdapter) HandleHistory(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleTerminate handles workflow termination.
|
|
||||||
// Expects payload: { "namespace": "default", "workflow_id": "...", "reason": "..." }
|
|
||||||
func (wa *WorkflowAdapter) HandleTerminate(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleCancel handles workflow cancellation.
|
|
||||||
// Expects payload: { "namespace": "default", "workflow_id": "..." }
|
|
||||||
func (wa *WorkflowAdapter) HandleCancel(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleSignal handles workflow signal.
|
|
||||||
// Expects payload: { "namespace": "default", "workflow_id": "...", "signal_name": "...", "signal_data": {...} }
|
|
||||||
func (wa *WorkflowAdapter) HandleSignal(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleQuery handles workflow query.
|
|
||||||
// Expects payload: { "namespace": "default", "workflow_id": "...", "query_type": "...", "query_data": {...} }
|
|
||||||
func (wa *WorkflowAdapter) HandleQuery(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleReset handles workflow reset.
|
|
||||||
// Expects payload: { "namespace": "default", "workflow_id": "...", "reset_type": "..." }
|
|
||||||
func (wa *WorkflowAdapter) HandleReset(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleUpdate handles workflow update.
|
|
||||||
// Expects payload: { "namespace": "default", "workflow_id": "...", "update_data": {...} }
|
|
||||||
func (wa *WorkflowAdapter) HandleUpdate(w http.ResponseWriter, r *http.Request) {
|
|
||||||
wa.forwardToTemporal(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// forwardToTemporal reads the request body, ensures namespace is specified,
|
|
||||||
// and forwards to the temporal handler.
|
|
||||||
func (wa *WorkflowAdapter) forwardToTemporal(w http.ResponseWriter, r *http.Request) {
|
|
||||||
// Read request body
|
|
||||||
body, err := io.ReadAll(r.Body)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, fmt.Sprintf("failed to read request body: %v", err), http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer r.Body.Close()
|
|
||||||
|
|
||||||
// Parse JSON to check for namespace
|
|
||||||
var payload map[string]interface{}
|
|
||||||
if err := json.Unmarshal(body, &payload); err != nil {
|
|
||||||
http.Error(w, fmt.Sprintf("invalid JSON payload: %v", err), http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ensure namespace is specified (required for Temporal routing)
|
|
||||||
namespace, ok := payload["namespace"].(string)
|
|
||||||
if !ok || namespace == "" {
|
|
||||||
http.Error(w, `"namespace" field required in payload`, http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Forward to temporal handler by calling it with the request
|
|
||||||
// Restore body for temporal handler
|
|
||||||
r.Body = io.NopCloser(bytes.NewReader(body))
|
|
||||||
r.ContentLength = int64(len(body))
|
|
||||||
|
|
||||||
// Call temporal handler
|
|
||||||
wa.temporalHandler.ServeHTTP(w, r)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetSpec returns the ServiceAdapter spec for workflow service.
|
|
||||||
// This defines the available resources and methods.
|
|
||||||
func GetWorkflowSpec() *Spec {
|
|
||||||
return &Spec{
|
|
||||||
ServiceName: "workflow",
|
|
||||||
Upstream: Upstream{
|
|
||||||
URL: "grpc://temporal:7233", // gRPC endpoint
|
|
||||||
TimeoutSeconds: 30,
|
|
||||||
},
|
|
||||||
Auth: Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:execute",
|
|
||||||
},
|
|
||||||
Retryable: true,
|
|
||||||
Resources: []Resource{
|
|
||||||
{
|
|
||||||
Name: "start",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/StartWorkflowExecution",
|
|
||||||
RequestSchema: "workflow_start_request",
|
|
||||||
ResponseSchema: "workflow_start_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:execute",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "describe",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/DescribeWorkflowExecution",
|
|
||||||
RequestSchema: "workflow_describe_request",
|
|
||||||
ResponseSchema: "workflow_describe_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:read",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "list",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/ListWorkflowExecutions",
|
|
||||||
RequestSchema: "workflow_list_request",
|
|
||||||
ResponseSchema: "workflow_list_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:read",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "history",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/GetWorkflowExecutionHistory",
|
|
||||||
RequestSchema: "workflow_history_request",
|
|
||||||
ResponseSchema: "workflow_history_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:read",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "terminate",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/TerminateWorkflowExecution",
|
|
||||||
RequestSchema: "workflow_terminate_request",
|
|
||||||
ResponseSchema: "workflow_terminate_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:execute",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "cancel",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/RequestCancelWorkflowExecution",
|
|
||||||
RequestSchema: "workflow_cancel_request",
|
|
||||||
ResponseSchema: "workflow_cancel_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:execute",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "signal",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/SignalWorkflowExecution",
|
|
||||||
RequestSchema: "workflow_signal_request",
|
|
||||||
ResponseSchema: "workflow_signal_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:signal",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "query",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/QueryWorkflow",
|
|
||||||
RequestSchema: "workflow_query_request",
|
|
||||||
ResponseSchema: "workflow_query_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:query",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "reset",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/ResetWorkflowExecution",
|
|
||||||
RequestSchema: "workflow_reset_request",
|
|
||||||
ResponseSchema: "workflow_reset_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:execute",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "update",
|
|
||||||
Methods: []Method{
|
|
||||||
{
|
|
||||||
Verb: "POST",
|
|
||||||
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/UpdateWorkflowExecution",
|
|
||||||
RequestSchema: "workflow_update_request",
|
|
||||||
ResponseSchema: "workflow_update_response",
|
|
||||||
Auth: &Auth{
|
|
||||||
Required: true,
|
|
||||||
Capability: "workflow:execute",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,7 +7,6 @@ resources:
|
|||||||
- ci-rbac.yaml
|
- ci-rbac.yaml
|
||||||
- task-integration-test.yaml
|
- task-integration-test.yaml
|
||||||
- task-load-test.yaml
|
- task-load-test.yaml
|
||||||
- task-workflow-visibility.yaml
|
|
||||||
- pipeline-sse-optimization.yaml
|
- pipeline-sse-optimization.yaml
|
||||||
|
|
||||||
generatorOptions:
|
generatorOptions:
|
||||||
@@ -20,6 +19,3 @@ configMapGenerator:
|
|||||||
- name: load-test-script
|
- name: load-test-script
|
||||||
files:
|
files:
|
||||||
- scripts/load-test.sh
|
- scripts/load-test.sh
|
||||||
- name: workflow-visibility-test-script
|
|
||||||
files:
|
|
||||||
- scripts/workflow-visibility-test.sh
|
|
||||||
|
|||||||
@@ -30,22 +30,10 @@ spec:
|
|||||||
- name: gateway-port
|
- name: gateway-port
|
||||||
value: $(params.gateway-port)
|
value: $(params.gateway-port)
|
||||||
|
|
||||||
# Workflow visibility tests (runs after integration tests pass)
|
|
||||||
- name: workflow-visibility-tests
|
|
||||||
runAfter:
|
|
||||||
- integration-tests
|
|
||||||
taskRef:
|
|
||||||
name: workflow-visibility-test
|
|
||||||
params:
|
|
||||||
- name: image
|
|
||||||
value: $(params.image)
|
|
||||||
- name: gateway-port
|
|
||||||
value: $(params.gateway-port)
|
|
||||||
|
|
||||||
# Performance load tests (runs after integration tests pass)
|
# Performance load tests (runs after integration tests pass)
|
||||||
- name: load-tests
|
- name: load-tests
|
||||||
runAfter:
|
runAfter:
|
||||||
- workflow-visibility-tests
|
- integration-tests
|
||||||
taskRef:
|
taskRef:
|
||||||
name: load-test-sse-streaming
|
name: load-test-sse-streaming
|
||||||
params:
|
params:
|
||||||
@@ -64,7 +52,6 @@ spec:
|
|||||||
- name: report-results
|
- name: report-results
|
||||||
runAfter:
|
runAfter:
|
||||||
- load-tests
|
- load-tests
|
||||||
- workflow-visibility-tests
|
|
||||||
taskSpec:
|
taskSpec:
|
||||||
description: "Report combined test results"
|
description: "Report combined test results"
|
||||||
params:
|
params:
|
||||||
@@ -72,10 +59,6 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
- name: integration-summary
|
- name: integration-summary
|
||||||
type: string
|
type: string
|
||||||
- name: workflow-result
|
|
||||||
type: string
|
|
||||||
- name: workflow-summary
|
|
||||||
type: string
|
|
||||||
- name: load-result
|
- name: load-result
|
||||||
type: string
|
type: string
|
||||||
- name: load-summary
|
- name: load-summary
|
||||||
@@ -87,35 +70,27 @@ spec:
|
|||||||
image: busybox
|
image: busybox
|
||||||
script: |
|
script: |
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
echo "╔═══════════════════════════════════════════════════════════╗"
|
echo "╔════════════════════════════════════════════════════╗"
|
||||||
echo "║ SSE Optimization + Workflow Tests (PR #26) ║"
|
echo "║ SSE Optimization Test Results (PR #26) ║"
|
||||||
echo "╠═══════════════════════════════════════════════════════════╣"
|
echo "╠════════════════════════════════════════════════════╣"
|
||||||
echo "║ ║"
|
echo "║ ║"
|
||||||
echo "║ Integration Tests: ║"
|
echo "║ Integration Tests: ║"
|
||||||
echo "║ Status: $(params.integration-result)"
|
echo "║ Status: $(params.integration-result)"
|
||||||
echo "║ Summary: $(params.integration-summary)"
|
echo "║ Summary: $(params.integration-summary)"
|
||||||
echo "║ ║"
|
echo "║ ║"
|
||||||
echo "║ Workflow Visibility (namespace pass-down): ║"
|
echo "║ Load Tests (Issues #31, #32, #33): ║"
|
||||||
echo "║ Status: $(params.workflow-result)"
|
|
||||||
echo "║ Summary: $(params.workflow-summary)"
|
|
||||||
echo "║ ║"
|
|
||||||
echo "║ Load Tests (Issues #31, #32, #33): ║"
|
|
||||||
echo "║ Status: $(params.load-result)"
|
echo "║ Status: $(params.load-result)"
|
||||||
echo "║ Summary: $(params.load-summary)"
|
echo "║ Summary: $(params.load-summary)"
|
||||||
echo "║ ║"
|
echo "║ ║"
|
||||||
echo "║ Performance Metrics: ║"
|
echo "║ Performance Metrics: ║"
|
||||||
echo "║ $(params.load-metrics)"
|
echo "║ $(params.load-metrics)"
|
||||||
echo "║ ║"
|
echo "║ ║"
|
||||||
echo "╚═══════════════════════════════════════════════════════════╝"
|
echo "╚════════════════════════════════════════════════════╝"
|
||||||
params:
|
params:
|
||||||
- name: integration-result
|
- name: integration-result
|
||||||
value: $(tasks.integration-tests.results.result)
|
value: $(tasks.integration-tests.results.result)
|
||||||
- name: integration-summary
|
- name: integration-summary
|
||||||
value: $(tasks.integration-tests.results.summary)
|
value: $(tasks.integration-tests.results.summary)
|
||||||
- name: workflow-result
|
|
||||||
value: $(tasks.workflow-visibility-tests.results.result)
|
|
||||||
- name: workflow-summary
|
|
||||||
value: $(tasks.workflow-visibility-tests.results.summary)
|
|
||||||
- name: load-result
|
- name: load-result
|
||||||
value: $(tasks.load-tests.results.result)
|
value: $(tasks.load-tests.results.result)
|
||||||
- name: load-summary
|
- name: load-summary
|
||||||
|
|||||||
@@ -76,56 +76,10 @@ echo "▸ SQS service"
|
|||||||
assert "sqs/list-queues" 401 \
|
assert "sqs/list-queues" 401 \
|
||||||
-X GET -H "X-Service: sqs" -H "X-Resource: list-queues" "${GW}/"
|
-X GET -H "X-Service: sqs" -H "X-Resource: list-queues" "${GW}/"
|
||||||
|
|
||||||
# ── Workflow visibility (namespace pass-down) ──
|
# ── Workflow (gRPC needs content-type → 400) ──
|
||||||
echo "▸ Workflow service"
|
echo "▸ Workflow service"
|
||||||
|
assert "workflow/list (no grpc content-type → 400)" 400 \
|
||||||
# Test 1: List workflows in poimen-harness namespace (should see 4 terminated workflows)
|
-X GET -H "X-Service: workflow" -H "X-Resource: list" "${GW}/"
|
||||||
echo " Testing workflow visibility in poimen-harness namespace..."
|
|
||||||
WF_LIST=$(curl -s -X POST \
|
|
||||||
-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)"
|
|
||||||
PASS=$((PASS + 1))
|
|
||||||
else
|
|
||||||
echo " ✗ Workflow list failed to return executions"
|
|
||||||
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 \
|
|
||||||
-H "X-Service: workflow" \
|
|
||||||
-H "X-Resource: list" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{}' \
|
|
||||||
"${GW}/" 2>/dev/null || echo "000")
|
|
||||||
|
|
||||||
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))
|
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "═══ Results: ${PASS}/${TOTAL} passed, ${FAIL} failed ═══"
|
echo "═══ Results: ${PASS}/${TOTAL} passed, ${FAIL} failed ═══"
|
||||||
|
|||||||
@@ -1,154 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Workflow visibility test for gateway.
|
|
||||||
# Verifies that the WorkflowAdapter provides visibility into terminated workflows
|
|
||||||
# in the poimen-harness namespace via X-Service: workflow routing.
|
|
||||||
#
|
|
||||||
# Expected: 4 terminated workflows in poimen-harness namespace
|
|
||||||
#
|
|
||||||
# Required env:
|
|
||||||
# GW — gateway base URL (e.g. http://localhost:8080)
|
|
||||||
# RESULTS_DIR — directory to write Tekton results
|
|
||||||
|
|
||||||
: "${RESULTS_DIR:=/tekton/results}"
|
|
||||||
|
|
||||||
PASS=0
|
|
||||||
FAIL=0
|
|
||||||
TOTAL=0
|
|
||||||
|
|
||||||
echo "═══ Workflow Visibility Test ═══"
|
|
||||||
echo ""
|
|
||||||
echo "Testing WorkflowAdapter namespace pass-down"
|
|
||||||
echo "Expected: 4 terminated workflows in poimen-harness namespace"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# ── Wait for gateway ──
|
|
||||||
echo "⏳ Waiting for gateway..."
|
|
||||||
READY=false
|
|
||||||
for i in $(seq 1 60); do
|
|
||||||
if curl -s -f "${GW}/healthz" > /dev/null 2>&1; then
|
|
||||||
echo "✓ Gateway ready"
|
|
||||||
READY=true
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ "$READY" = "false" ]; then
|
|
||||||
echo "✗ Gateway timeout"
|
|
||||||
echo "fail" > "${RESULTS_DIR}/result"
|
|
||||||
echo "Gateway did not become ready" > "${RESULTS_DIR}/summary"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ── Test 1: List workflows in poimen-harness ──
|
|
||||||
TOTAL=$((TOTAL + 1))
|
|
||||||
echo "Test 1: List workflows in poimen-harness namespace"
|
|
||||||
|
|
||||||
WF_RESPONSE=$(curl -s -X POST \
|
|
||||||
-H "X-Service: workflow" \
|
|
||||||
-H "X-Resource: list" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"namespace": "poimen-harness"}' \
|
|
||||||
"${GW}/" 2>/dev/null || echo "")
|
|
||||||
|
|
||||||
if [ -z "$WF_RESPONSE" ]; then
|
|
||||||
echo " ✗ No response from workflow list endpoint"
|
|
||||||
FAIL=$((FAIL + 1))
|
|
||||||
else
|
|
||||||
echo " ✓ Received workflow list response"
|
|
||||||
PASS=$((PASS + 1))
|
|
||||||
|
|
||||||
# Extract workflow count (if available)
|
|
||||||
WF_COUNT=$(echo "$WF_RESPONSE" | grep -o '"execution_time"' | wc -l || echo "0")
|
|
||||||
echo " Found workflows: $WF_COUNT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ── Test 2: Verify namespace is required ──
|
|
||||||
TOTAL=$((TOTAL + 1))
|
|
||||||
echo "Test 2: Namespace validation (missing namespace should fail)"
|
|
||||||
|
|
||||||
NO_NS_RESPONSE=$(curl -s -w "\n%{http_code}" -X POST \
|
|
||||||
-H "X-Service: workflow" \
|
|
||||||
-H "X-Resource: list" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{}' \
|
|
||||||
"${GW}/" 2>/dev/null || echo "")
|
|
||||||
|
|
||||||
NO_NS_CODE=$(echo "$NO_NS_RESPONSE" | tail -1)
|
|
||||||
|
|
||||||
if [ "$NO_NS_CODE" = "400" ]; then
|
|
||||||
echo " ✓ Correctly rejected missing namespace (HTTP 400)"
|
|
||||||
PASS=$((PASS + 1))
|
|
||||||
elif [ "$NO_NS_CODE" = "401" ]; then
|
|
||||||
echo " ⚠ Got 401 (auth required) - namespace validation happens after auth check"
|
|
||||||
PASS=$((PASS + 1))
|
|
||||||
else
|
|
||||||
echo " ✗ Expected 400/401, got $NO_NS_CODE"
|
|
||||||
FAIL=$((FAIL + 1))
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ── Test 3: Query specific terminated workflow ──
|
|
||||||
TOTAL=$((TOTAL + 1))
|
|
||||||
echo "Test 3: Describe specific workflow (if available)"
|
|
||||||
|
|
||||||
# Try to describe a workflow - this will fail if no workflows exist, but shows the feature works
|
|
||||||
DESCRIBE_RESPONSE=$(curl -s -X POST \
|
|
||||||
-H "X-Service: workflow" \
|
|
||||||
-H "X-Resource: describe" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"namespace": "poimen-harness", "workflow_id": "test-workflow"}' \
|
|
||||||
"${GW}/" 2>/dev/null || echo "")
|
|
||||||
|
|
||||||
if [ -n "$DESCRIBE_RESPONSE" ]; then
|
|
||||||
echo " ✓ Describe endpoint responded"
|
|
||||||
PASS=$((PASS + 1))
|
|
||||||
else
|
|
||||||
echo " ⚠ Describe endpoint no response (may indicate workflow doesn't exist)"
|
|
||||||
# Not a failure - endpoint exists but workflow may not
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ── Test 4: Verify auth requirement ──
|
|
||||||
TOTAL=$((TOTAL + 1))
|
|
||||||
echo "Test 4: Auth requirement (workflow service requires Authorization)"
|
|
||||||
|
|
||||||
NO_AUTH_CODE=$(curl -s -w '%{http_code}' -o /dev/null -X POST \
|
|
||||||
-H "X-Service: workflow" \
|
|
||||||
-H "X-Resource: list" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"namespace": "poimen-harness"}' \
|
|
||||||
"${GW}/" 2>/dev/null || echo "000")
|
|
||||||
|
|
||||||
if [ "$NO_AUTH_CODE" = "401" ]; then
|
|
||||||
echo " ✓ Correctly requires auth (HTTP 401)"
|
|
||||||
PASS=$((PASS + 1))
|
|
||||||
else
|
|
||||||
echo " ✗ Expected 401, got $NO_AUTH_CODE"
|
|
||||||
echo " (Auth may be disabled in test environment)"
|
|
||||||
FAIL=$((FAIL + 1))
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ── Summary ──
|
|
||||||
echo ""
|
|
||||||
echo "═══ Results ═══"
|
|
||||||
echo "Passed: $PASS/$TOTAL"
|
|
||||||
echo "Failed: $FAIL/$TOTAL"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
if [ "$FAIL" -eq 0 ]; then
|
|
||||||
echo "pass" > "${RESULTS_DIR}/result"
|
|
||||||
SUMMARY="Workflow visibility test passed. WorkflowAdapter can list/describe workflows in poimen-harness namespace with namespace pass-down support."
|
|
||||||
echo "✓ All tests passed"
|
|
||||||
else
|
|
||||||
echo "fail" > "${RESULTS_DIR}/result"
|
|
||||||
SUMMARY="$FAIL tests failed. Check WorkflowAdapter implementation and namespace validation."
|
|
||||||
echo "✗ Some tests failed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$SUMMARY" > "${RESULTS_DIR}/summary"
|
|
||||||
echo "" >> "${RESULTS_DIR}/summary"
|
|
||||||
echo "Passed: $PASS/$TOTAL" >> "${RESULTS_DIR}/summary"
|
|
||||||
echo "Failed: $FAIL/$TOTAL" >> "${RESULTS_DIR}/summary"
|
|
||||||
|
|
||||||
[ "$FAIL" -eq 0 ]
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
apiVersion: tekton.dev/v1
|
|
||||||
kind: Task
|
|
||||||
metadata:
|
|
||||||
name: workflow-visibility-test
|
|
||||||
namespace: api
|
|
||||||
labels:
|
|
||||||
app: api-gateway
|
|
||||||
component: testing
|
|
||||||
spec:
|
|
||||||
description: >
|
|
||||||
Test workflow visibility via WorkflowAdapter.
|
|
||||||
Verifies that the gateway provides visibility into terminated workflows
|
|
||||||
in the poimen-harness namespace via X-Service: workflow routing.
|
|
||||||
This ensures namespace pass-down is working correctly.
|
|
||||||
|
|
||||||
params:
|
|
||||||
- name: image
|
|
||||||
type: string
|
|
||||||
description: "Container image to test (repo:tag)"
|
|
||||||
- name: gateway-port
|
|
||||||
type: string
|
|
||||||
default: "8080"
|
|
||||||
|
|
||||||
results:
|
|
||||||
- name: result
|
|
||||||
type: string
|
|
||||||
description: "pass or fail"
|
|
||||||
- name: summary
|
|
||||||
type: string
|
|
||||||
description: "Test summary"
|
|
||||||
- name: workflow-count
|
|
||||||
type: string
|
|
||||||
description: "Number of workflows found in poimen-harness"
|
|
||||||
|
|
||||||
sidecars:
|
|
||||||
- name: gateway
|
|
||||||
image: $(params.image)
|
|
||||||
env:
|
|
||||||
- name: LISTEN_ADDR
|
|
||||||
value: "0.0.0.0:$(params.gateway-port)"
|
|
||||||
- name: CONFIG_PATH
|
|
||||||
value: /etc/gateway/config.yaml
|
|
||||||
- name: LOG_LEVEL
|
|
||||||
value: info
|
|
||||||
- name: AUTH_CLIENT_SECRET
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: api-gw-client-secret
|
|
||||||
key: client-secret
|
|
||||||
optional: true
|
|
||||||
volumeMounts:
|
|
||||||
- name: gateway-config
|
|
||||||
mountPath: /etc/gateway
|
|
||||||
readOnly: true
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: run-workflow-visibility-test
|
|
||||||
image: curlimages/curl:8.13.0
|
|
||||||
env:
|
|
||||||
- name: GW
|
|
||||||
value: "http://localhost:$(params.gateway-port)"
|
|
||||||
- name: RESULTS_DIR
|
|
||||||
value: /tekton/results
|
|
||||||
command: ["sh", "/scripts/workflow-visibility-test.sh"]
|
|
||||||
volumeMounts:
|
|
||||||
- name: test-script
|
|
||||||
mountPath: /scripts
|
|
||||||
readOnly: true
|
|
||||||
computeResources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 64Mi
|
|
||||||
limits:
|
|
||||||
cpu: 200m
|
|
||||||
memory: 128Mi
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
- name: gateway-config
|
|
||||||
secret:
|
|
||||||
secretName: api-gateway-config
|
|
||||||
- name: test-script
|
|
||||||
configMap:
|
|
||||||
name: workflow-visibility-test-script
|
|
||||||
defaultMode: 0755
|
|
||||||
Reference in New Issue
Block a user